Initial work on rewriting regions

Add a sign cache, better utilise internal mc code to perform sign validation, add warnings for access to invalidated region objects
Fix pom, shade in the NMS providers
2026-11-07 01:42:34 -05:00 · 2021-03-25 23:09:12 +01:00 · 2021-03-22 12:33:24 +01:00 · 2021-03-17 15:22:15 +01:00 · 2021-03-17 15:19:34 +01:00 · 2021-03-17 11:33:08 +01:00
184 changed files with 15102 additions and 15291 deletions
@@ -1,23 +0,0 @@
-name: Java CI with Gradle
-
-on: [ push, pull_request ]
-
-jobs:
-  build:
-    # Only run on PRs if the source branch is on someone else's repo
-    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
-    strategy:
-      matrix:
-        os: ["ubuntu-latest", "windows-latest"]
-    runs-on: "${{ matrix.os }}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1.0.4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
-        with:
-          java-version: '17'
-          distribution: 'zulu'
-          cache: 'gradle'
-      - name: Build with Gradle
-        run: ./gradlew clean build
@@ -0,0 +1,32 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Cache local Maven repository
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+      
@@ -1,194 +1,25 @@
+# Maven stuff
+target

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

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

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

-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-### Gradle ###
-.gradle
-build/
-build-cache/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Cache of project
-.gradletasknamecache
-
-# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
-# gradle/wrapper/gradle-wrapper.properties
-
-### Gradle Patch ###
-**/build/
-
-# End of https://www.toptal.com/developers/gitignore/api/macos,windows,intellij+all,gradle,maven
+desktop.ini
@@ -1,114 +0,0 @@
-plugins {
-    id("com.github.johnrengelman.shadow") version "8.1.1"
-}
-
-description = "AreaShop"
-
-dependencies {
-    // Platform
-    compileOnlyApi(libs.spigot)
-    compileOnlyApi(libs.worldeditCore) {
-        exclude("com.google.guava", "guava")
-    }
-    compileOnlyApi(libs.worldeditBukkit) {
-        exclude("com.google.guava", "guava")
-    }
-    compileOnlyApi(libs.worldguardCore) {
-        exclude("com.google.guava", "guava")
-    }
-    compileOnlyApi(libs.worldguardBukkit) {
-        exclude("com.google.guava", "guava")
-    }
-    compileOnlyApi("com.github.MilkBowl:VaultAPI:1.7") {
-        exclude("com.google.guava", "guava")
-    }
-
-    // 3rd party libraries
-    implementation("io.papermc:paperlib:1.0.8")
-    implementation("com.github.NLthijs48:InteractiveMessenger:e7749258ca")
-    implementation("com.github.NLthijs48:BukkitDo:819d51ec2b")
-    implementation("io.github.baked-libs:dough-data:1.2.0")
-    implementation("com.google.inject:guice:7.0.0") {
-        exclude("com.google.guava", "guava")
-    }
-    implementation("com.google.inject.extensions:guice-assistedinject:7.0.0") {
-        exclude("com.google.guava", "guava")
-    }
-    implementation("net.kyori:adventure-platform-bukkit:4.3.0")
-    implementation("net.kyori:adventure-text-minimessage:4.14.0")
-    implementation("org.spongepowered:configurate-yaml:4.0.0")
-
-    // Project submodules
-    implementation(projects.areashopInterface)
-    implementation(projects.areashopNms)
-    implementation(projects.adapters.platform.platformInterface)
-    implementation(projects.adapters.platform.paper)
-
-    runtimeOnly(projects.adapters.plugins.worldedit)
-    runtimeOnly(projects.adapters.plugins.worldguard)
-    runtimeOnly(projects.adapters.plugins.fastasyncworldedit)
-    // Adapters
-    if (!providers.environmentVariable("JITPACK").isPresent) {
-        runtimeOnly(project(":adapters:platform:bukkit-1-17", "reobf"))
-        runtimeOnly(project(":adapters:platform:bukkit-1-18", "reobf"))
-        runtimeOnly(project(":adapters:platform:bukkit-1-19", "reobf"))
-        runtimeOnly(project(":adapters:platform:bukkit-1-20", "reobf"))
-    }
-
-    testImplementation("com.github.seeseemelk:MockBukkit-v1.20:3.9.0")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
-}
-
-
-
-repositories {
-    mavenCentral()
-}
-
-tasks {
-    processResources {
-        filesMatching("plugin.yml") {
-            expand("version" to project.version)
-        }
-    }
-
-    assemble {
-        if (!providers.systemProperty("JITPACK").isPresent) {
-            dependsOn(shadowJar)
-        }
-    }
-
-    jar {
-        archiveClassifier.set("original")
-    }
-
-    java {
-        withSourcesJar()
-    }
-
-    test {
-        useJUnitPlatform()
-    }
-
-    val javaComponent = project.components["java"] as AdhocComponentWithVariants
-    javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
-        skip()
-    }
-
-    shadowJar {
-        archiveClassifier.set("")
-        base {
-            archiveBaseName.set("AreaShop")
-        }
-        val base = "me.wiefferink.areashop.libraries"
-        relocate("me.wiefferink.interactivemessenger", "${base}.interactivemessenger")
-        relocate("me.wiefferink.bukkitdo", "${base}.bukkitdo")
-        relocate("io.papermc.lib", "${base}.paperlib")
-        relocate("io.github.bakedlibs.dough", "${base}.dough")
-        relocate("com.google.inject", "${base}.inject")
-        relocate("org.aopalliance", "${base}.aopalliance")
-        relocate("javax.annotation", "${base}.javax.annotation")
-        relocate("javax.inject", "${base}.javax.inject")
-    }
-}
@@ -0,0 +1,342 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>areashop</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop</name>
+    <version>2.7</version> <!-- Main plugin version -->
+
+    <repositories>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>aikar</id>
+            <url>https://repo.aikar.co/content/groups/aikar/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>20.1.0</version>
+        </dependency>
+
+        <!-- Bukkit, AreaShop aims to support 1.15.2+ -->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.15.2-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- InteractiveMessenger library -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>interactivemessenger</artifactId>
+            <version>1.1-SNAPSHOT</version>
+        </dependency>
+
+        <!-- TaskChain library -->
+        <dependency>
+            <groupId>co.aikar</groupId>
+            <artifactId>taskchain-bukkit</artifactId>
+            <version>3.7.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>5.0.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject.extensions</groupId>
+            <artifactId>guice-assistedinject</artifactId>
+            <version>5.0.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- PaperLib -->
+        <dependency>
+            <groupId>io.papermc</groupId>
+            <artifactId>paperlib</artifactId>
+            <version>1.0.6</version>
+        </dependency>
+
+        <!-- WorldEdit/WorldGuard -->
+        <dependency>
+            <groupId>com.sk89q.worldedit</groupId>
+            <artifactId>worldedit-bukkit</artifactId>
+            <version>7.1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sk89q.worldguard</groupId>
+            <artifactId>worldguard-bukkit</artifactId>
+            <version>7.0.3</version>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <!-- Interfaces that specific WorldGuard and WorldEdit versions are built against -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-interface</artifactId>
+            <version>latest</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- WorldGuard implementations -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-worldguard-7</artifactId>
+            <version>latest</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- WorldEdit implementations -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-worldedit-7</artifactId>
+            <version>latest</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- FAWE compat -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-fawe-1-15</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- NMS Implementations -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-nms-1-15</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-nms-1-16</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- Vault -->
+        <dependency>
+            <groupId>net.milkbowl.vault</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- bStats -->
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>1.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+    <profiles>
+        <!-- Copy the jar file to a test server, activate by using -DcopyResult="/path/to/test/server" -->
+        <profile>
+            <id>test-locally</id>
+            <activation>
+                <property>
+                    <name>copyResult</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.8</version>
+                        <configuration>
+                            <target>
+                                <copy file="./target/${project.build.finalName}.jar"
+                                      tofile="${copyResult}\${project.build.finalName}.jar"/>
+                            </target>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- Package the source files in a jar, activate by using -Dsources -->
+        <profile>
+            <id>package-sources</id>
+            <activation>
+                <property>
+                    <name>sources</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.2.1</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- Produce javadoc files, activate by using -Djavadoc -->
+        <profile>
+            <id>generate-javadoc</id>
+            <activation>
+                <property>
+                    <name>javadoc</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.2.0</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <excludePackageNames>me.wiefferink.areashop.lib</excludePackageNames>
+                            <destDir>${javadoc}</destDir>
+                            <links>
+                                <link>https://hub.spigotmc.org/javadocs/bukkit/</link>
+                                <link>http://docs.sk89q.com/worldedit/apidocs/</link>
+                                <link>http://docs.sk89q.com/worldguard/apidocs/</link>
+                            </links>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <directory>target</directory>
+        <finalName>AreaShop</finalName>
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>plugin.yml</include>
+                    <include>config.yml</include>
+                    <include>hiddenConfig.yml</include>
+                    <include>default.yml</include>
+                    <include>README.md</include>
+                    <include>lang/*.yml</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <relocations>
+                                <!-- Relocate TaskChain -->
+                                <relocation>
+                                    <pattern>co.aikar.taskchain</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.taskchain</shadedPattern>
+                                </relocation>
+                                <!-- Relocate messaging framework -->
+                                <relocation>
+                                    <pattern>me.wiefferink.interactivemessenger</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.interactivemessenger</shadedPattern>
+                                </relocation>
+                                <!-- Relocate bstats -->
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.bstats</shadedPattern>
+                                </relocation>
+                                <!-- Relocate PaperLib -->
+                                <relocation>
+                                    <pattern>io.papermc</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.paperlib</shadedPattern>
+                                </relocation>
+                                <!-- Relocate Guice -->
+                                <relocation>
+                                    <pattern>com.google.inject</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.google.inject</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.inject</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.javax.inject</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -1,145 +0,0 @@
-package io.github.md5sha256.areashop;
-
-import me.wiefferink.areashop.managers.AdventureLanguageManager;
-import me.wiefferink.interactivemessenger.processing.ReplacementProvider;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-
-import java.text.NumberFormat;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class AdventureMessageRenderer {
-
-
-    /**
-     * Lang pattern used by the old mechanism
-     * Equivalent REGEX: \Q%\E\Qlang:\E([a-zA-Z-]+?)\|(.+?)\|\Q%\E
-     * Group 1 is the message key for substitution
-     * Group 2 is the replacement arguments
-     * NOTE: A properly formatted key should have a trailing '|' char.
-     */
-    private static final Pattern LANG_PATTERN = Pattern.compile(
-            Pattern.quote("%") + "lang:([a-zA-Z-]+?)\\|(.+)\\|+" + Pattern.quote("%")
-    );
-    private static final Pattern POSITIONAL_ARGUMENT_PATTERN = Pattern.compile(
-            Pattern.quote("%") + "(\\d+)" + Pattern.quote("%")
-    );
-    private static final Pattern NAMED_ARGUMENT_PATTERN = Pattern.compile(Pattern.quote(
-            "%") + "(?<name>[a-zA-Z]+)" + Pattern.quote("%"));
-    private static final Pattern VARIABLE_DELIMITER = Pattern.compile("\\|");
-    private final AdventureLanguageManager adventureLanguageManager;
-
-    public AdventureMessageRenderer(AdventureLanguageManager languageManager) {
-        this.adventureLanguageManager = languageManager;
-    }
-
-    public String chatPrefix() {
-        return this.adventureLanguageManager.chatPrefix();
-    }
-
-    public Component renderedChatPrefix() {
-        return renderMessage(this.adventureLanguageManager.chatPrefix());
-    }
-
-    public Component renderMessageFromKey(String key, Object... replacements) {
-        String message = this.adventureLanguageManager.messageFor(key);
-        if (message.isEmpty()) {
-            return Component.empty();
-        }
-        return renderMessage(message, replacements);
-    }
-
-    public String performReplacementsFromKey(String key, Object... replacements) {
-        String message = this.adventureLanguageManager.messageFor(key);
-        if (message.isEmpty()) {
-            return message;
-        }
-        return performReplacements(message, replacements);
-    }
-
-
-    public String performReplacements(String message, Object... replacements) {
-        String result = processPositionalArgumentReplacement(message, replacements);
-        return processLanguageReplacements(result, replacements);
-    }
-
-    public Component renderMessage(String message, Object... replacements) {
-        MiniMessage miniMessage = MiniMessage
-                .builder()
-                .preProcessor(string -> performReplacements(string, replacements))
-                .build();
-        return miniMessage.deserialize(message);
-    }
-
-    private void processNamedArguments(String[] arguments, Object... replacements) {
-        for (int i = 0; i < arguments.length; i++) {
-            if (i >= replacements.length) {
-                continue;
-            }
-            String argument = arguments[i];
-            Matcher namedMatcher = NAMED_ARGUMENT_PATTERN.matcher(argument);
-            if (!namedMatcher.matches()) {
-                continue;
-            }
-            Object rawReplacement = replacements[i];
-            if (!(rawReplacement instanceof ReplacementProvider provider)) {
-                continue;
-            }
-            String replacement = parseString(provider.provideReplacement(argument));
-            arguments[i] = replacement;
-        }
-    }
-
-    private String processLanguageReplacements(String text, Object... replacements) {
-        Matcher langMatcher = LANG_PATTERN.matcher(text);
-        return langMatcher.replaceAll(result -> {
-            String langKey = result.group(1);
-            String rawArguments = result.group(2);
-            String[] arguments = VARIABLE_DELIMITER.split(rawArguments);
-            processNamedArguments(arguments, replacements);
-            String innerMessage = this.adventureLanguageManager.messageFor(langKey);
-            return processInnerPositionalArgumentReplacements(innerMessage, arguments);
-        });
-    }
-
-    private String processInnerPositionalArgumentReplacements(String text, String[] replacements) {
-        final Matcher matcher = POSITIONAL_ARGUMENT_PATTERN.matcher(text);
-        return matcher.replaceAll(result -> {
-            int position = Integer.parseInt(result.group(1));
-            if (position < 0 || position > replacements.length - 1) {
-                return "";
-            }
-            return replacements[position];
-        });
-    }
-
-    private String processPositionalArgumentReplacement(String text, Object... replacements) {
-        final Matcher matcher = POSITIONAL_ARGUMENT_PATTERN.matcher(text);
-        return matcher.replaceAll(result -> {
-            int position = Integer.parseInt(result.group(1));
-            if (position < 0 || position > replacements.length - 1) {
-                return "";
-            }
-            Object replacement = replacements[position];
-            if (!(replacement instanceof ReplacementProvider)) {
-                return replacement.toString();
-            }
-            return "";
-        });
-    }
-
-    private String parseString(Object replacementResult) {
-        if (replacementResult instanceof String s) {
-            return s;
-        }
-        if (replacementResult instanceof Component component) {
-            return MiniMessage.miniMessage().serialize(component);
-        }
-        if (replacementResult instanceof Number number) {
-            return NumberFormat.getNumberInstance().format(number);
-        }
-        return replacementResult.toString();
-    }
-
-}
@@ -1,51 +0,0 @@
-package io.github.md5sha256.areashop;
-
-import me.wiefferink.interactivemessenger.processing.Message;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CompositeMessage implements MessageWrapper {
-
-    private final List<MessageWrapper> children = new ArrayList<>();
-
-    @Override
-    public Message toLegacyMessage() {
-        Message message = Message.empty();
-        for (MessageWrapper wrapper : children) {
-            message.append(wrapper.toLegacyMessage());
-        }
-        return message;
-    }
-
-    @Override
-    public String toMiniMessage(AdventureMessageRenderer messageRenderer) {
-        StringBuilder message = new StringBuilder();
-        for (MessageWrapper wrapper : children) {
-            message.append(wrapper.toMiniMessage(messageRenderer));
-        }
-        return message.toString();
-    }
-
-    public CompositeMessage appendMessage(MessageWrapper wrapper) {
-        children.add(wrapper);
-        return this;
-    }
-
-    public CompositeMessage appendText(String text) {
-        this.children.add(new TextMessage(text));
-        return this;
-    }
-
-    public CompositeMessage appendMessage(String key, boolean prefix, Object... replacements) {
-        this.children.add(new KeyedMessage(key, prefix, replacements));
-        return this;
-    }
-
-    public CompositeMessage appendMessage(String key, Object... replacements) {
-        this.children.add(new KeyedMessage(key, replacements));
-        return this;
-    }
-
-
-}
@@ -1,20 +0,0 @@
-package io.github.md5sha256.areashop;
-
-import me.wiefferink.interactivemessenger.processing.Message;
-
-public record KeyedMessage(String messageKey, boolean prefix, Object... replacements) implements MessageWrapper{
-    public KeyedMessage(String messageKey, Object... replacements) {
-        this(messageKey, false, replacements);
-    }
-
-    @Override
-    public Message toLegacyMessage() {
-        return Message.fromKey(messageKey).prefix(prefix).replacements(replacements);
-    }
-
-    @Override
-    public String toMiniMessage(AdventureMessageRenderer messageRenderer) {
-        String chatPrefix = messageRenderer.chatPrefix();
-        return chatPrefix + messageRenderer.renderMessageFromKey(messageKey);
-    }
-}
@@ -1,89 +0,0 @@
-package io.github.md5sha256.areashop;
-
-import me.wiefferink.interactivemessenger.generators.TellrawGenerator;
-import me.wiefferink.interactivemessenger.parsers.YamlParser;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.chat.ComponentSerializer;
-import org.spongepowered.configurate.ConfigurateException;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.loader.HeaderMode;
-import org.spongepowered.configurate.yaml.NodeStyle;
-import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class LanguageConverter {
-
-    public static void performConversion(ConfigurationNode root) throws ConfigurateException {
-        if (!root.isMap()) {
-            convertNode(root);
-            return;
-        }
-        Map<Object, ? extends ConfigurationNode> map = root.childrenMap();
-        for (Map.Entry<Object, ? extends ConfigurationNode> entry : map.entrySet()) {
-            ConfigurationNode node = entry.getValue();
-            if (node.isMap()) {
-                performConversion(node);
-            } else {
-                convertNode(node);
-            }
-        }
-    }
-
-    public static void performConversion(File toConvert, File output) throws IOException {
-        YamlConfigurationLoader loader = YamlConfigurationLoader.builder()
-                .source(() -> new BufferedReader(new FileReader(toConvert, StandardCharsets.UTF_8)))
-                .sink(() -> new BufferedWriter(new FileWriter(output, StandardCharsets.UTF_8)))
-                .headerMode(HeaderMode.PRESERVE)
-                .nodeStyle(NodeStyle.BLOCK)
-                .build();
-        ConfigurationNode root = loader.load();
-        performConversion(root);
-        loader.save(root);
-    }
-
-    public static List<String> convertRawList(List<String> messages) {
-        List<String> jsonMessages = TellrawGenerator.generate(YamlParser.parse(messages));
-        List<String> converted = new ArrayList<>();
-        for (String json : jsonMessages) {
-            BaseComponent[] bungeeComponents = ComponentSerializer.parse(json);
-            Component convertedComponent = BungeeComponentSerializer.get()
-                    .deserialize(bungeeComponents);
-            String miniMessage = MiniMessage.miniMessage()
-                    .serialize(convertedComponent);
-            converted.add(miniMessage);
-        }
-        return converted;
-    }
-
-    private static void convertNode(ConfigurationNode node) throws ConfigurateException {
-        boolean isList = node.isList();
-        List<String> messages;
-        if (isList) {
-            messages = node.getList(String.class, Collections.emptyList());
-        } else {
-            messages = Collections.singletonList(node.getString());
-        }
-        List<String> converted = convertRawList(messages);
-        if (converted.size() == 1) {
-            node.set(String.class, converted.get(0));
-        } else {
-            node.setList(String.class, converted);
-        }
-    }
-
-
-}
@@ -1,11 +0,0 @@
-package io.github.md5sha256.areashop;
-
-import me.wiefferink.interactivemessenger.processing.Message;
-
-public interface MessageWrapper {
-
-    Message toLegacyMessage();
-
-    String toMiniMessage(AdventureMessageRenderer messageRenderer);
-
-}
@@ -1,22 +0,0 @@
-package io.github.md5sha256.areashop;
-
-import me.wiefferink.interactivemessenger.processing.Message;
-
-public class TextMessage implements MessageWrapper {
-
-    private final String text;
-
-    public TextMessage(String text) {
-        this.text = text;
-    }
-
-    @Override
-    public Message toLegacyMessage() {
-        return Message.empty().append(text);
-    }
-
-    @Override
-    public String toMiniMessage(AdventureMessageRenderer messageRenderer) {
-        return messageRenderer.performReplacements(text);
-    }
-}
@@ -1,39 +0,0 @@
-package me.wiefferink.areashop;
-
-import me.wiefferink.areashop.features.signs.SignManager;
-import me.wiefferink.areashop.interfaces.AreaShopInterface;
-import me.wiefferink.areashop.managers.CommandManager;
-import me.wiefferink.areashop.managers.FeatureManager;
-import me.wiefferink.areashop.managers.SignLinkerManager;
-
-import javax.annotation.Nonnull;
-
-public interface AreaShopApi extends AreaShopInterface {
-
-    /**
-     * Function to get the CommandManager.
-     *
-     * @return the CommandManager
-     */
-    @Nonnull CommandManager getCommandManager();
-
-    /**
-     * Get the SignLinkerManager.
-     * Handles sign linking mode.
-     *
-     * @return The SignLinkerManager
-     */
-    @Nonnull SignLinkerManager getSignlinkerManager();
-
-    /**
-     * Get the FeatureManager.
-     * Manages region specific features.
-     *
-     * @return The FeatureManager
-     */
-    @Nonnull FeatureManager getFeatureManager();
-
-
-    @Nonnull SignManager getSignManager();
-
-}
@@ -1,25 +0,0 @@
-package me.wiefferink.areashop;
-
-import io.github.md5sha256.areashop.MessageWrapper;
-
-public interface MessageBridge {
-    /**
-     * Send a message to a target without a prefix.
-     *
-     * @param target       The target to send the message to
-     * @param key          The key of the language string
-     * @param replacements The replacements to insert in the message
-     */
-    void messageNoPrefix(Object target, String key, Object... replacements);
-
-    /**
-     * Send a message to a target, prefixed by the default chat prefix.
-     *
-     * @param target       The target to send the message to
-     * @param key          The key of the language string
-     * @param replacements The replacements to insert in the message
-     */
-    void message(Object target, String key, Object... replacements);
-
-    void message(Object target, MessageWrapper message);
-}
@@ -1,54 +1,31 @@
 package me.wiefferink.areashop.commands;

 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.events.ask.AddingRegionEvent;
 import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
 import me.wiefferink.areashop.events.ask.RentingRegionEvent;
 import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
 import me.wiefferink.areashop.events.notify.RentedRegionEvent;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
 import me.wiefferink.areashop.interfaces.WorldEditSelection;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import me.wiefferink.areashop.managers.IFileManager;
+import me.wiefferink.areashop.managers.FileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RegionFactory;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.util.RegionEvent;
+import me.wiefferink.areashop.regions.util.RegionType;
 import me.wiefferink.areashop.tools.Utils;
-import 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.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;

-@Singleton
 public class AddCommand extends CommandAreaShop {

-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private AreaShop plugin;
-	@Inject
-	private WorldEditInterface worldEditInterface;
-	@Inject
-	private WorldGuardInterface worldGuardInterface;
-	@Inject
-	private RegionFactory regionFactory;
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop add";
@@ -77,12 +54,12 @@ public class AddCommand extends CommandAreaShop {
 				&& !sender.hasPermission("areashop.createbuy")
 				&& !sender.hasPermission("areashop.createbuy.member")
 				&& !sender.hasPermission("areashop.createbuy.owner")) {
-			messageBridge.message(sender, "add-noPermission");
+			plugin.message(sender, "add-noPermission");
 			return;
 		}

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

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

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

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

 						// Add existing owners/members if any
@@ -222,7 +198,7 @@ public class AddCommand extends CommandAreaShop {
 								rent.updateLastActiveTime();

 								// Fire schematic event and updated times extended
-								rent.handleSchematicEvent(GeneralRegion.RegionEvent.RENTED);
+								rent.handleSchematicEvent(RegionEvent.RENTED);

 								// Add others as friends
 								for(UUID friend : existing) {
@@ -235,7 +211,7 @@ public class AddCommand extends CommandAreaShop {

 						regionsSuccess.add(rent);
 					} else {
-						BuyRegion buy = regionFactory.createBuyRegion(regionName, world);
+						BuyRegion buy = new BuyRegion(regionName, world);
 						// Set landlord
 						if(landlord) {
 							buy.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
@@ -243,11 +219,11 @@ public class AddCommand extends CommandAreaShop {

 						AddingRegionEvent event = plugin.getFileManager().addRegion(buy);
 						if (event.isCancelled()) {
-							namesAddCancelled.add(buy.getName());
+							namesAddCancelled.add(buy.getRegionId());
 							return;
 						}

-						buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
+						buy.handleSchematicEvent(RegionEvent.CREATED);
 						buy.update();

 						// Add existing owners/members if any
@@ -265,7 +241,7 @@ public class AddCommand extends CommandAreaShop {
 								buy.updateLastActiveTime();

 								// Update everything
-								buy.handleSchematicEvent(GeneralRegion.RegionEvent.BOUGHT);
+								buy.handleSchematicEvent(RegionEvent.BOUGHT);

 								// Add others as friends
 								for (UUID friend : existing) {
@@ -279,40 +255,39 @@ public class AddCommand extends CommandAreaShop {
 						regionsSuccess.add(buy);
 					}
 				}
-			},
-			() -> {
+			}, false).thenAccept(
+			(success) -> {
 				if(!regionsSuccess.isEmpty()) {
-					messageBridge.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
+					plugin.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
 				}
 				if(!regionsAlready.isEmpty()) {
-					messageBridge.message(sender, "add-failed", Utils.combinedMessage(regionsAlready, "region"));
+					plugin.message(sender, "add-failed", Utils.combinedMessage(regionsAlready, "region"));
 				}
 				if(!regionsAlreadyOtherWorld.isEmpty()) {
-					messageBridge.message(sender, "add-failedOtherWorld", Utils.combinedMessage(regionsAlreadyOtherWorld, "region"));
+					plugin.message(sender, "add-failedOtherWorld", Utils.combinedMessage(regionsAlreadyOtherWorld, "region"));
 				}
 				if(!regionsRentCancelled.isEmpty()) {
-					messageBridge.message(sender, "add-rentCancelled", Utils.combinedMessage(regionsRentCancelled, "region"));
+					plugin.message(sender, "add-rentCancelled", Utils.combinedMessage(regionsRentCancelled, "region"));
 				}
 				if(!regionsBuyCancelled.isEmpty()) {
-					messageBridge.message(sender, "add-buyCancelled", Utils.combinedMessage(regionsBuyCancelled, "region"));
+					plugin.message(sender, "add-buyCancelled", Utils.combinedMessage(regionsBuyCancelled, "region"));
 				}
 				if(!namesBlacklisted.isEmpty()) {
-					messageBridge.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
+					plugin.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
 				}
 				if(!namesNoPermission.isEmpty()) {
-					messageBridge.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
-					messageBridge.message(sender, "add-noPermissionOwnerMember");
+					plugin.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
+					plugin.message(sender, "add-noPermissionOwnerMember");
 				}
 				if(!namesAddCancelled.isEmpty()) {
-					messageBridge.message(sender, "add-rentCancelled", Utils.createCommaSeparatedList(namesAddCancelled));
+					plugin.message(sender, "add-rentCancelled", Utils.createCommaSeparatedList(namesAddCancelled));
 				}
-			}
-		);
+			});
 	}

 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new ArrayList<>();
+		List<String> result = new LinkedList<>();
 		if(toComplete == 2) {
 			if(sender.hasPermission("areashop.createrent")) {
 				result.add("rent");
@@ -321,7 +296,8 @@ public class AddCommand extends CommandAreaShop {
 				result.add("buy");
 			}
 		} else if(toComplete == 3) {
-			if(sender instanceof Player player) {
+			if(sender instanceof Player) {
+				Player player = (Player)sender;
 				if(sender.hasPermission("areashop.createrent") || sender.hasPermission("areashop.createbuy")) {
 					for(ProtectedRegion region : plugin.getRegionManager(player.getWorld()).getRegions().values()) {
 						result.add(region.getId());
@@ -1,148 +1,141 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class AddfriendCommand extends CommandAreaShop {
-
-    @Inject
-    private MessageBridge messageBridge;
-    @Inject
-    private IFileManager fileManager;
-    @Inject
-    private Plugin plugin;
-
-    @Inject
-    private OfflinePlayerHelper offlinePlayerHelper;
-
-    @Inject
-    private BukkitSchedulerExecutor executor;
-
-    @Override
-    public String getCommandStart() {
-        return "areashop addfriend";
-    }
-
-    @Override
-    public String getHelp(CommandSender target) {
-        if (target.hasPermission("areashop.addfriendall") || target.hasPermission("areashop.addfriend")) {
-            return "help-addFriend";
-        }
-        return null;
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args) {
-        if (!sender.hasPermission("areashop.addfriend") && !sender.hasPermission("areashop.addfriendall")) {
-            messageBridge.message(sender, "addfriend-noPermission");
-            return;
-        }
-
-        if (args.length < 2) {
-            messageBridge.message(sender, "addfriend-help");
-            return;
-        }
-
-        GeneralRegion region;
-        if (args.length == 2) {
-            if (sender instanceof Player player) {
-                // get the region by location
-                List<GeneralRegion> regions = Utils.getImportantRegions(player.getLocation());
-                if (regions.isEmpty()) {
-                    messageBridge.message(sender, "cmd-noRegionsAtLocation");
-                    return;
-                } else if (regions.size() > 1) {
-                    messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-                    return;
-                } else {
-                    region = regions.get(0);
-                }
-            } else {
-                messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
-                return;
-            }
-        } else {
-            region = fileManager.getRegion(args[2]);
-            if (region == null) {
-                messageBridge.message(sender, "cmd-notRegistered", args[2]);
-                return;
-            }
-        }
-        if (sender.hasPermission("areashop.addfriendall")) {
-            if ((region instanceof RentRegion rentRegion && !rentRegion.isRented())
-                    || (region instanceof BuyRegion buyRegion && !buyRegion.isSold())) {
-                messageBridge.message(sender, "addfriend-noOwner", region);
-                return;
-            }
-            this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(friend -> {
-                if (friend.hasPlayedBefore() && !friend.isOnline() && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
-                    messageBridge.message(sender, "addfriend-notVisited", args[1], region);
-                } else if (region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-                    messageBridge.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
-                } else if (region.isOwner(friend.getUniqueId())) {
-                    messageBridge.message(sender, "addfriend-self", friend.getName(), region);
-                } else if (region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
-                    region.update();
-                    messageBridge.message(sender, "addfriend-successOther", friend.getName(), region);
-                }
-            }, this.executor);
-            return;
-        }
-        if (!sender.hasPermission("areashop.addfriend") || !(sender instanceof Player player)) {
-            messageBridge.message(sender, "addfriend-noPermission", region);
-            return;
-        }
-        if (!region.isOwner(player)) {
-            messageBridge.message(sender, "addfriend-noPermissionOther", region);
-            return;
-        }
-        this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(friend -> {
-            if (friend.getLastPlayed() == 0 && !friend.isOnline() && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
-                messageBridge.message(sender, "addfriend-notVisited", args[1], region);
-            } else if (region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-                messageBridge.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
-            } else if (region.isOwner(friend.getUniqueId())) {
-                messageBridge.message(sender, "addfriend-self", friend.getName(), region);
-            } else if (region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
-                region.update();
-                messageBridge.message(sender, "addfriend-success", friend.getName(), region);
-            }
-        }, this.executor);
-    }
-
-    @Override
-    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-        ArrayList<String> result = new ArrayList<>();
-        if (toComplete == 2) {
-            for (Player player : Utils.getOnlinePlayers()) {
-                result.add(player.getName());
-            }
-        } else if (toComplete == 3) {
-            result.addAll(fileManager.getRegionNames());
-        }
-        return result;
-    }
-}
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AddfriendCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop addfriend";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.addfriendall") || target.hasPermission("areashop.addfriend")) {
+			return "help-addFriend";
+		}
+		return null;
+	}
+
+	@SuppressWarnings("deprecation")
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.addfriend") && !sender.hasPermission("areashop.addfriendall")) {
+			plugin.message(sender, "addfriend-noPermission");
+			return;
+		}
+
+		if(args.length < 2) {
+			plugin.message(sender, "addfriend-help");
+			return;
+		}
+
+		LegacyGeneralRegion region;
+		if(args.length <= 2) {
+			if(sender instanceof Player) {
+				// get the region by location
+				List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
+					plugin.message(sender, "cmd-noRegionsAtLocation");
+					return;
+				} else if(regions.size() > 1) {
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
+					return;
+				} else {
+					region = regions.get(0);
+				}
+			} else {
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				return;
+			}
+		} else {
+			region = plugin.getFileManager().getRegion(args[2]);
+			if(region == null) {
+				plugin.message(sender, "cmd-notRegistered", args[2]);
+				return;
+			}
+		}
+		if(sender.hasPermission("areashop.addfriendall")) {
+			if((region instanceof RentRegion && !((RentRegion)region).isRented())
+					|| (region instanceof BuyRegion && !((BuyRegion)region).isSold())) {
+				plugin.message(sender, "addfriend-noOwner", region);
+				return;
+			}
+			OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
+			if(friend.getLastPlayed() == 0 && !friend.isOnline() && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
+				plugin.message(sender, "addfriend-notVisited", args[1], region);
+				return;
+			}
+			if(region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
+				plugin.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
+				return;
+			}
+			if(region.isOwner(friend.getUniqueId())) {
+				plugin.message(sender, "addfriend-self", friend.getName(), region);
+				return;
+			}
+			if(region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
+				region.update();
+				plugin.message(sender, "addfriend-successOther", friend.getName(), region);
+			}
+		} else {
+			if(sender.hasPermission("areashop.addfriend") && sender instanceof Player) {
+				if(region.isOwner((Player)sender)) {
+					OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
+					if(friend.getLastPlayed() == 0 && !friend.isOnline() && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
+						plugin.message(sender, "addfriend-notVisited", args[1], region);
+						return;
+					}
+					if(region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
+						plugin.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
+						return;
+					}
+					if(region.isOwner(friend.getUniqueId())) {
+						plugin.message(sender, "addfriend-self", friend.getName(), region);
+						return;
+					}
+
+					if(region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
+						region.update();
+						plugin.message(sender, "addfriend-success", friend.getName(), region);
+					}
+				} else {
+					plugin.message(sender, "addfriend-noPermissionOther", region);
+				}
+			} else {
+				plugin.message(sender, "addfriend-noPermission", region);
+			}
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(Player player : Utils.getOnlinePlayers()) {
+				result.add(player.getName());
+			}
+		} else if(toComplete == 3) {
+			result.addAll(plugin.getFileManager().getRegionNames());
+		}
+		return result;
+	}
+}
+
+
+
+
+
+
+
+
@@ -1,132 +1,128 @@
 package me.wiefferink.areashop.commands;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.features.signs.RegionSign;
-import me.wiefferink.areashop.features.signs.SignManager;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
 import me.wiefferink.areashop.tools.Materials;
-import me.wiefferink.areashop.tools.SignUtils;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Sign;
+import org.bukkit.block.data.type.WallSign;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.util.BlockIterator;

 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;

-@Singleton
 public class AddsignCommand extends CommandAreaShop {

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

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

-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.addsign")) {
-			return "help-addsign";
-		}
-		return null;
-	}
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.addsign")) {
+            plugin.message(sender, "addsign-noPermission");
+            return;
+        }
+        if (!(sender instanceof Player)) {
+            plugin.message(sender, "cmd-onlyByPlayer");
+            return;
+        }
+        Player player = (Player) sender;

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

-		// Get the sign
-		Block block = null;
-		BlockIterator blockIterator = new BlockIterator(player, 100);
-		while(blockIterator.hasNext() && block == null) {
-			Block next = blockIterator.next();
-			if(next.getType() != Material.AIR) {
-				block = next;
-			}
-		}
-		if(block == null || !Materials.isSign(block.getType())) {
-			messageBridge.message(sender, "addsign-noSign");
-			return;
-		}
+        LegacyGeneralRegion region;
+        if (args.length > 1) {
+            // Get region by argument
+            region = plugin.getFileManager().getRegion(args[1]);
+            if (region == null) {
+                plugin.message(sender, "cmd-notRegistered", args[1]);
+                return;
+            }
+        } else {
+            // Get region by sign position
+            List<LegacyGeneralRegion> regions = Utils.getImportantRegions(block.getLocation());
+            if (regions.isEmpty()) {
+                plugin.message(sender, "addsign-noRegions");
+                return;
+            } else if (regions.size() > 1) {
+                plugin.message(sender, "addsign-couldNotDetect", regions.get(0).getRegionId(), regions.get(1).getRegionId());
+                return;
+            }
+            region = regions.get(0);
+        }
+        String profile = null;
+        if (args.length > 2) {
+            profile = args[2];
+            Set<String> profiles = plugin.getConfig().getConfigurationSection("signProfiles").getKeys(false);
+            if (!profiles.contains(profile)) {
+                plugin.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles), region);
+                return;
+            }
+        }
+        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+        if (regionSign != null) {
+            plugin.message(sender, "addsign-alreadyRegistered", regionSign.getRegion());
+            return;
+        }

-		GeneralRegion region;
-		if(args.length > 1) {
-			// Get region by argument
-			region = fileManager.getRegion(args[1]);
-			if(region == null) {
-				messageBridge.message(sender, "cmd-notRegistered", args[1]);
-				return;
-			}
-		} else {
-			// Get region by sign position
-			List<GeneralRegion> regions = Utils.getImportantRegions(block.getLocation());
-			if(regions.isEmpty()) {
-				messageBridge.message(sender, "addsign-noRegions");
-				return;
-			} else if(regions.size() > 1) {
-				messageBridge.message(sender, "addsign-couldNotDetect", regions.get(0).getName(), regions.get(1).getName());
-				return;
-			}
-			region = regions.get(0);
-		}
-		String profile = null;
-		if(args.length > 2) {
-			profile = args[2];
-			Set<String> profiles = plugin.getConfig().getConfigurationSection("signProfiles").getKeys(false);
-			if(!profiles.contains(profile)) {
-				messageBridge.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles), region);
-				return;
-			}
-		}
-		Optional<RegionSign> optionalRegionSign = signManager.signFromLocation(block.getLocation());
-		if(optionalRegionSign.isPresent()) {
-			RegionSign regionSign = optionalRegionSign.get();
-			messageBridge.message(sender, "addsign-alreadyRegistered", regionSign.getRegion());
-			return;
-		}
+        final BlockData data = block.getBlockData();
+        final BlockFace rotation;
+        if (data instanceof Sign) {
+            rotation = ((Sign) data).getRotation();
+        } else if (data instanceof WallSign) {
+            rotation = ((WallSign) data).getFacing();
+        } else {
+            rotation = null;
+        }
+        region.getSignsFeature().addSign(block.getLocation(), block.getType(), rotation, profile);
+        if (profile == null) {
+            plugin.message(sender, "addsign-success", region);
+        } else {
+            plugin.message(sender, "addsign-successProfile", profile, region);
+        }
+        region.update();
+    }

-		region.getSignsFeature().addSign(block.getLocation(), block.getType(), SignUtils.getSignFacing(block), profile);
-		if(profile == null) {
-			messageBridge.message(sender, "addsign-success", region);
-		} else {
-			messageBridge.message(sender, "addsign-successProfile", profile, region);
-		}
-		region.update();
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			result.addAll(fileManager.getRegionNames());
-		} else if(toComplete == 3) {
-			result.addAll(plugin.getConfig().getStringList("signProfiles"));
-		}
-		return result;
-	}
+    @Override
+    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+        List<String> result = new ArrayList<>();
+        if (toComplete == 2) {
+            result.addAll(plugin.getFileManager().getRegionNames());
+        } else if (toComplete == 3) {
+            result.addAll(plugin.getConfig().getStringList("signProfiles"));
+        }
+        return result;
+    }

 }

@@ -1,81 +1,69 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class BuyCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private Plugin plugin;
-	@Inject
-	private IFileManager fileManager;
-
-	@Override
-	public String getCommandStart() {
-		return "areashop buy";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.buy")) {
-			return "help-buy";
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.buy")) {
-			messageBridge.message(sender, "buy-noPermission");
-			return;
-		}
-		if(!(sender instanceof Player player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
-			return;
-		}
-		if(args.length > 1 && args[1] != null) {
-			BuyRegion region = fileManager.getBuy(args[1]);
-			if(region == null) {
-				messageBridge.message(player, "buy-notBuyable", args[1]);
-			} else {
-				region.buy(player);
-			}
-		} else {
-			// get the region by location
-			List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
-			if(regions.isEmpty()) {
-				messageBridge.message(sender, "cmd-noRegionsAtLocation");
-			} else if(regions.size() > 1) {
-				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-			} else {
-				regions.get(0).buy(player);
-			}
-		}
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			for(BuyRegion region : fileManager.getBuysRef()) {
-				if(!region.isSold()) {
-					result.add(region.getName());
-				}
-			}
-		}
-		return result;
-	}
-}
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BuyCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop buy";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.buy")) {
+			return "help-buy";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.buy")) {
+			plugin.message(sender, "buy-noPermission");
+			return;
+		}
+		if(!(sender instanceof Player)) {
+			plugin.message(sender, "cmd-onlyByPlayer");
+			return;
+		}
+		Player player = (Player)sender;
+		if(args.length > 1 && args[1] != null) {
+			BuyRegion region = plugin.getFileManager().getBuy(args[1]);
+			if(region == null) {
+				plugin.message(player, "buy-notBuyable", args[1]);
+			} else {
+				region.buy(player);
+			}
+		} else {
+			// get the region by location
+			List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
+			if(regions.isEmpty()) {
+				plugin.message(sender, "cmd-noRegionsAtLocation");
+			} else if(regions.size() > 1) {
+				plugin.message(sender, "cmd-moreRegionsAtLocation");
+			} else {
+				regions.get(0).buy(player);
+			}
+		}
+	}
+
+	@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.getRegionId());
+				}
+			}
+		}
+		return result;
+	}
+}
@@ -1,23 +1,23 @@
 package me.wiefferink.areashop.commands;

+import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.interactivemessenger.processing.Message;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;

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

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

-	protected CommandAreaShop() {
+	public CommandAreaShop() {
 		lastUsed = new HashMap<>();
 	}

@@ -43,7 +43,7 @@ public abstract class CommandAreaShop {
 	 * @return A collection with all the possibilities for argument to complete
 	 */
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		return new ArrayList<>();
+		return Collections.emptyList();
 	}

 	/**
@@ -1,14 +1,9 @@
 package me.wiefferink.areashop.commands;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.events.ask.DeletingRegionEvent;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
 import me.wiefferink.areashop.interfaces.WorldEditSelection;
-import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
@@ -18,16 +13,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;

-@Singleton
 public class DelCommand extends CommandAreaShop {

-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private WorldEditInterface worldEditInterface;
-	@Inject
-	private IFileManager fileManager;
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop del";
@@ -48,30 +35,31 @@ public class DelCommand extends CommandAreaShop {

 				&& !sender.hasPermission("areashop.destroyrent")
 				&& !sender.hasPermission("areashop.destroyrent.landlord")) {
-			messageBridge.message(sender, "del-noPermission");
+			plugin.message(sender, "del-noPermission");
 			return;
 		}
 		if(args.length < 2) {
 			// Only players can have a selection
-			if(!(sender instanceof Player player)) {
-				messageBridge.message(sender, "cmd-weOnlyByPlayer");
+			if(!(sender instanceof Player)) {
+				plugin.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
-			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
+			Player player = (Player)sender;
+			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
 			if(selection == null) {
-				messageBridge.message(player, "cmd-noSelection");
+				plugin.message(player, "cmd-noSelection");
 				return;
 			}
-			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
+			List<LegacyGeneralRegion> regions = Utils.getRegionsInSelection(selection);
 			if(regions == null || regions.isEmpty()) {
-				messageBridge.message(player, "cmd-noRegionsFound");
+				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			// Start removing the regions that he has permission for
 			ArrayList<String> namesSuccess = new ArrayList<>();
-			TreeSet<GeneralRegion> regionsFailed = new TreeSet<>();
-			TreeSet<GeneralRegion> regionsCancelled = new TreeSet<>();
-			for(GeneralRegion region : regions) {
+			TreeSet<LegacyGeneralRegion> regionsFailed = new TreeSet<>();
+			TreeSet<LegacyGeneralRegion> regionsCancelled = new TreeSet<>();
+			for(LegacyGeneralRegion region : regions) {
 				boolean isLandlord = region.isLandlord(((Player)sender).getUniqueId());
 				if(region instanceof RentRegion) {
 					if(!sender.hasPermission("areashop.destroyrent") && !(isLandlord && sender.hasPermission("areashop.destroyrent.landlord"))) {
@@ -85,54 +73,54 @@ public class DelCommand extends CommandAreaShop {
 					}
 				}

-				DeletingRegionEvent event = fileManager.deleteRegion(region, true);
+				DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
 				if (event.isCancelled()) {
 					regionsCancelled.add(region);
 				} else {
-					namesSuccess.add(region.getName());
+					namesSuccess.add(region.getRegionId());
 				}
 			}

 			// Send messages
 			if(!namesSuccess.isEmpty()) {
-				messageBridge.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
+				plugin.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
 			}
 			if(!regionsFailed.isEmpty()) {
-				messageBridge.message(sender, "del-failed", Utils.combinedMessage(regionsFailed, "region"));
+				plugin.message(sender, "del-failed", Utils.combinedMessage(regionsFailed, "region"));
 			}
 			if(!regionsCancelled.isEmpty()) {
-				messageBridge.message(sender, "del-cancelled", Utils.combinedMessage(regionsCancelled, "region"));
+				plugin.message(sender, "del-cancelled", Utils.combinedMessage(regionsCancelled, "region"));
 			}
 		} else {
-			GeneralRegion region = fileManager.getRegion(args[1]);
+			LegacyGeneralRegion region = plugin.getFileManager().getRegion(args[1]);
 			if(region == null) {
-				messageBridge.message(sender, "cmd-notRegistered", args[1]);
+				plugin.message(sender, "cmd-notRegistered", args[1]);
 				return;
 			}
 			boolean isLandlord = sender instanceof Player && region.isLandlord(((Player)sender).getUniqueId());
 			if(region instanceof RentRegion) {
 				// Remove the rent if the player has permission
 				if(sender.hasPermission("areashop.destroyrent") || (isLandlord && sender.hasPermission("areashop.destroyrent.landlord"))) {
-					DeletingRegionEvent event = fileManager.deleteRegion(region, true);
+					DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
 					if (event.isCancelled()) {
-						messageBridge.message(sender, "general-cancelled", event.getReason());
+						plugin.message(sender, "general-cancelled", event.getReason());
 					} else {
-						messageBridge.message(sender, "destroy-successRent", region);
+						plugin.message(sender, "destroy-successRent", region);
 					}
 				} else {
-					messageBridge.message(sender, "destroy-noPermissionRent", region);
+					plugin.message(sender, "destroy-noPermissionRent", region);
 				}
 			} else if(region instanceof BuyRegion) {
 				// Remove the buy if the player has permission
 				if(sender.hasPermission("areashop.destroybuy") || (isLandlord && sender.hasPermission("areashop.destroybuy.landlord"))) {
-					DeletingRegionEvent event = fileManager.deleteRegion(region, true);
+					DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
 					if (event.isCancelled()) {
-						messageBridge.message(sender, "general-cancelled", event.getReason());
+						plugin.message(sender, "general-cancelled", event.getReason());
 					} else {
-						messageBridge.message(sender, "destroy-successBuy", region);
+						plugin.message(sender, "destroy-successBuy", region);
 					}
 				} else {
-					messageBridge.message(sender, "destroy-noPermissionBuy", region);
+					plugin.message(sender, "destroy-noPermissionBuy", region);
 				}
 			}
 		}
@@ -142,7 +130,7 @@ public class DelCommand extends CommandAreaShop {
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result = fileManager.getRegionNames();
+			result = plugin.getFileManager().getRegionNames();
 		}
 		return result;
 	}
@@ -1,153 +1,139 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class DelfriendCommand extends CommandAreaShop {
-
-    @Inject
-    private MessageBridge messageBridge;
-    @Inject
-    private IFileManager fileManager;
-
-    @Inject
-    private OfflinePlayerHelper offlinePlayerHelper;
-
-    @Inject
-    private BukkitSchedulerExecutor executor;
-
-    @Override
-    public String getCommandStart() {
-        return "areashop delfriend";
-    }
-
-    @Override
-    public String getHelp(CommandSender target) {
-        if (target.hasPermission("areashop.delfriendall") || target.hasPermission("areashop.delfriend")) {
-            return "help-delFriend";
-        }
-        return null;
-    }
-
-    /**
-     * Check if a person can remove friends.
-     *
-     * @param person The person to check
-     * @param region The region to check for
-     * @return true if the person can remove friends, otherwise false
-     */
-    public static boolean canUse(CommandSender person, GeneralRegion region) {
-        if (person.hasPermission("areashop.delfriendall")) {
-            return true;
-        }
-        if (person instanceof Player player) {
-            return region.isOwner(player) && player.hasPermission("areashop.delfriend");
-        }
-        return false;
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args) {
-        if (!sender.hasPermission("areashop.delfriend") && !sender.hasPermission("areashop.delfriendall")) {
-            messageBridge.message(sender, "delfriend-noPermission");
-            return;
-        }
-        if (args.length < 2) {
-            messageBridge.message(sender, "delfriend-help");
-            return;
-        }
-        GeneralRegion region;
-        if (args.length == 2) {
-            if (!(sender instanceof Player player)) {
-                messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
-                return;
-            }
-            // get the region by location
-            List<GeneralRegion> regions = Utils.getImportantRegions(player.getLocation());
-            if (regions.isEmpty()) {
-                messageBridge.message(sender, "cmd-noRegionsAtLocation");
-                return;
-            } else if (regions.size() > 1) {
-                messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-                return;
-            } else {
-                region = regions.get(0);
-            }
-        } else {
-            region = fileManager.getRegion(args[2]);
-            if (region == null) {
-                messageBridge.message(sender, "cmd-notRegistered", args[2]);
-                return;
-            }
-        }
-        if (sender.hasPermission("areashop.delfriendall")) {
-            if ((region instanceof RentRegion rentRegion && !rentRegion.isRented())
-                    || (region instanceof BuyRegion buyRegion && !buyRegion.isSold())) {
-                messageBridge.message(sender, "delfriend-noOwner", region);
-                return;
-            }
-            this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(friend -> {
-                if (!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-                    messageBridge.message(sender, "delfriend-notAdded", friend.getName(), region);
-                    return;
-                }
-                if (region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
-                    region.update();
-                    messageBridge.message(sender, "delfriend-successOther", friend.getName(), region);
-                }
-            }, this.executor);
-            return;
-        }
-        if (!sender.hasPermission("areashop.delfriend") || !(sender instanceof Player player)) {
-            messageBridge.message(sender, "delfriend-noPermission", region);
-            return;
-        }
-        if (!region.isOwner(player)) {
-            messageBridge.message(sender, "delfriend-noPermissionOther", region);
-            return;
-        }
-        this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(friend -> {
-            if (!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-                messageBridge.message(sender, "delfriend-notAdded", friend.getName(), region);
-            } else if (region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
-                region.update();
-                messageBridge.message(sender, "delfriend-success", friend.getName(), region);
-            }
-        }, this.executor);
-    }
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			for(Player player : Utils.getOnlinePlayers()) {
-				result.add(player.getName());
-			}
-		} else if(toComplete == 3) {
-			result.addAll(fileManager.getRegionNames());
-		}
-		return result;
-	}
-}
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DelfriendCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop delfriend";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.delfriendall") || target.hasPermission("areashop.delfriend")) {
+			return "help-delFriend";
+		}
+		return null;
+	}
+
+	/**
+	 * Check if a person can remove friends.
+	 * @param person The person to check
+	 * @param region The region to check for
+	 * @return true if the person can remove friends, otherwise false
+	 */
+	public static boolean canUse(CommandSender person, LegacyGeneralRegion region) {
+		if(person.hasPermission("areashop.delfriendall")) {
+			return true;
+		}
+		if(person instanceof Player) {
+			Player player = (Player)person;
+			return region.isOwner(player) && player.hasPermission("areashop.delfriend");
+		}
+		return false;
+	}
+
+	@SuppressWarnings("deprecation")
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.delfriend") && !sender.hasPermission("areashop.delfriendall")) {
+			plugin.message(sender, "delfriend-noPermission");
+			return;
+		}
+		if(args.length < 2) {
+			plugin.message(sender, "delfriend-help");
+			return;
+		}
+		LegacyGeneralRegion region;
+		if(args.length <= 2) {
+			if(sender instanceof Player) {
+				// get the region by location
+				List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
+					plugin.message(sender, "cmd-noRegionsAtLocation");
+					return;
+				} else if(regions.size() > 1) {
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
+					return;
+				} else {
+					region = regions.get(0);
+				}
+			} else {
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				return;
+			}
+		} else {
+			region = plugin.getFileManager().getRegion(args[2]);
+			if(region == null) {
+				plugin.message(sender, "cmd-notRegistered", args[2]);
+				return;
+			}
+		}
+		if(sender.hasPermission("areashop.delfriendall")) {
+			if((region instanceof RentRegion && !((RentRegion)region).isRented())
+					|| (region instanceof BuyRegion && !((BuyRegion)region).isSold())) {
+				plugin.message(sender, "delfriend-noOwner", region);
+				return;
+			}
+			OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
+			if(!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
+				plugin.message(sender, "delfriend-notAdded", friend.getName(), region);
+				return;
+			}
+			if(region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
+				region.update();
+				plugin.message(sender, "delfriend-successOther", friend.getName(), region);
+			}
+		} else {
+			if(sender.hasPermission("areashop.delfriend") && sender instanceof Player) {
+				if(region.isOwner((Player)sender)) {
+					OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
+					if(!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
+						plugin.message(sender, "delfriend-notAdded", friend.getName(), region);
+						return;
+					}
+					if(region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
+						region.update();
+						plugin.message(sender, "delfriend-success", friend.getName(), region);
+					}
+				} else {
+					plugin.message(sender, "delfriend-noPermissionOther", region);
+				}
+			} else {
+				plugin.message(sender, "delfriend-noPermission", region);
+			}
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(Player player : Utils.getOnlinePlayers()) {
+				result.add(player.getName());
+			}
+		} else if(toComplete == 3) {
+			result.addAll(plugin.getFileManager().getRegionNames());
+		}
+		return result;
+	}
+}
+
+
+
+
+
+
+
+
@@ -1,10 +1,7 @@
 package me.wiefferink.areashop.commands;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.features.signs.RegionSign;
-import me.wiefferink.areashop.features.signs.SignManager;
+import me.wiefferink.areashop.features.signs.SignsFeature;
 import me.wiefferink.areashop.tools.Materials;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -14,16 +11,9 @@ import org.bukkit.util.BlockIterator;

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

-@Singleton
 public class DelsignCommand extends CommandAreaShop {

-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private SignManager signManager;
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop delsign";
@@ -40,37 +30,35 @@ public class DelsignCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.delsign")) {
-			messageBridge.message(sender, "delsign-noPermission");
+			plugin.message(sender, "delsign-noPermission");
 			return;
 		}
-		if(!(sender instanceof Player player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
+		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().isAir()) {
+			if(next.getType() != Material.AIR) {
 				block = next;
 			}
 		}
 		if(block == null || !Materials.isSign(block.getType())) {
-			messageBridge.message(sender, "delsign-noSign");
+			plugin.message(sender, "delsign-noSign");
 			return;
 		}
-		Optional<RegionSign> optionalSign = signManager.removeSign(block.getLocation());
-		if(optionalSign.isEmpty()) {
-			messageBridge.message(sender, "delsign-noRegion");
+		RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+		if(regionSign == null) {
+			plugin.message(sender, "delsign-noRegion");
 			return;
 		}
-		RegionSign regionSign = optionalSign.get();
-		messageBridge.message(sender, "delsign-success", regionSign.getRegion());
+		plugin.message(sender, "delsign-success", regionSign.getRegion());
 		regionSign.remove();
-		// Sometimes the RegionSign data is corrupted. Forcefully set the block to air
-		block.setType(Material.AIR);
 	}

 	@Override
@@ -1,34 +1,20 @@
 package me.wiefferink.areashop.commands;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.RegionGroup;
 import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.interactivemessenger.processing.Message;
-import net.milkbowl.vault.economy.Economy;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;

-@Singleton
 public class FindCommand extends CommandAreaShop {

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

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

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

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

 				// Teleport
 				if(maxPriceSet) {
-					messageBridge.message(player, "find-successMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup, region);
+					plugin.message(player, "find-successMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup, region);
 				} else {
-					messageBridge.message(player, "find-success", "rent", Utils.formatCurrency(balance), onlyInGroup, region);
+					plugin.message(player, "find-success", "rent", Utils.formatCurrency(balance), onlyInGroup, region);
 				}
 				region.getTeleportFeature().teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);
 			} else {
@@ -155,9 +142,9 @@ public class FindCommand extends CommandAreaShop {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
 				}
 				if(maxPriceSet) {
-					messageBridge.message(player, "find-noneFoundMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup);
+					plugin.message(player, "find-noneFoundMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup);
 				} else {
-					messageBridge.message(player, "find-noneFound", "rent", Utils.formatCurrency(balance), onlyInGroup);
+					plugin.message(player, "find-noneFound", "rent", Utils.formatCurrency(balance), onlyInGroup);
 				}
 			}
 		}
@@ -1,129 +1,113 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
-import me.wiefferink.areashop.interfaces.WorldEditSelection;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RegionFactory;
-import me.wiefferink.areashop.regions.RegionGroup;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.TreeSet;
-
-@Singleton
-public class GroupaddCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	@Inject
-	private RegionFactory regionFactory;
-	@Inject
-	private WorldEditInterface worldEditInterface;
-	
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop groupadd";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.groupadd")) {
-			return "help-groupadd";
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.groupadd")) {
-			messageBridge.message(sender, "groupadd-noPermission");
-			return;
-		}
-		if(args.length < 2 || args[1] == null) {
-			messageBridge.message(sender, "groupadd-help");
-			return;
-		}
-		RegionGroup group = fileManager.getGroup(args[1]);
-		if(group == null) {
-			group = regionFactory.createRegionGroup(args[1]);
-			fileManager.addGroup(group);
-		}
-		if(args.length == 2) {
-			if(!(sender instanceof Player player)) {
-				messageBridge.message(sender, "cmd-weOnlyByPlayer");
-				return;
-			}
-			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
-			if(selection == null) {
-				messageBridge.message(player, "cmd-noSelection");
-				return;
-			}
-			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
-			if(regions.isEmpty()) {
-				messageBridge.message(player, "cmd-noRegionsFound");
-				return;
-			}
-			TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
-			TreeSet<GeneralRegion> regionsFailed = new TreeSet<>();
-			for(GeneralRegion region : regions) {
-				if(group.addMember(region)) {
-					regionsSuccess.add(region);
-				} else {
-					regionsFailed.add(region);
-				}
-			}
-			if(!regionsSuccess.isEmpty()) {
-				messageBridge.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
-			}
-			if(!regionsFailed.isEmpty()) {
-				messageBridge.message(player, "groupadd-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
-			}
-			// Update all regions, this does it in a task, updating them without lag
-			fileManager.updateRegions(new ArrayList<>(regionsSuccess), player);
-		} else {
-			GeneralRegion region = fileManager.getRegion(args[2]);
-			if(region == null) {
-				messageBridge.message(sender, "cmd-notRegistered", args[2]);
-				return;
-			}
-			if(group.addMember(region)) {
-				region.update();
-				messageBridge.message(sender, "groupadd-success", group.getName(), group.getMembers().size(), region);
-			} else {
-				messageBridge.message(sender, "groupadd-failed", group.getName(), region);
-			}
-		}
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			result = fileManager.getGroupNames();
-		} else if(toComplete == 3) {
-			result = fileManager.getRegionNames();
-		}
-		return result;
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeSet;
+
+public class GroupaddCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop groupadd";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.groupadd")) {
+			return "help-groupadd";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.groupadd")) {
+			plugin.message(sender, "groupadd-noPermission");
+			return;
+		}
+		if(args.length < 2 || args[1] == null) {
+			plugin.message(sender, "groupadd-help");
+			return;
+		}
+		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
+		if(group == null) {
+			group = new RegionGroup(plugin, args[1]);
+			plugin.getFileManager().addGroup(group);
+		}
+		if(args.length == 2) {
+			if(!(sender instanceof Player)) {
+				plugin.message(sender, "cmd-weOnlyByPlayer");
+				return;
+			}
+			Player player = (Player)sender;
+			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+			if(selection == null) {
+				plugin.message(player, "cmd-noSelection");
+				return;
+			}
+			List<LegacyGeneralRegion> regions = Utils.getRegionsInSelection(selection);
+			if(regions.isEmpty()) {
+				plugin.message(player, "cmd-noRegionsFound");
+				return;
+			}
+			TreeSet<LegacyGeneralRegion> regionsSuccess = new TreeSet<>();
+			TreeSet<LegacyGeneralRegion> regionsFailed = new TreeSet<>();
+			for(LegacyGeneralRegion region : regions) {
+				if(group.addMember(region)) {
+					regionsSuccess.add(region);
+				} else {
+					regionsFailed.add(region);
+				}
+			}
+			if(!regionsSuccess.isEmpty()) {
+				plugin.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
+			}
+			if(!regionsFailed.isEmpty()) {
+				plugin.message(player, "groupadd-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
+			}
+			// Update all regions, this does it in a task, updating them without lag
+			plugin.getFileManager().updateRegions(new ArrayList<>(regionsSuccess), player);
+		} else {
+			LegacyGeneralRegion region = plugin.getFileManager().getRegion(args[2]);
+			if(region == null) {
+				plugin.message(sender, "cmd-notRegistered", args[2]);
+				return;
+			}
+			if(group.addMember(region)) {
+				region.update();
+				plugin.message(sender, "groupadd-success", group.getName(), group.getMembers().size(), region);
+			} else {
+				plugin.message(sender, "groupadd-failed", group.getName(), region);
+			}
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			result = plugin.getFileManager().getGroupNames();
+		} else if(toComplete == 3) {
+			result = plugin.getFileManager().getRegionNames();
+		}
+		return result;
+	}
+
+}
+
+
+
+
+
+
+
+
+
+
@@ -1,130 +1,115 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
-import me.wiefferink.areashop.interfaces.WorldEditSelection;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RegionFactory;
-import me.wiefferink.areashop.regions.RegionGroup;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.TreeSet;
-
-@Singleton
-public class GroupdelCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	@Inject
-	private RegionFactory regionFactory;
-	@Inject
-	private WorldEditInterface worldEditInterface;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop groupdel";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.groupdel")) {
-			return "help-groupdel";
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.groupdel")) {
-			messageBridge.message(sender, "groupdel-noPermission");
-			return;
-		}
-		if(args.length < 2 || args[1] == null) {
-			messageBridge.message(sender, "groupdel-help");
-			return;
-		}
-		RegionGroup group = fileManager.getGroup(args[1]);
-		if(group == null) {
-			messageBridge.message(sender, "groupdel-wrongGroup", args[1]);
-			return;
-		}
-
-		if(args.length == 2) {
-			if(!(sender instanceof Player player)) {
-				messageBridge.message(sender, "cmd-weOnlyByPlayer");
-				return;
-			}
-			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
-			if(selection == null) {
-				messageBridge.message(player, "cmd-noSelection");
-				return;
-			}
-			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
-			if(regions.isEmpty()) {
-				messageBridge.message(player, "cmd-noRegionsFound");
-				return;
-			}
-			TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
-			TreeSet<GeneralRegion> regionsFailed = new TreeSet<>();
-			for(GeneralRegion region : regions) {
-				if(group.removeMember(region)) {
-					regionsSuccess.add(region);
-				} else {
-					regionsFailed.add(region);
-				}
-			}
-			if(!regionsSuccess.isEmpty()) {
-				messageBridge.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
-			}
-			if(!regionsFailed.isEmpty()) {
-				messageBridge.message(player, "groupdel-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
-			}
-			// Update all regions, this does it in a task, updating them without lag
-			fileManager.updateRegions(regionsSuccess, player);
-			group.saveRequired();
-		} else {
-			GeneralRegion region = fileManager.getRegion(args[2]);
-			if(region == null) {
-				messageBridge.message(sender, "cmd-notRegistered", args[2]);
-				return;
-			}
-			if(group.removeMember(region)) {
-				region.update();
-				messageBridge.message(sender, "groupdel-success", group.getName(), group.getMembers().size(), region);
-			} else {
-				messageBridge.message(sender, "groupdel-failed", group.getName(), region);
-			}
-		}
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			result = fileManager.getGroupNames();
-		} else if(toComplete == 3) {
-			result = fileManager.getRegionNames();
-		}
-		return result;
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeSet;
+
+public class GroupdelCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop groupdel";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.groupdel")) {
+			return "help-groupdel";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.groupdel")) {
+			plugin.message(sender, "groupdel-noPermission");
+			return;
+		}
+		if(args.length < 2 || args[1] == null) {
+			plugin.message(sender, "groupdel-help");
+			return;
+		}
+		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
+		if(group == null) {
+			plugin.message(sender, "groupdel-wrongGroup", args[1]);
+			return;
+		}
+
+		if(args.length == 2) {
+			if(!(sender instanceof Player)) {
+				plugin.message(sender, "cmd-weOnlyByPlayer");
+				return;
+			}
+			Player player = (Player)sender;
+			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+			if(selection == null) {
+				plugin.message(player, "cmd-noSelection");
+				return;
+			}
+			List<LegacyGeneralRegion> regions = Utils.getRegionsInSelection(selection);
+			if(regions.isEmpty()) {
+				plugin.message(player, "cmd-noRegionsFound");
+				return;
+			}
+			TreeSet<LegacyGeneralRegion> regionsSuccess = new TreeSet<>();
+			TreeSet<LegacyGeneralRegion> regionsFailed = new TreeSet<>();
+			for(LegacyGeneralRegion region : regions) {
+				if(group.removeMember(region)) {
+					regionsSuccess.add(region);
+				} else {
+					regionsFailed.add(region);
+				}
+			}
+			if(!regionsSuccess.isEmpty()) {
+				plugin.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
+			}
+			if(!regionsFailed.isEmpty()) {
+				plugin.message(player, "groupdel-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
+			}
+			// Update all regions, this does it in a task, updating them without lag
+			plugin.getFileManager().updateRegions(new ArrayList<>(regionsSuccess), player);
+			group.saveRequired();
+		} else {
+			LegacyGeneralRegion region = plugin.getFileManager().getRegion(args[2]);
+			if(region == null) {
+				plugin.message(sender, "cmd-notRegistered", args[2]);
+				return;
+			}
+			if(group.removeMember(region)) {
+				region.update();
+				plugin.message(sender, "groupdel-success", group.getName(), group.getMembers().size(), region);
+			} else {
+				plugin.message(sender, "groupdel-failed", group.getName(), region);
+			}
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			result = plugin.getFileManager().getGroupNames();
+		} else if(toComplete == 3) {
+			result = plugin.getFileManager().getRegionNames();
+		}
+		return result;
+	}
+
+}
+
+
+
+
+
+
+
+
+
+
@@ -1,9 +1,5 @@
 package me.wiefferink.areashop.commands;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.RegionGroup;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
@@ -12,14 +8,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

-@Singleton
 public class GroupinfoCommand extends CommandAreaShop {

-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop groupinfo";
@@ -37,23 +27,23 @@ public class GroupinfoCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.groupinfo")) {
-			messageBridge.message(sender, "groupinfo-noPermission");
+			plugin.message(sender, "groupinfo-noPermission");
 			return;
 		}
 		if(args.length < 2 || args[1] == null) {
-			messageBridge.message(sender, "groupinfo-help");
+			plugin.message(sender, "groupinfo-help");
 			return;
 		}
-		RegionGroup group = fileManager.getGroup(args[1]);
+		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
 		if(group == null) {
-			messageBridge.message(sender, "groupinfo-noGroup", args[1]);
+			plugin.message(sender, "groupinfo-noGroup", args[1]);
 			return;
 		}
 		Set<String> members = group.getMembers();
 		if(members.isEmpty()) {
-			messageBridge.message(sender, "groupinfo-noMembers", group.getName());
+			plugin.message(sender, "groupinfo-noMembers", group.getName());
 		} else {
-			messageBridge.message(sender, "groupinfo-members", group.getName(), Utils.createCommaSeparatedList(members));
+			plugin.message(sender, "groupinfo-members", group.getName(), Utils.createCommaSeparatedList(members));
 		}
 	}

@@ -61,7 +51,7 @@ public class GroupinfoCommand extends CommandAreaShop {
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result = fileManager.getGroupNames();
+			result = plugin.getFileManager().getGroupNames();
 		}
 		return result;
 	}
@@ -1,23 +1,13 @@
 package me.wiefferink.areashop.commands;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;

 import java.util.ArrayList;
 import java.util.List;

-@Singleton
 public class GrouplistCommand extends CommandAreaShop {

-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop grouplist";
@@ -34,14 +24,14 @@ public class GrouplistCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.grouplist")) {
-			messageBridge.message(sender, "grouplist-noPermission");
+			plugin.message(sender, "grouplist-noPermission");
 			return;
 		}
-		List<String> groups = fileManager.getGroupNames();
+		List<String> groups = plugin.getFileManager().getGroupNames();
 		if(groups.isEmpty()) {
-			messageBridge.message(sender, "grouplist-noGroups");
+			plugin.message(sender, "grouplist-noGroups");
 		} else {
-			messageBridge.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
+			plugin.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
 		}
 	}

@@ -1,20 +1,9 @@
 package me.wiefferink.areashop.commands;

-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import me.wiefferink.areashop.managers.CommandManager;
 import org.bukkit.command.CommandSender;

-import javax.annotation.Nonnull;
-
 public class HelpCommand extends CommandAreaShop {

-	private final CommandManager commandManager;
-
-	public HelpCommand(@Nonnull CommandManager commandManager) {
-		this.commandManager = commandManager;
-	}
-
 	@Override
 	public String getCommandStart() {
 		return "areashop help";
@@ -30,6 +19,6 @@ public class HelpCommand extends CommandAreaShop {

 	@Override
 	public void execute(CommandSender sender, String[] args) {
-		commandManager.showHelp(sender);
+		plugin.getCommandManager().showHelp(sender);
 	}
 }
@@ -1,16 +1,11 @@
 package me.wiefferink.areashop.commands;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.regions.ImportJobFactory;
 import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.command.CommandSender;

 import java.util.ArrayList;
 import java.util.List;

-@Singleton
 public class ImportCommand extends CommandAreaShop {

 	/* RegionGroup priority usage:
@@ -18,10 +13,6 @@ public class ImportCommand extends CommandAreaShop {
 	   1: Settings from /worlds/<world>/config.yml
 	   2: Settings from /worlds/<world>/parent-regions.yml (if their priority is set it is added to this value)
 	 */
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private ImportJobFactory importJobFactory;

 	@Override
 	public String getCommandStart() {
@@ -45,17 +36,17 @@ public class ImportCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.import")) {
-			messageBridge.message(sender, "import-noPermission");
+			plugin.message(sender, "import-noPermission");
 			return;
 		}

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

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

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

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

 	@Override
@@ -1,501 +1,481 @@
-package me.wiefferink.areashop.regions;
-
-import com.google.common.base.Charsets;
-import com.google.inject.assistedinject.Assisted;
-import com.google.inject.assistedinject.AssistedInject;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.events.ask.AddingRegionEvent;
-import me.wiefferink.areashop.features.signs.RegionSign;
-import me.wiefferink.areashop.features.signs.SignManager;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import me.wiefferink.areashop.managers.IFileManager;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-public class ImportJob {
-
-	private final AreaShop plugin;
-	private final IFileManager fileManager;
-	private final SignManager signManager;
-	private final WorldGuardInterface worldGuardInterface;
-	private final CommandSender sender;
-	private final MessageBridge messageBridge;
-	private final RegionFactory regionFactory;
-
-	/**
-	 * Create and execute the import.
-	 * @param sender CommandSender that should receive progress updates
-	 */
-	@AssistedInject
-	ImportJob(
-			@Nonnull AreaShop plugin,
-			@Nonnull IFileManager fileManager,
-			@Nonnull SignManager signManager,
-			@Nonnull WorldGuardInterface worldGuardInterface,
-			@Nonnull MessageBridge messageBridge,
-			@Nonnull RegionFactory regionFactory,
-			@Assisted @Nonnull CommandSender sender) {
-		this.regionFactory = regionFactory;
-		this.sender = sender;
-		this.plugin = plugin;
-		this.signManager = signManager;
-		this.fileManager = fileManager;
-		this.worldGuardInterface = worldGuardInterface;
-		this.messageBridge = messageBridge;
-	}
-
-	/**
-	 * Execute the job.
-	 */
-	public void execute() {
-		// Check for RegionForSale data
-		File regionForSaleFolder = new File(plugin.getDataFolder().getParentFile().getAbsolutePath(), "RegionForSale");
-		if(!regionForSaleFolder.exists()) {
-			message("import-noPluginFolder", regionForSaleFolder.getName());
-			return;
-		}
-
-		File worldsFolder = new File(regionForSaleFolder.getAbsolutePath(), "worlds");
-		if(!worldsFolder.exists()) {
-			message("import-noWorldsFolder");
-			return;
-		}
-
-		File[] worldFolders = worldsFolder.listFiles();
-		if(worldFolders == null) {
-			message("import-noWorldsFolder");
-			return;
-		}
-
-		// Import data for each world
-		message("import-start");
-
-		// Group with settings for all imported regions
-		RegionGroup regionForSaleGroup = regionFactory.createRegionGroup("RegionForSale");
-		fileManager.addGroup(regionForSaleGroup);
-
-		// Import /RegionForSale/config.yml settings
-		File regionForSaleConfigFile = new File(regionForSaleFolder.getAbsolutePath(), "config.yml");
-		YamlConfiguration regionForSaleConfig = loadConfiguration(regionForSaleConfigFile);
-		if(regionForSaleConfig == null) {
-			messageNoPrefix("import-loadConfigFailed", regionForSaleConfigFile.getAbsolutePath());
-			regionForSaleConfig = new YamlConfiguration();
-		} else {
-			importRegionSettings(regionForSaleConfig, regionForSaleGroup.getSettings(), null, false);
-			regionForSaleGroup.setSetting("priority", 0);
-		}
-
-		// Import /RegionForSale/general.yml settings
-		File regionForSaleGeneralFile = new File(regionForSaleFolder.getAbsolutePath(), "config.yml");
-		YamlConfiguration regionForSaleGeneral = loadConfiguration(regionForSaleConfigFile);
-		if(regionForSaleGeneral == null) {
-			messageNoPrefix("import-loadConfigFailed", regionForSaleGeneralFile.getAbsolutePath());
-		} else {
-			// Collection interval of RegionForSale maps to rent duration
-			String duration = "1 day";
-			if(regionForSaleGeneral.isLong("interval.collect_money")) {
-				duration = minutesToString(regionForSaleGeneral.getLong("interval.collect_money"));
-			}
-			regionForSaleGroup.setSetting("rent.duration", duration);
-
-			// Global economy account has an effect close to landlord in AreaShop
-			if(regionForSaleGeneral.isString("global_econ_account")) {
-				regionForSaleGroup.setSetting("general.landlordName", regionForSaleGeneral.getString("global_econ_account"));
-			}
-		}
-		regionForSaleGroup.saveRequired();
-
-		////////// Handle defaults of RegionForSale
-
-		// Set autoExtend, to keep the same behavior as RegionForSale had
-		regionForSaleGroup.setSetting("rent.autoExtend", true);
-
-		// Import regions from each world
-		for(File worldFolder : worldFolders) {
-			// Skip files
-			if(!worldFolder.isDirectory() || worldFolder.isHidden()) {
-				continue;
-			}
-
-			messageNoPrefix("import-doWorld", worldFolder.getName());
-
-			// Get the Bukkit world
-			World world = Bukkit.getWorld(worldFolder.getName());
-			if(world == null) {
-				messageNoPrefix("import-noBukkitWorld");
-				continue;
-			}
-
-			// Get the WorldGuard RegionManager
-			RegionManager regionManager = plugin.getRegionManager(world);
-			if(regionManager == null) {
-				messageNoPrefix("import-noRegionManger");
-				continue;
-			}
-
-			// Load the /worlds/<world>/regions.yml file
-			File regionsFile = new File(worldFolder.getAbsolutePath(), "regions.yml");
-			YamlConfiguration regions = loadConfiguration(regionsFile);
-			if(regions == null) {
-				messageNoPrefix("import-loadRegionsFailed", regionsFile.getAbsolutePath());
-				continue;
-			}
-
-			// Load /worlds/<world>/config.yml file
-			File worldConfigFile = new File(worldFolder.getAbsolutePath(), "config.yml");
-			YamlConfiguration worldConfig = loadConfiguration(worldConfigFile);
-			if(worldConfig == null) {
-				messageNoPrefix("import-loadWorldConfigFailed", worldConfigFile.getAbsolutePath());
-				// Simply skip importing the settings, since this is not really fatal
-				worldConfig = new YamlConfiguration();
-			} else {
-				// RegionGroup with all world settings
-				RegionGroup worldGroup = regionFactory.createRegionGroup("RegionForSale-" + worldFolder.getName());
-				importRegionSettings(worldConfig, worldGroup.getSettings(), null, false);
-				worldGroup.setSetting("priority", 1);
-				worldGroup.addWorld(worldFolder.getName());
-				fileManager.addGroup(regionForSaleGroup);
-				worldGroup.saveRequired();
-			}
-
-			// Create groups to hold settings of /worlds/<world>/parent-regions.yml
-			File parentRegionsFile = new File(worldFolder.getAbsolutePath(), "parent-regions.yml");
-			YamlConfiguration parentRegions = loadConfiguration(parentRegionsFile);
-			if(parentRegions == null) {
-				messageNoPrefix("import-loadParentRegionsFailed", parentRegionsFile.getAbsolutePath());
-				// Non-fatal, so just continue
-			} else {
-				for(String parentRegionName : parentRegions.getKeys(false)) {
-					// Get WorldGuard region
-					ProtectedRegion worldGuardRegion = regionManager.getRegion(parentRegionName);
-					if(worldGuardRegion == null) {
-						messageNoPrefix("import-noWorldGuardRegionParent", parentRegionName);
-						continue;
-					}
-
-					// Get settings section
-					ConfigurationSection parentRegionSection = parentRegions.getConfigurationSection(parentRegionName);
-					if(parentRegionSection == null) {
-						messageNoPrefix("import-improperParentRegion", parentRegionName);
-						continue;
-					}
-
-					// Skip if it does not have any settings
-					if(parentRegionSection.getKeys(false).isEmpty()) {
-						continue;
-					}
-
-					// Import parent region settings into a RegionGroup
-					RegionGroup parentRegionGroup = regionFactory.createRegionGroup( "RegionForSale-" + worldFolder.getName() + "-" + parentRegionName);
-					importRegionSettings(parentRegionSection, parentRegionGroup.getSettings(), null, false);
-					parentRegionGroup.setSetting("priority", 2 + parentRegionSection.getLong("info.priority", 0));
-					parentRegionGroup.saveRequired();
-
-					// TODO add all regions that are contained in this parent region
-					// Utils.getWorldEditRegionsInSelection()
-				}
-			}
-
-			// Read and import regions
-			for(String regionKey : regions.getKeys(false)) {
-				GeneralRegion existingRegion = fileManager.getRegion(regionKey);
-				if(existingRegion != null) {
-					if(world.getName().equalsIgnoreCase(existingRegion.getWorldName())) {
-						messageNoPrefix("import-alreadyAdded", regionKey);
-					} else {
-						messageNoPrefix("import-alreadyAddedOtherWorld", regionKey, existingRegion.getWorldName(), world.getName());
-					}
-					continue;
-				}
-
-				ConfigurationSection regionSection = regions.getConfigurationSection(regionKey);
-				if(regionSection == null) {
-					messageNoPrefix("import-invalidRegionSection", regionKey);
-					continue;
-				}
-
-				// Get WorldGuard region
-				ProtectedRegion worldGuardRegion = regionManager.getRegion(regionKey);
-				if(worldGuardRegion == null) {
-					messageNoPrefix("import-noWorldGuardRegion", regionKey);
-					continue;
-				}
-
-				String owner = regionSection.getString("info.owner", null);
-				boolean isBought = regionSection.getBoolean("info.is-bought");
-				// TODO: should also take into config settings of parent regions
-				boolean rentable = regionSection.getBoolean("economic-settings.rentable", worldConfig.getBoolean("economic-settings.rentable", regionForSaleConfig.getBoolean("economic-settings.rentable")));
-				boolean buyable = regionSection.getBoolean("economic-settings.buyable", worldConfig.getBoolean("economic-settings.buyable", regionForSaleConfig.getBoolean("economic-settings.buyable")));
-
-				// Can be bought and rented, import as buy
-				if(buyable && rentable) {
-					messageNoPrefix("import-buyAndRent", regionKey);
-				}
-
-				// Cannot be bought or rented, skip
-				if(!buyable && !rentable && owner == null) {
-					messageNoPrefix("import-noBuyAndNoRent", regionKey);
-					continue;
-				}
-
-				// Create region
-				GeneralRegion region;
-				if(rentable || (owner != null && !isBought)) {
-					region = regionFactory.createRentRegion(regionKey, world);
-				} else {
-					region = regionFactory.createBuyRegion(regionKey, world);
-				}
-				AddingRegionEvent event = plugin.getFileManager().addRegion(region);
-				if (event.isCancelled()) {
-					messageNoPrefix("general-cancelled", event.getReason());
-					continue;
-				}
-
-				// Import settings
-				importRegionSettings(regionSection, region.getConfig(), region, !buyable && !rentable);
-				region.getConfig().set("general.importedFrom", "RegionForSale");
-
-				// Get existing owners and members
-				List<UUID> existing = new ArrayList<>();
-				if(owner != null) {
-					@SuppressWarnings("deprecation")
-					OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
-					if(offlinePlayer.hasPlayedBefore()) {
-						existing.add(offlinePlayer.getUniqueId());
-					}
-				}
-				for(UUID uuid : worldGuardInterface.getOwners(worldGuardRegion).asUniqueIdList()) {
-					if(!existing.contains(uuid)) {
-						existing.add(uuid);
-					}
-				}
-				for(UUID uuid : worldGuardInterface.getMembers(worldGuardRegion).asUniqueIdList()) {
-					if(!existing.contains(uuid)) {
-						existing.add(uuid);
-					}
-				}
-
-				// First owner (or if none, the first member) will be the renter/buyer
-				if(!existing.isEmpty()) {
-					region.setOwner(existing.remove(0));
-				}
-				// Add others as friends
-				for(UUID friend : existing) {
-					region.getFriendsFeature().addFriend(friend, null);
-				}
-
-				region.saveRequired();
-
-				messageNoPrefix("import-imported", regionKey);
-			}
-		}
-
-		// Update all regions
-		fileManager.updateAllRegions(sender);
-		// Write all imported regions and settings to disk
-		fileManager.saveRequiredFiles();
-	}
-
-	/**
-	 * Load a YamlConfiguration from disk using UTF-8 encoding.
-	 * @param from File to read the configuration from
-	 * @return YamlConfiguration if the file exists and got read wihout problems, otherwise null
-	 */
-	private YamlConfiguration loadConfiguration(File from) {
-		try(
-				InputStreamReader reader = new InputStreamReader(new FileInputStream(from), Charsets.UTF_8)
-		) {
-			return YamlConfiguration.loadConfiguration(reader);
-		} catch(IOException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Import region specific settings from a RegionForSale source to an AreaShop target ConfigurationSection.
-	 * @param from RegionForSale config section that specifies region settings
-	 * @param to AreaShop config section that specifies region settings
-	 * @param region GeneralRegion to copy settings to, or null if doing generic settings
-	 * @param permanent Region cannot be rented or bought, disables some features
-	 */
-	private void importRegionSettings(ConfigurationSection from, ConfigurationSection to, GeneralRegion region, boolean permanent) {
-		// Maximum rental time, TODO check if this is actually the same
-		if(from.isLong("permissions.max-rent-time")) {
-			to.set("rent.maxRentTime", minutesToString(from.getLong("permissions.max-rent-time")));
-		}
-
-		// Region rebuild
-		if(from.getBoolean("region-rebuilding.auto-rebuild")) {
-			to.set("general.enableRestore", true);
-		}
-
-		// Get price settings
-		String unit = from.getString("economic-settings.unit-type");
-		String rentPrice = from.getString("economic-settings.cost-per-unit.rent");
-		String buyPrice = from.getString("economic-settings.cost-per-unit.buy");
-		String sellPrice = from.getString("economic-settings.cost-per-unit.selling-price");
-		// TODO: There is no easy way to import this, setup eventCommandsProfile?
-		// String taxes = from.getString("economic-settings.cost-per-unit.taxes");
-
-		// Determine unit and add that to the price
-		String unitSuffix = "";
-		if("region".equalsIgnoreCase(unit)) {
-			// add nothing
-		} else if("m3".equalsIgnoreCase(unit)) {
-			unitSuffix = "*%volume%";
-		} else { // m2 or nothing (in case not set, we should actually look in parent files to correctly set this...)
-			unitSuffix = "*(%volume%/%height%)"; // This is better than width*depth because of polygon regions
-		}
-
-		// Apply settings
-		if(rentPrice != null) {
-			to.set("rent.price", rentPrice + unitSuffix);
-		}
-		if(buyPrice != null) {
-			to.set("buy.price", buyPrice + unitSuffix);
-			if(sellPrice != null) {
-				try {
-					double buyPriceAmount = Double.parseDouble(buyPrice);
-					double sellPriceAmount = Double.parseDouble(sellPrice);
-					to.set("buy.moneyBack", sellPriceAmount / buyPriceAmount * 100);
-				} catch(NumberFormatException e) {
-					// There is not always a region here for the message, should probably indicate something though
-					message("import-moneyBackFailed", buyPrice, sellPrice);
-				}
-			}
-		}
-
-		// Apply permanent region settings
-		if(permanent) {
-			to.set("buy.resellDisabled", true);
-			to.set("buy.sellDisabled", true);
-			to.set("general.countForLimits", false);
-		}
-
-		// Set rented until
-		if(from.isLong("info.last-withdrawal")
-				&& region instanceof RentRegion rentRegion) {
-			long lastWithdrawal = from.getLong("info.last-withdrawal");
-			// Because the rental duration is already imported into the region and its parents this should be correct
-			rentRegion.setRentedUntil(lastWithdrawal + rentRegion.getDuration());
-		}
-
-		// Import signs (list of strings like "297, 71, -22")
-		if(from.isList("info.signs") && region != null) {
-			for(String signLocation : from.getStringList("info.signs")) {
-				String[] locationParts = signLocation.split(", ");
-				if(locationParts.length != 3) {
-					message("import-invalidSignLocation", region.getName(), signLocation);
-					continue;
-				}
-
-				// Parse the location
-				Location location;
-				try {
-					location = new Location(region.getWorld(), Double.parseDouble(locationParts[0]), Double.parseDouble(locationParts[1]), Double.parseDouble(locationParts[2]));
-				} catch(NumberFormatException e) {
-					message("import-invalidSignLocation", region.getName(), signLocation);
-					continue;
-				}
-
-				// Check if this location is already added to a region
-				Optional<RegionSign> optionalRegionSign = signManager.signFromLocation(location);
-				if(optionalRegionSign.isPresent()) {
-					RegionSign regionSign = optionalRegionSign.get();
-					if(!regionSign.getRegion().equals(region)) {
-						message("import-signAlreadyAdded", region.getName(), signLocation, regionSign.getRegion().getName());
-					}
-					continue;
-				}
-
-				// SignType and Facing will be written when the sign is updated later
-				region.getSignsFeature().addSign(location, null, null, null);
-			}
-		}
-
-	}
-
-	private static class TimeUnit {
-		public final long minutes;
-		public final String identifier;
-
-		TimeUnit(long minutes, String identifier) {
-			this.minutes = minutes;
-			this.identifier = identifier;
-		}
-	}
-
-	private static final List<TimeUnit> timeUnitLookup = new ArrayList<>() {
-		{
-			add(new TimeUnit(60 * 24 * 30 * 12, "year"));
-			add(new TimeUnit(60 * 24 * 30, "month"));
-			add(new TimeUnit(60 * 24, "day"));
-			add(new TimeUnit(60, "hour"));
-		}
-	};
-
-	/**
-	 * Convert minutes to a human-readable string.
-	 * @param minutes Value to convert
-	 * @return String that represents the same length of time in a readable format, like "1 day", "5 minutes", "3 months"
-	 */
-	private String minutesToString(long minutes) {
-		// If the specified number of minutes can map nicely to a higher unit, use that one
-		String resultUnit = "minute";
-		long resultValue = minutes;
-		for(TimeUnit unit : timeUnitLookup) {
-			long result = minutes / unit.minutes;
-			if(resultValue * unit.minutes == minutes) {
-				resultUnit = unit.identifier;
-				resultValue = result;
-				break;
-			}
-		}
-		return resultValue + " " + resultUnit + (resultValue == 1 ? "" : "s");
-	}
-
-	/**
-	 * Send a message to a target without a prefix.
-	 * @param key          The key of the language string
-	 * @param replacements The replacements to insert in the message
-	 */
-	public void messageNoPrefix(String key, Object... replacements) {
-		messageBridge.messageNoPrefix(sender, key, replacements);
-
-		if(!(sender instanceof ConsoleCommandSender)) {
-			messageBridge.messageNoPrefix(Bukkit.getConsoleSender(), key, replacements);
-		}
-	}
-
-	/**
-	 * Send a message to a target, prefixed by the default chat prefix.
-	 * @param key          The key of the language string
-	 * @param replacements The replacements to insert in the message
-	 */
-	public void message(String key, Object... replacements) {
-		messageBridge.message(sender, key, replacements);
-
-		if(!(sender instanceof ConsoleCommandSender)) {
-			messageBridge.message(Bukkit.getConsoleSender(), key, replacements);
-		}
-	}
-}
+package me.wiefferink.areashop.commands;
+
+import com.google.common.base.Charsets;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.regions.RentRegion;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class ImportJob {
+
+	private final AreaShop plugin;
+	private final CommandSender sender;
+
+	/**
+	 * Create and execute the import.
+	 * @param sender CommandSender that should receive progress updates
+	 */
+	public ImportJob(CommandSender sender) {
+		this.sender = sender;
+		this.plugin = AreaShop.getInstance();
+		execute();
+	}
+
+	/**
+	 * Execute the job.
+	 */
+	private void execute() {
+		// Check for RegionForSale data
+		File regionForSaleFolder = new File(plugin.getDataFolder().getParentFile().getAbsolutePath(), "RegionForSale");
+		if(!regionForSaleFolder.exists()) {
+			message("import-noPluginFolder", regionForSaleFolder.getName());
+			return;
+		}
+
+		File worldsFolder = new File(regionForSaleFolder.getAbsolutePath(), "worlds");
+		if(!worldsFolder.exists()) {
+			message("import-noWorldsFolder");
+			return;
+		}
+
+		File[] worldFolders = worldsFolder.listFiles();
+		if(worldFolders == null) {
+			message("import-noWorldsFolder");
+			return;
+		}
+
+		// Import data for each world
+		message("import-start");
+
+		// Group with settings for all imported regions
+		RegionGroup regionForSaleGroup = new RegionGroup(plugin, "RegionForSale");
+		plugin.getFileManager().addGroup(regionForSaleGroup);
+
+		// Import /RegionForSale/config.yml settings
+		File regionForSaleConfigFile = new File(regionForSaleFolder.getAbsolutePath(), "config.yml");
+		YamlConfiguration regionForSaleConfig = loadConfiguration(regionForSaleConfigFile);
+		if(regionForSaleConfig == null) {
+			messageNoPrefix("import-loadConfigFailed", regionForSaleConfigFile.getAbsolutePath());
+			regionForSaleConfig = new YamlConfiguration();
+		} else {
+			importRegionSettings(regionForSaleConfig, regionForSaleGroup.getSettings(), null, false);
+			regionForSaleGroup.setSetting("priority", 0);
+		}
+
+		// Import /RegionForSale/general.yml settings
+		File regionForSaleGeneralFile = new File(regionForSaleFolder.getAbsolutePath(), "config.yml");
+		YamlConfiguration regionForSaleGeneral = loadConfiguration(regionForSaleConfigFile);
+		if(regionForSaleGeneral == null) {
+			messageNoPrefix("import-loadConfigFailed", regionForSaleGeneralFile.getAbsolutePath());
+		} else {
+			// Collection interval of RegionForSale maps to rent duration
+			String duration = "1 day";
+			if(regionForSaleGeneral.isLong("interval.collect_money")) {
+				duration = minutesToString(regionForSaleGeneral.getLong("interval.collect_money"));
+			}
+			regionForSaleGroup.setSetting("rent.duration", duration);
+
+			// Global economy account has an effect close to landlord in AreaShop
+			if(regionForSaleGeneral.isString("global_econ_account")) {
+				regionForSaleGroup.setSetting("general.landlordName", regionForSaleGeneral.getString("global_econ_account"));
+			}
+		}
+		regionForSaleGroup.saveRequired();
+
+		////////// Handle defaults of RegionForSale
+
+		// Set autoExtend, to keep the same behavior as RegionForSale had
+		regionForSaleGroup.setSetting("rent.autoExtend", true);
+
+		// Import regions from each world
+		for(File worldFolder : worldFolders) {
+			// Skip files
+			if(!worldFolder.isDirectory() || worldFolder.isHidden()) {
+				continue;
+			}
+
+			messageNoPrefix("import-doWorld", worldFolder.getName());
+
+			// Get the Bukkit world
+			World world = Bukkit.getWorld(worldFolder.getName());
+			if(world == null) {
+				messageNoPrefix("import-noBukkitWorld");
+				continue;
+			}
+
+			// Get the WorldGuard RegionManager
+			RegionManager regionManager = plugin.getRegionManager(world);
+			if(regionManager == null) {
+				messageNoPrefix("import-noRegionManger");
+				continue;
+			}
+
+			// Load the /worlds/<world>/regions.yml file
+			File regionsFile = new File(worldFolder.getAbsolutePath(), "regions.yml");
+			YamlConfiguration regions = loadConfiguration(regionsFile);
+			if(regions == null) {
+				messageNoPrefix("import-loadRegionsFailed", regionsFile.getAbsolutePath());
+				continue;
+			}
+
+			// Load /worlds/<world>/config.yml file
+			File worldConfigFile = new File(worldFolder.getAbsolutePath(), "config.yml");
+			YamlConfiguration worldConfig = loadConfiguration(worldConfigFile);
+			if(worldConfig == null) {
+				messageNoPrefix("import-loadWorldConfigFailed", worldConfigFile.getAbsolutePath());
+				// Simply skip importing the settings, since this is not really fatal
+				worldConfig = new YamlConfiguration();
+			} else {
+				// RegionGroup with all world settings
+				RegionGroup worldGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName());
+				importRegionSettings(worldConfig, worldGroup.getSettings(), null, false);
+				worldGroup.setSetting("priority", 1);
+				worldGroup.addWorld(worldFolder.getName());
+				plugin.getFileManager().addGroup(regionForSaleGroup);
+				worldGroup.saveRequired();
+			}
+
+			// Create groups to hold settings of /worlds/<world>/parent-regions.yml
+			File parentRegionsFile = new File(worldFolder.getAbsolutePath(), "parent-regions.yml");
+			YamlConfiguration parentRegions = loadConfiguration(parentRegionsFile);
+			if(parentRegions == null) {
+				messageNoPrefix("import-loadParentRegionsFailed", parentRegionsFile.getAbsolutePath());
+				// Non-fatal, so just continue
+			} else {
+				for(String parentRegionName : parentRegions.getKeys(false)) {
+					// Get WorldGuard region
+					ProtectedRegion worldGuardRegion = regionManager.getRegion(parentRegionName);
+					if(worldGuardRegion == null) {
+						messageNoPrefix("import-noWorldGuardRegionParent", parentRegionName);
+						continue;
+					}
+
+					// Get settings section
+					ConfigurationSection parentRegionSection = parentRegions.getConfigurationSection(parentRegionName);
+					if(parentRegionSection == null) {
+						messageNoPrefix("import-improperParentRegion", parentRegionName);
+						continue;
+					}
+
+					// Skip if it does not have any settings
+					if(parentRegionSection.getKeys(false).isEmpty()) {
+						continue;
+					}
+
+					// Import parent region settings into a RegionGroup
+					RegionGroup parentRegionGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName() + "-" + parentRegionName);
+					importRegionSettings(parentRegionSection, parentRegionGroup.getSettings(), null, false);
+					parentRegionGroup.setSetting("priority", 2 + parentRegionSection.getLong("info.priority", 0));
+					parentRegionGroup.saveRequired();
+
+					// TODO add all regions that are contained in this parent region
+					// Utils.getWorldEditRegionsInSelection()
+				}
+			}
+
+			// Read and import regions
+			for(String regionKey : regions.getKeys(false)) {
+				LegacyGeneralRegion existingRegion = plugin.getFileManager().getRegion(regionKey);
+				if(existingRegion != null) {
+					if(world.getName().equalsIgnoreCase(existingRegion.getWorldName())) {
+						messageNoPrefix("import-alreadyAdded", regionKey);
+					} else {
+						messageNoPrefix("import-alreadyAddedOtherWorld", regionKey, existingRegion.getWorldName(), world.getName());
+					}
+					continue;
+				}
+
+				ConfigurationSection regionSection = regions.getConfigurationSection(regionKey);
+				if(regionSection == null) {
+					messageNoPrefix("import-invalidRegionSection", regionKey);
+					continue;
+				}
+
+				// Get WorldGuard region
+				ProtectedRegion worldGuardRegion = regionManager.getRegion(regionKey);
+				if(worldGuardRegion == null) {
+					messageNoPrefix("import-noWorldGuardRegion", regionKey);
+					continue;
+				}
+
+				String owner = regionSection.getString("info.owner", null);
+				boolean isBought = regionSection.getBoolean("info.is-bought");
+				// TODO: should also take into config settings of parent regions
+				boolean rentable = regionSection.getBoolean("economic-settings.rentable", worldConfig.getBoolean("economic-settings.rentable", regionForSaleConfig.getBoolean("economic-settings.rentable")));
+				boolean buyable = regionSection.getBoolean("economic-settings.buyable", worldConfig.getBoolean("economic-settings.buyable", regionForSaleConfig.getBoolean("economic-settings.buyable")));
+
+				// Can be bought and rented, import as buy
+				if(buyable && rentable) {
+					messageNoPrefix("import-buyAndRent", regionKey);
+				}
+
+				// Cannot be bought or rented, skip
+				if(!buyable && !rentable && owner == null) {
+					messageNoPrefix("import-noBuyAndNoRent", regionKey);
+					continue;
+				}
+
+				// Create region
+				LegacyGeneralRegion region;
+				if(rentable || (owner != null && !isBought)) {
+					region = new RentRegion(regionKey, world);
+				} else {
+					region = new BuyRegion(regionKey, world);
+				}
+				AddingRegionEvent event = plugin.getFileManager().addRegion(region);
+				if (event.isCancelled()) {
+					messageNoPrefix("general-cancelled", event.getReason());
+					continue;
+				}
+
+				// Import settings
+				importRegionSettings(regionSection, region.getConfig(), region, !buyable && !rentable);
+				region.getConfig().set("general.importedFrom", "RegionForSale");
+
+				// Get existing owners and members
+				List<UUID> existing = new ArrayList<>();
+				if(owner != null) {
+					@SuppressWarnings("deprecation")
+					OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
+					if(offlinePlayer != null) {
+						existing.add(offlinePlayer.getUniqueId());
+					}
+				}
+				for(UUID uuid : plugin.getWorldGuardHandler().getOwners(worldGuardRegion).asUniqueIdList()) {
+					if(!existing.contains(uuid)) {
+						existing.add(uuid);
+					}
+				}
+				for(UUID uuid : plugin.getWorldGuardHandler().getMembers(worldGuardRegion).asUniqueIdList()) {
+					if(!existing.contains(uuid)) {
+						existing.add(uuid);
+					}
+				}
+
+				// First owner (or if none, the first member) will be the renter/buyer
+				if(!existing.isEmpty()) {
+					region.setOwner(existing.remove(0));
+				}
+				// Add others as friends
+				for(UUID friend : existing) {
+					region.getFriendsFeature().addFriend(friend, null);
+				}
+
+				region.saveRequired();
+
+				messageNoPrefix("import-imported", regionKey);
+			}
+		}
+
+		// Update all regions
+		plugin.getFileManager().updateAllRegions(sender);
+		// Write all imported regions and settings to disk
+		plugin.getFileManager().saveRequiredFiles();
+	}
+
+	/**
+	 * Load a YamlConfiguration from disk using UTF-8 encoding.
+	 * @param from File to read the configuration from
+	 * @return YamlConfiguration if the file exists and got read wihout problems, otherwise null
+	 */
+	private YamlConfiguration loadConfiguration(File from) {
+		try(
+				InputStreamReader reader = new InputStreamReader(new FileInputStream(from), Charsets.UTF_8)
+		) {
+			return YamlConfiguration.loadConfiguration(reader);
+		} catch(IOException e) {
+			return null;
+		}
+	}
+
+	/**
+	 * Import region specific settings from a RegionForSale source to an AreaShop target ConfigurationSection.
+	 * @param from RegionForSale config section that specifies region settings
+	 * @param to AreaShop config section that specifies region settings
+	 * @param region GeneralRegion to copy settings to, or null if doing generic settings
+	 * @param permanent Region cannot be rented or bought, disables some features
+	 */
+	private void importRegionSettings(ConfigurationSection from, ConfigurationSection to, LegacyGeneralRegion region, boolean permanent) {
+		// Maximum rental time, TODO check if this is actually the same
+		if(from.isLong("permissions.max-rent-time")) {
+			to.set("rent.maxRentTime", minutesToString(from.getLong("permissions.max-rent-time")));
+		}
+
+		// Region rebuild
+		if(from.getBoolean("region-rebuilding.auto-rebuild")) {
+			to.set("general.enableRestore", true);
+		}
+
+		// Get price settings
+		String unit = from.getString("economic-settings.unit-type");
+		String rentPrice = from.getString("economic-settings.cost-per-unit.rent");
+		String buyPrice = from.getString("economic-settings.cost-per-unit.buy");
+		String sellPrice = from.getString("economic-settings.cost-per-unit.selling-price");
+		// TODO: There is no easy way to import this, setup eventCommandsProfile?
+		// String taxes = from.getString("economic-settings.cost-per-unit.taxes");
+
+		// Determine unit and add that to the price
+		String unitSuffix = "";
+		if("region".equalsIgnoreCase(unit)) {
+			// add nothing
+		} else if("m3".equalsIgnoreCase(unit)) {
+			unitSuffix = "*%volume%";
+		} else { // m2 or nothing (in case not set, we should actually look in parent files to correctly set this...)
+			unitSuffix = "*(%volume%/%height%)"; // This is better than width*depth because of polygon regions
+		}
+
+		// Apply settings
+		if(rentPrice != null) {
+			to.set("rent.price", rentPrice + unitSuffix);
+		}
+		if(buyPrice != null) {
+			to.set("buy.price", buyPrice + unitSuffix);
+			if(sellPrice != null) {
+				try {
+					double buyPriceAmount = Double.parseDouble(buyPrice);
+					double sellPriceAmount = Double.parseDouble(sellPrice);
+					to.set("buy.moneyBack", sellPriceAmount / buyPriceAmount * 100);
+				} catch(NumberFormatException e) {
+					// There is not always a region here for the message, should probably indicate something though
+					message("import-moneyBackFailed", buyPrice, sellPrice);
+				}
+			}
+		}
+
+		// Apply permanent region settings
+		if(permanent) {
+			to.set("buy.resellDisabled", true);
+			to.set("buy.sellDisabled", true);
+			to.set("general.countForLimits", false);
+		}
+
+		// Set rented until
+		if(from.isLong("info.last-withdrawal")
+				&& region instanceof RentRegion) {
+			RentRegion rentRegion = (RentRegion)region;
+			long lastWithdrawal = from.getLong("info.last-withdrawal");
+			// Because the rental duration is already imported into the region and its parents this should be correct
+			rentRegion.setRentedUntil(lastWithdrawal + rentRegion.getDuration());
+		}
+
+		// Import signs (list of strings like "297, 71, -22")
+		if(from.isList("info.signs") && region != null) {
+			for(String signLocation : from.getStringList("info.signs")) {
+				String[] locationParts = signLocation.split(", ");
+				if(locationParts.length != 3) {
+					message("import-invalidSignLocation", region.getRegionId(), signLocation);
+					continue;
+				}
+
+				// Parse the location
+				Location location;
+				try {
+					location = new Location(region.getWorld(), Double.parseDouble(locationParts[0]), Double.parseDouble(locationParts[1]), Double.parseDouble(locationParts[2]));
+				} catch(NumberFormatException e) {
+					message("import-invalidSignLocation", region.getRegionId(), signLocation);
+					continue;
+				}
+
+				// Check if this location is already added to a region
+				RegionSign regionSign = SignsFeature.getSignByLocation(location);
+				if(regionSign != null) {
+					if(!regionSign.getRegion().equals(region)) {
+						message("import-signAlreadyAdded", region.getRegionId(), signLocation, regionSign.getRegion().getRegionId());
+					}
+					continue;
+				}
+
+				// SignType and Facing will be written when the sign is updated later
+				region.getSignsFeature().addSign(location, null, null, null);
+			}
+		}
+
+	}
+
+	private static class TimeUnit {
+		public final long minutes;
+		public final String identifier;
+
+		TimeUnit(long minutes, String identifier) {
+			this.minutes = minutes;
+			this.identifier = identifier;
+		}
+	}
+
+	private static final List<TimeUnit> timeUnitLookup = new ArrayList<TimeUnit>() {
+		{
+			add(new TimeUnit(60 * 24 * 30 * 12, "year"));
+			add(new TimeUnit(60 * 24 * 30, "month"));
+			add(new TimeUnit(60 * 24, "day"));
+			add(new TimeUnit(60, "hour"));
+		}
+	};
+
+	/**
+	 * Convert minutes to a human-readable string.
+	 * @param minutes Value to convert
+	 * @return String that represents the same length of time in a readable format, like "1 day", "5 minutes", "3 months"
+	 */
+	private String minutesToString(long minutes) {
+		// If the specified number of minutes can map nicely to a higher unit, use that one
+		String resultUnit = "minute";
+		long resultValue = minutes;
+		for(TimeUnit unit : timeUnitLookup) {
+			long result = minutes / unit.minutes;
+			if(resultValue * unit.minutes == minutes) {
+				resultUnit = unit.identifier;
+				resultValue = result;
+				break;
+			}
+		}
+		return resultValue + " " + resultUnit + (resultValue == 1 ? "" : "s");
+	}
+
+	/**
+	 * Send a message to a target without a prefix.
+	 * @param key          The key of the language string
+	 * @param replacements The replacements to insert in the message
+	 */
+	public void messageNoPrefix(String key, Object... replacements) {
+		plugin.messageNoPrefix(sender, key, replacements);
+
+		if(!(sender instanceof ConsoleCommandSender)) {
+			plugin.messageNoPrefix(Bukkit.getConsoleSender(), key, replacements);
+		}
+	}
+
+	/**
+	 * Send a message to a target, prefixed by the default chat prefix.
+	 * @param key          The key of the language string
+	 * @param replacements The replacements to insert in the message
+	 */
+	public void message(String key, Object... replacements) {
+		plugin.message(sender, key, replacements);
+
+		if(!(sender instanceof ConsoleCommandSender)) {
+			plugin.message(Bukkit.getConsoleSender(), key, replacements);
+		}
+	}
+}
@@ -1,512 +1,484 @@
-package me.wiefferink.areashop.commands;
-
-import io.github.bakedlibs.dough.blocks.BlockPosition;
-import io.github.md5sha256.areashop.CompositeMessage;
-import io.github.md5sha256.areashop.KeyedMessage;
-import io.github.md5sha256.areashop.MessageWrapper;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RegionGroup;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-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
-@Singleton
-public class InfoCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop info";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.info")) {
-			return "help-info";
-		}
-		return null;
-	}
-
-	/**
-	 * Display a page of a list of regions.
-	 * @param sender      The CommandSender to send the messages to
-	 * @param regions     The regions to display
-	 * @param filterGroup The group to filter the regions by
-	 * @param keyHeader   The header to print above the page
-	 * @param pageInput   The page number, if any
-	 * @param baseCommand The command to execute for next/previous page (/areashop will be added)
-	 */
-	private void showSortedPagedList(CommandSender sender, List<? extends GeneralRegion> regions, RegionGroup filterGroup, String keyHeader, String pageInput, String baseCommand) {
-		int maximumItems = 20;
-		int itemsPerPage = maximumItems - 2;
-		int page = 1;
-		if(pageInput != null && Utils.isNumeric(pageInput)) {
-			try {
-				page = Integer.parseInt(pageInput);
-			} catch(NumberFormatException e) {
-				messageBridge.message(sender, "info-wrongPage", pageInput);
-				return;
-			}
-		}
-		if(filterGroup != null) {
-			regions.removeIf(generalRegion -> !filterGroup.isMember(generalRegion));
-		}
-		if(regions.isEmpty()) {
-			messageBridge.message(sender, "info-noRegions");
-		} else {
-			// First sort by type, then by name
-			regions.sort((one, two) -> {
-				int typeCompare = getTypeOrder(two).compareTo(getTypeOrder(one));
-				if(typeCompare != 0) {
-					return typeCompare;
-				} else {
-					return one.getName().compareTo(two.getName());
-				}
-			});
-			// Header
-			if(filterGroup != null) {
-				KeyedMessage limitedToGroup = new KeyedMessage("info-limitedToGroup", filterGroup.getName());
-				messageBridge.message(sender, keyHeader, limitedToGroup);
-			} else {
-				messageBridge.message(sender, keyHeader);
-			}
-			// Page entries
-			int totalPages = (int)Math.ceil(regions.size() / (double)itemsPerPage); // Clip page to correct boundaries, not much need to tell the user
-			if(regions.size() == itemsPerPage + 1) { // 19 total items is mapped to 1 page of 19
-				itemsPerPage++;
-				totalPages = 1;
-			}
-			page = Math.max(1, Math.min(totalPages, page));
-			int linesPrinted = 1; // header
-			for(int i = (page - 1) * itemsPerPage; i < page * itemsPerPage && i < regions.size(); i++) {
-				String state;
-				GeneralRegion region = regions.get(i);
-				if(region.getType() == GeneralRegion.RegionType.RENT) {
-					if(region.getOwner() == null) {
-						state = "Forrent";
-					} else {
-						state = "Rented";
-					}
-				} else {
-					if(region.getOwner() == null) {
-						state = "Forsale";
-					} else if(!((BuyRegion)region).isInResellingMode()) {
-						state = "Sold";
-					} else {
-						state = "Reselling";
-					}
-				}
-				messageBridge.messageNoPrefix(sender, "info-entry" + state, region);
-				linesPrinted++;
-			}
-			CompositeMessage footer = new CompositeMessage();
-			// Previous button
-            MessageWrapper infoPage;
-            if(page > 1) {
-                infoPage = new KeyedMessage("info-pagePrevious",
-                        baseCommand + " " + (page - 1));
-            } else {
-                infoPage = new KeyedMessage("info-pageNoPrevious");
-            }
-            footer.appendMessage(infoPage);
-            // Page status
-			if(totalPages > 1) {
-				StringBuilder pageString = new StringBuilder("" + page);
-				for(int i = pageString.length(); i < (totalPages + "").length(); i++) {
-					pageString.insert(0, "0");
-				}
-				MessageWrapper status = new KeyedMessage("info-pageStatus", page, totalPages);
-				footer.appendMessage(status);
-                MessageWrapper info;
-                if(page < totalPages) {
-                    info = new KeyedMessage("info-pageNext", baseCommand + " " + (page + 1));
-                } else {
-                    info = new KeyedMessage("info-pageNoNext");
-                }
-                footer.appendMessage(info);
-                // Fill up space if the page is not full (aligns header nicely)
-				String padding = " ".repeat(maximumItems - 1 - linesPrinted);
-				footer.appendText(padding);
-			}
-			messageBridge.message(sender, footer);
-		}
-	}
-
-	/**
-	 * Get an integer to order by type, usable for Comparators.
-	 * @param region The region to get the order for
-	 * @return An integer for sorting by type
-	 */
-	private Integer getTypeOrder(GeneralRegion region) {
-		if(region.getType() == GeneralRegion.RegionType.RENT) {
-			if(region.getOwner() == null) {
-				return 1;
-			} else {
-				return 2;
-			}
-		} else {
-			if(region.getOwner() == null) {
-				return 3;
-			} else if(!((BuyRegion)region).isInResellingMode()) {
-				return 4;
-			} else {
-				return 5;
-			}
-		}
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.info")) {
-			messageBridge.message(sender, "info-noPermission");
-			return;
-		}
-		if(args.length > 1 && args[1] != null) {
-			// Get filter group (only used by some commands)
-			RegionGroup filterGroup = null;
-			Set<String> groupFilters = new HashSet<>(Arrays.asList("all", "rented", "forrent", "sold", "forsale", "reselling"));
-			if(groupFilters.contains(args[1].toLowerCase()) && args.length > 2) {
-				if(!Utils.isNumeric(args[2])) {
-					filterGroup = fileManager.getGroup(args[2]);
-					if(filterGroup == null) {
-						messageBridge.message(sender, "info-noFiltergroup", args[2]);
-						return;
-					}
-					// Pass page number to args[2] if available
-					if(args.length > 3) {
-						args[2] = args[3];
-					}
-				}
-			}
-
-			// All regions
-			if(args[1].equalsIgnoreCase("all")) {
-				showSortedPagedList(sender, new ArrayList<>(fileManager.getRegionsRef()), filterGroup, "info-allHeader", (args.length > 2 ? args[2] : null), "info all");
-			}
-
-			// Rented regions
-			else if(args[1].equalsIgnoreCase("rented")) {
-				List<RentRegion> regions = new ArrayList<>(fileManager.getRentsRef());
-				regions.removeIf(RentRegion::isAvailable);
-				showSortedPagedList(sender, regions, filterGroup, "info-rentedHeader", (args.length > 2 ? args[2] : null), "info rented");
-			}
-			// Forrent regions
-			else if(args[1].equalsIgnoreCase("forrent")) {
-				List<RentRegion> regions = new ArrayList<>(fileManager.getRentsRef());
-				regions.removeIf(RentRegion::isRented);
-				showSortedPagedList(sender, regions, filterGroup, "info-forrentHeader", (args.length > 2 ? args[2] : null), "info forrent");
-			}
-			// Sold regions
-			else if(args[1].equalsIgnoreCase("sold")) {
-				List<BuyRegion> regions = new ArrayList<>(fileManager.getBuysRef());
-				regions.removeIf(BuyRegion::isAvailable);
-				showSortedPagedList(sender, regions, filterGroup, "info-soldHeader", (args.length > 2 ? args[2] : null), "info sold");
-			}
-			// Forsale regions
-			else if(args[1].equalsIgnoreCase("forsale")) {
-				List<BuyRegion> regions = new ArrayList<>(fileManager.getBuysRef());
-				regions.removeIf(BuyRegion::isSold);
-				showSortedPagedList(sender, regions, filterGroup, "info-forsaleHeader", (args.length > 2 ? args[2] : null), "info forsale");
-			}
-			// Reselling regions
-			else if(args[1].equalsIgnoreCase("reselling")) {
-				List<BuyRegion> regions = new ArrayList<>(fileManager.getBuysRef());
-				regions.removeIf(region -> !region.isInResellingMode());
-				showSortedPagedList(sender, regions, filterGroup, "info-resellingHeader", (args.length > 2 ? args[2] : null), "info reselling");
-			}
-
-			// List of regions without a group
-			else if(args[1].equalsIgnoreCase("nogroup")) {
-				List<GeneralRegion> regions = new ArrayList<>(fileManager.getRegionsRef());
-				for(RegionGroup group : fileManager.getGroups()) {
-					regions.removeAll(group.getMemberRegions());
-				}
-				if(regions.isEmpty()) {
-					messageBridge.message(sender, "info-nogroupNone");
-				} else {
-					showSortedPagedList(sender, regions, filterGroup, "info-nogroupHeader", (args.length > 2 ? args[2] : null), "info nogroup");
-				}
-			}
-
-			// Region info
-			else if(args[1].equalsIgnoreCase("region")) {
-				if(args.length > 1) {
-					RentRegion rent = null;
-					BuyRegion buy = null;
-					if(args.length > 2) {
-						rent = fileManager.getRent(args[2]);
-						buy = fileManager.getBuy(args[2]);
-					} else {
-						if(sender instanceof Player) {
-							// get the region by location
-							List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
-							if(regions.isEmpty()) {
-								messageBridge.message(sender, "cmd-noRegionsAtLocation");
-								return;
-							} else if(regions.size() > 1) {
-								messageBridge.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 {
-							messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
-							return;
-						}
-					}
-
-					if(rent == null && buy == null) {
-						messageBridge.message(sender, "info-regionNotExisting", args[2]);
-						return;
-					}
-
-					if(rent != null) {
-						messageBridge.message(sender, "info-regionHeaderRent", rent);
-						if(rent.isRented()) {
-							messageBridge.messageNoPrefix(sender, "info-regionRented", rent);
-							messageBridge.messageNoPrefix(sender, "info-regionExtending", rent);
-							// Money back
-							if(UnrentCommand.canUse(sender, rent)) {
-								messageBridge.messageNoPrefix(sender, "info-regionMoneyBackRentClick", rent);
-							} else {
-								messageBridge.messageNoPrefix(sender, "info-regionMoneyBackRent", rent);
-							}
-							// Friends
-							if(!rent.getFriendsFeature().getFriendNames().isEmpty()) {
-								String messagePart = "info-friend";
-								if(DelfriendCommand.canUse(sender, rent)) {
-									messagePart = "info-friendRemove";
-								}
-								messageBridge.messageNoPrefix(sender, "info-regionFriends", rent, Utils.combinedMessage(rent.getFriendsFeature().getFriendNames(), messagePart));
-							}
-						} else {
-							messageBridge.messageNoPrefix(sender, "info-regionCanBeRented", rent);
-						}
-						if(rent.getLandlordName() != null) {
-							messageBridge.messageNoPrefix(sender, "info-regionLandlord", rent);
-						}
-						// Maximum extends
-						if(rent.getMaxExtends() != -1) {
-							if(rent.getMaxExtends() == 0) {
-								messageBridge.messageNoPrefix(sender, "info-regionNoExtending", rent);
-							} else if(rent.isRented()) {
-								messageBridge.messageNoPrefix(sender, "info-regionExtendsLeft", rent);
-							} else {
-								messageBridge.messageNoPrefix(sender, "info-regionMaxExtends", rent);
-							}
-						}
-						// If maxExtends is zero it does not make sense to show this message
-						if(rent.getMaxRentTime() != -1 && rent.getMaxExtends() != 0) {
-							messageBridge.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
-						}
-						if(rent.getInactiveTimeUntilUnrent() != -1) {
-							messageBridge.messageNoPrefix(sender, "info-regionInactiveUnrent", rent);
-						}
-						// Teleport
-						CompositeMessage tp = new CompositeMessage();
-						tp.appendMessage("info-prefix");
-						boolean foundSomething = false;
-						if(TeleportCommand.canUse(sender, rent)) {
-							foundSomething = true;
-							tp.appendMessage("info-regionTeleport", rent);
-						}
-						if(SetteleportCommand.canUse(sender, rent)) {
-							if(foundSomething) {
-								tp.appendText(", ");
-							}
-							foundSomething = true;
-							tp.appendMessage("info-setRegionTeleport", rent);
-						}
-						if(foundSomething) {
-							tp.appendText(".");
-							messageBridge.message(sender, tp);
-						}
-						// Signs
-						CompositeMessage signLocations = new CompositeMessage();
-						Iterator<BlockPosition> signPositions = rent.getSignsFeature().signManager().allSignLocations().iterator();
-						while (signPositions.hasNext()) {
-							BlockPosition location = signPositions.next();
-							MessageWrapper signInfo = new KeyedMessage("info-regionSignLocation", location.getWorld().getName(), location.getX(), location.getY(), location.getZ());
-							signLocations.appendMessage(signInfo);
-							if (signPositions.hasNext()) {
-								signLocations.appendText(", ");
-							}
-						}
-						messageBridge.message(sender, "info-regionSigns", signLocations);
-						// Groups
-						if(sender.hasPermission("areashop.groupinfo") && !rent.getGroupNames().isEmpty()) {
-							messageBridge.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(rent.getGroupNames()));
-						}
-						// Restoring
-						if(rent.isRestoreEnabled()) {
-							messageBridge.messageNoPrefix(sender, "info-regionRestoringRent", rent);
-						}
-						// Restrictions
-						if(!rent.isRented()) {
-							if(rent.restrictedToRegion()) {
-								messageBridge.messageNoPrefix(sender, "info-regionRestrictedRegionRent", rent);
-							} else if(rent.restrictedToWorld()) {
-								messageBridge.messageNoPrefix(sender, "info-regionRestrictedWorldRent", rent);
-							}
-						}
-						messageBridge.messageNoPrefix(sender, "info-regionFooterRent", rent);
-					} else if(buy != null) {
-						messageBridge.message(sender, "info-regionHeaderBuy", buy);
-						if(buy.isSold()) {
-							if(buy.isInResellingMode()) {
-								messageBridge.messageNoPrefix(sender, "info-regionReselling", buy);
-								messageBridge.messageNoPrefix(sender, "info-regionReselPrice", buy);
-							} else {
-								messageBridge.messageNoPrefix(sender, "info-regionBought", buy);
-							}
-							// Money back
-							if(!buy.getBooleanSetting("buy.sellDisabled")) {
-								if (SellCommand.canUse(sender, buy)) {
-									messageBridge.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
-								} else {
-									messageBridge.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
-								}
-							}
-							// Friends
-							if(!buy.getFriendsFeature().getFriendNames().isEmpty()) {
-								String messagePart = "info-friend";
-								if(DelfriendCommand.canUse(sender, buy)) {
-									messagePart = "info-friendRemove";
-								}
-								messageBridge.messageNoPrefix(sender, "info-regionFriends", buy, Utils.combinedMessage(buy.getFriendsFeature().getFriendNames(), messagePart));
-							}
-						} else {
-							messageBridge.messageNoPrefix(sender, "info-regionCanBeBought", buy);
-						}
-						if(buy.getLandlord() != null) {
-							messageBridge.messageNoPrefix(sender, "info-regionLandlord", buy);
-						}
-						if(buy.getInactiveTimeUntilSell() != -1) {
-							messageBridge.messageNoPrefix(sender, "info-regionInactiveSell", buy);
-						}
-						// Teleport
-						CompositeMessage tp = new CompositeMessage();
-						tp.appendMessage("info-prefix");
-						boolean foundSomething = false;
-						if(TeleportCommand.canUse(sender, buy)) {
-							foundSomething = true;
-							tp.appendMessage("info-regionTeleport",buy);
-						}
-						if(SetteleportCommand.canUse(sender, buy)) {
-							if(foundSomething) {
-								tp.appendText(", ");
-							}
-							foundSomething = true;
-							tp.appendMessage("info-setRegionTeleport", buy);
-						}
-						if(foundSomething) {
-							tp.appendText(".");
-							messageBridge.message(sender, tp);
-						}
-						// Signs
-						CompositeMessage signLocations = new CompositeMessage();
-						Iterator<BlockPosition> signPositions = buy.getSignsFeature().signManager().allSignLocations().iterator();
-						while (signPositions.hasNext()) {
-							BlockPosition location = signPositions.next();
-							signLocations.appendMessage("info-regionSignLocation", location.getWorld().getName(), location.getX(), location.getY(), location.getZ());
-							if (signPositions.hasNext()) {
-								signLocations.appendText(", ");
-							}
-						}
-						messageBridge.messageNoPrefix(sender, "info-regionSigns", signLocations);
-						// Groups
-						if(sender.hasPermission("areashop.groupinfo") && !buy.getGroupNames().isEmpty()) {
-							messageBridge.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(buy.getGroupNames()));
-						}
-						// Restoring
-						if(buy.isRestoreEnabled()) {
-							messageBridge.messageNoPrefix(sender, "info-regionRestoringBuy", buy);
-						}
-						// Restrictions
-						if(!buy.isSold()) {
-							if(buy.restrictedToRegion()) {
-								messageBridge.messageNoPrefix(sender, "info-regionRestrictedRegionBuy", buy);
-							} else if(buy.restrictedToWorld()) {
-								messageBridge.messageNoPrefix(sender, "info-regionRestrictedWorldBuy", buy);
-							}
-						}
-						messageBridge.messageNoPrefix(sender, "info-regionFooterBuy", buy);
-					}
-				} else {
-					messageBridge.message(sender, "info-regionHelp");
-				}
-			} else {
-				messageBridge.message(sender, "info-help");
-			}
-		} else {
-			messageBridge.message(sender, "info-help");
-		}
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			result.addAll(Arrays.asList("all", "rented", "forrent", "sold", "forsale", "player", "region", "nogroup", "reselling"));
-		} else if(toComplete == 3) {
-			if(start[2].equalsIgnoreCase("player")) {
-				for(Player player : Utils.getOnlinePlayers()) {
-					result.add(player.getName());
-				}
-			} else if(start[2].equalsIgnoreCase("region")) {
-				result.addAll(fileManager.getBuyNames());
-				result.addAll(fileManager.getRentNames());
-			}
-		}
-		return result;
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.interactivemessenger.processing.Message;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+// TODO fix '/as info' help message hitting replacement limit (improve depth tracking?)
+// TODO add info about autoExtend
+public class InfoCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop info";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.info")) {
+			return "help-info";
+		}
+		return null;
+	}
+
+	/**
+	 * Display a page of a list of regions.
+	 * @param sender      The CommandSender to send the messages to
+	 * @param regions     The regions to display
+	 * @param filterGroup The group to filter the regions by
+	 * @param keyHeader   The header to print above the page
+	 * @param pageInput   The page number, if any
+	 * @param baseCommand The command to execute for next/previous page (/areashop will be added)
+	 */
+	private void showSortedPagedList(CommandSender sender, List<? extends LegacyGeneralRegion> regions, RegionGroup filterGroup, String keyHeader, String pageInput, String baseCommand) {
+		int maximumItems = 20;
+		int itemsPerPage = maximumItems - 2;
+		int page = 1;
+		if(pageInput != null && Utils.isNumeric(pageInput)) {
+			try {
+				page = Integer.parseInt(pageInput);
+			} catch(NumberFormatException e) {
+				plugin.message(sender, "info-wrongPage", pageInput);
+				return;
+			}
+		}
+		if(filterGroup != null) {
+			regions.removeIf(generalRegion -> !filterGroup.isMember(generalRegion));
+		}
+		if(regions.isEmpty()) {
+			plugin.message(sender, "info-noRegions");
+		} else {
+			// First sort by type, then by name
+			regions.sort((one, two) -> {
+				int typeCompare = getTypeOrder(two).compareTo(getTypeOrder(one));
+				if(typeCompare != 0) {
+					return typeCompare;
+				} else {
+					return one.getRegionId().compareTo(two.getRegionId());
+				}
+			});
+			// Header
+			Message limitedToGroup = Message.empty();
+			if(filterGroup != null) {
+				limitedToGroup = Message.fromKey("info-limitedToGroup").replacements(filterGroup.getName());
+			}
+			plugin.message(sender, keyHeader, limitedToGroup);
+			// Page entries
+			int totalPages = (int)Math.ceil(regions.size() / (double)itemsPerPage); // Clip page to correct boundaries, not much need to tell the user
+			if(regions.size() == itemsPerPage + 1) { // 19 total items is mapped to 1 page of 19
+				itemsPerPage++;
+				totalPages = 1;
+			}
+			page = Math.max(1, Math.min(totalPages, page));
+			int linesPrinted = 1; // header
+			for(int i = (page - 1) * itemsPerPage; i < page * itemsPerPage && i < regions.size(); i++) {
+				String state;
+				LegacyGeneralRegion region = regions.get(i);
+				if(region.getType() == LegacyGeneralRegion.RegionType.RENT) {
+					if(region.getOwner() == null) {
+						state = "Forrent";
+					} else {
+						state = "Rented";
+					}
+				} else {
+					if(region.getOwner() == null) {
+						state = "Forsale";
+					} else if(!((BuyRegion)region).isInResellingMode()) {
+						state = "Sold";
+					} else {
+						state = "Reselling";
+					}
+				}
+				plugin.messageNoPrefix(sender, "info-entry" + state, region);
+				linesPrinted++;
+			}
+			Message footer = Message.empty();
+			// Previous button
+			if(page > 1) {
+				footer.append(Message.fromKey("info-pagePrevious").replacements(baseCommand + " " + (page - 1)));
+			} else {
+				footer.append(Message.fromKey("info-pageNoPrevious"));
+			}
+			// Page status
+			if(totalPages > 1) {
+				StringBuilder pageString = new StringBuilder("" + page);
+				for(int i = pageString.length(); i < (totalPages + "").length(); i++) {
+					pageString.insert(0, "0");
+				}
+				footer.append(Message.fromKey("info-pageStatus").replacements(page, totalPages));
+				if(page < totalPages) {
+					footer.append(Message.fromKey("info-pageNext").replacements(baseCommand + " " + (page + 1)));
+				} else {
+					footer.append(Message.fromKey("info-pageNoNext"));
+				}
+				// Fill up space if the page is not full (aligns header nicely)
+				for(int i = linesPrinted; i < maximumItems - 1; i++) {
+					sender.sendMessage(" ");
+				}
+				footer.send(sender);
+			}
+		}
+	}
+
+	/**
+	 * Get an integer to order by type, usable for Comparators.
+	 * @param region The region to get the order for
+	 * @return An integer for sorting by type
+	 */
+	private Integer getTypeOrder(LegacyGeneralRegion region) {
+		if(region.getType() == LegacyGeneralRegion.RegionType.RENT) {
+			if(region.getOwner() == null) {
+				return 1;
+			} else {
+				return 2;
+			}
+		} else {
+			if(region.getOwner() == null) {
+				return 3;
+			} else if(!((BuyRegion)region).isInResellingMode()) {
+				return 4;
+			} else {
+				return 5;
+			}
+		}
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.info")) {
+			plugin.message(sender, "info-noPermission");
+			return;
+		}
+		if(args.length > 1 && args[1] != null) {
+			// Get filter group (only used by some commands)
+			RegionGroup filterGroup = null;
+			Set<String> groupFilters = new HashSet<>(Arrays.asList("all", "rented", "forrent", "sold", "forsale", "reselling"));
+			if(groupFilters.contains(args[1].toLowerCase()) && args.length > 2) {
+				if(!Utils.isNumeric(args[2])) {
+					filterGroup = plugin.getFileManager().getGroup(args[2]);
+					if(filterGroup == null) {
+						plugin.message(sender, "info-noFiltergroup", args[2]);
+						return;
+					}
+					// Pass page number to args[2] if available
+					if(args.length > 3) {
+						args[2] = args[3];
+					}
+				}
+			}
+
+			// All regions
+			if(args[1].equalsIgnoreCase("all")) {
+				showSortedPagedList(sender, plugin.getFileManager().getRegions(), filterGroup, "info-allHeader", (args.length > 2 ? args[2] : null), "info all");
+			}
+
+			// Rented regions
+			else if(args[1].equalsIgnoreCase("rented")) {
+				List<RentRegion> regions = plugin.getFileManager().getRents();
+				regions.removeIf(RentRegion::isAvailable);
+				showSortedPagedList(sender, regions, filterGroup, "info-rentedHeader", (args.length > 2 ? args[2] : null), "info rented");
+			}
+			// Forrent regions
+			else if(args[1].equalsIgnoreCase("forrent")) {
+				List<RentRegion> regions = plugin.getFileManager().getRents();
+				regions.removeIf(RentRegion::isRented);
+				showSortedPagedList(sender, regions, filterGroup, "info-forrentHeader", (args.length > 2 ? args[2] : null), "info forrent");
+			}
+			// Sold regions
+			else if(args[1].equalsIgnoreCase("sold")) {
+				List<BuyRegion> regions = plugin.getFileManager().getBuys();
+				regions.removeIf(BuyRegion::isAvailable);
+				showSortedPagedList(sender, regions, filterGroup, "info-soldHeader", (args.length > 2 ? args[2] : null), "info sold");
+			}
+			// Forsale regions
+			else if(args[1].equalsIgnoreCase("forsale")) {
+				List<BuyRegion> regions = plugin.getFileManager().getBuys();
+				regions.removeIf(BuyRegion::isSold);
+				showSortedPagedList(sender, regions, filterGroup, "info-forsaleHeader", (args.length > 2 ? args[2] : null), "info forsale");
+			}
+			// Reselling regions
+			else if(args[1].equalsIgnoreCase("reselling")) {
+				List<BuyRegion> regions = plugin.getFileManager().getBuys();
+				regions.removeIf(region -> !region.isInResellingMode());
+				showSortedPagedList(sender, regions, filterGroup, "info-resellingHeader", (args.length > 2 ? args[2] : null), "info reselling");
+			}
+
+			// List of regions without a group
+			else if(args[1].equalsIgnoreCase("nogroup")) {
+				List<LegacyGeneralRegion> regions = plugin.getFileManager().getRegions();
+				for(RegionGroup group : plugin.getFileManager().getGroups()) {
+					regions.removeAll(group.getMemberRegions());
+				}
+				if(regions.isEmpty()) {
+					plugin.message(sender, "info-nogroupNone");
+				} else {
+					showSortedPagedList(sender, regions, filterGroup, "info-nogroupHeader", (args.length > 2 ? args[2] : null), "info nogroup");
+				}
+			}
+
+			// Region info
+			else if(args[1].equalsIgnoreCase("region")) {
+				if(args.length > 1) {
+					RentRegion rent = null;
+					BuyRegion buy = null;
+					if(args.length > 2) {
+						rent = plugin.getFileManager().getRent(args[2]);
+						buy = plugin.getFileManager().getBuy(args[2]);
+					} else {
+						if(sender instanceof Player) {
+							// get the region by location
+							List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+							if(regions.isEmpty()) {
+								plugin.message(sender, "cmd-noRegionsAtLocation");
+								return;
+							} else if(regions.size() > 1) {
+								plugin.message(sender, "cmd-moreRegionsAtLocation");
+								return;
+							} else {
+								if(regions.get(0) instanceof RentRegion) {
+									rent = (RentRegion)regions.get(0);
+								} else if(regions.get(0) instanceof BuyRegion) {
+									buy = (BuyRegion)regions.get(0);
+								}
+							}
+						} else {
+							plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+							return;
+						}
+					}
+
+					if(rent == null && buy == null) {
+						plugin.message(sender, "info-regionNotExisting", args[2]);
+						return;
+					}
+
+					if(rent != null) {
+						plugin.message(sender, "info-regionHeaderRent", rent);
+						if(rent.isRented()) {
+							plugin.messageNoPrefix(sender, "info-regionRented", rent);
+							plugin.messageNoPrefix(sender, "info-regionExtending", rent);
+							// Money back
+							if(UnrentCommand.canUse(sender, rent)) {
+								plugin.messageNoPrefix(sender, "info-regionMoneyBackRentClick", rent);
+							} else {
+								plugin.messageNoPrefix(sender, "info-regionMoneyBackRent", rent);
+							}
+							// Friends
+							if(!rent.getFriendsFeature().getFriendNames().isEmpty()) {
+								String messagePart = "info-friend";
+								if(DelfriendCommand.canUse(sender, rent)) {
+									messagePart = "info-friendRemove";
+								}
+								plugin.messageNoPrefix(sender, "info-regionFriends", rent, Utils.combinedMessage(rent.getFriendsFeature().getFriendNames(), messagePart));
+							}
+						} else {
+							plugin.messageNoPrefix(sender, "info-regionCanBeRented", rent);
+						}
+						if(rent.getLandlordName() != null) {
+							plugin.messageNoPrefix(sender, "info-regionLandlord", rent);
+						}
+						// Maximum extends
+						if(rent.getMaxExtends() != -1) {
+							if(rent.getMaxExtends() == 0) {
+								plugin.messageNoPrefix(sender, "info-regionNoExtending", rent);
+							} else if(rent.isRented()) {
+								plugin.messageNoPrefix(sender, "info-regionExtendsLeft", rent);
+							} else {
+								plugin.messageNoPrefix(sender, "info-regionMaxExtends", rent);
+							}
+						}
+						// If maxExtends is zero it does not make sense to show this message
+						if(rent.getMaxRentTime() != -1 && rent.getMaxExtends() != 0) {
+							plugin.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
+						}
+						if(rent.getInactiveTimeUntilUnrent() != -1) {
+							plugin.messageNoPrefix(sender, "info-regionInactiveUnrent", rent);
+						}
+						// Teleport
+						Message tp = Message.fromKey("info-prefix");
+						boolean foundSomething = false;
+						if(TeleportCommand.canUse(sender, rent)) {
+							foundSomething = true;
+							tp.append(Message.fromKey("info-regionTeleport").replacements(rent));
+						}
+						if(SetteleportCommand.canUse(sender, rent)) {
+							if(foundSomething) {
+								tp.append(", ");
+							}
+							foundSomething = true;
+							tp.append(Message.fromKey("info-setRegionTeleport").replacements(rent));
+						}
+						if(foundSomething) {
+							tp.append(".");
+							tp.send(sender);
+						}
+						// Signs
+						List<String> signLocations = new ArrayList<>();
+						for(Location location : rent.getSignsFeature().getSignLocations()) {
+							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
+						}
+						if(!signLocations.isEmpty()) {
+							plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
+						}
+						// Groups
+						if(sender.hasPermission("areashop.groupinfo") && !rent.getGroupNames().isEmpty()) {
+							plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(rent.getGroupNames()));
+						}
+						// Restoring
+						if(rent.isRestoreEnabled()) {
+							plugin.messageNoPrefix(sender, "info-regionRestoringRent", rent);
+						}
+						// Restrictions
+						if(!rent.isRented()) {
+							if(rent.restrictedToRegion()) {
+								plugin.messageNoPrefix(sender, "info-regionRestrictedRegionRent", rent);
+							} else if(rent.restrictedToWorld()) {
+								plugin.messageNoPrefix(sender, "info-regionRestrictedWorldRent", rent);
+							}
+						}
+						plugin.messageNoPrefix(sender, "info-regionFooterRent", rent);
+					} else if(buy != null) {
+						plugin.message(sender, "info-regionHeaderBuy", buy);
+						if(buy.isSold()) {
+							if(buy.isInResellingMode()) {
+								plugin.messageNoPrefix(sender, "info-regionReselling", buy);
+								plugin.messageNoPrefix(sender, "info-regionReselPrice", buy);
+							} else {
+								plugin.messageNoPrefix(sender, "info-regionBought", buy);
+							}
+							// Money back
+							if(!buy.getBooleanSetting("buy.sellDisabled")) {
+								if (SellCommand.canUse(sender, buy)) {
+									plugin.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
+								} else {
+									plugin.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
+								}
+							}
+							// Friends
+							if(!buy.getFriendsFeature().getFriendNames().isEmpty()) {
+								String messagePart = "info-friend";
+								if(DelfriendCommand.canUse(sender, buy)) {
+									messagePart = "info-friendRemove";
+								}
+								plugin.messageNoPrefix(sender, "info-regionFriends", buy, Utils.combinedMessage(buy.getFriendsFeature().getFriendNames(), messagePart));
+							}
+						} else {
+							plugin.messageNoPrefix(sender, "info-regionCanBeBought", buy);
+						}
+						if(buy.getLandlord() != null) {
+							plugin.messageNoPrefix(sender, "info-regionLandlord", buy);
+						}
+						if(buy.getInactiveTimeUntilSell() != -1) {
+							plugin.messageNoPrefix(sender, "info-regionInactiveSell", buy);
+						}
+						// Teleport
+						Message tp = Message.fromKey("info-prefix");
+						boolean foundSomething = false;
+						if(TeleportCommand.canUse(sender, buy)) {
+							foundSomething = true;
+							tp.append(Message.fromKey("info-regionTeleport").replacements(buy));
+						}
+						if(SetteleportCommand.canUse(sender, buy)) {
+							if(foundSomething) {
+								tp.append(", ");
+							}
+							foundSomething = true;
+							tp.append(Message.fromKey("info-setRegionTeleport").replacements(buy));
+						}
+						if(foundSomething) {
+							tp.append(".");
+							tp.send(sender);
+						}
+						// Signs
+						List<String> signLocations = new ArrayList<>();
+						for(Location location : buy.getSignsFeature().getSignLocations()) {
+							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
+						}
+						if(!signLocations.isEmpty()) {
+							plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
+						}
+						// Groups
+						if(sender.hasPermission("areashop.groupinfo") && !buy.getGroupNames().isEmpty()) {
+							plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(buy.getGroupNames()));
+						}
+						// Restoring
+						if(buy.isRestoreEnabled()) {
+							plugin.messageNoPrefix(sender, "info-regionRestoringBuy", buy);
+						}
+						// Restrictions
+						if(!buy.isSold()) {
+							if(buy.restrictedToRegion()) {
+								plugin.messageNoPrefix(sender, "info-regionRestrictedRegionBuy", buy);
+							} else if(buy.restrictedToWorld()) {
+								plugin.messageNoPrefix(sender, "info-regionRestrictedWorldBuy", buy);
+							}
+						}
+						plugin.messageNoPrefix(sender, "info-regionFooterBuy", buy);
+					}
+				} else {
+					plugin.message(sender, "info-regionHelp");
+				}
+			} else {
+				plugin.message(sender, "info-help");
+			}
+		} else {
+			plugin.message(sender, "info-help");
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			result.addAll(Arrays.asList("all", "rented", "forrent", "sold", "forsale", "player", "region", "nogroup", "reselling"));
+		} else if(toComplete == 3) {
+			if(start[2].equalsIgnoreCase("player")) {
+				for(Player player : Utils.getOnlinePlayers()) {
+					result.add(player.getName());
+				}
+			} else if(start[2].equalsIgnoreCase("region")) {
+				result.addAll(plugin.getFileManager().getBuyNames());
+				result.addAll(plugin.getFileManager().getRentNames());
+			}
+		}
+		return result;
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1,10 +1,5 @@
 package me.wiefferink.areashop.commands;

-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.SignLinkerManager;
 import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
@@ -14,16 +9,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

-@Singleton
 public class LinksignsCommand extends CommandAreaShop {

-	@Inject
-	private SignLinkerManager signLinkerManager;
-	@Inject
-	private AreaShop plugin;
-	@Inject
-	private MessageBridge messageBridge;
-
 	@Override
 	public String getCommandStart() {
 		return "areashop linksigns";
@@ -40,16 +27,17 @@ public class LinksignsCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.linksigns")) {
-			messageBridge.message(sender, "linksigns-noPermission");
+			plugin.message(sender, "linksigns-noPermission");
 			return;
 		}
-		if(!(sender instanceof Player player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof Player)) {
+			plugin.message(sender, "cmd-onlyByPlayer");
 			return;
 		}

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

@@ -1,161 +1,143 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@Singleton
-public class MeCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-
-	@Inject
-	private OfflinePlayerHelper offlinePlayerHelper;
-
-	@Inject
-	private BukkitSchedulerExecutor executor;
-
-	@Override
-	public String getCommandStart() {
-		return "areashop me";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.me")) {
-			return "help-me";
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.me")) {
-			messageBridge.message(sender, "me-noPermission");
-			return;
-		}
-		OfflinePlayer player = null;
-		if(!(sender instanceof Player)) {
-			if(args.length <= 1) {
-				messageBridge.message(sender, "me-notAPlayer");
-				return;
-			}
-		} else {
-			player = (OfflinePlayer)sender;
-		}
-		if(args.length > 1) {
-			// Lookup offline players async
-			this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(offlinePlayer -> {
-				if (!offlinePlayer.hasPlayedBefore()) {
-					messageBridge.message(sender, "me-noPlayer", args[1]);
-				} else {
-					sendMessageAboutRegions(sender, offlinePlayer);
-				}
-			}, this.executor);
-			return;
-		}
-		sendMessageAboutRegions(sender, player);
-	}
-
-	private void sendMessageAboutRegions(CommandSender sender, OfflinePlayer target) {
-		// Get the regions owned by the player
-		Set<RentRegion> rentRegions = new HashSet<>();
-		for(RentRegion region : fileManager.getRentsRef()) {
-			if(region.isOwner(target)) {
-				rentRegions.add(region);
-			}
-		}
-		Set<BuyRegion> buyRegions = new HashSet<>();
-		for(BuyRegion region : fileManager.getBuysRef()) {
-			if(region.isOwner(target)) {
-				buyRegions.add(region);
-			}
-		}
-		// Get the regions the player is added as friend
-		Set<GeneralRegion> friendRegions = new HashSet<>();
-		for(GeneralRegion region : fileManager.getRegionsRef()) {
-			if(region.getFriendsFeature().getFriends().contains(target.getUniqueId())) {
-				friendRegions.add(region);
-			}
-		}
-
-		// Send messages
-		boolean foundSome = !rentRegions.isEmpty() || !buyRegions.isEmpty() || !friendRegions.isEmpty();
-		if(!foundSome) {
-			messageBridge.message(sender, "me-nothing", target.getName());
-			return;
-		}
-		messageBridge.message(sender, "me-header", target.getName());
-		if(!rentRegions.isEmpty()) {
-			for(RentRegion region : rentRegions) {
-				messageBridge.messageNoPrefix(sender, "me-rentLine", region);
-			}
-		}
-		if(!buyRegions.isEmpty()) {
-			for(BuyRegion region : buyRegions) {
-				messageBridge.messageNoPrefix(sender, "me-buyLine", region);
-			}
-		}
-		if(!friendRegions.isEmpty()) {
-			for(GeneralRegion region : friendRegions) {
-				messageBridge.messageNoPrefix(sender, "me-friendLine", region);
-			}
-		}
-		messageBridge.messageNoPrefix(sender, "me-clickHint");
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			for(Player player : Utils.getOnlinePlayers()) {
-				result.add(player.getName());
-			}
-		}
-		return result;
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class MeCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop me";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.me")) {
+			return "help-me";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.me")) {
+			plugin.message(sender, "me-noPermission");
+			return;
+		}
+		OfflinePlayer player = null;
+		if(!(sender instanceof Player)) {
+			if(args.length <= 1) {
+				plugin.message(sender, "me-notAPlayer");
+				return;
+			}
+		} else {
+			player = (OfflinePlayer)sender;
+		}
+		if(args.length > 1) {
+			player = Bukkit.getOfflinePlayer(args[1]);
+			if(player == null) {
+				plugin.message(sender, "me-noPlayer", args[1]);
+				return;
+			}
+		}
+		if(player == null) {
+			return;
+		}
+
+		// Get the regions owned by the player
+		Set<RentRegion> rentRegions = new HashSet<>();
+		for(RentRegion region : plugin.getFileManager().getRents()) {
+			if(region.isOwner(player)) {
+				rentRegions.add(region);
+			}
+		}
+		Set<BuyRegion> buyRegions = new HashSet<>();
+		for(BuyRegion region : plugin.getFileManager().getBuys()) {
+			if(region.isOwner(player)) {
+				buyRegions.add(region);
+			}
+		}
+		// Get the regions the player is added as friend
+		Set<LegacyGeneralRegion> friendRegions = new HashSet<>();
+		for(LegacyGeneralRegion region : plugin.getFileManager().getRegions()) {
+			if(region.getFriendsFeature().getFriends().contains(player.getUniqueId())) {
+				friendRegions.add(region);
+			}
+		}
+
+		// Send messages
+		boolean foundSome = !rentRegions.isEmpty() || !buyRegions.isEmpty() || !friendRegions.isEmpty();
+		if(foundSome) {
+			plugin.message(sender, "me-header", player.getName());
+		}
+		if(!rentRegions.isEmpty()) {
+			for(RentRegion region : rentRegions) {
+				plugin.messageNoPrefix(sender, "me-rentLine", region);
+			}
+		}
+		if(!buyRegions.isEmpty()) {
+			for(BuyRegion region : buyRegions) {
+				plugin.messageNoPrefix(sender, "me-buyLine", region);
+			}
+		}
+		if(!friendRegions.isEmpty()) {
+			for(LegacyGeneralRegion region : friendRegions) {
+				plugin.messageNoPrefix(sender, "me-friendLine", region);
+			}
+		}
+
+		if(!foundSome) {
+			plugin.message(sender, "me-nothing", player.getName());
+		} else {
+			plugin.messageNoPrefix(sender, "me-clickHint");
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(Player player : Utils.getOnlinePlayers()) {
+				result.add(player.getName());
+			}
+		}
+		return result;
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1,8 +1,5 @@
 package me.wiefferink.areashop.commands;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.interactivemessenger.processing.Message;
 import org.apache.commons.lang.StringUtils;
@@ -13,12 +10,8 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;

-@Singleton
 public class MessageCommand extends CommandAreaShop {

-	@Inject
-	private MessageBridge messageBridge;
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop message";
@@ -33,18 +26,18 @@ public class MessageCommand extends CommandAreaShop {
 	@Override
 	public void execute(final CommandSender sender, final String[] args) {
 		if(!sender.hasPermission("areashop.message")) {
-			messageBridge.message(sender, "message-noPermission");
+			plugin.message(sender, "message-noPermission");
 			return;
 		}

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

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

@@ -1,19 +1,9 @@
 package me.wiefferink.areashop.commands;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
 import org.bukkit.command.CommandSender;

-@Singleton
 public class ReloadCommand extends CommandAreaShop {

-	@Inject
-	private AreaShop plugin;
-	@Inject
-	private MessageBridge messageBridge;
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop reload";
@@ -33,7 +23,7 @@ public class ReloadCommand extends CommandAreaShop {
 			// Reload the configuration files and update all region flags/signs
 			plugin.reload(sender);
 		} else {
-			messageBridge.message(sender, "reload-noPermission");
+			plugin.message(sender, "reload-noPermission");
 		}
 	}
 }
@@ -1,78 +1,69 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class RentCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop rent";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.rent")) {
-			return "help-rent";
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.rent")) {
-			messageBridge.message(sender, "rent-noPermission");
-			return;
-		}
-		if(!(sender instanceof Player player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
-			return;
-		}
-		if(args.length > 1 && args[1] != null) {
-			RentRegion rent = fileManager.getRent(args[1]);
-			if(rent == null) {
-				messageBridge.message(sender, "rent-notRentable", args[1]);
-			} else {
-				rent.rent(player);
-			}
-		} else {
-			// get the region by location
-			List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
-			if(regions.isEmpty()) {
-				messageBridge.message(sender, "cmd-noRegionsAtLocation");
-			} else if(regions.size() > 1) {
-				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-			} else {
-				regions.get(0).rent(player);
-			}
-		}
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			for(RentRegion region : fileManager.getRentsRef()) {
-				if(!region.isRented()) {
-					result.add(region.getName());
-				}
-			}
-		}
-		return result;
-	}
-}
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RentCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop rent";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.rent")) {
+			return "help-rent";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.rent")) {
+			plugin.message(sender, "rent-noPermission");
+			return;
+		}
+		if(!(sender instanceof Player)) {
+			plugin.message(sender, "cmd-onlyByPlayer");
+			return;
+		}
+		Player player = (Player)sender;
+		if(args.length > 1 && args[1] != null) {
+			RentRegion rent = plugin.getFileManager().getRent(args[1]);
+			if(rent == null) {
+				plugin.message(sender, "rent-notRentable", args[1]);
+			} else {
+				rent.rent(player);
+			}
+		} else {
+			// get the region by location
+			List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
+			if(regions.isEmpty()) {
+				plugin.message(sender, "cmd-noRegionsAtLocation");
+			} else if(regions.size() > 1) {
+				plugin.message(sender, "cmd-moreRegionsAtLocation");
+			} else {
+				regions.get(0).rent(player);
+			}
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(RentRegion region : plugin.getFileManager().getRents()) {
+				if(!region.isRented()) {
+					result.add(region.getRegionId());
+				}
+			}
+		}
+		return result;
+	}
+}
@@ -1,144 +1,134 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class ResellCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop resell";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.resellall") || target.hasPermission("areashop.resell")) {
-			return "help-resell";
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.resell") && !sender.hasPermission("areashop.resellall")) {
-			messageBridge.message(sender, "resell-noPermissionOther");
-			return;
-		}
-
-		if(args.length <= 1) {
-			messageBridge.message(sender, "resell-help");
-			return;
-		}
-		double price;
-		try {
-			price = Double.parseDouble(args[1]);
-		} catch(NumberFormatException e) {
-			messageBridge.message(sender, "resell-wrongPrice", args[1]);
-			return;
-		}
-
-		if(price < 0) {
-			messageBridge.message(sender, "resell-wrongPrice", args[1]);
-			return;
-		}
-
-		BuyRegion buy;
-		if(args.length <= 2) {
-			if(sender instanceof Player) {
-				// get the region by location
-				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
-				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					buy = regions.get(0);
-				}
-			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
-				return;
-			}
-		} else {
-			buy = fileManager.getBuy(args[2]);
-			if(buy == null) {
-				messageBridge.message(sender, "resell-notRegistered", args[2]);
-				return;
-			}
-		}
-		if(buy == null) {
-			messageBridge.message(sender, "cmd-noRegionsAtLocation");
-			return;
-		}
-		if(!buy.isSold()) {
-			messageBridge.message(sender, "resell-notBought", buy);
-			return;
-		}
-		if(sender.hasPermission("areashop.resellall")) {
-			buy.enableReselling(price);
-			buy.update();
-			messageBridge.message(sender, "resell-success", buy);
-		} else if(sender.hasPermission("areashop.resell") && sender instanceof Player) {
-			if(!buy.isOwner((Player)sender)) {
-				messageBridge.message(sender, "resell-noPermissionOther", buy);
-				return;
-			}
-
-			if(buy.getBooleanSetting("buy.resellDisabled")) {
-				messageBridge.message(sender, "resell-disabled", buy);
-				return;
-			}
-
-			buy.enableReselling(price);
-			buy.update();
-			messageBridge.message(sender, "resell-success", buy);
-		} else {
-			messageBridge.message(sender, "resell-noPermission", buy);
-		}
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 3) {
-			for(BuyRegion region : fileManager.getBuysRef()) {
-				if(region.isSold() && !region.isInResellingMode()) {
-					result.add(region.getName());
-				}
-			}
-		}
-		return result;
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ResellCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop resell";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.resellall") || target.hasPermission("areashop.resell")) {
+			return "help-resell";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.resell") && !sender.hasPermission("areashop.resellall")) {
+			plugin.message(sender, "resell-noPermissionOther");
+			return;
+		}
+
+		if(args.length <= 1) {
+			plugin.message(sender, "resell-help");
+			return;
+		}
+		double price;
+		try {
+			price = Double.parseDouble(args[1]);
+		} catch(NumberFormatException e) {
+			plugin.message(sender, "resell-wrongPrice", args[1]);
+			return;
+		}
+
+		if(price < 0) {
+			plugin.message(sender, "resell-wrongPrice", args[1]);
+			return;
+		}
+
+		BuyRegion buy;
+		if(args.length <= 2) {
+			if(sender instanceof Player) {
+				// 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[2]);
+			if(buy == null) {
+				plugin.message(sender, "resell-notRegistered", args[2]);
+				return;
+			}
+		}
+		if(buy == null) {
+			plugin.message(sender, "cmd-noRegionsAtLocation");
+			return;
+		}
+		if(!buy.isSold()) {
+			plugin.message(sender, "resell-notBought", buy);
+			return;
+		}
+		if(sender.hasPermission("areashop.resellall")) {
+			buy.enableReselling(price);
+			buy.update();
+			plugin.message(sender, "resell-success", buy);
+		} else if(sender.hasPermission("areashop.resell") && sender instanceof Player) {
+			if(!buy.isOwner((Player)sender)) {
+				plugin.message(sender, "resell-noPermissionOther", buy);
+				return;
+			}
+
+			if(buy.getBooleanSetting("buy.resellDisabled")) {
+				plugin.message(sender, "resell-disabled", buy);
+				return;
+			}
+
+			buy.enableReselling(price);
+			buy.update();
+			plugin.message(sender, "resell-success", buy);
+		} else {
+			plugin.message(sender, "resell-noPermission", buy);
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 3) {
+			for(BuyRegion region : plugin.getFileManager().getBuys()) {
+				if(region.isSold() && !region.isInResellingMode()) {
+					result.add(region.getRegionId());
+				}
+			}
+		}
+		return result;
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1,96 +1,87 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@Singleton
-public class SchematiceventCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop schemevent";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.schematicevents")) {
-			return "help-schemevent";
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.schematicevents")) {
-			messageBridge.message(sender, "schemevent-noPermission");
-			return;
-		}
-
-		if(args.length < 3 || args[1] == null || args[2] == null) {
-			messageBridge.message(sender, "schemevent-help");
-			return;
-		}
-		GeneralRegion region = fileManager.getRegion(args[1]);
-		if(region == null) {
-			messageBridge.message(sender, "cmd-notRegistered", args[1]);
-			return;
-		}
-		if(region.getRegion() == null) {
-			messageBridge.message(sender, "general-noRegion", region);
-			return;
-		}
-		GeneralRegion.RegionEvent event = null;
-		boolean exception = false;
-		try {
-			event = GeneralRegion.RegionEvent.valueOf(args[2].toUpperCase());
-		} catch(IllegalArgumentException e) {
-			exception = true;
-		}
-		// Check for a totally wrong event or a non matching event
-		if(exception) {
-			ArrayList<String> values = new ArrayList<>();
-			for(GeneralRegion.RegionEvent value : GeneralRegion.RegionEvent.values()) {
-				values.add(value.getValue().toLowerCase());
-			}
-			messageBridge.message(sender, "schemevent-wrongEvent", args[2], Utils.createCommaSeparatedList(values), region);
-			return;
-		}
-		region.handleSchematicEvent(event);
-		region.update();
-		messageBridge.message(sender, "schemevent-success", args[2], region);
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			result.addAll(fileManager.getRegionNames());
-		} else if(toComplete == 3) {
-			GeneralRegion region = fileManager.getRegion(start[2]);
-			if(region != null) {
-				if(region instanceof RentRegion) {
-					result.addAll(Arrays.asList("created", "deleted", "rented", "unrented"));
-				} else if(region instanceof BuyRegion) {
-					result.addAll(Arrays.asList("created", "deleted", "bought", "sold"));
-				}
-			}
-		}
-		return result;
-	}
-}
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.util.RegionEvent;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class SchematiceventCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop schemevent";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.schematicevents")) {
+			return "help-schemevent";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.schematicevents")) {
+			plugin.message(sender, "schemevent-noPermission");
+			return;
+		}
+
+		if(args.length < 3 || args[1] == null || args[2] == null) {
+			plugin.message(sender, "schemevent-help");
+			return;
+		}
+		LegacyGeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+		if(region == null) {
+			plugin.message(sender, "cmd-notRegistered", args[1]);
+			return;
+		}
+		if(region.getRegion() == null) {
+			plugin.message(sender, "general-noRegion", region);
+			return;
+		}
+		RegionEvent event = null;
+		boolean exception = false;
+		try {
+			event = RegionEvent.valueOf(args[2].toUpperCase());
+		} catch(IllegalArgumentException e) {
+			exception = true;
+		}
+		// Check for a totally wrong event or a non matching event
+		if(exception) {
+			ArrayList<String> values = new ArrayList<>();
+			for(RegionEvent value : RegionEvent.values()) {
+				values.add(value.getValue().toLowerCase());
+			}
+			plugin.message(sender, "schemevent-wrongEvent", args[2], Utils.createCommaSeparatedList(values), region);
+			return;
+		}
+		region.handleSchematicEvent(event);
+		region.update();
+		plugin.message(sender, "schemevent-success", args[2], region);
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			result.addAll(plugin.getFileManager().getRegionNames());
+		} else if(toComplete == 3) {
+			LegacyGeneralRegion region = plugin.getFileManager().getRegion(start[2]);
+			if(region != null) {
+				if(region instanceof RentRegion) {
+					result.addAll(Arrays.asList("created", "deleted", "rented", "unrented"));
+				} else if(region instanceof BuyRegion) {
+					result.addAll(Arrays.asList("created", "deleted", "bought", "sold"));
+				}
+			}
+		}
+		return result;
+	}
+}
@@ -1,119 +1,110 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class SellCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop sell";
-	}
-
-	@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) {
-			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")) {
-			messageBridge.message(sender, "sell-noPermission");
-			return;
-		}
-		BuyRegion buy;
-		if(args.length <= 1) {
-			if(sender instanceof Player player) {
-				// get the region by location
-				List<BuyRegion> regions = Utils.getImportantBuyRegions((player).getLocation());
-				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					buy = regions.get(0);
-				}
-			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
-				return;
-			}
-		} else {
-			buy = fileManager.getBuy(args[1]);
-		}
-		if(buy == null) {
-			messageBridge.message(sender, "sell-notRegistered");
-			return;
-		}
-		if(!buy.isSold()) {
-			messageBridge.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 : fileManager.getBuysRef()) {
-				if(region.isSold()) {
-					result.add(region.getName());
-				}
-			}
-		}
-		return result;
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SellCommand extends CommandAreaShop {
+
+	@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;
+	}
+
+	/**
+	 * Check if a person can sell the region.
+	 * @param person The person to check
+	 * @param region The region to check for
+	 * @return true if the person can sell it, otherwise false
+	 */
+	public static boolean canUse(CommandSender person, LegacyGeneralRegion region) {
+		if(person.hasPermission("areashop.sell")) {
+			return true;
+		}
+		if(person instanceof Player) {
+			Player player = (Player)person;
+			return region.isOwner(player) && person.hasPermission("areashop.sellown");
+		}
+		return false;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.sell") && !sender.hasPermission("areashop.sellown")) {
+			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.getRegionId());
+				}
+			}
+		}
+		return result;
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1,28 +1,15 @@
 package me.wiefferink.areashop.commands;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;

 import java.util.ArrayList;
 import java.util.List;

-@Singleton
 public class SetdurationCommand extends CommandAreaShop {

-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	@Inject
-	private Plugin plugin;
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop setduration";
@@ -39,11 +26,11 @@ public class SetdurationCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setduration") && (!sender.hasPermission("areashop.setduration.landlord") && sender instanceof Player)) {
-			messageBridge.message(sender, "setduration-noPermission");
+			plugin.message(sender, "setduration-noPermission");
 			return;
 		}
 		if(args.length < 3 || args[1] == null || args[2] == null) {
-			messageBridge.message(sender, "setduration-help");
+			plugin.message(sender, "setduration-help");
 			return;
 		}
 		int regionArgument = 3;
@@ -56,48 +43,48 @@ public class SetdurationCommand extends CommandAreaShop {
 				// get the region by location
 				List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
+					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					rent = regions.get(0);
 				}
 			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			rent = fileManager.getRent(args[regionArgument]);
+			rent = plugin.getFileManager().getRent(args[regionArgument]);
 		}
 		if(rent == null) {
-			messageBridge.message(sender, "setduration-notRegistered", args[regionArgument]);
+			plugin.message(sender, "setduration-notRegistered", args[regionArgument]);
 			return;
 		}
 		if(!sender.hasPermission("areashop.setduration") && !(sender instanceof Player && rent.isLandlord(((Player)sender).getUniqueId()))) {
-			messageBridge.message(sender, "setduration-noLandlord", rent);
+			plugin.message(sender, "setduration-noLandlord", rent);
 			return;
 		}
 		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
 			rent.setDuration(null);
 			rent.update();
-			messageBridge.message(sender, "setduration-successRemoved", rent);
+			plugin.message(sender, "setduration-successRemoved", rent);
 			return;
 		}
 		try {
 			Integer.parseInt(args[1]);
 		} catch(NumberFormatException e) {
-			messageBridge.message(sender, "setduration-wrongAmount", args[1], rent);
+			plugin.message(sender, "setduration-wrongAmount", args[1], rent);
 			return;
 		}
 		if(!Utils.checkTimeFormat(args[1] + " " + args[2])) {
-			messageBridge.message(sender, "setduration-wrongFormat", args[1] + " " + args[2], rent);
+			plugin.message(sender, "setduration-wrongFormat", args[1] + " " + args[2], rent);
 			return;
 		}
 		rent.setDuration(args[1] + " " + args[2]);
 		rent.update();
-		messageBridge.message(sender, "setduration-success", rent);
+		plugin.message(sender, "setduration-success", rent);
 	}

 	@Override
@@ -110,7 +97,7 @@ public class SetdurationCommand extends CommandAreaShop {
 			result.addAll(plugin.getConfig().getStringList("months"));
 			result.addAll(plugin.getConfig().getStringList("years"));
 		} else if(toComplete == 4) {
-			result = fileManager.getRentNames();
+			result = plugin.getFileManager().getRentNames();
 		}
 		return result;
 	}
@@ -1,100 +1,87 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class SetlandlordCommand extends CommandAreaShop {
-
-    @Inject
-    private MessageBridge messageBridge;
-    @Inject
-    private IFileManager fileManager;
-    @Inject
-    private OfflinePlayerHelper offlinePlayerHelper;
-    @Inject
-    private BukkitSchedulerExecutor executor;
-
-    @Override
-    public String getCommandStart() {
-        return "areashop setlandlord";
-    }
-
-    @Override
-    public String getHelp(CommandSender target) {
-        if (target.hasPermission("areashop.setlandlord")) {
-            return "help-setlandlord";
-        }
-        return null;
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args) {
-        if (!sender.hasPermission("areashop.setlandlord")) {
-            messageBridge.message(sender, "setlandlord-noPermission");
-            return;
-        }
-        if (args.length < 2) {
-            messageBridge.message(sender, "setlandlord-help");
-            return;
-        }
-        GeneralRegion region;
-        if (args.length < 3) {
-            if (!(sender instanceof Player player)) {
-                messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
-                return;
-            }
-            // get the region by location
-            List<GeneralRegion> regions = Utils.getImportantRegions(player.getLocation());
-            if (regions.isEmpty()) {
-                messageBridge.message(sender, "cmd-noRegionsAtLocation");
-                return;
-            } else if (regions.size() > 1) {
-                messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-                return;
-            } else {
-                region = regions.get(0);
-            }
-        } else {
-            region = fileManager.getRegion(args[2]);
-        }
-        if (region == null) {
-            messageBridge.message(sender, "cmd-notRegistered", args[2]);
-            return;
-        }
-        this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(offlinePlayer -> {
-            String playerName = offlinePlayer.getName();
-            if (playerName == null || playerName.isEmpty()) {
-                playerName = args[1];
-            }
-            region.setLandlord(offlinePlayer.getUniqueId(), playerName);
-            region.update();
-            messageBridge.message(sender, "setlandlord-success", playerName, region);
-        }, this.executor);
-    }
-
-    @Override
-    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-        ArrayList<String> result = new ArrayList<>();
-        if (toComplete == 2) {
-            for (Player player : Utils.getOnlinePlayers()) {
-                result.add(player.getName());
-            }
-        } else if (toComplete == 3) {
-            result.addAll(fileManager.getRegionNames());
-        }
-        return result;
-    }
-
-}
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SetlandlordCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop setlandlord";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.setlandlord")) {
+			return "help-setlandlord";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.setlandlord")) {
+			plugin.message(sender, "setlandlord-noPermission");
+			return;
+		}
+		if(args.length < 2) {
+			plugin.message(sender, "setlandlord-help");
+			return;
+		}
+		@SuppressWarnings("deprecation")
+		OfflinePlayer player = Bukkit.getOfflinePlayer(args[1]);
+		LegacyGeneralRegion region;
+		if(args.length < 3) {
+			if(sender instanceof Player) {
+				// get the region by location
+				List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
+					plugin.message(sender, "cmd-noRegionsAtLocation");
+					return;
+				} else if(regions.size() > 1) {
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
+					return;
+				} else {
+					region = regions.get(0);
+				}
+			} else {
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				return;
+			}
+		} else {
+			region = plugin.getFileManager().getRegion(args[2]);
+		}
+		if(region == null) {
+			plugin.message(sender, "cmd-notRegistered", args[2]);
+			return;
+		}
+		String playerName = player.getName();
+		if(playerName == null || playerName.isEmpty()) {
+			playerName = args[1];
+		}
+		region.setLandlord(player.getUniqueId(), playerName);
+		region.update();
+		plugin.message(sender, "setlandlord-success", playerName, region);
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(Player player : Utils.getOnlinePlayers()) {
+				result.add(player.getName());
+			}
+		} else if(toComplete == 3) {
+			result.addAll(plugin.getFileManager().getRegionNames());
+		}
+		return result;
+	}
+
+}
@@ -1,142 +1,134 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.UUID;
-
-@Singleton
-public class SetownerCommand extends CommandAreaShop {
-
-    @Inject
-    private MessageBridge messageBridge;
-    @Inject
-    private IFileManager fileManager;
-    @Inject
-    private OfflinePlayerHelper offlinePlayerHelper;
-    @Inject
-    private BukkitSchedulerExecutor executor;
-
-    @Override
-    public String getCommandStart() {
-        return "areashop setowner";
-    }
-
-    @Override
-    public String getHelp(CommandSender target) {
-        if (target.hasPermission("areashop.setownerrent") || target.hasPermission("areashop.setownerbuy")) {
-            return "help-setowner";
-        }
-        return null;
-    }
-
-    @Override
-    public void execute(CommandSender sender, String[] args) {
-        if (!sender.hasPermission("areashop.setownerrent") && !sender.hasPermission("areashop.setownerbuy")) {
-            messageBridge.message(sender, "setowner-noPermission");
-            return;
-        }
-        GeneralRegion region;
-        if (args.length < 2) {
-            messageBridge.message(sender, "setowner-help");
-            return;
-        }
-        if (args.length == 2) {
-            if (!(sender instanceof Player player)) {
-                messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
-                return;
-            }
-            // get the region by location
-            List<GeneralRegion> regions = Utils.getImportantRegions(player.getLocation());
-            if (regions.isEmpty()) {
-                messageBridge.message(sender, "cmd-noRegionsAtLocation");
-                return;
-            } else if (regions.size() > 1) {
-                messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-                return;
-            } else {
-                region = regions.get(0);
-            }
-
-        } else {
-            region = fileManager.getRegion(args[2]);
-        }
-        if (region == null) {
-            messageBridge.message(sender, "setowner-notRegistered");
-            return;
-        }
-
-        if (region instanceof RentRegion && !sender.hasPermission("areashop.setownerrent")) {
-            messageBridge.message(sender, "setowner-noPermissionRent", region);
-            return;
-        }
-        if (region instanceof BuyRegion && !sender.hasPermission("areashop.setownerbuy")) {
-            messageBridge.message(sender, "setowner-noPermissionBuy", region);
-            return;
-        }
-
-        this.offlinePlayerHelper.lookupUuidAsync(args[1]).thenAcceptAsync(optionalUuid -> {
-            if (optionalUuid.isEmpty()) {
-                messageBridge.message(sender, "setowner-noPlayer", args[1], region);
-                return;
-            }
-            final UUID uuid = optionalUuid.get();
-            if (region instanceof RentRegion rent) {
-                if (rent.isRenter(uuid)) {
-                    // extend
-                    rent.setRentedUntil(rent.getRentedUntil() + rent.getDuration());
-                    rent.setRenter(uuid);
-                    messageBridge.message(sender, "setowner-succesRentExtend", region);
-                } else {
-                    // change
-                    if (!rent.isRented()) {
-                        rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
-                    }
-                    rent.setRenter(uuid);
-                    messageBridge.message(sender, "setowner-succesRent", region);
-                }
-            }
-            if (region instanceof BuyRegion buy) {
-                buy.setBuyer(uuid);
-                messageBridge.message(sender, "setowner-succesBuy", region);
-            }
-            region.getFriendsFeature().deleteFriend(region.getOwner(), null);
-            region.update();
-            region.saveRequired();
-        }, this.executor);
-    }
-
-    @Override
-    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-        ArrayList<String> result = new ArrayList<>();
-        if (toComplete == 2) {
-            for (Player player : Utils.getOnlinePlayers()) {
-                result.add(player.getName());
-            }
-        } else if (toComplete == 3) {
-            result.addAll(fileManager.getRegionNames());
-        }
-        return result;
-    }
-}
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.UUID;
+
+public class SetownerCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop setowner";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.setownerrent") || target.hasPermission("areashop.setownerbuy")) {
+			return "help-setowner";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.setownerrent") && !sender.hasPermission("areashop.setownerbuy")) {
+			plugin.message(sender, "setowner-noPermission");
+			return;
+		}
+		LegacyGeneralRegion region;
+		if(args.length < 2) {
+			plugin.message(sender, "setowner-help");
+			return;
+		}
+		if(args.length == 2) {
+			if(sender instanceof Player) {
+				// get the region by location
+				List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
+					plugin.message(sender, "cmd-noRegionsAtLocation");
+					return;
+				} else if(regions.size() > 1) {
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
+					return;
+				} else {
+					region = regions.get(0);
+				}
+			} else {
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				return;
+			}
+		} else {
+			region = plugin.getFileManager().getRegion(args[2]);
+		}
+		if(region == null) {
+			plugin.message(sender, "setowner-notRegistered");
+			return;
+		}
+
+		if(region instanceof RentRegion && !sender.hasPermission("areashop.setownerrent")) {
+			plugin.message(sender, "setowner-noPermissionRent", region);
+			return;
+		}
+		if(region instanceof BuyRegion && !sender.hasPermission("areashop.setownerbuy")) {
+			plugin.message(sender, "setowner-noPermissionBuy", region);
+			return;
+		}
+
+		UUID uuid = null;
+		@SuppressWarnings("deprecation")
+		OfflinePlayer player = Bukkit.getOfflinePlayer(args[1]);
+		if(player != null) {
+			uuid = player.getUniqueId();
+		}
+		if(uuid == null) {
+			plugin.message(sender, "setowner-noPlayer", args[1], region);
+			return;
+		}
+
+		if(region instanceof RentRegion) {
+			RentRegion rent = (RentRegion)region;
+			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(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
+				}
+				rent.setRenter(uuid);
+				plugin.message(sender, "setowner-succesRent", region);
+			}
+		}
+		if(region instanceof BuyRegion) {
+			BuyRegion buy = (BuyRegion)region;
+			buy.setBuyer(uuid);
+			plugin.message(sender, "setowner-succesBuy", region);
+		}
+		region.getFriendsFeature().deleteFriend(region.getOwner(), null);
+		region.update();
+		region.saveRequired();
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(Player player : Utils.getOnlinePlayers()) {
+				result.add(player.getName());
+			}
+		} else if(toComplete == 3) {
+			result.addAll(plugin.getFileManager().getRegionNames());
+		}
+		return result;
+	}
+}
+
+
+
+
+
+
+
+
@@ -1,113 +1,103 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class SetpriceCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop setprice";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.setprice")) {
-			return "help-setprice";
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.setprice") && (!sender.hasPermission("areashop.setprice.landlord") && sender instanceof Player)) {
-			messageBridge.message(sender, "setprice-noPermission");
-			return;
-		}
-		if(args.length < 2 || args[1] == null) {
-			messageBridge.message(sender, "setprice-help");
-			return;
-		}
-		GeneralRegion region;
-		if(args.length < 3) {
-			if(sender instanceof Player) {
-				// get the region by location
-				List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
-				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					region = regions.get(0);
-				}
-			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
-				return;
-			}
-		} else {
-			region = fileManager.getRegion(args[2]);
-		}
-		if(region == null) {
-			messageBridge.message(sender, "setprice-notRegistered", args[2]);
-			return;
-		}
-		if(!sender.hasPermission("areashop.setprice") && !(sender instanceof Player && region.isLandlord(((Player)sender).getUniqueId()))) {
-			messageBridge.message(sender, "setprice-noLandlord", region);
-			return;
-		}
-		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
-			if(region instanceof RentRegion) {
-				((RentRegion)region).setPrice(null);
-			} else if(region instanceof BuyRegion) {
-				((BuyRegion)region).setPrice(null);
-			}
-			region.update();
-			messageBridge.message(sender, "setprice-successRemoved", region);
-			return;
-		}
-		double price;
-		try {
-			price = Double.parseDouble(args[1]);
-		} catch(NumberFormatException e) {
-			messageBridge.message(sender, "setprice-wrongPrice", args[1], region);
-			return;
-		}
-		if(region instanceof RentRegion) {
-			((RentRegion)region).setPrice(price);
-			messageBridge.message(sender, "setprice-successRent", region);
-		} else if(region instanceof BuyRegion) {
-			((BuyRegion)region).setPrice(price);
-			messageBridge.message(sender, "setprice-successBuy", region);
-		}
-		region.update();
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new ArrayList<>();
-		if(toComplete == 3) {
-			result = fileManager.getRegionNames();
-		}
-		return result;
-	}
-
-}
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SetpriceCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop setprice";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.setprice")) {
+			return "help-setprice";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.setprice") && (!sender.hasPermission("areashop.setprice.landlord") && sender instanceof Player)) {
+			plugin.message(sender, "setprice-noPermission");
+			return;
+		}
+		if(args.length < 2 || args[1] == null) {
+			plugin.message(sender, "setprice-help");
+			return;
+		}
+		LegacyGeneralRegion region;
+		if(args.length < 3) {
+			if(sender instanceof Player) {
+				// get the region by location
+				List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
+					plugin.message(sender, "cmd-noRegionsAtLocation");
+					return;
+				} else if(regions.size() > 1) {
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
+					return;
+				} else {
+					region = regions.get(0);
+				}
+			} else {
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				return;
+			}
+		} else {
+			region = plugin.getFileManager().getRegion(args[2]);
+		}
+		if(region == null) {
+			plugin.message(sender, "setprice-notRegistered", args[2]);
+			return;
+		}
+		if(!sender.hasPermission("areashop.setprice") && !(sender instanceof Player && region.isLandlord(((Player)sender).getUniqueId()))) {
+			plugin.message(sender, "setprice-noLandlord", region);
+			return;
+		}
+		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
+			if(region instanceof RentRegion) {
+				((RentRegion)region).setPrice(null);
+			} else if(region instanceof BuyRegion) {
+				((BuyRegion)region).setPrice(null);
+			}
+			region.update();
+			plugin.message(sender, "setprice-successRemoved", region);
+			return;
+		}
+		double price;
+		try {
+			price = Double.parseDouble(args[1]);
+		} catch(NumberFormatException e) {
+			plugin.message(sender, "setprice-wrongPrice", args[1], region);
+			return;
+		}
+		if(region instanceof RentRegion) {
+			((RentRegion)region).setPrice(price);
+			plugin.message(sender, "setprice-successRent", region);
+		} else if(region instanceof BuyRegion) {
+			((BuyRegion)region).setPrice(price);
+			plugin.message(sender, "setprice-successBuy", region);
+		}
+		region.update();
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new ArrayList<>();
+		if(toComplete == 3) {
+			result = plugin.getFileManager().getRegionNames();
+		}
+		return result;
+	}
+
+}
@@ -1,90 +1,73 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.plugin.Plugin;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class SetrestoreCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	@Inject
-	private Plugin plugin;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop setrestore";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.setrestore")) {
-			return "help-setrestore";
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.setrestore")) {
-			messageBridge.message(sender, "setrestore-noPermission");
-			return;
-		}
-		if(args.length <= 2 || args[1] == null || args[2] == null) {
-			messageBridge.message(sender, "setrestore-help");
-			return;
-		}
-		GeneralRegion region = fileManager.getRegion(args[1]);
-		if(region == null) {
-			messageBridge.message(sender, "setrestore-notRegistered", args[1]);
-			return;
-		}
-		Boolean value = null;
-		if(args[2].equalsIgnoreCase("true")) {
-			value = true;
-		} else if(args[2].equalsIgnoreCase("false")) {
-			value = false;
-		}
-		region.setRestoreSetting(value);
-		String valueString = "general";
-		if(value != null) {
-			valueString = value + "";
-		}
-		if(args.length > 3) {
-			region.setSchematicProfile(args[3]);
-			messageBridge.message(sender, "setrestore-successProfile", valueString, args[3], region);
-		} else {
-			messageBridge.message(sender, "setrestore-success", valueString, region);
-		}
-		region.update();
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			result = fileManager.getRegionNames();
-		} else if(toComplete == 3) {
-			result.add("true");
-			result.add("false");
-			result.add("general");
-		} else if(toComplete == 4) {
-			ConfigurationSection schemProfiles = fileManager.getConfig().getConfigurationSection("schematicProfiles");
-			if (schemProfiles != null) {
-				result.addAll(schemProfiles.getKeys(false));
-			}
-		}
-		return result;
-	}
-}
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import org.bukkit.command.CommandSender;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SetrestoreCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop setrestore";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.setrestore")) {
+			return "help-setrestore";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.setrestore")) {
+			plugin.message(sender, "setrestore-noPermission");
+			return;
+		}
+		if(args.length <= 2 || args[1] == null || args[2] == null) {
+			plugin.message(sender, "setrestore-help");
+			return;
+		}
+		LegacyGeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+		if(region == null) {
+			plugin.message(sender, "setrestore-notRegistered", args[1]);
+			return;
+		}
+		Boolean value = null;
+		if(args[2].equalsIgnoreCase("true")) {
+			value = true;
+		} else if(args[2].equalsIgnoreCase("false")) {
+			value = false;
+		}
+		region.setRestoreSetting(value);
+		String valueString = "general";
+		if(value != null) {
+			valueString = value + "";
+		}
+		if(args.length > 3) {
+			region.setSchematicProfile(args[3]);
+			plugin.message(sender, "setrestore-successProfile", valueString, args[3], region);
+		} else {
+			plugin.message(sender, "setrestore-success", valueString, region);
+		}
+		region.update();
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			result = plugin.getFileManager().getRegionNames();
+		} else if(toComplete == 3) {
+			result.add("true");
+			result.add("false");
+			result.add("general");
+		} else if(toComplete == 4) {
+			result.addAll(plugin.getConfig().getConfigurationSection("schematicProfiles").getKeys(false));
+		}
+		return result;
+	}
+}
@@ -1,126 +1,118 @@
-package me.wiefferink.areashop.commands;
-
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class SetteleportCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop settp";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.setteleportall") || target.hasPermission("areashop.setteleport")) {
-			return "help-setteleport";
-		}
-		return null;
-	}
-
-	/**
-	 * Check if a person can set the teleport location of the region.
-	 * @param person The person to check
-	 * @param region The region to check for
-	 * @return true if the person can set the teleport location, otherwise false
-	 */
-	public static boolean canUse(CommandSender person, GeneralRegion region) {
-		if(!(person instanceof Player player)) {
-			return false;
-		}
-		return player.hasPermission("areashop.setteleportall")
-				|| region.isOwner(player) && player.hasPermission("areashop.setteleport");
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.setteleport") && !sender.hasPermission("areashop.setteleportall")) {
-			messageBridge.message(sender, "setteleport-noPermission");
-			return;
-		}
-		if(!(sender instanceof Player player)) {
-			messageBridge.message(sender, "onlyByPlayer");
-			return;
-		}
-		GeneralRegion region;
-		if(args.length < 2) {
-			// get the region by location
-			List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
-			if(regions.isEmpty()) {
-				messageBridge.message(sender, "cmd-noRegionsAtLocation");
-				return;
-			} else if(regions.size() > 1) {
-				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-				return;
-			} else {
-				region = regions.get(0);
-			}
-		} else {
-			region = fileManager.getRegion(args[1]);
-		}
-
-		boolean owner;
-
-		if(region == null) {
-			messageBridge.message(player, "setteleport-noRentOrBuy", args[1]);
-			return;
-		}
-		if(region instanceof RentRegion) {
-			owner = player.getUniqueId().equals(((RentRegion)region).getRenter());
-		} else {
-			owner = player.getUniqueId().equals(((BuyRegion)region).getBuyer());
-		}
-		if(!player.hasPermission("areashop.setteleport")) {
-			messageBridge.message(player, "setteleport-noPermission", region);
-			return;
-		} else if(!owner && !player.hasPermission("areashop.setteleportall")) {
-			messageBridge.message(player, "setteleport-noPermissionOther", region);
-			return;
-		}
-
-		ProtectedRegion wgRegion = region.getRegion();
-		if(args.length > 2 && args[2] != null && (args[2].equalsIgnoreCase("reset") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) {
-			region.getTeleportFeature().setTeleport(null);
-			region.update();
-			messageBridge.message(player, "setteleport-reset", region);
-			return;
-		}
-		if(!player.hasPermission("areashop.setteleportoutsideregion") && (wgRegion == null || !wgRegion.contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()))) {
-			messageBridge.message(player, "setteleport-notInside", region);
-			return;
-		}
-		region.getTeleportFeature().setTeleport(player.getLocation());
-		region.update();
-		messageBridge.message(player, "setteleport-success", region);
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			result.addAll(fileManager.getRegionNames());
-		} else if(toComplete == 3) {
-			result.add("reset");
-		}
-		return result;
-	}
-
-}
+package me.wiefferink.areashop.commands;
+
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SetteleportCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop settp";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.setteleportall") || target.hasPermission("areashop.setteleport")) {
+			return "help-setteleport";
+		}
+		return null;
+	}
+
+	/**
+	 * Check if a person can set the teleport location of the region.
+	 * @param person The person to check
+	 * @param region The region to check for
+	 * @return true if the person can set the teleport location, otherwise false
+	 */
+	public static boolean canUse(CommandSender person, LegacyGeneralRegion region) {
+		if(!(person instanceof Player)) {
+			return false;
+		}
+		Player player = (Player)person;
+		return player.hasPermission("areashop.setteleportall")
+				|| region.isOwner(player) && player.hasPermission("areashop.setteleport");
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.setteleport") && !sender.hasPermission("areashop.setteleportall")) {
+			plugin.message(sender, "setteleport-noPermission");
+			return;
+		}
+		if(!(sender instanceof Player)) {
+			plugin.message(sender, "onlyByPlayer");
+			return;
+		}
+		Player player = (Player)sender;
+		LegacyGeneralRegion region;
+		if(args.length < 2) {
+			// get the region by location
+			List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+			if(regions.isEmpty()) {
+				plugin.message(sender, "cmd-noRegionsAtLocation");
+				return;
+			} else if(regions.size() > 1) {
+				plugin.message(sender, "cmd-moreRegionsAtLocation");
+				return;
+			} else {
+				region = regions.get(0);
+			}
+		} else {
+			region = plugin.getFileManager().getRegion(args[1]);
+		}
+
+		boolean owner;
+
+		if(region == null) {
+			plugin.message(player, "setteleport-noRentOrBuy", args[1]);
+			return;
+		}
+		if(region instanceof RentRegion) {
+			owner = player.getUniqueId().equals(((RentRegion)region).getRenter());
+		} else {
+			owner = player.getUniqueId().equals(((BuyRegion)region).getBuyer());
+		}
+		if(!player.hasPermission("areashop.setteleport")) {
+			plugin.message(player, "setteleport-noPermission", region);
+			return;
+		} else if(!owner && !player.hasPermission("areashop.setteleportall")) {
+			plugin.message(player, "setteleport-noPermissionOther", region);
+			return;
+		}
+
+		ProtectedRegion wgRegion = region.getRegion();
+		if(args.length > 2 && args[2] != null && (args[2].equalsIgnoreCase("reset") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) {
+			region.getTeleportFeature().setTeleport(null);
+			region.update();
+			plugin.message(player, "setteleport-reset", region);
+			return;
+		}
+		if(!player.hasPermission("areashop.setteleportoutsideregion") && (wgRegion == null || !wgRegion.contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()))) {
+			plugin.message(player, "setteleport-notInside", region);
+			return;
+		}
+		region.getTeleportFeature().setTeleport(player.getLocation());
+		region.update();
+		plugin.message(player, "setteleport-success", region);
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			result.addAll(plugin.getFileManager().getRegionNames());
+		} else if(toComplete == 3) {
+			result.add("reset");
+		}
+		return result;
+	}
+
+}
@@ -1,282 +1,264 @@
-package me.wiefferink.areashop.commands;
-
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.events.ask.AddingRegionEvent;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
-import me.wiefferink.areashop.interfaces.WorldEditSelection;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RegionFactory;
-import me.wiefferink.areashop.regions.RegionGroup;
-import me.wiefferink.areashop.tools.Utils;
-import me.wiefferink.interactivemessenger.processing.Message;
-import org.bukkit.Location;
-import org.bukkit.block.BlockFace;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.util.Vector;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class StackCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	@Inject
-	private WorldEditInterface worldEditInterface;
-	@Inject
-	private WorldGuardInterface worldGuardInterface;
-	@Inject
-	private RegionFactory regionFactory;
-	@Inject
-	private Plugin plugin;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop stack";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.stack")) {
-			return "help-stack";
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		// Check permission
-		if(!sender.hasPermission("areashop.stack")) {
-			messageBridge.message(sender, "stack-noPermission");
-			return;
-		}
-		// Only from ingame
-		if(!(sender instanceof final Player player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
-			return;
-		}
-		// Specify enough arguments
-		if(args.length < 5) {
-			messageBridge.message(sender, "stack-help");
-			return;
-		}
-		// Check amount
-		int tempAmount = -1;
-		try {
-			tempAmount = Integer.parseInt(args[1]);
-		} catch(NumberFormatException e) {
-			// Incorrect number
-		}
-		if(tempAmount <= 0) {
-			messageBridge.message(player, "stack-wrongAmount", args[1]);
-			return;
-		}
-		// Check gap
-		int gap;
-		try {
-			gap = Integer.parseInt(args[2]);
-		} catch(NumberFormatException e) {
-			messageBridge.message(player, "stack-wrongGap", args[2]);
-			return;
-		}
-		// Check region type
-		if(!"rent".equalsIgnoreCase(args[4]) && !"buy".equalsIgnoreCase(args[4])) {
-			messageBridge.message(sender, "stack-help");
-			return;
-		}
-		// Get WorldEdit selection
-		final WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
-		if(selection == null) {
-			messageBridge.message(player, "stack-noSelection");
-			return;
-		}
-		// Get or create group
-		RegionGroup group = null;
-		if(args.length > 5) {
-			group = fileManager.getGroup(args[5]);
-			if(group == null) {
-				group = regionFactory.createRegionGroup(args[5]);
-				fileManager.addGroup(group);
-			}
-		}
-		// Get facing of the player (must be clearly one of the four directions to make sure it is no mistake)
-		BlockFace facing = Utils.yawToFacing(player.getLocation().getYaw());
-		if(player.getLocation().getPitch() > 45) {
-			facing = BlockFace.DOWN;
-		} else if(player.getLocation().getPitch() < -45) {
-			facing = BlockFace.UP;
-		}
-		if(!(facing == BlockFace.NORTH || facing == BlockFace.EAST || facing == BlockFace.SOUTH || facing == BlockFace.WEST || facing == BlockFace.UP || facing == BlockFace.DOWN)) {
-			messageBridge.message(player, "stack-unclearDirection", facing.toString().toLowerCase().replace('_', '-'));
-			return;
-		}
-		Vector shift = new Vector(0, 0, 0);
-		if(facing == BlockFace.SOUTH) {
-			shift = shift.setZ(-selection.getLength() - gap);
-		} else if(facing == BlockFace.WEST) {
-			shift = shift.setX(selection.getWidth() + gap);
-		} else if(facing == BlockFace.NORTH) {
-			shift = shift.setZ(selection.getLength() + gap);
-		} else if(facing == BlockFace.EAST) {
-			shift = shift.setX(-selection.getWidth() - gap);
-		} else if(facing == BlockFace.DOWN) {
-			shift = shift.setY(-selection.getHeight() - gap);
-		} else if(facing == BlockFace.UP) {
-			shift = shift.setY(selection.getHeight() + gap);
-		}
-		AreaShop.debug("  calculated shift vector: " + shift + ", with facing=" + facing);
-		// Create regions and add them to AreaShop
-		final String nameTemplate = args[3];
-
-
-		final int regionsPerTick = plugin.getConfig().getInt("adding.regionsPerTick");
-		final boolean rentRegions = "rent".equalsIgnoreCase(args[4]);
-		final int amount = tempAmount;
-		final RegionGroup finalGroup = group;
-		final Vector finalShift = shift;
-		String type;
-		if(rentRegions) {
-			type = "rent";
-		} else {
-			type = "buy";
-		}
-		Message groupsMessage = Message.empty();
-		if(group != null) {
-			groupsMessage = Message.fromKey("stack-addToGroup").replacements(group.getName());
-		}
-		messageBridge.message(player, "stack-accepted", amount, type, gap, nameTemplate, groupsMessage);
-		messageBridge.message(player, "stack-addStart", amount, regionsPerTick * 20);
-
-		Location minimumLocation = selection.getMinimumLocation();
-		Vector minimumVector = new Vector(minimumLocation.getX(), minimumLocation.getY(), minimumLocation.getZ());
-		Location maximumLocation = selection.getMaximumLocation();
-		Vector maximumVector = new Vector(maximumLocation.getX(), maximumLocation.getY(), maximumLocation.getZ());
-		new BukkitRunnable() {
-			private int current = -1;
-			private final RegionManager manager = AreaShop.getInstance().getRegionManager(selection.getWorld());
-			private int counter = 1;
-			private int tooLow = 0;
-			private int tooHigh = 0;
-
-			@Override
-			public void run() {
-				for(int i = 0; i < regionsPerTick; i++) {
-					current++;
-					if(current < amount) {
-						// Create the region name
-						String regionName = countToName(nameTemplate, counter);
-						while(manager.getRegion(regionName) != null || AreaShop.getInstance().getFileManager().getRegion(regionName) != null) {
-							counter++;
-							regionName = countToName(nameTemplate, counter);
-						}
-
-						// Add the region to WorldGuard (at startposition shifted by the number of this region times the blocks it should shift)
-						Vector minimum = minimumVector.clone().add(finalShift.clone().multiply(current));
-						Vector maximum = maximumVector.clone().add(finalShift.clone().multiply(current));
-
-						// Check for out of bounds
-						if(minimum.getBlockY() < 0) {
-							tooLow++;
-							continue;
-						} else if(maximum.getBlockY() > 256) {
-							tooHigh++;
-							continue;
-						}
-						ProtectedCuboidRegion region = worldGuardInterface.createCuboidRegion(regionName, minimum,maximum);
-						manager.addRegion(region);
-
-						// Add the region to AreaShop
-						GeneralRegion newRegion;
-						if(rentRegions) {
-							newRegion = regionFactory.createRentRegion(regionName, selection.getWorld());
-
-						} else {
-							newRegion = regionFactory.createBuyRegion(regionName, selection.getWorld());
-						}
-
-						if(finalGroup != null) {
-							finalGroup.addMember(newRegion);
-						}
-						AddingRegionEvent event = fileManager.addRegion(newRegion);
-						if (event.isCancelled()) {
-							messageBridge.message(player, "general-cancelled", event.getReason());
-							continue;
-						}
-						newRegion.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-						newRegion.update();
-					}
-				}
-				if(current >= amount) {
-					if(player.isOnline()) {
-						int added = amount - tooLow - tooHigh;
-						Message wrong = Message.empty();
-						if(tooHigh > 0) {
-							wrong.append(Message.fromKey("stack-tooHigh").replacements(tooHigh));
-						}
-						if(tooLow > 0) {
-							wrong.append(Message.fromKey("stack-tooLow").replacements(tooLow));
-						}
-						messageBridge.message(player, "stack-addComplete", added, wrong);
-					}
-					this.cancel();
-				}
-			}
-		}.runTaskTimer(plugin, 1, 1);
-	}
-
-	/**
-	 * Build a name from a count, with the right length.
-	 * @param template Template to put the name in (# to put the count there, otherwise count is appended)
-	 * @param count Number to use
-	 * @return name with prepended 0's
-	 */
-	private String countToName(String template, int count) {
-		StringBuilder counterName =  new StringBuilder().append(count);
-		int minimumLength = plugin.getConfig().getInt("stackRegionNumberLength");
-		while(counterName.length() < minimumLength) {
-			counterName.insert(0, "0");
-		}
-
-		if(template.contains("#")) {
-			return template.replace("#", counterName);
-		} else {
-			return template + counterName;
-		}
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new ArrayList<>();
-		if(toComplete == 5) {
-			result.add("rent");
-			result.add("buy");
-		} else if(toComplete == 6) {
-			result.addAll(fileManager.getGroupNames());
-		}
-		return result;
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.util.RegionEvent;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.interactivemessenger.processing.Message;
+import org.bukkit.Location;
+import org.bukkit.block.BlockFace;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.Vector;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StackCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop stack";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.stack")) {
+			return "help-stack";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		// Check permission
+		if(!sender.hasPermission("areashop.stack")) {
+			plugin.message(sender, "stack-noPermission");
+			return;
+		}
+		// Only from ingame
+		if(!(sender instanceof Player)) {
+			plugin.message(sender, "cmd-onlyByPlayer");
+			return;
+		}
+		final Player player = (Player)sender;
+		// Specify enough arguments
+		if(args.length < 5) {
+			plugin.message(sender, "stack-help");
+			return;
+		}
+		// Check amount
+		int tempAmount = -1;
+		try {
+			tempAmount = Integer.parseInt(args[1]);
+		} catch(NumberFormatException e) {
+			// Incorrect number
+		}
+		if(tempAmount <= 0) {
+			plugin.message(player, "stack-wrongAmount", args[1]);
+			return;
+		}
+		// Check gap
+		int gap;
+		try {
+			gap = Integer.parseInt(args[2]);
+		} catch(NumberFormatException e) {
+			plugin.message(player, "stack-wrongGap", args[2]);
+			return;
+		}
+		// Check region type
+		if(!"rent".equalsIgnoreCase(args[4]) && !"buy".equalsIgnoreCase(args[4])) {
+			plugin.message(sender, "stack-help");
+			return;
+		}
+		// Get WorldEdit selection
+		final WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+		if(selection == null) {
+			plugin.message(player, "stack-noSelection");
+			return;
+		}
+		// Get or create group
+		RegionGroup group = null;
+		if(args.length > 5) {
+			group = plugin.getFileManager().getGroup(args[5]);
+			if(group == null) {
+				group = new RegionGroup(plugin, args[5]);
+				plugin.getFileManager().addGroup(group);
+			}
+		}
+		// Get facing of the player (must be clearly one of the four directions to make sure it is no mistake)
+		BlockFace facing = Utils.yawToFacing(player.getLocation().getYaw());
+		if(player.getLocation().getPitch() > 45) {
+			facing = BlockFace.DOWN;
+		} else if(player.getLocation().getPitch() < -45) {
+			facing = BlockFace.UP;
+		}
+		if(!(facing == BlockFace.NORTH || facing == BlockFace.EAST || facing == BlockFace.SOUTH || facing == BlockFace.WEST || facing == BlockFace.UP || facing == BlockFace.DOWN)) {
+			plugin.message(player, "stack-unclearDirection", facing.toString().toLowerCase().replace('_', '-'));
+			return;
+		}
+		Vector shift = new Vector(0, 0, 0);
+		if(facing == BlockFace.SOUTH) {
+			shift = shift.setZ(-selection.getLength() - gap);
+		} else if(facing == BlockFace.WEST) {
+			shift = shift.setX(selection.getWidth() + gap);
+		} else if(facing == BlockFace.NORTH) {
+			shift = shift.setZ(selection.getLength() + gap);
+		} else if(facing == BlockFace.EAST) {
+			shift = shift.setX(-selection.getWidth() - gap);
+		} else if(facing == BlockFace.DOWN) {
+			shift = shift.setY(-selection.getHeight() - gap);
+		} else if(facing == BlockFace.UP) {
+			shift = shift.setY(selection.getHeight() + gap);
+		}
+		AreaShop.debug("  calculated shift vector: " + shift + ", with facing=" + facing);
+		// Create regions and add them to AreaShop
+		final String nameTemplate = args[3];
+
+
+		final int regionsPerTick = plugin.getConfig().getInt("adding.regionsPerTick");
+		final boolean rentRegions = "rent".equalsIgnoreCase(args[4]);
+		final int amount = tempAmount;
+		final RegionGroup finalGroup = group;
+		final Vector finalShift = shift;
+		String type;
+		if(rentRegions) {
+			type = "rent";
+		} else {
+			type = "buy";
+		}
+		Message groupsMessage = Message.empty();
+		if(group != null) {
+			groupsMessage = Message.fromKey("stack-addToGroup").replacements(group.getName());
+		}
+		plugin.message(player, "stack-accepted", amount, type, gap, nameTemplate, groupsMessage);
+		plugin.message(player, "stack-addStart", amount, regionsPerTick * 20);
+
+		Location minimumLocation = selection.getMinimumLocation();
+		Vector minimumVector = new Vector(minimumLocation.getX(), minimumLocation.getY(), minimumLocation.getZ());
+		Location maximumLocation = selection.getMaximumLocation();
+		Vector maximumVector = new Vector(maximumLocation.getX(), maximumLocation.getY(), maximumLocation.getZ());
+		new BukkitRunnable() {
+			private int current = -1;
+			private final RegionManager manager = AreaShop.getInstance().getRegionManager(selection.getWorld());
+			private int counter = 1;
+			private int tooLow = 0;
+			private int tooHigh = 0;
+
+			@Override
+			public void run() {
+				for(int i = 0; i < regionsPerTick; i++) {
+					current++;
+					if(current < amount) {
+						// Create the region name
+						String regionName = countToName(nameTemplate, counter);
+						while(manager.getRegion(regionName) != null || AreaShop.getInstance().getFileManager().getRegion(regionName) != null) {
+							counter++;
+							regionName = countToName(nameTemplate, counter);
+						}
+
+						// Add the region to WorldGuard (at startposition shifted by the number of this region times the blocks it should shift)
+						Vector minimum = minimumVector.clone().add(finalShift.clone().multiply(current));
+						Vector maximum = maximumVector.clone().add(finalShift.clone().multiply(current));
+
+						// Check for out of bounds
+						if(minimum.getBlockY() < 0) {
+							tooLow++;
+							continue;
+						} else if(maximum.getBlockY() > 256) {
+							tooHigh++;
+							continue;
+						}
+						ProtectedCuboidRegion region = plugin.getWorldGuardHandler().createCuboidRegion(regionName, minimum,maximum);
+						manager.addRegion(region);
+
+						// Add the region to AreaShop
+						LegacyGeneralRegion newRegion;
+						if(rentRegions) {
+							newRegion = new RentRegion(regionName, selection.getWorld());
+
+						} else {
+							newRegion = new BuyRegion(regionName, selection.getWorld());
+						}
+
+						if(finalGroup != null) {
+							finalGroup.addMember(newRegion);
+						}
+						AddingRegionEvent event = plugin.getFileManager().addRegion(newRegion);
+						if (event.isCancelled()) {
+							plugin.message(player, "general-cancelled", event.getReason());
+							continue;
+						}
+						newRegion.handleSchematicEvent(RegionEvent.CREATED);
+						newRegion.update();
+					}
+				}
+				if(current >= amount) {
+					if(player.isOnline()) {
+						int added = amount - tooLow - tooHigh;
+						Message wrong = Message.empty();
+						if(tooHigh > 0) {
+							wrong.append(Message.fromKey("stack-tooHigh").replacements(tooHigh));
+						}
+						if(tooLow > 0) {
+							wrong.append(Message.fromKey("stack-tooLow").replacements(tooLow));
+						}
+						plugin.message(player, "stack-addComplete", added, wrong);
+					}
+					this.cancel();
+				}
+			}
+		}.runTaskTimer(plugin, 1, 1);
+	}
+
+	/**
+	 * Build a name from a count, with the right length.
+	 * @param template Template to put the name in (# to put the count there, otherwise count is appended)
+	 * @param count Number to use
+	 * @return name with prepended 0's
+	 */
+	private String countToName(String template, int count) {
+		StringBuilder counterName =  new StringBuilder().append(count);
+		int minimumLength = plugin.getConfig().getInt("stackRegionNumberLength");
+		while(counterName.length() < minimumLength) {
+			counterName.insert(0, "0");
+		}
+
+		if(template.contains("#")) {
+			return template.replace("#", counterName);
+		} else {
+			return template + counterName;
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new ArrayList<>();
+		if(toComplete == 5) {
+			result.add("rent");
+			result.add("buy");
+		} else if(toComplete == 6) {
+			result.addAll(plugin.getFileManager().getGroupNames());
+		}
+		return result;
+	}
+
+}
+
+
+
+
+
+
+
+
+
+
@@ -1,121 +1,111 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class StopresellCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop stopresell";
-	}
-
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.stopresellall") || target.hasPermission("areashop.stopresell")) {
-			return "help-stopResell";
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.stopresell") && !sender.hasPermission("areashop.stopresellall")) {
-			messageBridge.message(sender, "stopresell-noPermissionOther");
-			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()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					buy = regions.get(0);
-				}
-			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
-				return;
-			}
-		} else {
-			buy = fileManager.getBuy(args[1]);
-			if(buy == null) {
-				messageBridge.message(sender, "stopresell-notRegistered", args[1]);
-				return;
-			}
-		}
-		if(buy == null) {
-			messageBridge.message(sender, "cmd-noRegionsAtLocation");
-			return;
-		}
-		if(!buy.isInResellingMode()) {
-			messageBridge.message(sender, "stopresell-notResell", buy);
-			return;
-		}
-		if(sender.hasPermission("areashop.stopresellall")) {
-			buy.disableReselling();
-			buy.update();
-			messageBridge.message(sender, "stopresell-success", buy);
-		} else if(sender.hasPermission("areashop.stopresell") && sender instanceof Player) {
-			if(buy.isOwner((Player)sender)) {
-				buy.disableReselling();
-				buy.update();
-				messageBridge.message(sender, "stopresell-success", buy);
-			} else {
-				messageBridge.message(sender, "stopresell-noPermissionOther", buy);
-			}
-		} else {
-			messageBridge.message(sender, "stopresell-noPermission", buy);
-		}
-	}
-
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			for(BuyRegion region : fileManager.getBuysRef()) {
-				if(region.isSold() && region.isInResellingMode()) {
-					result.add(region.getName());
-				}
-			}
-		}
-		return result;
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StopresellCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop stopresell";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.stopresellall") || target.hasPermission("areashop.stopresell")) {
+			return "help-stopResell";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.stopresell") && !sender.hasPermission("areashop.stopresellall")) {
+			plugin.message(sender, "stopresell-noPermissionOther");
+			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, "stopresell-notRegistered", args[1]);
+				return;
+			}
+		}
+		if(buy == null) {
+			plugin.message(sender, "cmd-noRegionsAtLocation");
+			return;
+		}
+		if(!buy.isInResellingMode()) {
+			plugin.message(sender, "stopresell-notResell", buy);
+			return;
+		}
+		if(sender.hasPermission("areashop.stopresellall")) {
+			buy.disableReselling();
+			buy.update();
+			plugin.message(sender, "stopresell-success", buy);
+		} else if(sender.hasPermission("areashop.stopresell") && sender instanceof Player) {
+			if(buy.isOwner((Player)sender)) {
+				buy.disableReselling();
+				buy.update();
+				plugin.message(sender, "stopresell-success", buy);
+			} else {
+				plugin.message(sender, "stopresell-noPermissionOther", buy);
+			}
+		} else {
+			plugin.message(sender, "stopresell-noPermission", buy);
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(BuyRegion region : plugin.getFileManager().getBuys()) {
+				if(region.isSold() && region.isInResellingMode()) {
+					result.add(region.getRegionId());
+				}
+			}
+		}
+		return result;
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1,90 +1,82 @@
 package me.wiefferink.areashop.commands;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;

-@Singleton
 public class TeleportCommand extends CommandAreaShop {

-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop tp";
-	}
+    /**
+     * Check if a person can teleport to the region (assuming he is not teleporting to a sign).
+     *
+     * @param person The person to check
+     * @param region The region to check for
+     * @return true if the person can teleport to it, otherwise false
+     */
+    public static boolean canUse(CommandSender person, LegacyGeneralRegion region) {
+        if (!(person instanceof Player)) {
+            return false;
+        }
+        Player player = (Player) person;
+        return player.hasPermission("areashop.teleportall")
+                || region.isOwner(player) && player.hasPermission("areashop.teleport")
+                || region.isAvailable() && player.hasPermission("areashop.teleportavailable")
+                || region.getFriendsFeature().getFriends().contains(player.getUniqueId()) && player.hasPermission("areashop.teleportfriend");
+    }

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

-	/**
-	 * Check if a person can teleport to the region (assuming he is not teleporting to a sign).
-	 * @param person The person to check
-	 * @param region The region to check for
-	 * @return true if the person can teleport to it, otherwise false
-	 */
-	public static boolean canUse(CommandSender person, GeneralRegion region) {
-		if(!(person instanceof Player player)) {
-			return false;
-		}
-		return player.hasPermission("areashop.teleportall")
-				|| region.isOwner(player) && player.hasPermission("areashop.teleport")
-				|| region.isAvailable() && player.hasPermission("areashop.teleportavailable")
-				|| region.getFriendsFeature().getFriends().contains(player.getUniqueId()) && player.hasPermission("areashop.teleportfriend");
-	}
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.teleportall") || target.hasPermission("areashop.teleport")) {
+            return "help-teleport";
+        }
+        return null;
+    }

-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.teleport") && !sender.hasPermission("areashop.teleportall") && !sender.hasPermission("areashop.teleportavailable") && !sender.hasPermission("areashop.teleportavailablesign") && !sender.hasPermission("areashop.teleportsign") && !sender.hasPermission("areashop.teleportsignall") && !sender.hasPermission("areashop.teleportfriend") && !sender.hasPermission("teleportfriendsign")) {
-			messageBridge.message(sender, "teleport-noPermission");
-			return;
-		}
-		if(!(sender instanceof Player player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
-			return;
-		}
-		if(args.length <= 1 || args[1] == null) {
-			messageBridge.message(sender, "teleport-help");
-			return;
-		}
-		GeneralRegion region = fileManager.getRegion(args[1]);
-		if(region == null) {
-			messageBridge.message(player, "teleport-noRentOrBuy", args[1]);
-			return;
-		}
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.teleport") && !sender.hasPermission("areashop.teleportall") && !sender.hasPermission("areashop.teleportavailable") && !sender.hasPermission("areashop.teleportavailablesign") && !sender.hasPermission("areashop.teleportsign") && !sender.hasPermission("areashop.teleportsignall") && !sender.hasPermission("areashop.teleportfriend") && !sender.hasPermission("teleportfriendsign")) {
+            plugin.message(sender, "teleport-noPermission");
+            return;
+        }
+        if (!(sender instanceof Player)) {
+            plugin.message(sender, "cmd-onlyByPlayer");
+            return;
+        }
+        if (args.length <= 1 || args[1] == null) {
+            plugin.message(sender, "teleport-help");
+            return;
+        }
+        Player player = (Player) sender;
+        LegacyGeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+        if (region == null) {
+            plugin.message(player, "teleport-noRentOrBuy", args[1]);
+            return;
+        }

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

-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			result.addAll(fileManager.getRegionNames());
-		} else if(toComplete == 3) {
-			result.add("sign");
-		}
-		return result;
-	}
+    @Override
+    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+        if (toComplete == 2) {
+            return plugin.getFileManager().getRegionNames();
+        } else if (toComplete == 3) {
+            return Collections.singletonList("sign");
+        }
+        return Collections.emptyList();
+    }

 }
@@ -1,111 +1,102 @@
-package me.wiefferink.areashop.commands;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class UnrentCommand extends CommandAreaShop {
-
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop unrent";
-	}
-
-	@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) {
-			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")) {
-			messageBridge.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()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					rent = regions.get(0);
-				}
-			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
-				return;
-			}
-		} else {
-			rent = fileManager.getRent(args[1]);
-		}
-		if(rent == null) {
-			messageBridge.message(sender, "unrent-notRegistered");
-			return;
-		}
-		if(!rent.isRented()) {
-			messageBridge.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 : fileManager.getRentsRef()) {
-				if(region.isRented()) {
-					result.add(region.getName());
-				}
-			}
-		}
-		return result;
-	}
-}
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UnrentCommand extends CommandAreaShop {
+
+	@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;
+	}
+
+	/**
+	 * Check if a person can unrent the region.
+	 * @param person The person to check
+	 * @param region The region to check for
+	 * @return true if the person can unrent it, otherwise false
+	 */
+	public static boolean canUse(CommandSender person, LegacyGeneralRegion region) {
+		if(person.hasPermission("areashop.unrent")) {
+			return true;
+		}
+		if(person instanceof Player) {
+			Player player = (Player)person;
+			return region.isOwner(player) && person.hasPermission("areashop.unrentown");
+		}
+		return false;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.unrent") && !sender.hasPermission("areashop.unrentown")) {
+			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.getRegionId());
+				}
+			}
+		}
+		return result;
+	}
+}
+
+
+
+
+
+
+
+
@@ -1,19 +1,19 @@
-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);
-	}
-
-}
+package me.wiefferink.areashop.events.ask;
+
+import me.wiefferink.areashop.events.CancellableRegionEvent;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+
+/**
+ * Broadcasted when a region has been added to AreaShop.
+ */
+public class AddingRegionEvent extends CancellableRegionEvent<LegacyGeneralRegion> {
+
+	/**
+	 * Constructor.
+	 * @param region The region that has been added
+	 */
+	public AddingRegionEvent(LegacyGeneralRegion region) {
+		super(region);
+	}
+
+}
@@ -1,19 +1,19 @@
-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);
-	}
-
-}
+package me.wiefferink.areashop.events.ask;
+
+import me.wiefferink.areashop.events.CancellableRegionEvent;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+
+/**
+ * Broadcasted when a region has been added to AreaShop.
+ */
+public class DeletingRegionEvent extends CancellableRegionEvent<LegacyGeneralRegion> {
+
+	/**
+	 * Constructor.
+	 * @param region The region that has been added
+	 */
+	public DeletingRegionEvent(LegacyGeneralRegion region) {
+		super(region);
+	}
+
+}
@@ -1,43 +1,43 @@
-package me.wiefferink.areashop.events.askandnotify;
-
-import me.wiefferink.areashop.events.CancellableRegionEvent;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
-
-/**
- * Broadcasted when a friend is being added to a region.
- */
-public class AddedFriendEvent extends CancellableRegionEvent<GeneralRegion> {
-
-	private final OfflinePlayer friend;
-	private final CommandSender by;
-
-	/**
-	 * Constructor.
-	 * @param region The region the friend is getting added to
-	 * @param friend The friend that is about to be added
-	 * @param by     The CommandSender that is adding the friend, or null if none
-	 */
-	public AddedFriendEvent(GeneralRegion region, OfflinePlayer friend, CommandSender by) {
-		super(region);
-		this.friend = friend;
-		this.by = by;
-	}
-
-	/**
-	 * Get the OfflinePlayer that is getting added as friend.
-	 * @return The friend that is getting added
-	 */
-	public OfflinePlayer getFriend() {
-		return friend;
-	}
-
-	/**
-	 * Get the CommandSender that is adding the friend.
-	 * @return null if none, a CommandSender if done by someone (likely Player or ConsoleCommandSender)
-	 */
-	public CommandSender getBy() {
-		return by;
-	}
-}
+package me.wiefferink.areashop.events.askandnotify;
+
+import me.wiefferink.areashop.events.CancellableRegionEvent;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+
+/**
+ * Broadcasted when a friend is being added to a region.
+ */
+public class AddedFriendEvent extends CancellableRegionEvent<LegacyGeneralRegion> {
+
+	private final OfflinePlayer friend;
+	private final CommandSender by;
+
+	/**
+	 * Constructor.
+	 * @param region The region the friend is getting added to
+	 * @param friend The friend that is about to be added
+	 * @param by     The CommandSender that is adding the friend, or null if none
+	 */
+	public AddedFriendEvent(LegacyGeneralRegion region, OfflinePlayer friend, CommandSender by) {
+		super(region);
+		this.friend = friend;
+		this.by = by;
+	}
+
+	/**
+	 * Get the OfflinePlayer that is getting added as friend.
+	 * @return The friend that is getting added
+	 */
+	public OfflinePlayer getFriend() {
+		return friend;
+	}
+
+	/**
+	 * Get the CommandSender that is adding the friend.
+	 * @return null if none, a CommandSender if done by someone (likely Player or ConsoleCommandSender)
+	 */
+	public CommandSender getBy() {
+		return by;
+	}
+}
@@ -1,43 +1,43 @@
-package me.wiefferink.areashop.events.askandnotify;
-
-import me.wiefferink.areashop.events.CancellableRegionEvent;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
-
-/**
- * Broadcasted when a friend is being added to a region.
- */
-public class DeletedFriendEvent extends CancellableRegionEvent<GeneralRegion> {
-
-	private final OfflinePlayer friend;
-	private final CommandSender by;
-
-	/**
-	 * Constructor.
-	 * @param region The region the friend is getting added to
-	 * @param friend The friend that is about to be added
-	 * @param by     The CommandSender that is adding the friend, or null if none
-	 */
-	public DeletedFriendEvent(GeneralRegion region, OfflinePlayer friend, CommandSender by) {
-		super(region);
-		this.friend = friend;
-		this.by = by;
-	}
-
-	/**
-	 * Get the OfflinePlayer that is getting added as friend.
-	 * @return The friend that is getting added
-	 */
-	public OfflinePlayer getFriend() {
-		return friend;
-	}
-
-	/**
-	 * Get the CommandSender that is adding the friend.
-	 * @return null if none, a CommandSender if done by someone (likely Player or ConsoleCommandSender)
-	 */
-	public CommandSender getBy() {
-		return by;
-	}
-}
+package me.wiefferink.areashop.events.askandnotify;
+
+import me.wiefferink.areashop.events.CancellableRegionEvent;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+
+/**
+ * Broadcasted when a friend is being added to a region.
+ */
+public class DeletedFriendEvent extends CancellableRegionEvent<LegacyGeneralRegion> {
+
+	private final OfflinePlayer friend;
+	private final CommandSender by;
+
+	/**
+	 * Constructor.
+	 * @param region The region the friend is getting added to
+	 * @param friend The friend that is about to be added
+	 * @param by     The CommandSender that is adding the friend, or null if none
+	 */
+	public DeletedFriendEvent(LegacyGeneralRegion region, OfflinePlayer friend, CommandSender by) {
+		super(region);
+		this.friend = friend;
+		this.by = by;
+	}
+
+	/**
+	 * Get the OfflinePlayer that is getting added as friend.
+	 * @return The friend that is getting added
+	 */
+	public OfflinePlayer getFriend() {
+		return friend;
+	}
+
+	/**
+	 * Get the CommandSender that is adding the friend.
+	 * @return null if none, a CommandSender if done by someone (likely Player or ConsoleCommandSender)
+	 */
+	public CommandSender getBy() {
+		return by;
+	}
+}
@@ -1,19 +1,19 @@
-package me.wiefferink.areashop.events.notify;
-
-import me.wiefferink.areashop.events.NotifyRegionEvent;
-import me.wiefferink.areashop.regions.GeneralRegion;
-
-/**
- * Broadcasted when a region has been added to AreaShop.
- */
-public class AddedRegionEvent extends NotifyRegionEvent<GeneralRegion> {
-
-	/**
-	 * Constructor.
-	 * @param region The region that has been added
-	 */
-	public AddedRegionEvent(GeneralRegion region) {
-		super(region);
-	}
-
-}
+package me.wiefferink.areashop.events.notify;
+
+import me.wiefferink.areashop.events.NotifyRegionEvent;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+
+/**
+ * Broadcasted when a region has been added to AreaShop.
+ */
+public class AddedRegionEvent extends NotifyRegionEvent<LegacyGeneralRegion> {
+
+	/**
+	 * Constructor.
+	 * @param region The region that has been added
+	 */
+	public AddedRegionEvent(LegacyGeneralRegion region) {
+		super(region);
+	}
+
+}
@@ -1,18 +1,18 @@
-package me.wiefferink.areashop.events.notify;
-
-import me.wiefferink.areashop.events.NotifyRegionEvent;
-import me.wiefferink.areashop.regions.GeneralRegion;
-
-/**
- * Broadcasted when a region has been removed from AreaShop.
- */
-public class DeletedRegionEvent extends NotifyRegionEvent<GeneralRegion> {
-
-	/**
-	 * Constructor.
-	 * @param region The region that has been removed
-	 */
-	public DeletedRegionEvent(GeneralRegion region) {
-		super(region);
-	}
-}
+package me.wiefferink.areashop.events.notify;
+
+import me.wiefferink.areashop.events.NotifyRegionEvent;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+
+/**
+ * Broadcasted when a region has been removed from AreaShop.
+ */
+public class DeletedRegionEvent extends NotifyRegionEvent<LegacyGeneralRegion> {
+
+	/**
+	 * Constructor.
+	 * @param region The region that has been removed
+	 */
+	public DeletedRegionEvent(LegacyGeneralRegion region) {
+		super(region);
+	}
+}
@@ -1,19 +1,20 @@
-package me.wiefferink.areashop.events.notify;
-
-import me.wiefferink.areashop.events.NotifyRegionEvent;
-import me.wiefferink.areashop.regions.GeneralRegion;
-
-/**
- * Broadcasted when the data of a region changes.
- * Should be used for updating displays that use region data.
- */
-public class UpdateRegionEvent extends NotifyRegionEvent<GeneralRegion> {
-
-	/**
-	 * Contructor.
-	 * @param region The region that has been updated
-	 */
-	public UpdateRegionEvent(GeneralRegion region) {
-		super(region);
-	}
-}
+package me.wiefferink.areashop.events.notify;
+
+import me.wiefferink.areashop.events.NotifyRegionEvent;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.MarketableRegion;
+
+/**
+ * Broadcasted when the data of a region changes.
+ * Should be used for updating displays that use region data.
+ */
+public class UpdateRegionEvent extends NotifyRegionEvent<MarketableRegion> {
+
+	/**
+	 * Contructor.
+	 * @param region The region that has been updated
+	 */
+	public UpdateRegionEvent(MarketableRegion region) {
+		super(region);
+	}
+}
@@ -1,127 +1,119 @@
-package me.wiefferink.areashop.features;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.events.ask.AddingRegionEvent;
-import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
-import me.wiefferink.areashop.events.ask.DeletingRegionEvent;
-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;
-
-@Singleton
-public class CommandsFeature extends RegionFeature {
-
-	@Inject
-	CommandsFeature(AreaShop plugin) {
-		super(plugin);
-	}
-
-	/**
-	 * Run command for a certain event.
-	 * @param region Region to execute the events for
-	 * @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.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);
-	}
-
-}
+package me.wiefferink.areashop.features;
+
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
+import me.wiefferink.areashop.events.ask.DeletingRegionEvent;
+import me.wiefferink.areashop.events.ask.RentingRegionEvent;
+import me.wiefferink.areashop.events.ask.ResellingRegionEvent;
+import me.wiefferink.areashop.events.ask.SellingRegionEvent;
+import me.wiefferink.areashop.events.ask.UnrentingRegionEvent;
+import me.wiefferink.areashop.events.notify.AddedRegionEvent;
+import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
+import me.wiefferink.areashop.events.notify.DeletedRegionEvent;
+import me.wiefferink.areashop.events.notify.RentedRegionEvent;
+import me.wiefferink.areashop.events.notify.ResoldRegionEvent;
+import me.wiefferink.areashop.events.notify.SoldRegionEvent;
+import me.wiefferink.areashop.events.notify.UnrentedRegionEvent;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.util.RegionEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+import java.util.List;
+
+public class CommandsFeature extends RegionFeature {
+
+	/**
+	 * Run command for a certain event.
+	 * @param region Region to execute the events for
+	 * @param event The event
+	 * @param before The 'before' or 'after' commands
+	 */
+	public void runEventCommands(LegacyGeneralRegion region, RegionEvent event, boolean before) {
+		ConfigurationSection eventCommandProfileSection = region.getConfigurationSectionSetting("general.eventCommandProfile", "eventCommandProfiles");
+		if(eventCommandProfileSection == null) {
+			return;
+		}
+		List<String> commands = eventCommandProfileSection.getStringList(event.getValue() + "." + (before ? "before" : "after"));
+		if(commands.isEmpty()) {
+			return;
+		}
+		region.runCommands(Bukkit.getConsoleSender(), commands);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void addingRegion(AddingRegionEvent event) {
+		runEventCommands(event.getRegion(), RegionEvent.CREATED, true);
+	}
+
+	@EventHandler
+	public void addedRegion(AddedRegionEvent event) {
+		runEventCommands(event.getRegion(), RegionEvent.CREATED, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void deletingRegion(DeletingRegionEvent event) {
+		runEventCommands(event.getRegion(), RegionEvent.DELETED, true);
+	}
+
+	@EventHandler
+	public void deletedRegion(DeletedRegionEvent event) {
+		runEventCommands(event.getRegion(), RegionEvent.DELETED, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void rentingRegion(RentingRegionEvent event) {
+		// Technically the rent can still be cancelled if the payment fails...
+		runEventCommands(event.getRegion(), event.isExtending() ? RegionEvent.EXTENDED : RegionEvent.RENTED, true);
+	}
+
+	@EventHandler
+	public void rentedRegion(RentedRegionEvent event) {
+		runEventCommands(event.getRegion(), event.hasExtended() ? RegionEvent.EXTENDED : RegionEvent.RENTED, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void buyingRegion(BuyingRegionEvent event) {
+		// Technically the buy can still be cancelled if the payment fails...
+		runEventCommands(event.getRegion(), RegionEvent.BOUGHT, true);
+	}
+
+	@EventHandler
+	public void boughtRegion(BoughtRegionEvent event) {
+		runEventCommands(event.getRegion(), RegionEvent.BOUGHT, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void resellingRegion(ResellingRegionEvent event) {
+		// Technically the resell can still be cancelled if the payment fails...
+		runEventCommands(event.getRegion(), RegionEvent.RESELL, true);
+	}
+
+	@EventHandler
+	public void resoldRegion(ResoldRegionEvent event) {
+		runEventCommands(event.getRegion(), RegionEvent.RESELL, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void sellingRegion(SellingRegionEvent event) {
+		runEventCommands(event.getRegion(), RegionEvent.SOLD, true);
+	}
+
+	@EventHandler
+	public void soldRegion(SoldRegionEvent event) {
+		runEventCommands(event.getRegion(), RegionEvent.SOLD, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void unrentingRegion(UnrentingRegionEvent event) {
+		runEventCommands(event.getRegion(), RegionEvent.UNRENTED, true);
+	}
+
+	@EventHandler
+	public void unrentedRegion(UnrentedRegionEvent event) {
+		runEventCommands(event.getRegion(), RegionEvent.UNRENTED, false);
+	}
+
+}
@@ -1,108 +1,98 @@
-package me.wiefferink.areashop.features;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
-import me.wiefferink.areashop.events.ask.RentingRegionEvent;
-import me.wiefferink.areashop.events.ask.ResellingRegionEvent;
-import me.wiefferink.areashop.events.ask.SellingRegionEvent;
-import me.wiefferink.areashop.events.ask.UnrentingRegionEvent;
-import me.wiefferink.areashop.events.askandnotify.AddedFriendEvent;
-import me.wiefferink.areashop.events.askandnotify.DeletedFriendEvent;
-import me.wiefferink.areashop.events.notify.AddedRegionEvent;
-import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
-import me.wiefferink.areashop.events.notify.DeletedRegionEvent;
-import me.wiefferink.areashop.events.notify.RentedRegionEvent;
-import me.wiefferink.areashop.events.notify.ResoldRegionEvent;
-import me.wiefferink.areashop.events.notify.SoldRegionEvent;
-import me.wiefferink.areashop.events.notify.UnrentedRegionEvent;
-import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.event.EventHandler;
-
-import javax.annotation.Nonnull;
-
-@Singleton
-public class DebugFeature extends RegionFeature {
-
-	@Inject
-	DebugFeature(@Nonnull AreaShop plugin) {
-		super(plugin);
-	}
-
-	@EventHandler
-	public void buyingRegion(BuyingRegionEvent event) {
-		AreaShop.debug("BuyingRegionEvent: " + event.getPlayer().getName() + " is trying to buy " + event.getRegion().getName());
-	}
-
-	@EventHandler
-	public void boughtRegion(BoughtRegionEvent event) {
-		AreaShop.debug("BoughtRegionEvent: " + event.getRegion().getPlayerName() + " bought " + event.getRegion().getName());
-	}
-
-	@EventHandler
-	public void sellingRegion(SellingRegionEvent event) {
-		AreaShop.debug("SellingRegionEvent: " + event.getRegion().getName() + " is trying to sell " + event.getRegion().getName());
-	}
-
-	@EventHandler
-	public void soldRegion(SoldRegionEvent event) {
-		AreaShop.debug("SoldRegionEvent: " + Utils.toName(event.getOldBuyer()) + " sold " + event.getRegion().getName());
-	}
-
-	@EventHandler
-	public void resellingRegion(ResellingRegionEvent event) {
-		AreaShop.debug("ResellingRegionEvent: " + event.getRegion().getName() + " is trying to resell " + event.getRegion().getName());
-	}
-
-	@EventHandler
-	public void resoldRegion(ResoldRegionEvent event) {
-		AreaShop.debug("ResoldRegionEvent: " + Utils.toName(event.getFromPlayer()) + " resold " + event.getRegion().getName() + " to " + event.getRegion().getPlayerName());
-	}
-
-	@EventHandler
-	public void rentingRegion(RentingRegionEvent event) {
-		AreaShop.debug("RentingRegionEvent: " + event.getPlayer().getName() + " is trying to rent " + event.getRegion().getName() + ", extending=" + event.isExtending());
-	}
-
-	@EventHandler
-	public void rentedRegion(RentedRegionEvent event) {
-		AreaShop.debug("RentedRegionEvent: " + event.getRegion().getPlayerName() + " rented " + event.getRegion().getName() + ", extending=" + event.hasExtended());
-	}
-
-	@EventHandler
-	public void unrentingRegion(UnrentingRegionEvent event) {
-		AreaShop.debug("UnrentingRegionEvent: " + event.getRegion().getPlayerName() + " is trying to unrent " + event.getRegion().getName());
-	}
-
-	@EventHandler
-	public void unrentedRegion(UnrentedRegionEvent event) {
-		AreaShop.debug("UnrentedRegionEvent: " + Utils.toName(event.getOldRenter()) + " unrented " + event.getRegion().getName());
-	}
-
-	@EventHandler
-	public void regionUpdate(UpdateRegionEvent event) {
-		//AreaShop.debug("UpdateRegionEvent: " + event.getRegion().getName() + " updated");
-	}
-
-	@EventHandler
-	public void addedRegion(AddedRegionEvent event) {
-		AreaShop.debug("AddedRegionEvent: " + event.getRegion().getName());
-	}
-
-	@EventHandler
-	public void removedRegion(DeletedRegionEvent event) {
-		AreaShop.debug("DeletedRegionEvent: " + event.getRegion().getName());
-	}
-
-	@EventHandler
-	public void addedFriend(AddedFriendEvent event) {
-		AreaShop.debug("AddedFriendEvent: region " + event.getRegion().getName() + ", " + event.getFriend().getName() + " by " + (event.getBy() == null ? "<nobody>" : event.getBy().getName()));
-	}
-
-	@EventHandler
-	public void deleteFriend(DeletedFriendEvent event) {
-		AreaShop.debug("DeletedFriendEvent: region " + event.getRegion().getName() + ", " + event.getFriend().getName() + " by " + (event.getBy() == null ? "<nobody>" : event.getBy().getName()));
-	}
-}
+package me.wiefferink.areashop.features;
+
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
+import me.wiefferink.areashop.events.ask.RentingRegionEvent;
+import me.wiefferink.areashop.events.ask.ResellingRegionEvent;
+import me.wiefferink.areashop.events.ask.SellingRegionEvent;
+import me.wiefferink.areashop.events.ask.UnrentingRegionEvent;
+import me.wiefferink.areashop.events.askandnotify.AddedFriendEvent;
+import me.wiefferink.areashop.events.askandnotify.DeletedFriendEvent;
+import me.wiefferink.areashop.events.notify.AddedRegionEvent;
+import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
+import me.wiefferink.areashop.events.notify.DeletedRegionEvent;
+import me.wiefferink.areashop.events.notify.RentedRegionEvent;
+import me.wiefferink.areashop.events.notify.ResoldRegionEvent;
+import me.wiefferink.areashop.events.notify.SoldRegionEvent;
+import me.wiefferink.areashop.events.notify.UnrentedRegionEvent;
+import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.event.EventHandler;
+
+public class DebugFeature extends RegionFeature {
+
+	@EventHandler
+	public void buyingRegion(BuyingRegionEvent event) {
+		AreaShop.debug("BuyingRegionEvent: " + event.getPlayer().getName() + " is trying to buy " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void boughtRegion(BoughtRegionEvent event) {
+		AreaShop.debug("BoughtRegionEvent: " + event.getRegion().getPlayerName() + " bought " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void sellingRegion(SellingRegionEvent event) {
+		AreaShop.debug("SellingRegionEvent: " + event.getRegion().getRegionId() + " is trying to sell " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void soldRegion(SoldRegionEvent event) {
+		AreaShop.debug("SoldRegionEvent: " + Utils.toName(event.getOldBuyer()) + " sold " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void resellingRegion(ResellingRegionEvent event) {
+		AreaShop.debug("ResellingRegionEvent: " + event.getRegion().getRegionId() + " is trying to resell " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void resoldRegion(ResoldRegionEvent event) {
+		AreaShop.debug("ResoldRegionEvent: " + Utils.toName(event.getFromPlayer()) + " resold " + event.getRegion().getRegionId() + " to " + event.getRegion().getPlayerName());
+	}
+
+	@EventHandler
+	public void rentingRegion(RentingRegionEvent event) {
+		AreaShop.debug("RentingRegionEvent: " + event.getPlayer().getName() + " is trying to rent " + event.getRegion().getRegionId() + ", extending=" + event.isExtending());
+	}
+
+	@EventHandler
+	public void rentedRegion(RentedRegionEvent event) {
+		AreaShop.debug("RentedRegionEvent: " + event.getRegion().getPlayerName() + " rented " + event.getRegion().getRegionId() + ", extending=" + event.hasExtended());
+	}
+
+	@EventHandler
+	public void unrentingRegion(UnrentingRegionEvent event) {
+		AreaShop.debug("UnrentingRegionEvent: " + event.getRegion().getPlayerName() + " is trying to unrent " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void unrentedRegion(UnrentedRegionEvent event) {
+		AreaShop.debug("UnrentedRegionEvent: " + Utils.toName(event.getOldRenter()) + " unrented " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void regionUpdate(UpdateRegionEvent event) {
+		//AreaShop.debug("UpdateRegionEvent: " + event.getRegion().getName() + " updated");
+	}
+
+	@EventHandler
+	public void addedRegion(AddedRegionEvent event) {
+		AreaShop.debug("AddedRegionEvent: " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void removedRegion(DeletedRegionEvent event) {
+		AreaShop.debug("DeletedRegionEvent: " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void addedFriend(AddedFriendEvent event) {
+		AreaShop.debug("AddedFriendEvent: region " + event.getRegion().getRegionId() + ", " + event.getFriend().getName() + " by " + (event.getBy() == null ? "<nobody>" : event.getBy().getName()));
+	}
+
+	@EventHandler
+	public void deleteFriend(DeletedFriendEvent event) {
+		AreaShop.debug("DeletedFriendEvent: region " + event.getRegion().getRegionId() + ", " + event.getFriend().getName() + " by " + (event.getBy() == null ? "<nobody>" : event.getBy().getName()));
+	}
+}
@@ -1,19 +0,0 @@
-package me.wiefferink.areashop.features;
-
-import me.wiefferink.areashop.features.signs.SignsFeature;
-import me.wiefferink.areashop.regions.GeneralRegion;
-
-import javax.annotation.Nonnull;
-
-public interface FeatureFactory {
-
-    @Nonnull
-    SignsFeature createSignsFeature(@Nonnull GeneralRegion generalRegion);
-
-    @Nonnull
-    TeleportFeature createTeleportFeature(@Nonnull GeneralRegion generalRegion);
-
-    @Nonnull
-    FriendsFeature createFriendsFeature(@Nonnull GeneralRegion generalRegion);
-
-}
@@ -1,18 +1,12 @@
 package me.wiefferink.areashop.features;

-import com.google.inject.Inject;
-import com.google.inject.assistedinject.Assisted;
-import com.google.inject.assistedinject.AssistedInject;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.events.askandnotify.AddedFriendEvent;
 import me.wiefferink.areashop.events.askandnotify.DeletedFriendEvent;
-import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -21,12 +15,7 @@ import java.util.UUID;

 public class FriendsFeature extends RegionFeature {

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

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

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

@@ -1,12 +1,11 @@
 package me.wiefferink.areashop.features;

 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;

-import javax.annotation.Nonnull;
-
 /*
 Possible future feature classes:
 - RestrictedToRegion feature
@@ -29,19 +28,16 @@ Possible future feature classes:
 */

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

-	protected final AreaShop plugin;
-	private GeneralRegion region;
-
-	protected RegionFeature(@Nonnull AreaShop plugin) {
-		this.plugin = plugin;
-	}
+	protected YamlConfiguration config = plugin.getConfig();
+	private LegacyGeneralRegion region;

 	/**
 	 * Set the region for this feature.
 	 * @param region Feature region
 	 */
-	public void setRegion(GeneralRegion region) {
+	public void setRegion(LegacyGeneralRegion region) {
 		this.region = region;
 	}

@@ -49,7 +45,7 @@ public abstract class RegionFeature implements Listener {
 	 * Get the region of this feature.
 	 * @return region of this feature, or null if generic
 	 */
-	public GeneralRegion getRegion() {
+	public LegacyGeneralRegion getRegion() {
 		return region;
 	}

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

-import javax.annotation.Nonnull;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;

-@Singleton
 public class WorldGuardRegionFlagsFeature extends RegionFeature {

-	@Inject
-	private WorldGuardInterface worldGuardInterface;
-	@Inject
-	private WorldGuardPlugin worldGuard;
-	
-	@Inject
-	WorldGuardRegionFlagsFeature(@Nonnull AreaShop plugin) {
-		super(plugin);
-	}

 	@EventHandler
 	public void regionUpdate(UpdateRegionEvent event) {
@@ -44,7 +31,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 	 * @param region The region to update the flags for
 	 * @return true if the flags have been set correctly, otherwise false
 	 */
-	private boolean updateRegionFlags(GeneralRegion region) {
+	private boolean updateRegionFlags(LegacyGeneralRegion region) {
 		boolean result = true;

 		// Get section defining the region flag profile
@@ -63,7 +50,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 		ConfigurationSection stateFlags = flagProfileSection.getConfigurationSection(region.getState().getValue());

 		// If in reselling mode, fallback to 'resale' section if 'resell' is not found (legacy configuration problem: https://github.com/NLthijs48/AreaShop/issues/303)
-		if(stateFlags == null && region.getState() == GeneralRegion.RegionState.RESELL) {
+		if(stateFlags == null && region.getState() == RegionStatus.RESELL) {
 			stateFlags = flagProfileSection.getConfigurationSection("resale");
 		}
 		if(stateFlags != null) {
@@ -79,29 +66,30 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 	 * @param flags  The flags to apply
 	 * @return true if the flags have been set correctly, otherwise false
 	 */
-	private boolean updateRegionFlags(GeneralRegion region, ConfigurationSection flags) {
+	private boolean updateRegionFlags(LegacyGeneralRegion region, ConfigurationSection flags) {
 		boolean result = true;

 		Set<String> flagNames = flags.getKeys(false);
+		WorldGuardPlugin worldGuard = plugin.getWorldGuard();

 		// Get the region
 		ProtectedRegion worldguardRegion = region.getRegion();
 		if(worldguardRegion == null) {
-			AreaShop.debug("Region '" + region.getName() + "' does not exist, setting flags failed");
+			AreaShop.debug("Region '" + region.getRegionId() + "' does not exist, setting flags failed");
 			return false;
 		}
 		// Loop through all flags that are set in the config
 		for(String flagName : flagNames) {
 			String value = Message.fromString(flags.getString(flagName)).replacements(region).getPlain();
 			// In the config normal Bukkit color codes are used, those only need to be translated on 5.X WorldGuard versions
-			if(worldGuard.getDescription().getVersion().startsWith("5.")) {
+			if(plugin.getWorldGuard().getDescription().getVersion().startsWith("5.")) {
 				value = translateBukkitToWorldGuardColors(value);
 			}
 			if(flagName.equalsIgnoreCase("members")) {
-				worldGuardInterface.setMembers(worldguardRegion, parseAccessSet(value));
+				plugin.getWorldGuardHandler().setMembers(worldguardRegion, parseAccessSet(value));
 				//AreaShop.debug("  Flag " + flagName + " set: " + members.toUserFriendlyString());
 			} else if(flagName.equalsIgnoreCase("owners")) {
-				worldGuardInterface.setOwners(worldguardRegion, parseAccessSet(value));
+				plugin.getWorldGuardHandler().setOwners(worldguardRegion, parseAccessSet(value));
 				//AreaShop.debug("  Flag " + flagName + " set: " + owners.toUserFriendlyString());
 			} else if(flagName.equalsIgnoreCase("priority")) {
 				try {
@@ -136,7 +124,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 				String flagSetting = null;
 				com.sk89q.worldguard.protection.flags.RegionGroup groupValue = null;

-				Flag<?> foundFlag = worldGuardInterface.fuzzyMatchFlag(flagName);
+				Flag<?> foundFlag = plugin.getWorldGuardHandler().fuzzyMatchFlag(flagName);
 				if(foundFlag == null) {
 					AreaShop.warn("Found wrong flag in flagProfiles section: " + flagName + ", check if that is the correct WorldGuard flag");
 					continue;
@@ -158,7 +146,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 							if(part.startsWith("g:")) {
 								if(part.length() > 2) {
 									try {
-										groupValue = worldGuardInterface.parseFlagGroupInput(groupFlag, part.substring(2));
+										groupValue = plugin.getWorldGuardHandler().parseFlagGroupInput(groupFlag, part.substring(2));
 									} catch(InvalidFlagFormat e) {
 										AreaShop.warn("Found wrong group value for flag " + flagName);
 									}
@@ -242,7 +230,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 	 */
 	private <V> void setFlag(ProtectedRegion region, Flag<V> flag, String value) throws InvalidFlagFormat {
 		V current = region.getFlag(flag);
-		V next = worldGuardInterface.parseFlagInput(flag, value);
+		V next = plugin.getWorldGuardHandler().parseFlagInput(flag, value);

 		if(!Objects.equals(current, next)) {
 			region.setFlag(flag, next);
@@ -1,16 +1,13 @@
 package me.wiefferink.areashop.features.signs;

 import com.google.common.base.Objects;
-import com.google.inject.assistedinject.Assisted;
-import com.google.inject.assistedinject.AssistedInject;
-import io.github.bakedlibs.dough.blocks.BlockPosition;
 import io.papermc.lib.PaperLib;
+import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;
 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.managers.SignErrorLogger;
-import me.wiefferink.areashop.nms.BlockBehaviourHelper;
-import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.interfaces.BlockBehaviourHelper;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.util.ClickType;
 import me.wiefferink.areashop.tools.Materials;
-import me.wiefferink.areashop.tools.SignUtils;
 import me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.Bukkit;
@@ -26,270 +23,328 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;

-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;

 /**
 * Sign that is connected to a region to display information and interact with the region.
 */
 public class RegionSign {

-	private final BlockBehaviourHelper blockHelper;
-	private final SignErrorLogger errorLogger;
+    public static final BlockBehaviourHelper behaviourHelper = AreaShop.getInstance().getNMSHelper().behaviourHelper();
+    public static Level invalidSignLogLevel;
+    public static boolean removeInvalidSigns;

-	private final SignsFeature signsFeature;
-	private final String key;
+    static {
+        YamlConfiguration configuration = AreaShop.getInstance().getConfig();
+        removeInvalidSigns = configuration.getBoolean("signs.removeInvalid");
+        final String rawLogLevel = configuration.getString("signs.invalidSignLogLevel", "WARNING");
+        try {
+            assert rawLogLevel != null;
+            invalidSignLogLevel = Level.parse(rawLogLevel);
+        } catch (IllegalArgumentException ex) {
+            AreaShop.warn("Invalid Logging Level: " + rawLogLevel);
+            invalidSignLogLevel = Level.WARNING;
+        }
+    }


-	@AssistedInject
-	RegionSign(
-			@Nonnull BlockBehaviourHelper blockBehaviourHelper,
-			@Nonnull SignErrorLogger signErrorLogger,
-			@Assisted @Nonnull SignsFeature signsFeature,
-			@Assisted @Nonnull String key
-	) {
-		this.blockHelper = blockBehaviourHelper;
-		this.errorLogger = signErrorLogger;
-		this.signsFeature = signsFeature;
-		this.key = key;
-	}
+    private static boolean canLogSignError() {
+        return AreaShop.getInstance().getLogger().isLoggable(invalidSignLogLevel);
+    }

-	public BlockPosition getPosition() {
-		return new BlockPosition(getLocation());
-	}
+    private static void logSignError(String... messages) {
+        if (invalidSignLogLevel == Level.OFF) {
+            return;
+        }
+        if (invalidSignLogLevel == Level.SEVERE) {
+            AreaShop.error((Object) messages);
+        } else if (invalidSignLogLevel == Level.WARNING) {
+            AreaShop.warn((Object) messages);
+        } else if (invalidSignLogLevel.intValue() >= Level.FINE.intValue()) {
+            AreaShop.debug((Object) messages);
+        } else {
+            AreaShop.info((Object) messages);
+        }
+    }

-	/**
-	 * Get the location of this sign.
-	 * @return The location of this sign
-	 */
-	public Location getLocation() {
-		return Utils.configToLocation(getRegion().getConfig().getConfigurationSection("general.signs." + key + ".location"));
-	}
+    private final SignsFeature signsFeature;
+    private final String key;

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

-	/**
-	 * Chunk string to be used as key in maps.
-	 * @return Chunk string
-	 */
-	public String getStringChunk() {
-		return SignsFeature.chunkToString(getLocation());
-	}
+    /**
+     * Get the location of this sign.
+     *
+     * @return The location of this sign
+     */
+    public Location getLocation() {
+        return Utils.configToLocation(getRegion().getConfig().getConfigurationSection("general.signs." + key + ".location"));
+    }

-	/**
-	 * Get the region this sign is linked to.
-	 * @return The region this sign is linked to
-	 */
-	public GeneralRegion getRegion() {
-		return signsFeature.getRegion();
-	}
+    /**
+     * Location string to be used as key in maps.
+     *
+     * @return Location string
+     */
+    public String getStringLocation() {
+        return SignsFeature.locationToString(getLocation());
+    }

-	/**
-	 * Remove this sign from the region.
-	 */
-	public void remove() {
-		Location location = getLocation();
-		if (location != null && location.getWorld() != null) {
-			location.getBlock().setType(Material.AIR);
-			this.signsFeature.signManager().removeSign(this);
-		}
-		getRegion().setSetting("general.signs." + key, null);
-		// Remove the sign from the region's sign manager
-	}
+    /**
+     * Chunk string to be used as key in maps.
+     *
+     * @return Chunk string
+     */
+    public String getStringChunk() {
+        return SignsFeature.chunkToString(getLocation());
+    }

-	/**
-	 * Get the ConfigurationSection defining the sign layout.
-	 * @return The sign layout config
-	 */
-	public ConfigurationSection getProfile() {
-		return getRegion().getConfigurationSectionSetting("general.signProfile", "signProfiles", getRegion().getConfig().get("general.signs." + key + ".profile"));
-	}
+    /**
+     * Get the region this sign is linked to.
+     *
+     * @return The region this sign is linked to
+     */
+    public LegacyGeneralRegion getRegion() {
+        return signsFeature.getRegion();
+    }

-	/**
-	 * Get the facing of the sign as saved in the config.
-	 * @return BlockFace the sign faces, or null if unknown
-	 */
-	public BlockFace getFacing() {
-		try {
-			return BlockFace.valueOf(getRegion().getConfig().getString("general.signs." + key + ".facing"));
-		} catch(NullPointerException | IllegalArgumentException e) {
-			return null;
-		}
-	}
+    /**
+     * Remove this sign from the region.
+     */
+    public void remove() {
+        final Block block = getLocation().getBlock();
+        if (block.getType() == getMaterial()) {
+            // If removing a valid sign, replace with air, otherwise ignore.
+            block.setType(Material.AIR);
+        }
+        signsFeature.getSignsRef().remove(getStringLocation());
+        SignsFeature.getAllSigns().remove(getStringLocation());
+        SignsFeature.getSignsByChunk().get(getStringChunk()).remove(this);
+        getRegion().setSetting("general.signs." + key, null);
+    }

-	/**
-	 * Get the material of the sign as saved in the config.
-	 * @return Material of the sign,Material.AIR if none.
-	 */
-	public Material getMaterial() {
-		String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
-		Material result = Materials.signNameToMaterial(name);
-		return result == null ? Material.AIR : result;
-	}
+    /**
+     * Get the ConfigurationSection defining the sign layout.
+     *
+     * @return The sign layout config
+     */
+    public ConfigurationSection getProfile() {
+        return getRegion().getConfigurationSectionSetting("general.signProfile", "signProfiles", getRegion().getConfig().get("general.signs." + key + ".profile"));
+    }

-	/**
-	 * Update this sign.
-	 * @return true if the update was successful, otherwise false
-	 */
-	public boolean update() {
-		// Ignore updates of signs in chunks that are not loaded
-		Location signLocation = getLocation();
-		if(signLocation == null
-				|| signLocation.getWorld() == null
-				|| !signLocation.getWorld().isChunkLoaded(signLocation.getBlockX() >> 4, signLocation.getBlockZ() >> 4)) {
-			return false;
-		}
+    /**
+     * Get the facing of the sign as saved in the config.
+     *
+     * @return BlockFace the sign faces, or null if unknown
+     */
+    public BlockFace getFacing() {
+        try {
+            return BlockFace.valueOf(getRegion().getConfig().getString("general.signs." + key + ".facing"));
+        } catch (NullPointerException | IllegalArgumentException e) {
+            return null;
+        }
+    }

-		if(getRegion().isDeleted()) {
-			return false;
-		}
+    /**
+     * Get the material of the sign as saved in the config.
+     *
+     * @return Material of the sign, usually, a sign or {@link Material#AIR} if none.
+     */
+    public Material getMaterial() {
+        String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
+        Material result = Materials.signNameToMaterial(name);
+        return result == null ? Material.AIR : result;
+    }

-		YamlConfiguration regionConfig = getRegion().getConfig();
-		ConfigurationSection signConfig = getProfile();
-		Block block = signLocation.getBlock();
-		if(signConfig == null || !signConfig.isSet(getRegion().getState().getValue())) {
-			block.setType(Material.AIR);
-			return true;
-		}
+    /**
+     * Update this sign.
+     *
+     * @return true if the update was successful, otherwise false
+     */
+    public boolean update() {

-		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
+        // Ignore updates of signs in chunks that are not loaded
+        Location signLocation = getLocation();
+        if (signLocation == null
+                || signLocation.getWorld() == null
+                || !signLocation.getWorld().isChunkLoaded(signLocation.getBlockX() >> 4, signLocation.getBlockZ() >> 4)) {
+            return false;
+        }

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

-		// Place the sign back (with proper rotation and type) after it has been hidden or (indirectly) destroyed
-		if(!Materials.isSign(block.getType())) {
-			Material signType = getMaterial();
-			if (!blockHelper.canPlace(block.getLocation(), Bukkit.createBlockData(signType))) {
-				errorLogger.submitWarning("Setting sign" +  key +  "of region" + getRegion().getName() +  "failed, could not set sign block back");
-				this.remove();
-				return false;
-			}
-			// Don't do physics here, we first need to update the direction
-			block.setType(signType, false);
+        if (region.isDeleted()) {
+            return false;
+        }

-			BlockState blockState = PaperLib.getBlockState(block, false).getState();
-			BlockData blockData = blockState.getBlockData();
+        YamlConfiguration regionConfig = region.getConfig();
+        ConfigurationSection signConfig = getProfile();
+        Block block = signLocation.getBlock();
+        final String value = region.getState().getValue();
+        if (signConfig == null || !signConfig.isSet(value)) {
+            block.setType(Material.AIR);
+            return true;
+        }

-			if(blockData instanceof WallSign) {
-				((WallSign) blockData).setFacing(getFacing());
-			} else if(blockData instanceof org.bukkit.block.data.type.Sign) {
-				((org.bukkit.block.data.type.Sign) blockData).setRotation(getFacing());
-			} else {
-				errorLogger.submitWarning("Failed to update the facing direction of the sign at" + getStringLocation() + "to " + getFacing() + ", region:" + getRegion().getName());
-				return false;
-			}
-			block.setBlockData(blockData);
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(value);

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

-		// Save current rotation and type
-		if(!regionConfig.isString("general.signs." + key + ".signType")) {
-			getRegion().setSetting("general.signs." + key + ".signType", block.getType().name());
-		}
-		if(!regionConfig.isString("general.signs." + key + ".facing")) {
-			BlockFace signFacing = SignUtils.getSignFacing(block);
-			getRegion().setSetting("general.signs." + key + ".facing", signFacing == null ? null : signFacing.toString());
-		}
+        final BlockStateSnapshotResult snapshot = PaperLib.getBlockState(block, true);
+        final BlockState blockState = snapshot.getState();
+        final BlockData blockData = blockState.getBlockData();

-		// Apply replacements and color and then set it on the sign
-		Sign signState = (Sign) PaperLib.getBlockState(block, false).getState();
-		for(int i = 0; i < signLines.length; i++) {
-			if(signLines[i] == null) {
-				signState.setLine(i, "");
-				continue;
-			}
-			signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
-			signLines[i] = Utils.applyColors(signLines[i]);
-			signState.setLine(i, signLines[i]);
-		}
-		signState.update(false, false);
-		return true;
-	}
+        // Place the sign back (with proper rotation and type) after it has been hidden or (indirectly) destroyed
+        if (!Materials.isSign(block.getType())) {
+            Material signType = getMaterial();
+            if (Materials.isSign(signType)) {
+                // Don't do physics here, we first need to update the direction
+                blockState.setType(signType);
+                if (blockData instanceof WallSign) {
+                    ((WallSign) blockData).setFacing(getFacing());
+                } else if (blockData instanceof Sign) {
+                    ((org.bukkit.block.data.type.Sign) blockData).setRotation(getFacing());
+                }
+                if (behaviourHelper.canPlace(block.getLocation(), blockData)) {
+                    blockState.setBlockData(blockData);
+                    // Update the block if its valid but don't apply physics
+                    blockState.update(true, false);
+                } else {
+                    if (canLogSignError()) {
+                        logSignError("Setting sign", key, "of region", region.getRegionId(), "failed, could not set sign block back");
+                    }
+                    if (removeInvalidSigns) {
+                        remove();
+                    }
+                    return false;
+                }
+            } else {
+                if (canLogSignError()) {
+                    logSignError("Setting sign", key, "of region", region.getRegionId(), "failed, RegionSign material was: " + signType.name());
+                }
+                if (removeInvalidSigns) {
+                    remove();
+                    return false;
+                }
+            }
+        }

-	/**
-	 * Check if the sign needs to update periodically.
-	 * @return true if it needs periodic updates, otherwise false
-	 */
-	public boolean needsPeriodicUpdate() {
-		ConfigurationSection signConfig = getProfile();
-		if(signConfig == null || !signConfig.isSet(getRegion().getState().getValue().toLowerCase())) {
-			return false;
-		}
+        // Save current rotation and type
+        if (!regionConfig.isString("general.signs." + key + ".signType")) {
+            region.setSetting("general.signs." + key + ".signType", blockState.getType().name());
+        }
+        if (!regionConfig.isString("general.signs." + key + ".facing")) {
+            final BlockFace rotation;
+            if (Materials.isSign(block.getType())) {
+                if (blockData instanceof org.bukkit.block.data.type.Sign) {
+                    rotation = ((org.bukkit.block.data.type.Sign) blockData).getRotation();
+                } else if (blockData instanceof WallSign) {
+                    rotation = ((WallSign) blockData).getFacing();
+                } else {
+                    rotation = null;
+                }
+            } else {
+                rotation = null;
+            }
+            region.setSetting("general.signs." + key + ".facing", rotation == null ? null : rotation.toString());
+        }

-		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
-		if(stateConfig == null) {
-			return false;
-		}
+        // Apply replacements and color and then set it on the sign
+        Sign signState = (Sign) blockState;
+        for (int i = 0; i < signLines.length; i++) {
+            if (signLines[i] == null) {
+                signState.setLine(i, "");
+                continue;
+            }
+            signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
+            signLines[i] = Utils.applyColors(signLines[i]);
+            signState.setLine(i, signLines[i]);
+        }
+        // BlockState#update *should* return true here.
+        return blockState.update(true, false);
+    }

-		// Check the lines for the timeleft tag
-		for(int i = 1; i <= 4; i++) {
-			String line = stateConfig.getString("line" + i);
-			if(line != null && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
-				return true;
-			}
-		}
-		return false;
-	}
+    /**
+     * 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, ClickType clickType) {
+        ConfigurationSection signConfig = getProfile();
+        if (signConfig == null) {
+            return false;
+        }
+        final LegacyGeneralRegion region = getRegion();
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(region.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()));
+        }
+        region.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()));
+        }
+        region.runCommands(Bukkit.getConsoleSender(), consoleCommands);

-	@Override
-	public int hashCode() {
-		return Objects.hashCode(key, getRegion().getName());
-	}
+        return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        return object instanceof RegionSign && ((RegionSign) object).getRegion().equals(this.getRegion()) && ((RegionSign) object).key.equals(this.key);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(key, getRegion().getRegionId());
+    }
 }
@@ -1,81 +1,523 @@
-package me.wiefferink.areashop.features.signs;
-
-import io.github.bakedlibs.dough.blocks.BlockPosition;
-import io.github.bakedlibs.dough.blocks.ChunkPosition;
-import org.bukkit.Location;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-
-public class SignCache {
-
-    private final Map<Long, RegionSign> allSigns = new HashMap<>();
-    private final Map<Long, Collection<RegionSign>> signsByChunk = new HashMap<>();
-
-    public Optional<RegionSign> signAtLocation(long position) {
-        return Optional.ofNullable(this.allSigns.get(position));
-    }
-
-    public Collection<RegionSign> signsAtChunk(long position) {
-        return Collections.unmodifiableCollection(this.signsByChunk.getOrDefault(position, Collections.emptyList()));
-    }
-
-    public Collection<RegionSign> allSigns() {
-        return Collections.unmodifiableCollection(this.allSigns.values());
-    }
-
-    public Collection<BlockPosition> allSignLocations() {
-        Collection<BlockPosition> positions = new ArrayList<>(this.signsByChunk.size());
-        for (RegionSign sign : this.allSigns.values()) {
-            positions.add(sign.getPosition());
-        }
-        return positions;
-    }
-
-    public void addSign(RegionSign regionSign) {
-        BlockPosition blockPosition = regionSign.getPosition();
-        this.allSigns.put(blockPosition.getPosition(), regionSign);
-        ChunkPosition chunkPosition = new ChunkPosition(blockPosition.getChunk());
-        Collection<RegionSign> signs = this.signsByChunk.computeIfAbsent(chunkPosition.getPosition(), x -> new HashSet<>());
-        signs.add(regionSign);
-    }
-
-    public Optional<RegionSign> removeSign(Location location) {
-        return removeSign(new BlockPosition(location));
-    }
-
-    public Optional<RegionSign> removeSign(BlockPosition position) {
-        RegionSign removed = this.allSigns.remove(position.getPosition());
-        if (removed != null) {
-            Location location = position.toLocation();
-            this.signsByChunk.remove(new ChunkPosition(location).getPosition());
-            // Remove the sign from the region
-        }
-        return Optional.ofNullable(removed);
-    }
-
-    public void removeSign(RegionSign regionSign) {
-        BlockPosition blockPosition = regionSign.getPosition();
-        this.allSigns.remove(blockPosition.getPosition());
-        ChunkPosition chunkPosition = new ChunkPosition(blockPosition.getChunk());
-        long packedChunkPos = chunkPosition.getPosition();
-        Collection<RegionSign> signs = this.signsByChunk.get(packedChunkPos);
-        if (signs != null) {
-            signs.remove(regionSign);
-            if (signs.isEmpty()) {
-                this.signsByChunk.remove(packedChunkPos);
-            }
-        }
-    }
-
-    public void clear() {
-        this.allSigns.clear();
-        this.signsByChunk.clear();
-    }
-
-}
+package me.wiefferink.areashop.features.signs;
+
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
+import me.wiefferink.areashop.interfaces.BlockBehaviourHelper;
+import me.wiefferink.areashop.managers.FileManager;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.util.ClickType;
+import me.wiefferink.areashop.regions.util.RegionEvent;
+import me.wiefferink.areashop.regions.util.RegionType;
+import me.wiefferink.areashop.tools.Materials;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Sign;
+import org.bukkit.block.data.type.WallSign;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.block.SignChangeEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.world.ChunkLoadEvent;
+
+import java.util.*;
+
+public class SignCache implements Listener {
+
+    private final Map<String, RegionSign> allSigns = new HashMap<>();
+    private final Map<String, List<RegionSign>> signsByChunk = new HashMap<>();
+    private final BlockBehaviourHelper behaviourHelper = AreaShop.getInstance().getNMSHelper().behaviourHelper();
+    private final AreaShop plugin = AreaShop.getInstance();
+
+    public void registerListeners() {
+        Bukkit.getPluginManager().registerEvents(this, AreaShop.getInstance());
+    }
+
+    /**
+     * Convert a location to a string to use as map key.
+     *
+     * @param location The location to get the key for
+     * @return A string to use in a map for a location
+     */
+    public static String locationToString(Location location) {
+        return location.getWorld().getName() + ";" + location.getBlockX() + ";" + location.getBlockY() + ";" + location.getBlockZ();
+    }
+
+    /**
+     * Convert a chunk to a string to use as map key.
+     *
+     * @param location The location to get the key for
+     * @return A string to use in a map for a chunk
+     */
+    public static String chunkToString(Location location) {
+        return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
+    }
+
+    /**
+     * Convert a chunk to a string to use as map key.
+     * Use a Location argument to prevent chunk loading!
+     *
+     * @param chunk The location to get the key for
+     * @return A string to use in a map for a chunk
+     */
+    public static String chunkToString(Chunk chunk) {
+        return chunk.getWorld().getName() + ";" + chunk.getX() + ";" + chunk.getZ();
+    }
+
+    /**
+     * Get a sign by a location.
+     *
+     * @param location The location to get the sign for
+     * @return The RegionSign that is at the location, or null if none
+     */
+    public RegionSign getSignByLocation(Location location) {
+        return allSigns.get(locationToString(location));
+    }
+
+    /**
+     * Get the map with all signs.
+     *
+     * @return Map with all signs: locationString -&gt; RegionSign
+     */
+    public Map<String, RegionSign> getAllSigns() {
+        return allSigns;
+    }
+
+    /**
+     * Get the map with signs by chunk.
+     *
+     * @return Map with signs by chunk: chunkString -&gt; List&lt;RegionSign&gt;
+     */
+    public Map<String, List<RegionSign>> getSignsByChunk() {
+        return signsByChunk;
+    }
+
+    public void addSign(RegionSign regionSign) {
+        signsByChunk.computeIfAbsent(regionSign.getStringChunk(), (unused) -> new ArrayList<>()).add(regionSign);
+    }
+
+    public void removeSign(RegionSign regionSign) {
+        final List<RegionSign> signs = signsByChunk.get(regionSign.getStringChunk());
+        if (signs != null) {
+            signs.remove(regionSign);
+        }
+        allSigns.remove(regionSign.getStringLocation());
+    }
+
+    public void shutdown() {
+        HandlerList.unregisterAll(this);
+        signsByChunk.clear();
+        allSigns.clear();
+    }
+
+    @EventHandler
+    public void regionUpdate(UpdateRegionEvent event) {
+        event.getRegion().getSignsFeature().update();
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onIndirectSignBreak(BlockPhysicsEvent event) {
+        // Check if the block is a sign
+        if (!Materials.isSign(event.getBlock().getType())) {
+            return;
+        }
+        final Block block = event.getBlock();
+
+        // Check if the sign is really the same as a saved rent
+        RegionSign regionSign = SignsFeature.getSignByLocation(event.getBlock().getLocation());
+        if (regionSign == null) {
+            return;
+        }
+        // If the block is in an invalid position then we remove the sign
+        if (!behaviourHelper.isBlockValid(block)) {
+            regionSign.remove();
+        }
+
+        // Remove the sign so that it does not fall on the floor as an item (next region update will place it back when possible)
+        AreaShop.debug("onIndirectSignBreak: Removed block of sign for", regionSign.getRegion().getRegionId(), "at", regionSign.getStringLocation());
+        event.getBlock().setType(Material.AIR);
+        event.setCancelled(true);
+    }
+
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onChunkLoad(ChunkLoadEvent event) {
+        List<RegionSign> chunkSigns = signsByChunk.get(chunkToString(event.getChunk()));
+        if (chunkSigns == null) {
+            return;
+        }
+        int batchSize = Math.max(chunkSigns.size() / 10, 10);
+        Utils.runAsBatches(chunkSigns, batchSize, RegionSign::update, false);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onSignBreak(BlockBreakEvent event) {
+        Block block = event.getBlock();
+        // Check if it is a sign
+        if (Materials.isSign(block.getType())) {
+            // Check if the rent sign is really the same as a saved rent
+            RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+            if (regionSign == null) {
+                return;
+            }
+            if (regionSign.getRegion().invalidated()) {
+                AreaShop.warn("SignsFeature: Sign feature for an invalidated region object is still active!");
+            }
+            // Remove the sign of the rental region if the player has permission
+            if (event.getPlayer().hasPermission("areashop.delsign")) {
+                regionSign.remove();
+                plugin.message(event.getPlayer(), "delsign-success", regionSign.getRegion());
+            } else { // Cancel the breaking of the sign
+                event.setCancelled(true);
+                plugin.message(event.getPlayer(), "delsign-noPermission", regionSign.getRegion());
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onSignClick(PlayerInteractEvent event) {
+        Block block = event.getClickedBlock();
+        if (block == null) {
+            return;
+        }
+
+        // Only listen to left and right clicks on blocks
+        if (!(event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)) {
+            return;
+        }
+
+        // Only care about clicking blocks
+        if (!Materials.isSign(block.getType())) {
+            return;
+        }
+
+        // Check if this sign belongs to a region
+        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+        if (regionSign == null) {
+            return;
+        }
+
+        // Ignore players that are in sign link mode (which will handle the event itself)
+        Player player = event.getPlayer();
+        if (plugin.getSignlinkerManager().isInSignLinkMode(player)) {
+            return;
+        }
+
+        // Get the clicktype
+        ClickType clickType = null;
+        if (player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
+            clickType = ClickType.SHIFTLEFTCLICK;
+        } else if (!player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
+            clickType = ClickType.LEFTCLICK;
+        } else if (player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            clickType = ClickType.SHIFTRIGHTCLICK;
+        } else if (!player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            clickType = ClickType.RIGHTCLICK;
+        }
+
+        boolean ran = regionSign.runSignCommands(player, clickType);
+
+        // Only cancel event if at least one command has been executed
+        event.setCancelled(ran);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onSignChange(SignChangeEvent event) {
+        Player player = event.getPlayer();
+        if (!plugin.isReady()) {
+            plugin.message(player, "general-notReady");
+            return;
+        }
+
+        final BlockFace rotation;
+        final BlockData data = event.getBlock().getBlockData();
+        if (data instanceof Sign) {
+            rotation = ((Sign) data).getRotation();
+        } else if (data instanceof WallSign) {
+            rotation = ((WallSign) data).getFacing();
+        } else {
+            rotation = null;
+        }
+
+        final String line0 = event.getLine(0) == null ? "" : event.getLine(0);
+
+        // Check if the sign is meant for this plugin
+        if (line0.contains(plugin.getConfig().getString("signTags.rent"))) {
+            if (!player.hasPermission("areashop.createrent")
+                    && !player.hasPermission("areashop.createrent.member")
+                    && !player.hasPermission("areashop.createrent.owner")) {
+                plugin.message(player, "setup-noPermissionRent");
+                return;
+            }
+
+            // Get the other lines
+            String secondLine = event.getLine(1);
+            String thirdLine = event.getLine(2);
+            String fourthLine = event.getLine(3);
+
+            // Get the regionManager for accessing regions
+            RegionManager regionManager = plugin.getRegionManager(event.getPlayer().getWorld());
+
+            // If the secondLine does not contain a name try to find the region by location
+            if (secondLine == null || secondLine.isEmpty()) {
+                Set<ProtectedRegion> regions = plugin.getWorldGuardHandler().getApplicableRegionsSet(event.getBlock().getLocation());
+                if (regions != null) {
+                    boolean first = true;
+                    ProtectedRegion candidate = null;
+                    for (ProtectedRegion pr : regions) {
+                        if (first) {
+                            candidate = pr;
+                            first = false;
+                        } else {
+                            if (pr.getPriority() > candidate.getPriority()) {
+                                candidate = pr;
+                            } else if (pr.getParent() != null && pr.getParent().equals(candidate)) {
+                                candidate = pr;
+                            } else {
+                                plugin.message(player, "setup-couldNotDetect", candidate.getId(), pr.getId());
+                                return;
+                            }
+                        }
+                    }
+                    if (candidate != null) {
+                        secondLine = candidate.getId();
+                    }
+                }
+            }
+
+            boolean priceSet = fourthLine != null && !fourthLine.isEmpty();
+            boolean durationSet = thirdLine != null && !thirdLine.isEmpty();
+            // check if all the lines are correct
+            if (secondLine == null || secondLine.isEmpty()) {
+                plugin.message(player, "setup-noRegion");
+                return;
+            }
+            ProtectedRegion region = regionManager.getRegion(secondLine);
+            if (region == null) {
+                plugin.message(player, "cmd-noRegion", secondLine);
+                return;
+            }
+
+            FileManager.AddResult addResult = plugin.getFileManager().checkRegionAdd(player, regionManager.getRegion(secondLine), event.getPlayer().getWorld(), RegionType.RENT);
+
+            switch (addResult) {
+                case BLACKLISTED:
+                    plugin.message(player, "setup-blacklisted", secondLine);
+                    break;
+                case ALREADYADDED:
+                    plugin.message(player, "setup-alreadyRentSign");
+                    break;
+                case ALREADYADDEDOTHERWORLD:
+                    plugin.message(player, "setup-alreadyOtherWorld");
+                    break;
+                case NOPERMISSION:
+                    plugin.message(player, "setup-noPermission", secondLine);
+                    break;
+                default:
+                    if (thirdLine != null && !thirdLine.isEmpty() && !Utils.checkTimeFormat(thirdLine)) {
+                        plugin.message(player, "setup-wrongDuration");
+                        break;
+                    }
+                    double price = 0.0;
+                    if (priceSet) {
+                        // Check the fourth line
+                        try {
+                            price = Double.parseDouble(fourthLine);
+                        } catch (NumberFormatException e) {
+                            plugin.message(player, "setup-wrongPrice");
+                            return;
+                        }
+                    }
+
+                    // Add rent to the FileManager
+                    final RentRegion rent = new RentRegion(secondLine, event.getPlayer().getWorld());
+                    boolean isMember = plugin.getWorldGuardHandler().containsMember(rent.getRegion(), player.getUniqueId());
+                    boolean isOwner = plugin.getWorldGuardHandler().containsOwner(rent.getRegion(), player.getUniqueId());
+                    boolean landlord = (!player.hasPermission("areashop.createrent")
+                            && ((player.hasPermission("areashop.createrent.owner") && isOwner)
+                            || (player.hasPermission("areashop.createrent.member") && isMember)));
+
+                    if (landlord) {
+                        rent.setLandlord(player.getUniqueId(), player.getName());
+                    }
+                    if (priceSet) {
+                        rent.setPrice(price);
+                    }
+                    if (durationSet) {
+                        rent.setDuration(thirdLine);
+                    }
+                    rent.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), rotation, null);
+
+                    AddingRegionEvent addingRegionEvent = plugin.getFileManager().addRegion(rent);
+                    if (addingRegionEvent.isCancelled()) {
+                        plugin.message(player, "general-cancelled", addingRegionEvent.getReason());
+                        return;
+                    }
+
+                    rent.handleSchematicEvent(RegionEvent.CREATED);
+                    plugin.message(player, "setup-rentSuccess", rent);
+                    // Update the region after the event has written its lines
+                    Bukkit.getScheduler().runTask(plugin, rent::update);
+
+            }
+        } else if (line0.contains(plugin.getConfig().getString("signTags.buy"))) {
+            // Check for permission
+            if (!player.hasPermission("areashop.createbuy") && !player.hasPermission("areashop.createbuy.member") && !player.hasPermission("areashop.createbuy.owner")) {
+                plugin.message(player, "setup-noPermissionBuy");
+                return;
+            }
+
+            // Get the other lines
+            String secondLine = event.getLine(1);
+            String thirdLine = event.getLine(2);
+
+            // Get the regionManager for accessing regions
+            RegionManager regionManager = plugin.getRegionManager(event.getPlayer().getWorld());
+
+            // If the secondLine does not contain a name try to find the region by location
+            if (secondLine == null || secondLine.isEmpty()) {
+                Set<ProtectedRegion> regions = plugin.getWorldGuardHandler().getApplicableRegionsSet(event.getBlock().getLocation());
+                if (regions != null) {
+                    boolean first = true;
+                    ProtectedRegion candidate = null;
+                    for (ProtectedRegion pr : regions) {
+                        if (first) {
+                            candidate = pr;
+                            first = false;
+                        } else {
+                            if (pr.getPriority() > candidate.getPriority()) {
+                                candidate = pr;
+                            } else if (pr.getParent() != null && pr.getParent().equals(candidate)) {
+                                candidate = pr;
+                            } else {
+                                plugin.message(player, "setup-couldNotDetect", candidate.getId(), pr.getId());
+                                return;
+                            }
+                        }
+                    }
+                    if (candidate != null) {
+                        secondLine = candidate.getId();
+                    }
+                }
+            }
+
+            boolean priceSet = thirdLine != null && !thirdLine.isEmpty();
+            // Check if all the lines are correct
+            if (secondLine == null || secondLine.isEmpty()) {
+                plugin.message(player, "setup-noRegion");
+                return;
+            }
+            ProtectedRegion region = regionManager.getRegion(secondLine);
+            if (region == null) {
+                plugin.message(player, "cmd-noRegion", secondLine);
+                return;
+            }
+            FileManager.AddResult addResult = plugin.getFileManager().checkRegionAdd(player, region, event.getPlayer().getWorld(), RegionType.BUY);
+            if (addResult == FileManager.AddResult.BLACKLISTED) {
+                plugin.message(player, "setup-blacklisted", secondLine);
+            } else if (addResult == FileManager.AddResult.ALREADYADDED) {
+                plugin.message(player, "setup-alreadyRentSign");
+            } else if (addResult == FileManager.AddResult.ALREADYADDEDOTHERWORLD) {
+                plugin.message(player, "setup-alreadyOtherWorld");
+            } else if (addResult == FileManager.AddResult.NOPERMISSION) {
+                plugin.message(player, "setup-noPermission", secondLine);
+            } else {
+                double price = 0.0;
+                if (priceSet) {
+                    // Check the fourth line
+                    try {
+                        price = Double.parseDouble(thirdLine);
+                    } catch (NumberFormatException e) {
+                        plugin.message(player, "setup-wrongPrice");
+                        return;
+                    }
+                }
+
+                // Add buy to the FileManager
+                final BuyRegion buy = new BuyRegion(secondLine, event.getPlayer().getWorld());
+                boolean isMember = plugin.getWorldGuardHandler().containsMember(buy.getRegion(), player.getUniqueId());
+                boolean isOwner = plugin.getWorldGuardHandler().containsOwner(buy.getRegion(), player.getUniqueId());
+                boolean landlord = (!player.hasPermission("areashop.createbuy")
+                        && ((player.hasPermission("areashop.createbuy.owner") && isOwner)
+                        || (player.hasPermission("areashop.createbuy.member") && isMember)));
+
+                if (landlord) {
+                    buy.setLandlord(player.getUniqueId(), player.getName());
+                }
+                if (priceSet) {
+                    buy.setPrice(price);
+                }
+                buy.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), rotation, null);
+
+                AddingRegionEvent addingRegionEvent = plugin.getFileManager().addRegion(buy);
+                if (addingRegionEvent.isCancelled()) {
+                    plugin.message(player, "general-cancelled", addingRegionEvent.getReason());
+                    return;
+                }
+
+                buy.handleSchematicEvent(RegionEvent.CREATED);
+                plugin.message(player, "setup-buySuccess", buy);
+                // Update the region after the event has written its lines
+                Bukkit.getScheduler().runTask(plugin, buy::update);
+            }
+        } else if (event.getLine(0).contains(plugin.getConfig().getString("signTags.add"))) {
+            // Check for permission
+            if (!player.hasPermission("areashop.addsign")) {
+                plugin.message(player, "addsign-noPermission");
+                return;
+            }
+
+            // Get the other lines
+            String secondLine = event.getLine(1);
+            String thirdLine = event.getLine(2);
+
+            LegacyGeneralRegion region;
+            if (secondLine != null && !secondLine.isEmpty()) {
+                // Get region by secondLine of the sign
+                region = plugin.getFileManager().getRegion(secondLine);
+                if (region == null) {
+                    plugin.message(player, "addSign-notRegistered", secondLine);
+                    return;
+                }
+            } else {
+                // Get region by sign position
+                List<LegacyGeneralRegion> regions = Utils.getImportantRegions(event.getBlock().getLocation());
+                if (regions.isEmpty()) {
+                    plugin.message(player, "addsign-noRegions");
+                    return;
+                } else if (regions.size() > 1) {
+                    plugin.message(player, "addsign-couldNotDetectSign", regions.get(0).getRegionId(), regions.get(1).getRegionId());
+                    return;
+                }
+                region = regions.get(0);
+            }
+            String profile = thirdLine == null || thirdLine.isEmpty() ? null : thirdLine;
+            region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), rotation, profile);
+            if (profile == null) {
+                plugin.message(player, "addsign-success", region);
+            } else {
+                plugin.message(player, "addsign-successProfile", thirdLine, region);
+            }
+
+            // Update the region later because this event will do it first
+            Bukkit.getScheduler().runTask(plugin, region::update);
+        }
+    }
+
+}
@@ -1,10 +0,0 @@
-package me.wiefferink.areashop.features.signs;
-
-
-import javax.annotation.Nonnull;
-
-public interface SignFactory {
-
-    @Nonnull RegionSign createRegionSign(@Nonnull SignsFeature signsFeature, @Nonnull String key);
-
-}
@@ -1,450 +0,0 @@
-package me.wiefferink.areashop.features.signs;
-
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import io.github.bakedlibs.dough.blocks.ChunkPosition;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.events.ask.AddingRegionEvent;
-import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.managers.SignLinkerManager;
-import me.wiefferink.areashop.nms.BlockBehaviourHelper;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RegionFactory;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.Materials;
-import me.wiefferink.areashop.tools.SignUtils;
-import me.wiefferink.areashop.tools.Utils;
-import me.wiefferink.bukkitdo.Do;
-import org.bukkit.Chunk;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockPhysicsEvent;
-import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.world.ChunkLoadEvent;
-
-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-public class SignListener implements Listener {
-
-    private final BlockBehaviourHelper behaviourHelper;
-    private final AreaShop plugin;
-    private final MessageBridge messageBridge;
-    private final SignManager signManager;
-    private final SignLinkerManager signLinkerManager;
-    private final WorldGuardInterface worldGuardInterface;
-    private final RegionFactory regionFactory;
-    private final IFileManager fileManager;
-
-    public SignListener(
-                        @Nonnull AreaShop plugin,
-                        @Nonnull BlockBehaviourHelper behaviourHelper,
-                        @Nonnull RegionFactory regionFactory,
-                        @Nonnull MessageBridge messageBridge,
-                        @Nonnull SignLinkerManager signLinkerManager,
-                        @Nonnull WorldGuardInterface worldGuardInterface,
-                        @Nonnull SignManager signManager,
-                        @Nonnull IFileManager fileManager) {
-        this.fileManager = fileManager;
-        this.signManager = signManager;
-        this.signLinkerManager = signLinkerManager;
-        this.regionFactory = regionFactory;
-        this.behaviourHelper = behaviourHelper;
-        this.plugin = plugin;
-        this.worldGuardInterface = worldGuardInterface;
-        this.messageBridge = messageBridge;
-    }
-
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
-    public void regionUpdate(UpdateRegionEvent event) {
-        Optional<SignsFeature> signsFeature = event.getRegion().getFeature(SignsFeature.class);
-        signsFeature.map(SignsFeature::signManager).ifPresent(SignManager::update);
-    }
-
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onChunkLoad(ChunkLoadEvent event) {
-        Chunk chunk = event.getChunk();
-        Optional<SignCache> optional = this.signManager.getCacheForWorld(chunk.getWorld());
-        if (optional.isEmpty()) {
-            return;
-        }
-        final SignCache signCache = optional.get();
-        Collection<RegionSign> chunkSigns = new ArrayList<>(signCache.signsAtChunk(ChunkPosition.getAsLong(chunk.getX(), chunk.getZ())));
-        if(chunkSigns.isEmpty()) {
-            return;
-        }
-        Do.forAll(chunkSigns, RegionSign::update);
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onIndirectSignBreak(BlockPhysicsEvent event) {
-        // Check if the block is a sign
-        if(!Materials.isSign(event.getBlock().getType()) || behaviourHelper.isBlockValid(event.getBlock())) {
-            return;
-        }
-
-        // Check if the sign is really the same as a saved rent
-        final Optional<RegionSign> optionalSign = this.signManager.signFromLocation(event.getBlock().getLocation());
-        if(optionalSign.isEmpty()) {
-            return;
-        }
-        RegionSign regionSign = optionalSign.get();
-
-        // Remove the sign so that it does not fall on the floor as an item (next region update will place it back when possible)
-        AreaShop.debug("onIndirectSignBreak: Removed block of sign for", regionSign.getRegion().getName(), "at", regionSign.getStringLocation());
-        event.getBlock().setType(Material.AIR);
-        event.setCancelled(true);
-    }
-
-
-
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onSignBreak(BlockBreakEvent event) {
-        if(event.isCancelled()) {
-            return;
-        }
-        Block block = event.getBlock();
-        // Check if it is a sign
-        if(Materials.isSign(block.getType())) {
-            // Check if the rent sign is really the same as a saved rent
-            Optional<RegionSign> optional = signManager.signFromLocation(block.getLocation());
-            if(optional.isEmpty()) {
-                return;
-            }
-            RegionSign regionSign = optional.get();
-            // Remove the sign of the rental region if the player has permission
-            if(event.getPlayer().hasPermission("areashop.delsign")) {
-                signManager.removeSign(regionSign);
-                messageBridge.message(event.getPlayer(), "delsign-success", regionSign.getRegion());
-            } else { // Cancel the breaking of the sign
-                event.setCancelled(true);
-                messageBridge.message(event.getPlayer(), "delsign-noPermission", regionSign.getRegion());
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onSignClick(PlayerInteractEvent event) {
-        Block block = event.getClickedBlock();
-        if (block == null) {
-            return;
-        }
-
-        // Only listen to left and right clicks on blocks
-        if (!(event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)) {
-            return;
-        }
-
-        // Only care about clicking blocks
-        if(!Materials.isSign(block.getType())) {
-            return;
-        }
-
-        // Check if this sign belongs to a region
-        Optional<RegionSign> optional = signManager.signFromLocation(block.getLocation());
-        if(optional.isEmpty()) {
-            return;
-        }
-        RegionSign regionSign = optional.get();
-
-        // Ignore players that are in sign link mode (which will handle the event itself)
-        Player player = event.getPlayer();
-        if(signLinkerManager.isInSignLinkMode(player)) {
-            return;
-        }
-
-        // Get the clicktype
-        GeneralRegion.ClickType clickType = null;
-        if(player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
-            clickType = GeneralRegion.ClickType.SHIFTLEFTCLICK;
-        } else if(!player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
-            clickType = GeneralRegion.ClickType.LEFTCLICK;
-        } else if(player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-            clickType = GeneralRegion.ClickType.SHIFTRIGHTCLICK;
-        } else if(!player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-            clickType = GeneralRegion.ClickType.RIGHTCLICK;
-        }
-
-        boolean ran = regionSign.runSignCommands(player, clickType);
-
-        // Only cancel event if at least one command has been executed
-        event.setCancelled(ran);
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onSignChange(SignChangeEvent event) {
-        Player player = event.getPlayer();
-        if(!plugin.isReady()) {
-            messageBridge.message(player, "general-notReady");
-            return;
-        }
-        // Check if the sign is meant for this plugin
-        if(event.getLine(0).contains(plugin.getConfig().getString("signTags.rent"))) {
-            if(!player.hasPermission("areashop.createrent") && !player.hasPermission("areashop.createrent.member") && !player.hasPermission("areashop.createrent.owner")) {
-                messageBridge.message(player, "setup-noPermissionRent");
-                return;
-            }
-            // Get the other lines
-            String secondLine = event.getLine(1);
-            String thirdLine = event.getLine(2);
-            String fourthLine = event.getLine(3);
-
-            // Get the regionManager for accessing regions
-            RegionManager regionManager = plugin.getRegionManager(event.getPlayer().getWorld());
-
-            // If the secondLine does not contain a name try to find the region by location
-            if(secondLine == null || secondLine.isEmpty()) {
-                Set<ProtectedRegion> regions = worldGuardInterface.getApplicableRegionsSet(event.getBlock().getLocation());
-                if(regions != null) {
-                    boolean first = true;
-                    ProtectedRegion candidate = null;
-                    for(ProtectedRegion pr : regions) {
-                        if(first) {
-                            candidate = pr;
-                            first = false;
-                        } else {
-                            if(pr.getPriority() > candidate.getPriority()) {
-                                candidate = pr;
-                            } else if(pr.getParent() != null && pr.getParent().equals(candidate)) {
-                                candidate = pr;
-                            } else {
-                                messageBridge.message(player, "setup-couldNotDetect", candidate.getId(), pr.getId());
-                                return;
-                            }
-                        }
-                    }
-                    if(candidate != null) {
-                        secondLine = candidate.getId();
-                    }
-                }
-            }
-
-            boolean priceSet = fourthLine != null && !fourthLine.isEmpty();
-            boolean durationSet = thirdLine != null && !thirdLine.isEmpty();
-            // check if all the lines are correct
-            if(secondLine == null || secondLine.isEmpty()) {
-                messageBridge.message(player, "setup-noRegion");
-                return;
-            }
-            ProtectedRegion region = regionManager.getRegion(secondLine);
-            if(region == null) {
-                messageBridge.message(player, "cmd-noRegion", secondLine);
-                return;
-            }
-
-            IFileManager.AddResult addResult = fileManager.checkRegionAdd(player, regionManager.getRegion(secondLine), event.getPlayer().getWorld(), GeneralRegion.RegionType.RENT);
-            if(addResult == IFileManager.AddResult.BLACKLISTED) {
-                messageBridge.message(player, "setup-blacklisted", secondLine);
-            } else if(addResult == IFileManager.AddResult.ALREADYADDED) {
-                messageBridge.message(player, "setup-alreadyRentSign");
-            } else if(addResult == IFileManager.AddResult.ALREADYADDEDOTHERWORLD) {
-                messageBridge.message(player, "setup-alreadyOtherWorld");
-            } else if(addResult == IFileManager.AddResult.NOPERMISSION) {
-                messageBridge.message(player, "setup-noPermission", secondLine);
-            } else if(thirdLine != null && !thirdLine.isEmpty() && !Utils.checkTimeFormat(thirdLine)) {
-                messageBridge.message(player, "setup-wrongDuration");
-            } else {
-                double price = 0.0;
-                if(priceSet) {
-                    // Check the fourth line
-                    try {
-                        price = Double.parseDouble(fourthLine);
-                    } catch(NumberFormatException e) {
-                        messageBridge.message(player, "setup-wrongPrice");
-                        return;
-                    }
-                }
-
-                // Add rent to the FileManager
-                final RentRegion rent = regionFactory.createRentRegion(secondLine, event.getPlayer().getWorld());
-                boolean isMember = worldGuardInterface.containsMember(rent.getRegion(), player.getUniqueId());
-                boolean isOwner = worldGuardInterface.containsOwner(rent.getRegion(), player.getUniqueId());
-                boolean landlord = (!player.hasPermission("areashop.createrent")
-                        && ((player.hasPermission("areashop.createrent.owner") && isOwner)
-                        || (player.hasPermission("areashop.createrent.member") && isMember)));
-
-                if(landlord) {
-                    rent.setLandlord(player.getUniqueId(), player.getName());
-                }
-                if(priceSet) {
-                    rent.setPrice(price);
-                }
-                if(durationSet) {
-                    rent.setDuration(thirdLine);
-                }
-                rent.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), SignUtils.getSignFacing(event.getBlock()), null);
-
-                AddingRegionEvent addingRegionEvent = plugin.getFileManager().addRegion(rent);
-                if (addingRegionEvent.isCancelled()) {
-                    messageBridge.message(player, "general-cancelled", addingRegionEvent.getReason());
-                    return;
-                }
-
-                rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-                messageBridge.message(player, "setup-rentSuccess", rent);
-                // Update the region after the event has written its lines
-                Do.sync(rent::update);
-            }
-        } else if(event.getLine(0).contains(plugin.getConfig().getString("signTags.buy"))) {
-            // Check for permission
-            if(!player.hasPermission("areashop.createbuy") && !player.hasPermission("areashop.createbuy.member") && !player.hasPermission("areashop.createbuy.owner")) {
-                messageBridge.message(player, "setup-noPermissionBuy");
-                return;
-            }
-
-            // Get the other lines
-            String secondLine = event.getLine(1);
-            String thirdLine = event.getLine(2);
-
-            // Get the regionManager for accessing regions
-            RegionManager regionManager = plugin.getRegionManager(event.getPlayer().getWorld());
-
-            // If the secondLine does not contain a name try to find the region by location
-            if(secondLine == null || secondLine.isEmpty()) {
-                Set<ProtectedRegion> regions = worldGuardInterface.getApplicableRegionsSet(event.getBlock().getLocation());
-                if(regions != null) {
-                    boolean first = true;
-                    ProtectedRegion candidate = null;
-                    for(ProtectedRegion pr : regions) {
-                        if(first) {
-                            candidate = pr;
-                            first = false;
-                        } else {
-                            if(pr.getPriority() > candidate.getPriority()) {
-                                candidate = pr;
-                            } else if(pr.getParent() != null && pr.getParent().equals(candidate)) {
-                                candidate = pr;
-                            } else {
-                                messageBridge.message(player, "setup-couldNotDetect", candidate.getId(), pr.getId());
-                                return;
-                            }
-                        }
-                    }
-                    if(candidate != null) {
-                        secondLine = candidate.getId();
-                    }
-                }
-            }
-
-            boolean priceSet = thirdLine != null && !thirdLine.isEmpty();
-            // Check if all the lines are correct
-            if(secondLine == null || secondLine.isEmpty()) {
-                messageBridge.message(player, "setup-noRegion");
-                return;
-            }
-            ProtectedRegion region = regionManager.getRegion(secondLine);
-            if(region == null) {
-                messageBridge.message(player, "cmd-noRegion", secondLine);
-                return;
-            }
-            IFileManager.AddResult addResult = plugin.getFileManager().checkRegionAdd(player, region, event.getPlayer().getWorld(), GeneralRegion.RegionType.BUY);
-            if(addResult == IFileManager.AddResult.BLACKLISTED) {
-                messageBridge.message(player, "setup-blacklisted", secondLine);
-            } else if(addResult == IFileManager.AddResult.ALREADYADDED) {
-                messageBridge.message(player, "setup-alreadyRentSign");
-            } else if(addResult == IFileManager.AddResult.ALREADYADDEDOTHERWORLD) {
-                messageBridge.message(player, "setup-alreadyOtherWorld");
-            } else if(addResult == IFileManager.AddResult.NOPERMISSION) {
-                messageBridge.message(player, "setup-noPermission", secondLine);
-            } else {
-                double price = 0.0;
-                if(priceSet) {
-                    // Check the fourth line
-                    try {
-                        price = Double.parseDouble(thirdLine);
-                    } catch(NumberFormatException e) {
-                        messageBridge.message(player, "setup-wrongPrice");
-                        return;
-                    }
-                }
-
-                // Add buy to the FileManager
-                final BuyRegion buy = regionFactory.createBuyRegion(secondLine, event.getPlayer().getWorld());
-                boolean isMember = worldGuardInterface.containsMember(buy.getRegion(), player.getUniqueId());
-                boolean isOwner = worldGuardInterface.containsOwner(buy.getRegion(), player.getUniqueId());
-                boolean landlord = (!player.hasPermission("areashop.createbuy")
-                        && ((player.hasPermission("areashop.createbuy.owner") && isOwner)
-                        || (player.hasPermission("areashop.createbuy.member") && isMember)));
-
-                if(landlord) {
-                    buy.setLandlord(player.getUniqueId(), player.getName());
-                }
-                if(priceSet) {
-                    buy.setPrice(price);
-                }
-                buy.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), SignUtils.getSignFacing(event.getBlock()), null);
-
-                AddingRegionEvent addingRegionEvent = plugin.getFileManager().addRegion(buy);
-                if (addingRegionEvent.isCancelled()) {
-                    messageBridge.message(player, "general-cancelled", addingRegionEvent.getReason());
-                    return;
-                }
-
-                buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-                messageBridge.message(player, "setup-buySuccess", buy);
-                // Update the region after the event has written its lines
-                Do.sync(buy::update);
-            }
-        } else if(event.getLine(0).contains(plugin.getConfig().getString("signTags.add"))) {
-            // Check for permission
-            if(!player.hasPermission("areashop.addsign")) {
-                messageBridge.message(player, "addsign-noPermission");
-                return;
-            }
-
-            // Get the other lines
-            String secondLine = event.getLine(1);
-            String thirdLine = event.getLine(2);
-
-            GeneralRegion region;
-            if(secondLine != null && !secondLine.isEmpty()) {
-                // Get region by secondLine of the sign
-                region = fileManager.getRegion(secondLine);
-                if(region == null) {
-                    messageBridge.message(player, "addSign-notRegistered", secondLine);
-                    return;
-                }
-            } else {
-                // Get region by sign position
-                List<GeneralRegion> regions = Utils.getImportantRegions(event.getBlock().getLocation());
-                if(regions.isEmpty()) {
-                    messageBridge.message(player, "addsign-noRegions");
-                    return;
-                } else if(regions.size() > 1) {
-                    messageBridge.message(player, "addsign-couldNotDetectSign", regions.get(0).getName(), regions.get(1).getName());
-                    return;
-                }
-                region = regions.get(0);
-            }
-
-            if(thirdLine == null || thirdLine.isEmpty()) {
-                region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), SignUtils.getSignFacing(event.getBlock()), null);
-                messageBridge.message(player, "addsign-success", region);
-            } else {
-                region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), SignUtils.getSignFacing(event.getBlock()), thirdLine);
-                messageBridge.message(player, "addsign-successProfile", thirdLine, region);
-            }
-
-            // Update the region later because this event will do it first
-            Do.sync(region::update);
-        }
-    }
-
-}
@@ -1,110 +0,0 @@
-package me.wiefferink.areashop.features.signs;
-
-import io.github.bakedlibs.dough.blocks.BlockPosition;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.managers.Manager;
-import org.bukkit.Location;
-import org.bukkit.World;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-public class SignManager extends Manager {
-
-    private final Map<World, SignCache> signCacheMap = new HashMap<>();
-
-    public Collection<BlockPosition> allSignLocations() {
-        final Set<BlockPosition> set = new HashSet<>(signCacheMap.size());
-        for (SignCache signCache : signCacheMap.values()) {
-            set.addAll(signCache.allSignLocations());
-        }
-        return set;
-    }
-
-    public Collection<RegionSign> allSigns() {
-        final Set<RegionSign> signs = new HashSet<>(signCacheMap.size());
-        for (SignCache signCache : signCacheMap.values()) {
-            signs.addAll(signCache.allSigns());
-        }
-        return signs;
-    }
-
-    public SignCache cacheForWorld(World world) {
-        return this.signCacheMap.computeIfAbsent(world, x -> new SignCache());
-    }
-
-    public Optional<SignCache> getCacheForWorld(World world) {
-        return Optional.ofNullable(this.signCacheMap.get(world));
-    }
-
-    public Optional<RegionSign> signFromLocation(Location location) {
-        final World world = location.getWorld();
-        return getCacheForWorld(world)
-                .flatMap(cache -> cache.signAtLocation(BlockPosition.getAsLong(location)));
-    }
-
-    public void addSign(RegionSign regionSign) {
-        Location location = regionSign.getLocation();
-        cacheForWorld(location.getWorld()).addSign(regionSign);
-    }
-
-    public void removeSign(RegionSign regionSign) {
-        Location location = regionSign.getLocation();
-        if (location.getWorld() == null) {
-            return;
-        }
-        cacheForWorld(location.getWorld()).removeSign(regionSign);
-    }
-
-    public Optional<RegionSign> removeSign(Location location) {
-        if (location == null || location.getWorld() == null) {
-            return Optional.empty();
-        }
-        return getCacheForWorld(location.getWorld()).flatMap(cache -> cache.removeSign(location));
-    }
-
-    /**
-     * Update all signs connected to this region.
-     * @return true if all signs are updated correctly, false if one or more updates failed
-     */
-    public boolean update() {
-        boolean result = true;
-        for (SignCache signCache : this.signCacheMap.values())
-        for(RegionSign sign : signCache.allSigns()) {
-            result &= sign.update();
-        }
-        return result;
-    }
-
-    /**
-     * Check if any of the signs need periodic updating.
-     * @return true if one or more of the signs need periodic updating, otherwise false
-     */
-    public boolean needsPeriodicUpdate() {
-        boolean result = false;
-        for (SignCache signCache : this.signCacheMap.values()) {
-            for (RegionSign sign : signCache.allSigns()) {
-                if (result) {
-                    break;
-                }
-                if (sign.needsPeriodicUpdate()) {
-                    result = true;
-                    break;
-                }
-            }
-        }
-        return result;
-    }
-
-
-    public void shutdown() {
-        update();
-        this.signCacheMap.values().forEach(SignCache::clear);
-        this.signCacheMap.clear();
-    }
-
-}
@@ -1,108 +1,214 @@
 package me.wiefferink.areashop.features.signs;

-import com.google.inject.assistedinject.Assisted;
-import com.google.inject.assistedinject.AssistedInject;
-import io.github.bakedlibs.dough.blocks.BlockPosition;
-import io.github.bakedlibs.dough.blocks.ChunkPosition;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.features.RegionFeature;
-import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
 import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.configuration.ConfigurationSection;

-import javax.annotation.Nonnull;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;

 public class SignsFeature extends RegionFeature {

-	private final SignManager internalSignManager = new SignManager();
-	private final SignManager globalSignManager;
-	private final SignFactory signFactory;
-	/**
-	 * Constructor.
-	 * @param region The region to bind to
-	 */
-	@AssistedInject
-	SignsFeature(@Nonnull AreaShop plugin,
-						@Nonnull SignManager signManager,
-						@Nonnull SignFactory signFactory,
-						@Assisted @Nonnull GeneralRegion region
-	) {
-		super(plugin);
-		this.globalSignManager = signManager;
-		this.signFactory = signFactory;
-		setRegion(region);
-		// Setup current signs
-		ConfigurationSection signSection = region.getConfig().getConfigurationSection("general.signs");
-		if (signSection == null) {
-			return;
-		}
-		for(String signKey : signSection.getKeys(false)) {
-			RegionSign sign = signFactory.createRegionSign(this, signKey);
-			Location location = sign.getLocation();
-			if(location == null) {
-				AreaShop.warn("Sign with key " + signKey + " of region " + region.getName() + " does not have a proper location");
-				continue;
-			}
-			this.globalSignManager.cacheForWorld(location.getWorld()).addSign(sign);
-			this.internalSignManager.addSign(sign);
-		}
-	}
+    public static final SignCache signCache = new SignCache();

-	/**
-	 * Convert a location to a string to use as map key.
-	 * @param location The location to get the key for
-	 * @return A string to use in a map for a location
-	 */
-	public static String locationToString(Location location) {
-		return location.getWorld().getName() + ";" + location.getBlockX() + ";" + location.getBlockY() + ";" + location.getBlockZ();
-	}
+    static {
+        signCache.registerListeners();
+    }

-	/**
-	 * Convert a chunk to a string to use as map key.
-	 * @param location The location to get the key for
-	 * @return A string to use in a map for a chunk
-	 */
-	public static String chunkToString(Location location) {
-		return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
-	}
+    private Map<String, RegionSign> signs;

-	@Override
-	public void shutdown() {
+    public SignsFeature() {

-	}
+    }

-	public SignManager signManager() {
-		return this.internalSignManager;
-	}
+    /**
+     * Constructor.
+     *
+     * @param region The region to bind to
+     */
+    public SignsFeature(LegacyGeneralRegion region) {
+        setRegion(region);
+        signs = new HashMap<>();
+        // Setup current signs
+        ConfigurationSection signSection = region.getConfig().getConfigurationSection("general.signs");
+        if (signSection != null) {
+            for (String signKey : signSection.getKeys(false)) {
+                RegionSign sign = new RegionSign(this, signKey);
+                Location location = sign.getLocation();
+                if (location == null) {
+                    AreaShop.warn("Sign with key " + signKey + " of region " + region.getRegionId() + " does not have a proper location");
+                    continue;
+                }
+                signs.put(sign.getStringLocation(), sign);
+                signCache.addSign(sign);
+            }
+        }
+    }

-	/**
-	 * Add a sign to this region.
-	 * @param location The location of the sign
-	 * @param signType The type of the sign (WALL_SIGN or SIGN_POST)
-	 * @param facing   The orientation of the sign
-	 * @param profile  The profile to use with this sign (null for default)
-	 */
-	public void addSign(Location location, Material signType, BlockFace facing, String profile) {
-		int i = 0;
-		while(getRegion().getConfig().isSet("general.signs." + i)) {
-			i++;
-		}
-		String signPath = "general.signs." + i + ".";
-		getRegion().setSetting(signPath + "location", Utils.locationToConfig(location));
-		getRegion().setSetting(signPath + "facing", facing != null ? facing.name() : null);
-		getRegion().setSetting(signPath + "signType", signType != null ? signType.name() : null);
-		if(profile != null && !profile.isEmpty()) {
-			getRegion().setSetting(signPath + "profile", profile);
-		}
-		// Add to the map
-		RegionSign regionSign = this.signFactory.createRegionSign(this, String.valueOf(i));
-		this.globalSignManager.addSign(regionSign);
-		this.internalSignManager.addSign(regionSign);
-	}
+    public static void shutdownGlobalState() {
+        signCache.shutdown();
+    }
+
+    /**
+     * Convert a location to a string to use as map key.
+     *
+     * @param location The location to get the key for
+     * @return A string to use in a map for a location
+     */
+    public static String locationToString(Location location) {
+        return location.getWorld().getName() + ";" + location.getBlockX() + ";" + location.getBlockY() + ";" + location.getBlockZ();
+    }
+
+    /**
+     * Convert a chunk to a string to use as map key.
+     *
+     * @param location The location to get the key for
+     * @return A string to use in a map for a chunk
+     */
+    public static String chunkToString(Location location) {
+        return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
+    }
+
+    /**
+     * Convert a chunk to a string to use as map key.
+     * Use a Location argument to prevent chunk loading!
+     *
+     * @param chunk The location to get the key for
+     * @return A string to use in a map for a chunk
+     */
+    public static String chunkToString(Chunk chunk) {
+        return chunk.getWorld().getName() + ";" + chunk.getX() + ";" + chunk.getZ();
+    }
+
+    /**
+     * Get a sign by a location.
+     *
+     * @param location The location to get the sign for
+     * @return The RegionSign that is at the location, or null if none
+     */
+    public static RegionSign getSignByLocation(Location location) {
+        return signCache.getSignByLocation(location);
+    }
+
+    /**
+     * Get the map with all signs.
+     *
+     * @return Map with all signs: locationString -&gt; RegionSign
+     */
+    public static Map<String, RegionSign> getAllSigns() {
+        return signCache.getAllSigns();
+    }
+
+    /**
+     * Get the map with signs by chunk.
+     *
+     * @return Map with signs by chunk: chunkString -&gt; List&lt;RegionSign&gt;
+     */
+    public static Map<String, List<RegionSign>> getSignsByChunk() {
+        return signCache.getSignsByChunk();
+    }
+
+    @Override
+    public void shutdown() {
+        // Deregister signs from the registry
+        if (signs != null) {
+            for (Map.Entry<String, RegionSign> entry : signs.entrySet()) {
+                signCache.removeSign(entry.getValue());
+            }
+        }
+    }
+
+    /**
+     * Update all signs connected to this region.
+     *
+     * @return true if all signs are updated correctly, false if one or more updates failed
+     */
+    public boolean update() {
+        boolean result = true;
+        for (RegionSign sign : signs.values()) {
+            result &= sign.update();
+        }
+        return result;
+    }
+
+    /**
+     * Check if any of the signs need periodic updating.
+     *
+     * @return true if one or more of the signs need periodic updating, otherwise false
+     */
+    public boolean needsPeriodicUpdate() {
+        for (RegionSign sign : signs.values()) {
+            if (sign.needsPeriodicUpdate()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Get the signs of this region.
+     *
+     * @return List of signs
+     */
+    public List<RegionSign> getSigns() {
+        return new ArrayList<>(signs.values());
+    }
+
+    /**
+     * Get the signs of this region.
+     *
+     * @return Map with signs: locationString -&gt; RegionSign
+     */
+    Map<String, RegionSign> getSignsRef() {
+        return signs;
+    }
+
+    /**
+     * Get a list with all sign locations.
+     *
+     * @return A List with all sign locations
+     */
+    public List<Location> getSignLocations() {
+        List<Location> result = new ArrayList<>();
+        for (RegionSign sign : signs.values()) {
+            result.add(sign.getLocation());
+        }
+        return result;
+    }
+
+    /**
+     * Add a sign to this region.
+     *
+     * @param location The location of the sign
+     * @param signType The type of the sign (WALL_SIGN or SIGN_POST)
+     * @param facing   The orientation of the sign
+     * @param profile  The profile to use with this sign (null for default)
+     */
+    public void addSign(Location location, Material signType, BlockFace facing, String profile) {
+        int i = 0;
+        while (getRegion().getConfig().isSet("general.signs." + i)) {
+            i++;
+        }
+        String signPath = "general.signs." + i + ".";
+        final LegacyGeneralRegion region = getRegion();
+        region.setSetting(signPath + "location", Utils.locationToConfig(location));
+        region.setSetting(signPath + "facing", facing != null ? facing.name() : null);
+        region.setSetting(signPath + "signType", signType != null ? signType.name() : null);
+        if (profile != null && !profile.isEmpty()) {
+            region.setSetting(signPath + "profile", profile);
+        }
+        // Add to the map
+        RegionSign sign = new RegionSign(this, String.valueOf(i));
+        signs.put(sign.getStringLocation(), sign);
+        signCache.addSign(sign);
+    }

 }
@@ -1,50 +0,0 @@
-package me.wiefferink.areashop.features.signs;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import com.google.inject.Singleton;
-import com.google.inject.assistedinject.FactoryModuleBuilder;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.managers.SignLinkerManager;
-import me.wiefferink.areashop.nms.BlockBehaviourHelper;
-import me.wiefferink.areashop.regions.RegionFactory;
-
-import javax.annotation.Nonnull;
-
-public class SignsModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        bind(SignManager.class).asEagerSingleton();
-        install(new FactoryModuleBuilder().build(SignFactory.class));
-    }
-
-    @Provides
-    @Singleton
-    public SignListener provideSignListener(@Nonnull AreaShop plugin,
-                                            @Nonnull BlockBehaviourHelper behaviourHelper,
-                                            @Nonnull RegionFactory regionFactory,
-                                            @Nonnull MessageBridge messageBridge,
-                                            @Nonnull SignLinkerManager signLinkerManager,
-                                            @Nonnull WorldGuardInterface worldGuardInterface,
-                                            @Nonnull SignManager signManager,
-                                            @Nonnull IFileManager fileManager
-    ) {
-        final SignListener signListener = new SignListener(
-                plugin,
-                behaviourHelper,
-                regionFactory,
-                messageBridge,
-                signLinkerManager,
-                worldGuardInterface,
-                signManager,
-                fileManager
-        );
-        plugin.getServer().getPluginManager().registerEvents(signListener, plugin);
-        return signListener;
-    }
-
-}
@@ -0,0 +1,265 @@
+package me.wiefferink.areashop.features.teleport;
+
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.features.RegionFeature;
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.areashop.tools.Value;
+import org.bukkit.*;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+public class TeleportFeature extends RegionFeature {
+
+    public TeleportFeature() {
+    }
+
+    public TeleportFeature(LegacyGeneralRegion region) {
+        setRegion(region);
+    }
+
+    /**
+     * Checks if a certain location is safe to teleport to.
+     *
+     * @param location The location to check
+     * @return true if it is safe, otherwise false
+     */
+    static boolean isSafe(Location location) {
+        Block feet = location.getBlock();
+        Block head = feet.getRelative(BlockFace.UP);
+        Block below = feet.getRelative(BlockFace.DOWN);
+        Block above = head.getRelative(BlockFace.UP);
+
+        // Check the block at the feet and head of the player
+        if ((feet.getType().isSolid() && !canSpawnIn(feet.getType())) || feet.isLiquid()) {
+            return false;
+        } else if ((head.getType().isSolid() && !canSpawnIn(head.getType())) || head.isLiquid()) {
+            return false;
+        } else if (!below.getType().isSolid() || cannotSpawnOn(below.getType()) || below.isLiquid()) {
+            return false;
+        } else if (above.isLiquid() || cannotSpawnBeside(above.getType())) {
+            return false;
+        }
+
+        // Get all blocks around the player (below foot level, foot level, head level and above head level)
+        Set<Material> around = new HashSet<>();
+        for (int y = 0; y <= 3; y++) {
+            for (int x = -1; x <= 1; x++) {
+                for (int z = -1; z <= 1; z++) {
+                    // Skip blocks in the column of the player
+                    if (x == 0 && z == 0) {
+                        continue;
+                    }
+
+                    around.add(below.getRelative(x, y, z).getType());
+                }
+            }
+        }
+
+        // Check the blocks around the player
+        for (Material material : around) {
+            if (cannotSpawnBeside(material)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check if a player can spawn in here.
+     *
+     * @param material Material to check (assumed that this is at the feet or head level)
+     * @return true when it is safe to spawn inside, otherwise false
+     */
+    private static boolean canSpawnIn(Material material) {
+        String name = material.name();
+        return name.contains("DOOR")
+                || name.contains("SIGN")
+                || name.contains("PLATE") // Redstone plates
+                || name.equals("DRAGON_EGG");
+    }
+
+    /**
+     * Check if a player can spawn on here.
+     *
+     * @param material Material to check (assumed that this is below the feet)
+     * @return true when it is safe to spawn on top of, otherwise false
+     */
+    private static boolean cannotSpawnOn(Material material) {
+        String name = material.name();
+        return name.equals("CACTUS")
+                || name.contains("PISTON")
+                || name.contains("SIGN")
+                || name.contains("DOOR")
+                || name.contains("PLATE")
+                || name.contains("REDSTONE_LAMP")
+                || name.contains("FENCE")
+                || name.contains("GLASS_PANE") || name.contains("THIN_GLASS")
+                || name.equals("DRAGON_EGG")
+                || name.contains("MAGMA");
+    }
+
+    /**
+     * Check if a player can spawn next to it.
+     *
+     * @param material Material to check (assumed that this is somewhere around the player)
+     * @return true when it is safe to spawn next to, otherwise false
+     */
+    private static boolean cannotSpawnBeside(Material material) {
+        String name = material.name();
+        return name.contains("LAVA")
+                || name.contains("CACTUS")
+                || name.equals("FIRE")
+                || name.contains("MAGMA");
+    }
+
+    /**
+     * Get the teleportlocation set for this region.
+     *
+     * @return The teleport location, or null if not set
+     */
+    public Location getTeleportLocation() {
+        return Utils.configToLocation(getRegion().getConfigurationSectionSetting("general.teleportLocation"));
+    }
+
+    /**
+     * Check if the region has a teleportLocation specified.
+     *
+     * @return true if the region has a teleportlocation, false otherwise
+     */
+    public boolean hasTeleportLocation() {
+        return getRegion().getConfigurationSectionSetting("general.teleportLocation") != null;
+    }
+
+    /**
+     * Set the teleport location of this region.
+     *
+     * @param location The location to set as teleport location
+     */
+    public void setTeleport(Location location) {
+        if (location == null) {
+            getRegion().setSetting("general.teleportLocation", null);
+        } else {
+            getRegion().setSetting("general.teleportLocation", Utils.locationToConfig(location, true));
+        }
+    }
+
+    /**
+     * Teleport a player to the region or sign.
+     *
+     * @param player            Player that should be teleported
+     * @param toSign            true to teleport to the first sign of the region, false for teleporting to the region itself
+     * @param checkRestrictions Set to true if teleport permissions should be checked, false otherwise, also toggles cross-world check
+     * @return true if the teleport succeeded, otherwise false
+     */
+    public CompletableFuture<Boolean> teleportPlayer(Player player, boolean toSign, boolean checkRestrictions) {
+        return new TeleportJob(this, plugin).executeTeleport(player, toSign, checkRestrictions);
+    }
+
+    /**
+     * Teleport a player to the region or sign when he has permissions for it.
+     *
+     * @param player Player that should be teleported
+     * @param toSign true to teleport to the first sign of the region, false for teleporting to the region itself
+     * @return true if the teleport succeeded, otherwise false
+     */
+    public CompletableFuture<Boolean> teleportPlayer(Player player, boolean toSign) {
+        return teleportPlayer(player, toSign, true);
+    }
+
+    /**
+     * Teleport a player to the region when he has permissions for it.
+     *
+     * @param player Player that should be teleported
+     * @return true if the teleport succeeded, otherwise false
+     */
+    public CompletableFuture<Boolean> teleportPlayer(Player player) {
+        return teleportPlayer(player, false, true);
+    }
+
+    /**
+     * Get the start location of a safe teleport search.
+     *
+     * @param player The player to get it for
+     * @param toSign true to try teleporting to the first sign, false for teleporting to the region
+     * @return The start location
+     */
+    Location getStartLocation(Player player, Value<Boolean> toSign) {
+        Location startLocation = null;
+        ProtectedRegion worldguardRegion = getRegion().getRegion();
+
+        // Try to get sign location
+        List<RegionSign> signs = getRegion().getSignsFeature().getSigns();
+        boolean signAvailable = !signs.isEmpty();
+        if (toSign.get()) {
+            if (signAvailable) {
+                // Use the location 1 below the sign to prevent weird spawing above the sign
+                startLocation = signs.get(0).getLocation(); //.subtract(0.0, 1.0, 0.0);
+                startLocation.setPitch(player.getLocation().getPitch());
+                startLocation.setYaw(player.getLocation().getYaw());
+
+                // Move player x blocks away from the sign
+                double distance = getRegion().getDoubleSetting("general.teleportSignDistance");
+                if (distance > 0) {
+                    BlockFace facing = getRegion().getSignsFeature().getSigns().get(0).getFacing();
+                    Vector facingVector = new Vector(facing.getModX(), facing.getModY(), facing.getModZ())
+                            .normalize()
+                            .multiply(distance);
+                    startLocation.setX(startLocation.getBlockX() + 0.5);
+                    startLocation.setZ(startLocation.getBlockZ() + 0.5);
+                    startLocation.add(facingVector);
+                }
+            } else {
+                // No sign available
+                getRegion().message(player, "teleport-changedToNoSign");
+                toSign.set(false);
+            }
+        }
+
+        // Use teleportation location that is set for the region
+        if (startLocation == null && hasTeleportLocation()) {
+            startLocation = getTeleportLocation();
+        }
+
+        // Calculate a default location
+        if (startLocation == null) {
+            // Set to block in the middle, y configured in the config
+            Vector regionMin = AreaShop.getInstance().getWorldGuardHandler().getMinimumPoint(worldguardRegion);
+            Vector regionMax = AreaShop.getInstance().getWorldGuardHandler().getMaximumPoint(worldguardRegion);
+            Vector middle = regionMin.clone().midpoint(regionMax);
+            String configSetting = getRegion().getStringSetting("general.teleportLocationY");
+            if ("bottom".equalsIgnoreCase(configSetting)) {
+                middle = middle.setY(regionMin.getBlockY());
+            } else if ("top".equalsIgnoreCase(configSetting)) {
+                middle = middle.setY(regionMax.getBlockY());
+            } else if ("middle".equalsIgnoreCase(configSetting)) {
+                middle = middle.setY(middle.getBlockY());
+            } else {
+                try {
+                    int vertical = Integer.parseInt(configSetting);
+                    middle = middle.setY(vertical);
+                } catch (NumberFormatException e) {
+                    AreaShop.warn("Could not parse general.teleportLocationY: '" + configSetting + "'");
+                }
+            }
+            startLocation = new Location(getRegion().getWorld(), middle.getX(), middle.getY(), middle.getZ(), player.getLocation().getYaw(), player.getLocation().getPitch());
+        }
+
+        // Set location in the center of the block
+        startLocation.setX(startLocation.getBlockX() + 0.5);
+        startLocation.setZ(startLocation.getBlockZ() + 0.5);
+
+        return startLocation;
+    }
+
+
+}
@@ -0,0 +1,639 @@
+package me.wiefferink.areashop.features.teleport;
+
+import co.aikar.taskchain.TaskChain;
+import com.sk89q.worldedit.math.BlockVector2;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import io.papermc.lib.PaperLib;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.areashop.tools.Value;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
+import org.bukkit.util.Vector;
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.Function;
+
+class TeleportJob {
+
+    private final AreaShop plugin;
+    private final LegacyGeneralRegion region;
+    private final TeleportFeature feature;
+    private BukkitTask notifierTask;
+
+    private boolean running;
+    private int checked;
+    private boolean done;
+    private boolean blocksInRegionCopy;
+    private boolean northDone = false, eastDone = false, southDone = false, westDone = false, topDone = false, bottomDone = false;
+    private boolean continueThisDirection;
+    private int radius = 1;
+
+    public TeleportJob(final TeleportFeature region, final AreaShop plugin) {
+        this.feature = region;
+        this.region = region.getRegion();
+        this.plugin = plugin;
+    }
+
+    private static Function<double[], Boolean> generateContainsFunction(final ProtectedRegion worldguardRegion) {
+        final BlockVector3 min = worldguardRegion.getMinimumPoint(), max = worldguardRegion.getMaximumPoint();
+        if (worldguardRegion instanceof GlobalProtectedRegion) {
+            return (unused) -> true;
+        } else if (worldguardRegion instanceof ProtectedCuboidRegion) {
+            return coords -> {
+                final double x = coords[0];
+                final double y = coords[1];
+                final double z = coords[2];
+                return x >= min.getBlockX() && x < max.getBlockX() + 1
+                        && y >= min.getBlockY() && y < max.getBlockY() + 1
+                        && z >= min.getBlockZ() && z < max.getBlockZ() + 1;
+            };
+        } else if (worldguardRegion instanceof ProtectedPolygonalRegion) {
+            final int minY = min.getY(), maxY = max.getY();
+            final List<BlockVector2> points = worldguardRegion.getPoints();
+            return coords -> {
+
+                int targetX = (int) Math.round(coords[0]); // Width
+                int targetY = (int) Math.round(coords[1]); // Height
+                int targetZ = (int) Math.round(coords[2]); // Depth
+
+                if (targetY < minY || targetY > maxY) {
+                    return false;
+                }
+                //Quick and dirty check.
+                if (targetX < min.getBlockX() || targetX > max.getBlockX() || targetZ < min.getBlockZ() || targetZ > max.getBlockZ()) {
+                    return false;
+                }
+                boolean inside = false;
+                int npoints = points.size();
+                int xNew, zNew;
+                int xOld, zOld;
+                int x1, z1;
+                int x2, z2;
+                long crossproduct;
+                int i;
+
+                xOld = points.get(npoints - 1).getBlockX();
+                zOld = points.get(npoints - 1).getBlockZ();
+
+                for (i = 0; i < npoints; i++) {
+                    xNew = points.get(i).getBlockX();
+                    zNew = points.get(i).getBlockZ();
+                    //Check for corner
+                    if (xNew == targetX && zNew == targetZ) {
+                        return true;
+                    }
+                    if (xNew > xOld) {
+                        x1 = xOld;
+                        x2 = xNew;
+                        z1 = zOld;
+                        z2 = zNew;
+                    } else {
+                        x1 = xNew;
+                        x2 = xOld;
+                        z1 = zNew;
+                        z2 = zOld;
+                    }
+                    if (x1 <= targetX && targetX <= x2) {
+                        crossproduct = ((long) targetZ - (long) z1) * (long) (x2 - x1)
+                                - ((long) z2 - (long) z1) * (long) (targetX - x1);
+                        if (crossproduct == 0) {
+                            if ((z1 <= targetZ) == (targetZ <= z2)) return true; // on edge
+                        } else if (crossproduct < 0 && (x1 != targetX)) {
+                            inside = !inside;
+                        }
+                    }
+                    xOld = xNew;
+                    zOld = zNew;
+                }
+
+                return inside;
+            };
+        } else {
+            throw new UnsupportedOperationException("Unknown region type: " + worldguardRegion.getClass().getCanonicalName());
+        }
+    }
+
+    public boolean isRunning() {
+        return running;
+    }
+
+    public CompletableFuture<Boolean> executeTeleport(final Player player, boolean toSign, boolean checkRestrictions) {
+
+        if (running) {
+            throw new IllegalStateException("Task is already running!");
+        }
+        running = true;
+        // Check basics
+        if (feature == null) {
+            region.message(player, "general-noRegion");
+            return CompletableFuture.completedFuture(false);
+        }
+
+        if (region.getWorld() == null) {
+            region.message(player, "general-noWorld");
+            return CompletableFuture.completedFuture(false);
+        }
+
+        if (checkRestrictions) {
+            // Check correct world
+            if (!region.getBooleanSetting("general.teleportCrossWorld") && !player.getWorld().equals(region.getWorld())) {
+                region.message(player, "teleport-wrongWorld", player.getWorld().getName());
+                return CompletableFuture.completedFuture(false);
+            }
+
+            boolean owner = player.getUniqueId().equals(region.getOwner());
+            boolean friend = region.getFriendsFeature().getFriends().contains(player.getUniqueId());
+            boolean available = region.isAvailable();
+            // Teleport to sign instead if they dont have permission for teleporting to region
+            if ((!toSign && owner && !player.hasPermission("areashop.teleport") && player.hasPermission("areashop.teleportsign")
+                    || !toSign && !owner && !friend && !player.hasPermission("areashop.teleportall") && player.hasPermission("areashop.teleportsignall")
+                    || !toSign && !owner && friend && !player.hasPermission("areashop.teleportfriend") && player.hasPermission("areashop.teleportfriendsign")
+                    || !toSign && !owner && !friend && available && !player.hasPermission("areashop.teleportavailable") && player.hasPermission("areashop.teleportavailablesign"))) {
+                region.message(player, "teleport-changedToSign");
+                toSign = true;
+            }
+            // Check permissions
+            if (owner && !available && !player.hasPermission("areashop.teleport") && !toSign) {
+                region.message(player, "teleport-noPermission");
+                return CompletableFuture.completedFuture(false);
+            } else if (!owner && !available && !player.hasPermission("areashop.teleportall") && !toSign && !friend) {
+                region.message(player, "teleport-noPermissionOther");
+                return CompletableFuture.completedFuture(false);
+            } else if (!owner && !available && !player.hasPermission("areashop.teleportfriend") && !toSign && friend) {
+                region.message(player, "teleport-noPermissionFriend");
+                return CompletableFuture.completedFuture(false);
+            } else if (available && !player.hasPermission("areashop.teleportavailable") && !toSign) {
+                region.message(player, "teleport-noPermissionAvailable");
+                return CompletableFuture.completedFuture(false);
+            } else if (owner && !available && !player.hasPermission("areashop.teleportsign") && toSign) {
+                region.message(player, "teleport-noPermissionSign");
+                return CompletableFuture.completedFuture(false);
+            } else if (!owner && !available && !player.hasPermission("areashop.teleportsignall") && toSign && !friend) {
+                region.message(player, "teleport-noPermissionOtherSign");
+                return CompletableFuture.completedFuture(false);
+            } else if (!owner && !available && !player.hasPermission("areashop.teleportfriendsign") && toSign && friend) {
+                region.message(player, "teleport-noPermissionFriendSign");
+                return CompletableFuture.completedFuture(false);
+            } else if (available && !player.hasPermission("areashop.teleportavailablesign") && toSign) {
+                region.message(player, "teleport-noPermissionAvailableSign");
+                return CompletableFuture.completedFuture(false);
+            }
+        }
+
+        // Get the starting location
+        Value<Boolean> toSignRef = new Value<>(toSign);
+        Location startLocation = feature.getStartLocation(player, toSignRef);
+        toSign = toSignRef.get();
+
+        boolean insideRegion;
+        if (toSign) {
+            insideRegion = region.getBooleanSetting("general.teleportToSignIntoRegion");
+        } else {
+            insideRegion = region.getBooleanSetting("general.teleportIntoRegion");
+        }
+
+        // Check locations starting from startLocation and then a cube that increases
+        // radius around that (until no block in the region is found at all cube sides)
+
+        ProtectedRegion worldguardRegion = region.getRegion();
+        final Function<double[], Boolean> regionContains = generateContainsFunction(worldguardRegion);
+
+        boolean blocksInRegion = worldguardRegion.contains(startLocation.getBlockX(), startLocation.getBlockY(), startLocation.getBlockZ());
+        if (!blocksInRegion && insideRegion) {
+            region.message(player, "teleport-blocked");
+            return CompletableFuture.completedFuture(false);
+        }
+
+        // Tracking of which sides to continue the search
+        final World world = region.getWorld();
+        BlockVector3 min = worldguardRegion.getMinimumPoint();
+        BlockVector3 max = worldguardRegion.getMaximumPoint();
+
+        final Collection<Chunk> collection = ConcurrentHashMap.newKeySet();
+        final List<CompletableFuture<Object>> futures = new ArrayList<>();
+        final Collection<int[]> coords = new HashSet<>();
+        for (int x = min.getX(); x < max.getX(); x += 16) {
+            for (int z = min.getZ(); z < max.getZ(); z += 16) {
+                coords.add(new int[]{x, z});
+            }
+        }
+        final CompletableFuture<?> schedulingFuture;
+        if (coords.size() < 128) {
+            schedulingFuture = Utils.runAsBatches(coords, 32,
+                    coord -> futures.add(PaperLib.getChunkAtAsync(world, coord[0], coord[1]).thenApply(chunk -> {
+                        chunk.setForceLoaded(true);
+                        collection.add(chunk);
+                        return chunk;
+                    })), false);
+        } else {
+            schedulingFuture = null;
+        }
+        final CompletableFuture<Boolean> future = new CompletableFuture<>();
+        final boolean finalToSign = toSign;
+
+        final Runnable task = () -> {
+            blocksInRegionCopy = blocksInRegion;
+            int safeY = startLocation.getBlockY();
+            int safeX = startLocation.getBlockX();
+            int safeZ = startLocation.getBlockZ();
+            final Location temp = new Location(world, 0, 0, 0);
+            // Tries limit tracking
+
+            int maxTries = plugin.getConfig().getInt("maximumTries");
+
+            // Tracking of which sides to continue the search
+            try {
+                this.done = Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(startLocation)).get(5, TimeUnit.SECONDS);
+            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                ex.printStackTrace();
+                this.done = false;
+            }
+            Utils.newChain().async(() -> {
+                while ((blocksInRegionCopy || !insideRegion) && !done) {
+                    blocksInRegionCopy = false;
+
+                    // North side
+                    continueThisDirection = false;
+                    temp.setX(-radius + 1);
+                    temp.setY(-radius + 1);
+                    temp.setZ(-radius);
+                    for (int x = -radius + 1; x <= radius && !done && !northDone; x++) {
+                        for (int y = -radius + 1; y < radius && !done; y++) {
+                            if (y + safeY > 256 || y + safeY < 0) {
+                                continue;
+                            }
+                            if (!insideRegion || regionContains.apply(new double[]{x + safeX, y + safeY, safeZ - radius})) {
+                                checked++;
+                                try {
+                                    this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                                } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                    ex.printStackTrace();
+                                    this.done = false;
+                                }
+                                blocksInRegionCopy = true;
+                                continueThisDirection = true;
+                            }
+                            temp.add(0, 1, 0);
+                        }
+                        temp.add(1, 0, 0);
+                    }
+                    northDone = northDone || !continueThisDirection;
+                }
+            }).abortIf((var0) -> done).async(() -> {
+                // South side
+                continueThisDirection = false;
+                temp.setX(radius - 1);
+                temp.setY(-radius + 1);
+                temp.setZ(-radius);
+                for (int x = radius - 1; x >= -radius && !done && !southDone; x--) {
+                    for (int y = -radius + 1; y < radius && !done; y++) {
+                        if (y + safeY > 256 || y + safeY < 0) {
+                            continue;
+                        }
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + x, safeY + y, safeZ - radius})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 1, 0);
+                    }
+                    temp.add(-1, 0, 0);
+                }
+                southDone = southDone || !continueThisDirection;
+            }).abortIf((var0) -> done).async(() -> {
+                // East side
+                continueThisDirection = false;
+                temp.setX(-radius + 1);
+                temp.setY(-radius + 1);
+                temp.setZ(0);
+                for (int z = -radius + 1; z <= radius && !done && !eastDone; z++) {
+                    for (int y = -radius + 1; y < radius && !done; y++) {
+                        if (y + safeY > 256 || y + safeY < 0) {
+                            continue;
+                        }
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + radius, y + safeY, z + safeZ})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 1, 0);
+                    }
+                    temp.add(0, 0, 1);
+                }
+                eastDone = eastDone || !continueThisDirection;
+            }).abortIf((var0) -> done).async(() -> {
+                // West side
+                continueThisDirection = false;
+                temp.setX(-radius);
+                temp.setY(-radius);
+                temp.setZ(radius - 1);
+                for (int z = radius - 1; z >= -radius && !done && !westDone; z--) {
+                    for (int y = -radius + 1; y < radius && !done; y++) {
+                        if (y + safeY > 256 || y + safeY < 0) {
+                            continue;
+                        }
+                        if (!insideRegion || regionContains.apply(new double[]{safeX - radius, safeY + y, safeZ + z})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 1, 0);
+                    }
+                    temp.add(0, 0, -1);
+                }
+                westDone = westDone || !continueThisDirection;
+            }).abortIf((var0) -> done).async(() -> {
+                // Top side
+                continueThisDirection = false;
+                // Middle block of the top
+                if ((safeY + radius) > 256) {
+                    topDone = true;
+                }
+                if (!done && !topDone) {
+                    temp.setX(0);
+                    temp.setY(radius);
+                    temp.setZ(0);
+                    if (!insideRegion || regionContains.apply(new double[]{safeX, safeY + radius, safeZ})) {
+                        checked++;
+                        try {
+                            this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                        } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                            ex.printStackTrace();
+                            this.done = false;
+                        }
+                        blocksInRegionCopy = true;
+                        continueThisDirection = true;
+                    }
+                }
+
+                temp.setY(radius);
+                for (int r = 1; r <= radius && !done && !topDone; r++) {
+                    temp.setX(-r + 1);
+                    temp.setZ(-r);
+                    for (int x = -r + 1; x <= r && !done; x++) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + x, safeY + radius, safeZ - r})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(1, 0, 0);
+                    }
+                    // East
+                    temp.setX(r);
+                    temp.setZ(-r + 1);
+                    for (int z = -r + 1; z <= r && !done; z++) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + r, safeY + radius, safeZ + z})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 0, z);
+                    }
+                    // South side
+                    temp.setX(r - 1);
+                    temp.setZ(r);
+                    for (int x = r - 1; x >= -r && !done; x--) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + x, safeY + radius, safeZ + r})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(-1, 0, 0);
+                    }
+                    // West side
+                    temp.setX(-r);
+                    temp.setZ(r - 1);
+                    for (int z = r - 1; z >= -r && !done; z--) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX - r, safeY + radius, safeZ + z})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 0, -1);
+                    }
+                }
+                topDone = topDone || !continueThisDirection;
+            }).abortIf(var0 -> done).async(() -> {
+                // Bottom side
+                continueThisDirection = false;
+                // Middle block of the bottom
+                if (safeY - radius < 0) {
+                    bottomDone = true;
+                }
+                if (!done && !bottomDone) {
+                    temp.setX(0);
+                    temp.setY(-radius);
+                    temp.setZ(0);
+                    if (!insideRegion || regionContains.apply(new double[]{safeX, safeY - radius, safeZ})) {
+                        checked++;
+                        try {
+                            this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                        } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                            ex.printStackTrace();
+                            this.done = false;
+                        }
+                        blocksInRegionCopy = true;
+                        continueThisDirection = true;
+                    }
+                }
+                temp.setY(-radius);
+                for (int r = 1; r <= radius && !done && !bottomDone; r++) {
+                    // North
+                    temp.setX(-r + 1);
+                    temp.setZ(-r);
+                    for (int x = -r + 1; x <= r && !done; x++) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + x, safeY - radius, safeZ - r})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(1, 0, 0);
+                    }
+                    // East
+                    temp.setX(0);
+                    temp.setZ(-r + 1);
+                    for (int z = -r + 1; z <= r && !done; z++) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + r, safeY - radius, safeZ + z})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 0, 1);
+                    }
+                    // South side
+                    temp.setX(r - 1);
+                    temp.setZ(r);
+                    for (int x = r - 1; x >= -r && !done; x--) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + x, safeY - radius, safeZ + r})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(-1, 0, 0);
+                    }
+                    // West side
+                    temp.setX(-r);
+                    temp.setZ(r - 1);
+                    for (int z = r - 1; z >= -r && !done; z--) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX - r, safeY - radius, safeZ + z})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 0, -1);
+                    }
+                }
+                bottomDone = bottomDone || !continueThisDirection;
+
+                // Increase cube radius
+                radius++;
+                startLocation.add(temp);
+            }).execute(() -> Bukkit.getScheduler().runTask(plugin, () -> {
+                if (done && TeleportFeature.isSafe(startLocation)) {
+                    if (finalToSign) {
+                        region.message(player, "teleport-successSign");
+
+                        // Let the player look at the sign
+                        Vector playerVector = startLocation.toVector();
+                        playerVector.setY(playerVector.getY() + player.getEyeHeight(true));
+                        Vector signVector = region.getSignsFeature().getSigns().get(0).getLocation().toVector().add(new Vector(0.5, 0.5, 0.5));
+                        Vector direction = playerVector.clone().subtract(signVector).normalize();
+                        startLocation.setYaw(180 - (float) Math.toDegrees(Math.atan2(direction.getX(), direction.getZ())));
+                        startLocation.setPitch(90 - (float) Math.toDegrees(Math.acos(direction.getY())));
+                    } else {
+                        region.message(player, "teleport-success");
+                    }
+
+                    AreaShop.debug("Found location: " + startLocation.toString() + " Tries: " + checked);
+                    PaperLib.teleportAsync(player, startLocation).thenAccept(future::complete);
+                } else {
+                    region.message(player, "teleport-noSafe", checked, maxTries);
+                    AreaShop.debug("No location found, checked " + checked + " spots of max " + maxTries);
+                    future.complete(false);
+                }
+            }));
+        };
+        // Start notifying the player, the one issue is that checked/max is 0 is if chunk loading takes up >= ~3s
+        doNotifications(player.getUniqueId());
+        TaskChain<?> chain = Utils.newChain();
+        if (schedulingFuture != null) {
+            // If there aren't too many chunks, pre-load them. Max will take 10 ticks ~ 500-600ms
+            chain = chain.asyncFirstFuture(() -> schedulingFuture).asyncFutures((unused) -> futures);
+        }
+        // Run the calculation task async
+        chain.async(task::run).execute();
+        // Don't keep chunks force-loaded once the teleportation has been completed.
+        return future.thenApply((unused0) -> {
+            for (Chunk chunk : collection) {
+                chunk.setForceLoaded(false); // Should be fine to call async(?)
+            }
+            running = false;
+            return unused0;
+        });
+    }
+
+    /**
+     * Get the task which notifies player of teleport progress.
+     *
+     * @return Returns the task, may be null.
+     */
+    public BukkitTask getNotifierTask() {
+        return notifierTask;
+    }
+
+    private void doNotifications(final UUID player0) {
+        final int maxTries = plugin.getConfig().getInt("maximumTries");
+        this.notifierTask = new BukkitRunnable() {
+
+            @Override
+            public void run() {
+                final Player player = Bukkit.getPlayer(player0);
+                if (TeleportJob.this.done || player == null) {
+                    this.cancel();
+                    TeleportJob.this.notifierTask = null;
+                    return;
+                }
+                region.message(player, "teleport-calculation-progress", "%done%", String.valueOf(checked), "%max%", String.valueOf(maxTries));
+            }
+
+        }.runTaskTimer(plugin, Utils.millisToTicks(3000), Utils.millisToTicks(3000));
+    }
+}
@@ -1,12 +1,10 @@
 package me.wiefferink.areashop.listeners;

 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.Utils;
-import me.wiefferink.bukkitdo.Do;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -16,7 +14,6 @@ import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.PlayerQuitEvent;

-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;

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

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

-	/**
-	 * Constructor.
-	 * @param plugin The AreaShop plugin
-	 */
-	public PlayerLoginLogoutListener(@Nonnull AreaShop plugin, @Nonnull MessageBridge messageBridge) {
-		this.plugin = plugin;
-		this.messageBridge = messageBridge;
-	}
+    /**
+     * Called when a sign is changed.
+     *
+     * @param event The event
+     */
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerLogin(PlayerLoginEvent event) {
+        if (event.getResult() != Result.ALLOWED) {
+            return;
+        }
+        final Player player = event.getPlayer();

-	/**
-	 * Called when a sign is changed.
-	 * @param event The event
-	 */
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerLogin(PlayerLoginEvent event) {
-		if(event.getResult() != Result.ALLOWED) {
-			return;
-		}
-		final Player player = event.getPlayer();
+        // Schedule task to check for notifications, prevents a lag spike at login
+        Utils.runCancellingTaskTimer(() -> {
+            // Delay until all regions are loaded
+            if (!plugin.isReady()) {
+                return true;
+            }
+            if (!player.isOnline()) {
+                return false;
+            }
+            // Notify for rents that almost run out
+            for (RentRegion region : plugin.getFileManager().getRents()) {
+                if (region.isRenter(player)) {
+                    String warningSetting = region.getStringSetting("rent.warningOnLoginTime");
+                    if (warningSetting == null || warningSetting.isEmpty()) {
+                        continue;
+                    }
+                    long warningTime = Utils.durationStringToLong(warningSetting);
+                    if (region.getTimeLeft() < warningTime) {
+                        // Send the warning message later to let it appear after general MOTD messages
+                        AreaShop.getInstance().message(player, "rent-expireWarning", region);
+                    }
+                }
+            }

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

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

-		// Check if the player has regions that use an old name of him and update them
-		Do.syncTimerLater(22, 10, () -> {
-			if(!plugin.isReady()) {
-				return true;
-			}
+            List<LegacyGeneralRegion> regions = new ArrayList<>();
+            for (LegacyGeneralRegion region : plugin.getFileManager().getRegions()) {
+                if (region.isOwner(player)) {
+                    regions.add(region);
+                }
+            }
+            final String name = player.getName();
+            Utils.runAsBatches(regions,
+                    plugin.getConfig().getInt("nameupdate.regionsPerTick"),
+                    (region) -> {
+                        if (region instanceof BuyRegion || region instanceof RentRegion) {
+                            String key = region instanceof BuyRegion ? "buy.buyerName" : "rent.renterName";
+                            if (!name.equals(region.getStringSetting("buy.buyerName"))) {
+                                region.setSetting(key, player.getName());
+                                region.update();
+                            }
+                        }
+                    }, false);
+            return false;
+        }, 22, 10, false);
+    }

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

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

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


@@ -1,82 +0,0 @@
-package me.wiefferink.areashop.managers;
-
-import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class AdventureLanguageManager {
-
-    private final Map<String, LanguageRegistry> languageRegistryMap = new HashMap<>();
-    private String currentLanguage;
-    private String fallbackLanguage;
-
-    private String chatPrefix = "";
-
-    public AdventureLanguageManager(String currentLanguage, String fallbackLanguage) {
-        this.currentLanguage = currentLanguage;
-        this.fallbackLanguage = fallbackLanguage;
-    }
-
-    public AdventureLanguageManager currentLanguage(@NotNull String language) {
-        this.currentLanguage = language;
-        return this;
-    }
-
-    public AdventureLanguageManager fallbackLanguage(@NotNull String language) {
-        this.fallbackLanguage = language;
-        return this;
-    }
-
-    public AdventureLanguageManager loadValues(@NotNull String language,
-                                               @NotNull Map<String, String> values) {
-        this.languageRegistryMap.put(language, new LanguageRegistry(values));
-        return this;
-    }
-
-    public String messageFor(String key, String lang) {
-        LanguageRegistry registry = this.languageRegistryMap.get(lang);
-        if (registry == null) {
-            return "";
-        }
-        return registry.messageFor(key);
-    }
-
-    public String messageFor(String key) {
-        String  message = messageFor(key, this.currentLanguage);
-        if (message.isEmpty() && !this.currentLanguage.equals(fallbackLanguage)) {
-            message = messageFor(key, this.fallbackLanguage);
-        }
-        return message;
-    }
-
-    public void chatPrefix(String prefix) {
-        this.chatPrefix = prefix;
-    }
-
-    public String chatPrefix() {
-        return this.chatPrefix;
-    }
-
-    private static class LanguageRegistry {
-        private final Map<String, String> messages = new HashMap<>();
-
-        public LanguageRegistry(Map<String, String> messages) {
-            this.messages.putAll(messages);
-        }
-
-        public void messageFor(String key, String message) {
-            this.messages.put(key, message);
-        }
-
-        public String messageFor(String key) {
-            return this.messages.getOrDefault(key, "");
-        }
-
-        public boolean isEmpty() {
-            return this.messages.isEmpty();
-        }
-    }
-
-}
@@ -1,10 +1,5 @@
 package me.wiefferink.areashop.managers;

-import com.google.inject.Injector;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.commands.AddCommand;
 import me.wiefferink.areashop.commands.AddfriendCommand;
 import me.wiefferink.areashop.commands.AddsignCommand;
@@ -44,60 +39,48 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;

-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.*;

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

 	/**
 	 * Constructor.
 	 */
-	@Inject
-	CommandManager(@Nonnull AreaShop plugin, @Nonnull MessageBridge messageBridge, @Nonnull
-				   Injector injector) {
-		this.plugin = plugin;
-		this.messageBridge = messageBridge;
-		commands = new ArrayList<>(34);
-		commands.add(new HelpCommand(this));
-		commands.add(injector.getInstance(RentCommand.class));
-		commands.add(injector.getInstance(UnrentCommand.class));
-		commands.add(injector.getInstance(BuyCommand.class));
-		commands.add(injector.getInstance(SellCommand.class));
-		commands.add(injector.getInstance(MeCommand.class));
-		commands.add(injector.getInstance(InfoCommand.class));
-		commands.add(injector.getInstance(TeleportCommand.class));
-		commands.add(injector.getInstance(SetteleportCommand.class));
-		commands.add(injector.getInstance(AddfriendCommand.class));
-		commands.add(injector.getInstance(DelfriendCommand.class));
-		commands.add(injector.getInstance(FindCommand.class));
-		commands.add(injector.getInstance(ResellCommand.class));
-		commands.add(injector.getInstance(StopresellCommand.class));
-		commands.add(injector.getInstance(SetrestoreCommand.class));
-		commands.add(injector.getInstance(SetpriceCommand.class));
-		commands.add(injector.getInstance(SetownerCommand.class));
-		commands.add(injector.getInstance(SetdurationCommand.class));
-		commands.add(injector.getInstance(ReloadCommand.class));
-		commands.add(injector.getInstance(GroupaddCommand.class));
-		commands.add(injector.getInstance(GroupdelCommand.class));
-		commands.add(injector.getInstance(GrouplistCommand.class));
-		commands.add(injector.getInstance(GroupinfoCommand.class));
-		commands.add(injector.getInstance(SchematiceventCommand.class));
-		commands.add(injector.getInstance(AddCommand.class));
-		commands.add(injector.getInstance(DelCommand.class));
-		commands.add(injector.getInstance(AddsignCommand.class));
-		commands.add(injector.getInstance(DelsignCommand.class));
-		commands.add(injector.getInstance(LinksignsCommand.class));
-		commands.add(injector.getInstance(StackCommand.class));
-		commands.add(injector.getInstance(SetlandlordCommand.class));
-		commands.add(injector.getInstance(MessageCommand.class));
-		commands.add(injector.getInstance(ImportCommand.class));
+	public CommandManager() {
+		commands.add(new HelpCommand());
+		commands.add(new RentCommand());
+		commands.add(new UnrentCommand());
+		commands.add(new BuyCommand());
+		commands.add(new SellCommand());
+		commands.add(new MeCommand());
+		commands.add(new InfoCommand());
+		commands.add(new TeleportCommand());
+		commands.add(new SetteleportCommand());
+		commands.add(new AddfriendCommand());
+		commands.add(new DelfriendCommand());
+		commands.add(new FindCommand());
+		commands.add(new ResellCommand());
+		commands.add(new StopresellCommand());
+		commands.add(new SetrestoreCommand());
+		commands.add(new SetpriceCommand());
+		commands.add(new SetownerCommand());
+		commands.add(new SetdurationCommand());
+		commands.add(new ReloadCommand());
+		commands.add(new GroupaddCommand());
+		commands.add(new GroupdelCommand());
+		commands.add(new GrouplistCommand());
+		commands.add(new GroupinfoCommand());
+		commands.add(new SchematiceventCommand());
+		commands.add(new AddCommand());
+		commands.add(new DelCommand());
+		commands.add(new AddsignCommand());
+		commands.add(new DelsignCommand());
+		commands.add(new LinksignsCommand());
+		commands.add(new StackCommand());
+		commands.add(new SetlandlordCommand());
+		commands.add(new MessageCommand());
+		commands.add(new ImportCommand());

 		// Register commands in bukkit
 		plugin.getCommand("AreaShop").setExecutor(this);
@@ -109,7 +92,8 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 	 * @return The list with AreaShop commands
 	 */
 	public List<CommandAreaShop> getCommands() {
-		return commands;
+		// Return a cloned array
+		return new ArrayList<>(commands);
 	}

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

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

 		// Redirect `/as info player <player>` to `/as me <player>`
-		if(args.length == 3 && "info".equals(args[0]) && "player".equals(args[1])) {
+		if(args.length == 3 && "info".equalsIgnoreCase(args[0]) && "player".equalsIgnoreCase(args[1])) {
 			args[0] = "me";
 			args[1] = args[2];
 		}

 		// Execute command
 		boolean executed = false;
-		for(int i = 0; i < commands.size() && !executed; i++) {
-			if(commands.get(i).canExecute(command, args)) {
-				commands.get(i).execute(sender, args);
+		for (final CommandAreaShop cmd : commands) {
+			if (cmd.canExecute(command, args)) {
+				cmd.execute(sender, args);
 				executed = true;
+				// Can't have two commands with same label
+				break;
 			}
+
 		}

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

 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-		List<String> result = new ArrayList<>();
 		if(!sender.hasPermission("areashop.tabcomplete")) {
-			return result;
+			return Collections.emptyList();
 		}
+		List<String> result = new ArrayList<>();
 		int toCompleteNumber = args.length;
 		String toCompletePrefix = args[args.length - 1].toLowerCase();
 		//AreaShop.debug("toCompleteNumber=" + toCompleteNumber + ", toCompletePrefix=" + toCompletePrefix + ", length=" + toCompletePrefix.length());
@@ -197,6 +184,7 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 			for(CommandAreaShop c : commands) {
 				if(c.canExecute(command, args)) {
 					result = c.getTabCompleteList(toCompleteNumber, start, sender);
+					break;
 				}
 			}
 		}
@@ -208,8 +196,7 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 					set.add(suggestion);
 				}
 			}
-			result.clear();
-			result.addAll(set);
+			return new ArrayList<>(set);
 		}
 		//AreaShop.debug("Tabcomplete #" + toCompleteNumber + ", prefix="+ toCompletePrefix + ", result=" + result.toString());
 		return result;
@@ -1,75 +1,68 @@
 package me.wiefferink.areashop.managers;

-import com.google.inject.Injector;
-import com.google.inject.ProvisionException;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.features.CommandsFeature;
 import me.wiefferink.areashop.features.DebugFeature;
-import me.wiefferink.areashop.features.FeatureFactory;
 import me.wiefferink.areashop.features.FriendsFeature;
 import me.wiefferink.areashop.features.RegionFeature;
-import me.wiefferink.areashop.features.TeleportFeature;
+import me.wiefferink.areashop.features.teleport.TeleportFeature;
 import me.wiefferink.areashop.features.WorldGuardRegionFlagsFeature;
 import me.wiefferink.areashop.features.signs.SignsFeature;
-import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.interfaces.IRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import org.jetbrains.annotations.NotNull;

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

-@Singleton
 public class FeatureManager extends Manager {

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

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

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

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

 	/**
-	 * Instanciate a feature for a certain region.
+	 * Instantiate a feature for a certain region.
 	 * @param region       The region to create a feature for
 	 * @param featureClazz The class of the feature to create
 	 * @return The feature class
 	 */
-	public RegionFeature getRegionFeature(GeneralRegion region, Class<? extends RegionFeature> featureClazz) {
-		return regionFeatureConstructors.get(featureClazz).apply(region);
+	public <T extends RegionFeature> T getRegionFeature(@NotNull IRegion region, @NotNull Class<T> featureClazz) {
+		try {
+			return featureClazz.cast(regionFeatureConstructors.get(featureClazz).newInstance(region));
+		} catch(InstantiationException | InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
+			AreaShop.error("Failed to instantiate feature", featureClazz, "for region", region, e, e.getCause());
+		}
+		return null;
 	}

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

+import me.wiefferink.areashop.AreaShop;
+
 public abstract class Manager {

+	final AreaShop plugin = AreaShop.getInstance();
+
 	/**
 	 * Called at shutdown of the plugin.
 	 */
@@ -1,79 +0,0 @@
-package me.wiefferink.areashop.managers;
-
-import me.wiefferink.areashop.AreaShop;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
-import java.sql.Date;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.StringJoiner;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class SignErrorLogger {
-
-    public static final String PREFIX_WARN = "[Warning] [Sign Feature] ";
-    public static final DateFormat FORMAT = new SimpleDateFormat("MM/dd/yy HH:mm:ss");
-
-    private final List<String> cache = new LinkedList<>();
-    private final AtomicBoolean needsSaving = new AtomicBoolean(false);
-
-    private final File file;
-
-    public SignErrorLogger(File file) {
-        this.file = Objects.requireNonNull(file);
-    }
-
-    public void clearCache() {
-        synchronized (this.cache) {
-            this.cache.clear();
-        }
-    }
-
-    public SignErrorLogger submitWarning(String message) {
-        final String actual = FORMAT.format(Date.from(Instant.now())) + PREFIX_WARN + message;
-        synchronized (this.cache) {
-            this.cache.add(actual);
-        }
-        return this;
-    }
-
-    public void queueSave() {
-        this.needsSaving.set(true);
-    }
-
-    public void saveIfDirty() {
-        if (this.needsSaving.get()) {
-            save();
-        }
-    }
-
-    public synchronized void save() {
-        AreaShop.debugTask("[Sign Feature] Dumping sign errors to disk...");
-        final String[] copy;
-        synchronized (this.cache) {
-            copy = cache.toArray(new String[0]);
-        }
-        final StringJoiner joiner = new StringJoiner(System.lineSeparator());
-        for (String s : copy) {
-            joiner.add(s);
-        }
-        try (OutputStream os = new FileOutputStream(file);
-             OutputStreamWriter writer = new OutputStreamWriter(os, StandardCharsets.UTF_8)) {
-            writer.write(joiner.toString());
-        } catch (IOException ex) {
-            ex.printStackTrace();
-            AreaShop.error("Failed to update the sign error log!");
-        } finally {
-            AreaShop.debugTask("[Sign Feature] Error dump complete.");
-        }
-    }
-}
@@ -1,20 +1,18 @@
 package me.wiefferink.areashop.managers;

-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.features.signs.RegionSign;
-import me.wiefferink.areashop.features.signs.SignManager;
-import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
 import me.wiefferink.areashop.tools.Materials;
-import me.wiefferink.areashop.tools.SignUtils;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Sign;
+import org.bukkit.block.data.type.WallSign;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -29,23 +27,14 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;

-@Singleton
 public class SignLinkerManager extends Manager implements Listener {
 	private final Map<UUID, SignLinker> signLinkers;
 	private boolean eventsRegistered;

-	@Inject
-	private AreaShop plugin;
-	@Inject
-	private SignManager signManager;
-	@Inject
-	private MessageBridge messageBridge;
-
-	SignLinkerManager() {
+	public SignLinkerManager() {
 		signLinkers = new HashMap<>();
 		eventsRegistered = false;
 	}
@@ -53,7 +42,7 @@ public class SignLinkerManager extends Manager implements Listener {
 	@Override
 	public void shutdown() {
 		for(UUID uuid : signLinkers.keySet()) {
-			exitSignLinkMode(Bukkit.getPlayer(uuid));
+			exitSignLinkMode(uuid);
 		}
 	}

@@ -64,8 +53,8 @@ public class SignLinkerManager extends Manager implements Listener {
 	 */
 	public void enterSignLinkMode(Player player, String profile) {
 		signLinkers.put(player.getUniqueId(), new SignLinker(player, profile));
-		messageBridge.message(player, "linksigns-first");
-		messageBridge.message(player, "linksigns-next");
+		plugin.message(player, "linksigns-first");
+		plugin.message(player, "linksigns-next");
 		if(!eventsRegistered) {
 			eventsRegistered = true;
 			plugin.getServer().getPluginManager().registerEvents(this, plugin);
@@ -82,7 +71,19 @@ public class SignLinkerManager extends Manager implements Listener {
 			eventsRegistered = false;
 			HandlerList.unregisterAll(this);
 		}
-		messageBridge.message(player, "linksigns-stopped");
+		plugin.message(player, "linksigns-stopped");
+	}
+
+	private void exitSignLinkMode(UUID player) {
+		signLinkers.remove(player);
+		if(eventsRegistered && signLinkers.isEmpty()) {
+			eventsRegistered = false;
+			HandlerList.unregisterAll(this);
+		}
+		final Player online = Bukkit.getPlayer(player);
+		if (online != null) {
+			plugin.message(player, "linksigns-stopped");
+		}
 	}

 	/**
@@ -109,22 +110,22 @@ public class SignLinkerManager extends Manager implements Listener {
 				BlockIterator blockIterator = new BlockIterator(player, 100);
 				while(blockIterator.hasNext()) {
 					Block next = blockIterator.next();
-					List<GeneralRegion> regions = Utils.getRegions(next.getLocation());
+					List<LegacyGeneralRegion> regions = Utils.getRegions(next.getLocation());
 					if(regions.size() == 1) {
 						linker.setRegion(regions.get(0));
 						return;
 					} else if(regions.size() > 1) {
 						Set<String> names = new HashSet<>();
-						for(GeneralRegion region : regions) {
-							names.add(region.getName());
+						for(LegacyGeneralRegion region : regions) {
+							names.add(region.getRegionId());
 						}
-						messageBridge.message(player, "linksigns-multipleRegions", Utils.createCommaSeparatedList(names));
-						messageBridge.message(player, "linksigns-multipleRegionsAdvice");
+						plugin.message(player, "linksigns-multipleRegions", Utils.createCommaSeparatedList(names));
+						plugin.message(player, "linksigns-multipleRegionsAdvice");
 						return;
 					}
 				}
 				// No regions found within the maximum range
-				messageBridge.message(player, "linksigns-noRegions");
+				plugin.message(player, "linksigns-noRegions");
 			} else if(event.getAction() == Action.LEFT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK) {
 				Block block = null;
 				BlockIterator blockIterator = new BlockIterator(player, 100);
@@ -135,17 +136,25 @@ public class SignLinkerManager extends Manager implements Listener {
 					}
 				}
 				if(block == null || !Materials.isSign(block.getType())) {
-					messageBridge.message(player, "linksigns-noSign");
+					plugin.message(player, "linksigns-noSign");
 					return;
 				}

-				Optional<RegionSign> optional = signManager.signFromLocation(block.getLocation());
-				if(optional.isPresent()) {
-					RegionSign regionSign = optional.get();
-					messageBridge.message(player, "linksigns-alreadyRegistered", regionSign.getRegion());
+				RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+				if(regionSign != null) {
+					plugin.message(player, "linksigns-alreadyRegistered", regionSign.getRegion());
 					return;
 				}
-				linker.setSign(block.getLocation(), block.getType(), SignUtils.getSignFacing(block));
+				final BlockData blockData = block.getBlockData();
+				final BlockFace rotation;
+				if (blockData instanceof Sign) {
+					rotation = ((Sign) blockData).getRotation();
+				} else if (blockData instanceof WallSign) {
+					rotation = ((WallSign) blockData).getFacing();
+				} else {
+					rotation = null;
+				}
+				linker.setSign(block.getLocation(), block.getType(), rotation);
 			}
 		}
 	}
@@ -169,7 +178,7 @@ public class SignLinkerManager extends Manager implements Listener {
 		public final Player linker;
 		public final String profile;

-		public GeneralRegion region = null;
+		public LegacyGeneralRegion region = null;

 		public Location location = null;
 		public Material type = null;
@@ -180,11 +189,11 @@ public class SignLinkerManager extends Manager implements Listener {
 			this.profile = profile;
 		}

-		public void setRegion(GeneralRegion region) {
+		public void setRegion(LegacyGeneralRegion region) {
 			this.region = region;
 			hasRegion = true;
 			if(!isComplete()) {
-				messageBridge.message(linker, "linksigns-regionFound", region);
+				plugin.message(linker, "linksigns-regionFound", region);
 			}
 			finish();
 		}
@@ -195,7 +204,7 @@ public class SignLinkerManager extends Manager implements Listener {
 			this.facing = facing;
 			hasSign = true;
 			if(!isComplete()) {
-				messageBridge.message(linker, "linksigns-signFound", location.getBlockX(), location.getBlockY(), location.getBlockZ());
+				plugin.message(linker, "linksigns-signFound", location.getBlockX(), location.getBlockY(), location.getBlockZ());
 			}
 			finish();
 		}
@@ -204,14 +213,14 @@ public class SignLinkerManager extends Manager implements Listener {
 			if(isComplete()) {
 				region.getSignsFeature().addSign(location, type, facing, profile);
 				if(profile == null) {
-					messageBridge.message(linker, "addsign-success", region);
+					plugin.message(linker, "addsign-success", region);
 				} else {
-					messageBridge.message(linker, "addsign-successProfile", region, profile);
+					plugin.message(linker, "addsign-successProfile", region, profile);
 				}
 				region.update();
 				reset();

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

@@ -0,0 +1,15 @@
+package me.wiefferink.areashop.module;
+
+import me.wiefferink.areashop.interfaces.IRegion;
+import me.wiefferink.areashop.regions.util.RegionFeatureHelper;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.locks.ReadWriteLock;
+
+public interface RegionFactory {
+
+    @NotNull RegionFeatureHelper createFeatureHelper(@NotNull IRegion region, @NotNull ReadWriteLock readWriteLock);
+
+    @NotNull RegionFeatureHelper createFeatureHelper(@NotNull IRegion region);
+
+}
@@ -1,78 +0,0 @@
-package me.wiefferink.areashop.modules;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import com.google.inject.Singleton;
-import com.google.inject.assistedinject.FactoryModuleBuilder;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.MessageBridge;
-import me.wiefferink.areashop.features.FeatureFactory;
-import me.wiefferink.areashop.features.signs.SignsModule;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import me.wiefferink.areashop.managers.AdventureLanguageManager;
-import me.wiefferink.areashop.managers.CommandManager;
-import me.wiefferink.areashop.managers.FeatureManager;
-import me.wiefferink.areashop.managers.FileManager;
-import me.wiefferink.areashop.managers.IFileManager;
-import me.wiefferink.areashop.managers.SignErrorLogger;
-import me.wiefferink.areashop.managers.SignLinkerManager;
-import me.wiefferink.areashop.nms.NMS;
-import me.wiefferink.areashop.regions.ImportJobFactory;
-import me.wiefferink.areashop.regions.RegionModule;
-import me.wiefferink.areashop.tools.AdventureMessageBridge;
-import me.wiefferink.areashop.tools.ForwardingMessageBridge;
-import me.wiefferink.areashop.tools.LegacyMessageBridge;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.util.Arrays;
-
-public class AreaShopModule extends AbstractModule {
-
-    private final AreaShop instance;
-    private final WorldGuardInterface worldGuardInterface;
-    private final WorldEditInterface worldEditInterface;
-    private final NMS nms;
-    private final SignErrorLogger signErrorLogger;
-    private final AbstractModule[] extras;
-
-    public AreaShopModule(@Nonnull AreaShop instance,
-                          @Nonnull NMS nms,
-                          @Nonnull WorldEditInterface worldEditInterface,
-                          @Nonnull WorldGuardInterface worldGuardInterface,
-                          @Nonnull SignErrorLogger signErrorLogger,
-                          @Nonnull AbstractModule... extras
-    ) {
-        this.instance = instance;
-        this.nms = nms;
-        this.signErrorLogger = signErrorLogger;
-        this.worldEditInterface = worldEditInterface;
-        this.worldGuardInterface = worldGuardInterface;
-        this.extras = extras;
-    }
-
-    @Override
-    protected void configure() {
-        Arrays.stream(this.extras).forEach(this::install);
-        bind(Plugin.class).toInstance(this.instance);
-        bind(AreaShop.class).toInstance(this.instance);
-        bind(MessageBridge.class).to(ForwardingMessageBridge.class).asEagerSingleton();
-        bind(WorldGuardInterface.class).toInstance(this.worldGuardInterface);
-        bind(WorldEditInterface.class).toInstance(this.worldEditInterface);
-        bind(SignErrorLogger.class).toInstance(this.signErrorLogger);
-        // Setup managers
-        bind(IFileManager.class).to(FileManager.class).asEagerSingleton();
-        bind(FeatureManager.class).in(Singleton.class);
-        bind(CommandManager.class).in(Singleton.class);
-        bind(SignLinkerManager.class).in(Singleton.class);
-        install(new SignsModule());
-        install(new RegionModule());
-        install(new FactoryModuleBuilder().build(FeatureFactory.class));
-        install(new FactoryModuleBuilder().build(ImportJobFactory.class));
-        requestStaticInjection(Utils.class);
-    }
-}
@@ -1,34 +0,0 @@
-package me.wiefferink.areashop.modules;
-
-import com.google.inject.AbstractModule;
-import org.bukkit.Server;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.inventory.ItemFactory;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.ServicesManager;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scoreboard.ScoreboardManager;
-
-import javax.annotation.Nonnull;
-
-public class BukkitModule extends AbstractModule {
-
-    private final Server server;
-
-    public BukkitModule(@Nonnull Server server) {
-        this.server = server;
-    }
-
-    @Override
-    protected void configure() {
-        bind(Server.class).toInstance(this.server);
-        bind(PluginManager.class).toInstance(this.server.getPluginManager());
-        bind(BukkitScheduler.class).toInstance(this.server.getScheduler());
-        bind(PluginManager.class).toInstance(this.server.getPluginManager());
-        bind(ServicesManager.class).toInstance(this.server.getServicesManager());
-        bind(ItemFactory.class).toInstance(this.server.getItemFactory());
-        bind(ConsoleCommandSender.class).toInstance(this.server.getConsoleSender());
-        bind(ScoreboardManager.class).toInstance(this.server.getScoreboardManager());
-    }
-
-}
@@ -1,37 +0,0 @@
-package me.wiefferink.areashop.modules;
-
-import com.google.inject.AbstractModule;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import net.milkbowl.vault.economy.Economy;
-import net.milkbowl.vault.permission.Permission;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-public class DependencyModule extends AbstractModule {
-
-    private final WorldEditPlugin worldEditPlugin;
-    private final WorldGuardPlugin worldGuardPlugin;
-    private final Economy economy;
-    private final Permission permission;
-
-   public DependencyModule(@Nonnull WorldEditPlugin worldEditPlugin,
-                           @Nonnull WorldGuardPlugin worldGuardPlugin,
-                           @Nullable Economy economy,
-                           @Nullable Permission permission
-   ) {
-       this.worldEditPlugin = worldEditPlugin;
-       this.worldGuardPlugin = worldGuardPlugin;
-       this.economy = economy;
-       this.permission = permission;
-   }
-
-    @Override
-    protected void configure() {
-        bind(WorldEditPlugin.class).toInstance(this.worldEditPlugin);
-        bind(WorldGuardPlugin.class).toInstance(this.worldGuardPlugin);
-        bind(Economy.class).toInstance(this.economy);
-        bind(Permission.class).toInstance(this.permission);
-    }
-}
@@ -1,29 +0,0 @@
-package me.wiefferink.areashop.modules;
-
-import com.google.inject.AbstractModule;
-import me.wiefferink.areashop.adapters.platform.MinecraftPlatform;
-import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
-import me.wiefferink.areashop.nms.BlockBehaviourHelper;
-import me.wiefferink.areashop.nms.NMS;
-import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
-import org.jetbrains.annotations.NotNull;
-
-public class PlatformModule extends AbstractModule {
-
-    private final MinecraftPlatform minecraftPlatform;
-    private final NMS nms;
-
-    public PlatformModule(@NotNull MinecraftPlatform platform,
-                          @NotNull NMS nms) {
-        this.minecraftPlatform = platform;
-        this.nms = nms;
-    }
-    @Override
-    protected void configure() {
-        bind(MinecraftPlatform.class).toInstance(this.minecraftPlatform);
-        bind(OfflinePlayerHelper.class).toInstance(this.minecraftPlatform.offlinePlayerHelper());
-        bind(NMS.class).toInstance(this.nms);
-        bind(BlockBehaviourHelper.class).toInstance(this.nms.blockBehaviourHelper());
-        bind(BukkitSchedulerExecutor.class).asEagerSingleton();
-    }
-}
@@ -0,0 +1,352 @@
+package me.wiefferink.areashop.regions;
+
+import me.wiefferink.areashop.regions.util.RegionStatus;
+import me.wiefferink.areashop.regions.util.RegionType;
+import org.bukkit.World;
+import org.bukkit.configuration.ConfigurationSection;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+public class AbstractRegionMeta implements RegionMeta {
+
+    private static final String KEY_REGION_ID = "name";
+    private static final String KEY_RESTORE = "enableRestore";
+    private static final String KEY_SCHEMATIC_PROFILE = "schematicProfile";
+    //private static final String KEY_LAST_ACTIVE = "lastActive";
+    private static final String KEY_WORLD_NAME = "world";
+    private static final String KEY_LANDLORD = "landlord";
+    private static final String KEY_LANDLORD_NAME = "landlordName";
+
+    private static final String KEY_COUNT_FOR_LIMITS = "countForLimits";
+
+    protected transient final ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
+
+    private @NotNull String regionId;
+    private @NotNull String world;
+    private @Nullable String schematicProfile;
+    private @NotNull RegionStatus regionStatus;
+
+    private @Nullable UUID landlord;
+    private @Nullable String lastKnownLandlordName;
+
+    private boolean restoreEnabled;
+    private boolean restrictedToRegion;
+    private boolean restrictedToWorld;
+    private boolean countForLimits;
+
+    protected AbstractRegionMeta(@NotNull ConfigurationSection configurationSection) {
+        load0(configurationSection);
+    }
+
+    protected AbstractRegionMeta(@NotNull String regionId,
+                                 @NotNull String world,
+                                 @Nullable String schematicProfile,
+                                 @NotNull RegionType regionType,
+                                 @NotNull RegionStatus regionStatus,
+                                 boolean restoreEnabled,
+                                 boolean restrictedToRegion,
+                                 boolean restrictedToWorld) {
+
+        this.regionId = Objects.requireNonNull(regionId);
+        this.world = Objects.requireNonNull(world);
+        this.schematicProfile = Objects.requireNonNull(schematicProfile);
+        this.regionStatus = Objects.requireNonNull(regionStatus);
+        this.restoreEnabled = restoreEnabled;
+        this.restrictedToRegion = restrictedToRegion;
+        this.restrictedToWorld = restrictedToWorld;
+
+    }
+
+    private void load0(@NotNull ConfigurationSection section) {
+        this.regionId = Objects.requireNonNull(section.getString(KEY_REGION_ID));
+        this.world = Objects.requireNonNull(section.getString(KEY_WORLD_NAME));
+        this.schematicProfile = section.getString(KEY_SCHEMATIC_PROFILE);
+
+    }
+
+    @Override
+    public void load(@NotNull ConfigurationSection section) {
+        lockWrite();
+        try {
+            load0(section);
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void removeLandlord() {
+        lockWrite();
+        try {
+            this.landlord = null;
+            this.lastKnownLandlordName = null;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void landlord(@NotNull UUID landlord, @NotNull String lastKnownName) {
+        lockWrite();
+        try {
+            this.landlord = Objects.requireNonNull(landlord);
+            this.lastKnownLandlordName = Objects.requireNonNull(lastKnownName);
+        } finally {
+            unlockWrite();
+        }
+    }
+
+
+    @Override
+    public @NotNull Optional<@NotNull UUID> landlord() {
+        return Optional.ofNullable(this.landlord);
+    }
+
+    @Override
+    public @NotNull Optional<@NotNull String> landlordLastKnownName() {
+        lockWrite();
+        try {
+            return Optional.ofNullable(this.lastKnownLandlordName);
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public @NotNull String regionId() {
+        lockRead();
+        try {
+            return this.regionId;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public @NotNull String worldName() {
+        lockRead();
+        try {
+            return this.world;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public @NotNull Optional<@NotNull String> schematicProfile() {
+        lockRead();
+        try {
+            return Optional.ofNullable(this.schematicProfile);
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public @NotNull RegionStatus status() {
+        lockRead();
+        try {
+            return this.regionStatus;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public boolean restoreEnabled() {
+        lockRead();
+        try {
+            return this.restoreEnabled;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public boolean restrictedToRegion() {
+        lockRead();
+        try {
+            return this.restrictedToRegion;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public boolean restrictedToWorld() {
+        lockRead();
+        try {
+            return this.restrictedToWorld || restrictedToRegion();
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public void regionId(@NotNull String regionId) {
+        lockWrite();
+        try {
+            this.regionId = Objects.requireNonNull(regionId);
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void world(@NotNull World world) {
+        lockWrite();
+        try {
+            this.world = world.getName();
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void world(@NotNull String world) {
+        lockWrite();
+        try {
+            this.world = Objects.requireNonNull(world);
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void schematicProfile(@Nullable String schematicProfile) {
+        lockWrite();
+        try {
+            this.schematicProfile = schematicProfile;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void status(@NotNull RegionStatus regionStatus) {
+        lockWrite();
+        try {
+            this.regionStatus = regionStatus;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void restoreEnabled(boolean restoreEnabled) {
+        lockWrite();
+        try {
+            this.restoreEnabled = restoreEnabled;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void restrictedToRegion(boolean restrictedToRegion) {
+        lockWrite();
+        try {
+            this.restrictedToRegion = restrictedToRegion;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void restrictedToWorld(boolean restrictedToWorld) {
+        lockWrite();
+        try {
+            this.restrictedToWorld = restrictedToWorld;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public boolean countForLimits() {
+        lockRead();
+        try {
+            return this.countForLimits;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public void countForLimits(boolean countForLimits) {
+        lockWrite();
+        try {
+            this.countForLimits = countForLimits;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void saveTo(@NotNull ConfigurationSection section) {
+        section.set(KEY_REGION_ID, this.regionId);
+        section.set(KEY_RESTORE, this.restoreEnabled);
+        section.set(KEY_SCHEMATIC_PROFILE, this.schematicProfile);
+        section.set(KEY_WORLD_NAME, this.world);
+        section.set(KEY_LANDLORD, this.landlord);
+        section.set(KEY_LANDLORD_NAME, this.lastKnownLandlordName);
+        section.set(KEY_COUNT_FOR_LIMITS, this.countForLimits);
+    }
+
+    protected final void lockRead() {
+        this.readWriteLock.readLock().lock();
+    }
+
+    protected final void unlockRead() {
+        this.readWriteLock.readLock().unlock();
+    }
+
+    protected final void lockWrite() {
+        this.readWriteLock.writeLock().lock();
+    }
+
+    protected final void unlockWrite() {
+        this.readWriteLock.writeLock().unlock();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        AbstractRegionMeta that = (AbstractRegionMeta) o;
+
+        if (restoreEnabled != that.restoreEnabled) return false;
+        if (restrictedToRegion != that.restrictedToRegion) return false;
+        if (restrictedToWorld != that.restrictedToWorld) return false;
+        if (countForLimits != that.countForLimits) return false;
+        if (!regionId.equals(that.regionId)) return false;
+        if (!world.equals(that.world)) return false;
+        if (!Objects.equals(schematicProfile, that.schematicProfile))
+            return false;
+        if (regionStatus != that.regionStatus) return false;
+        if (!Objects.equals(landlord, that.landlord)) return false;
+        return Objects.equals(lastKnownLandlordName, that.lastKnownLandlordName);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = regionId.hashCode();
+        result = 31 * result + world.hashCode();
+        result = 31 * result + (schematicProfile != null ? schematicProfile.hashCode() : 0);
+        result = 31 * result + regionStatus.hashCode();
+        result = 31 * result + (landlord != null ? landlord.hashCode() : 0);
+        result = 31 * result + (lastKnownLandlordName != null ? lastKnownLandlordName.hashCode() : 0);
+        result = 31 * result + (restoreEnabled ? 1 : 0);
+        result = 31 * result + (restrictedToRegion ? 1 : 0);
+        result = 31 * result + (restrictedToWorld ? 1 : 0);
+        result = 31 * result + (countForLimits ? 1 : 0);
+        return result;
+    }
+}
@@ -0,0 +1,7 @@
+package me.wiefferink.areashop.regions;
+
+public interface BuyMeta extends RegionMeta {
+
+
+
+}
@@ -9,11 +9,12 @@ import me.wiefferink.areashop.events.ask.SellingRegionEvent;
 import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
 import me.wiefferink.areashop.events.notify.ResoldRegionEvent;
 import me.wiefferink.areashop.events.notify.SoldRegionEvent;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import me.wiefferink.areashop.managers.FeatureManager;
+import me.wiefferink.areashop.handlers.worldedit.v7.WorldEditHandler;
+import me.wiefferink.areashop.handlers.worldguard.v7.WorldGuardHandler;
+import me.wiefferink.areashop.managers.FileManager;
+import me.wiefferink.areashop.module.RegionFactory;
+import me.wiefferink.areashop.regions.util.*;
 import me.wiefferink.areashop.tools.Utils;
-import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -21,56 +22,30 @@ import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.Calendar;
 import java.util.UUID;

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

-	private final Economy economy;
-	
-	@AssistedInject
-	BuyRegion(
-			@Nonnull AreaShop plugin,
-			@Nonnull FeatureManager featureManager,
-			@Nonnull WorldEditInterface worldEditInterface,
-			@Nonnull WorldGuardInterface worldGuardInterface,
-			@Nullable Economy economy,
-			@Assisted @Nonnull YamlConfiguration config
-	) {
-		super(plugin, featureManager, worldEditInterface, worldGuardInterface, config);
-		this.economy = economy;
-	}
+	public static String KEY_SECTION = "buy";
+
+	public static String KEY_BUYER = "buyer";
+	public static String KEY_BUYER_NAME = "buyerName";
+	public static String KEY_PRICE = "price";
+	public static String KEY_RESELL_MODE = "resellMode";
+	public static String KEY_RESELL_PRICE = "resellPrice";
+	public static String KEY_MONEY_BACK_PERCENTAGE = "moneyBack";
+	public static String KEY_INACTIVE_TIME_THRESHOLD = "inactiveTimeUntilSell";

 	@AssistedInject
-	BuyRegion(
-			@Nonnull AreaShop plugin,
-			@Nonnull FeatureManager featureManager,
-			@Nonnull WorldEditInterface worldEditInterface,
-			@Nonnull WorldGuardInterface worldGuardInterface,
-			@Nullable Economy economy,
-			@Assisted @Nonnull String name,
-			@Assisted @Nonnull World world
-	) {
-		super(plugin, featureManager, worldEditInterface, worldGuardInterface, name, world);
-		this.economy = economy;
-	}
-
-	@Override
-	public boolean isOwner(UUID player) {
-		return isBuyer(player);
-	}
-
-	@Override
-	public UUID getOwner() {
-		return getBuyer();
-	}
-
-	@Override
-	public void setOwner(UUID player) {
-		setBuyer(player);
+	public BuyRegion(@NotNull @Assisted YamlConfiguration config,
+					 @NotNull RegionFactory regionFactory,
+					 @NotNull AreaShop plugin,
+					 @NotNull FileManager fileManager,
+					 @NotNull WorldEditHandler worldEditHandler,
+					 @NotNull WorldGuardHandler worldGuardHandler) {
+		super(config, regionFactory, plugin, fileManager, worldEditHandler, worldGuardHandler);
 	}

 	@Override
@@ -79,13 +54,18 @@ public class BuyRegion extends GeneralRegion {
 	}

 	@Override
-	public RegionState getState() {
+	public @NotNull BuyMeta regionMeta() {
+		return (BuyMeta) super.regionMeta();
+	}
+
+	@Override
+	public RegionStatus status() {
 		if(isSold() && isInResellingMode()) {
-			return RegionState.RESELL;
+			return RegionStatus.RESELL;
 		} else if(isSold() && !isInResellingMode()) {
-			return RegionState.SOLD;
+			return RegionStatus.SOLD;
 		} else {
-			return RegionState.FORSALE;
+			return RegionStatus.FORSALE;
 		}
 	}

@@ -252,20 +232,31 @@ public class BuyRegion extends GeneralRegion {

 	@Override
 	public Object provideReplacement(String variable) {
-        return switch (variable) {
-            case AreaShop.tagPrice -> getFormattedPrice();
-            case AreaShop.tagRawPrice -> getPrice();
-            case AreaShop.tagPlayerName -> getPlayerName();
-            case AreaShop.tagPlayerUUID -> getBuyer();
-            case AreaShop.tagResellPrice -> getFormattedResellPrice();
-            case AreaShop.tagRawResellPrice -> getResellPrice();
-            case AreaShop.tagMoneyBackAmount -> getFormattedMoneyBackAmount();
-            case AreaShop.tagRawMoneyBackAmount -> getMoneyBackAmount();
-            case AreaShop.tagMoneyBackPercentage ->
-                    getMoneyBackPercentage() % 1.0 == 0.0 ? (int) getMoneyBackPercentage() : getMoneyBackPercentage();
-            case AreaShop.tagMaxInactiveTime -> this.getFormattedInactiveTimeUntilSell();
-            default -> super.provideReplacement(variable);
-        };
+		switch(variable) {
+			case AreaShop.tagPrice:
+				return getFormattedPrice();
+			case AreaShop.tagRawPrice:
+				return getPrice();
+			case AreaShop.tagPlayerName:
+				return getPlayerName();
+			case AreaShop.tagPlayerUUID:
+				return getBuyer();
+			case AreaShop.tagResellPrice:
+				return getFormattedResellPrice();
+			case AreaShop.tagRawResellPrice:
+				return getResellPrice();
+			case AreaShop.tagMoneyBackAmount:
+				return getFormattedMoneyBackAmount();
+			case AreaShop.tagRawMoneyBackAmount:
+				return getMoneyBackAmount();
+			case AreaShop.tagMoneyBackPercentage:
+				return getMoneyBackPercentage() % 1.0 == 0.0 ? (int)getMoneyBackPercentage() : getMoneyBackPercentage();
+			case AreaShop.tagMaxInactiveTime:
+				return this.getFormattedInactiveTimeUntilSell();
+
+			default:
+				return super.provideReplacement(variable);
+		}
 	}

 	/**
@@ -297,7 +288,7 @@ public class BuyRegion extends GeneralRegion {
 			return false;
 		}

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

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

@@ -390,23 +381,23 @@ public class BuyRegion extends GeneralRegion {
 			getFriendsFeature().clearFriends();
 			double resellPrice = getResellPrice();
 			// Transfer the money to the previous owner
-			EconomyResponse r = economy.withdrawPlayer(offlinePlayer, getWorldName(), getResellPrice());
+			EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), getResellPrice());
 			if(!r.transactionSuccess()) {
 				message(offlinePlayer, "buy-payError");
-				AreaShop.debug("Something went wrong with getting money from " + offlinePlayer.getName() + " while buying " + getName() + ": " + r.errorMessage);
+				AreaShop.debug("Something went wrong with getting money from " + offlinePlayer.getName() + " while buying " + getRegionId() + ": " + r.errorMessage);
 				return false;
 			}
 			r = null;
 			OfflinePlayer oldOwnerPlayer = Bukkit.getOfflinePlayer(oldOwner);
 			String oldOwnerName = getPlayerName();
 			if(oldOwnerPlayer != null && oldOwnerPlayer.getName() != null) {
-				r = economy.depositPlayer(oldOwnerPlayer, getWorldName(), getResellPrice());
+				r = plugin.getEconomy().depositPlayer(oldOwnerPlayer, getWorldName(), getResellPrice());
 				oldOwnerName = oldOwnerPlayer.getName();
 			} else if(oldOwnerName != null) {
-				r = economy.depositPlayer(oldOwnerName, getWorldName(), getResellPrice());
+				r = plugin.getEconomy().depositPlayer(oldOwnerName, getWorldName(), getResellPrice());
 			}
 			if(r == null || !r.transactionSuccess()) {
-				AreaShop.warn("Something went wrong with paying '" + oldOwnerName + "' " + getFormattedPrice() + " for his resell of region " + getName() + " to " + offlinePlayer.getName());
+				AreaShop.warn("Something went wrong with paying '" + oldOwnerName + "' " + getFormattedPrice() + " for his resell of region " + getRegionId() + " to " + offlinePlayer.getName());
 			}
 			// Resell is done, disable that now
 			disableReselling();
@@ -437,7 +428,7 @@ public class BuyRegion extends GeneralRegion {
 			}

 			// Substract the money from the players balance
-			EconomyResponse r = economy.withdrawPlayer(offlinePlayer, getWorldName(), getPrice());
+			EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), getPrice());
 			if(!r.transactionSuccess()) {
 				message(offlinePlayer, "buy-payError");
 				return false;
@@ -450,12 +441,12 @@ public class BuyRegion extends GeneralRegion {
 			String landlordName = getLandlordName();
 			if(landlordName != null) {
 				if(landlordPlayer != null && landlordPlayer.getName() != null) {
-					r = economy.depositPlayer(landlordPlayer, getWorldName(), getPrice());
+					r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), getPrice());
 				} else {
-					r = economy.depositPlayer(landlordName, getWorldName(), getPrice());
+					r = plugin.getEconomy().depositPlayer(landlordName, getWorldName(), getPrice());
 				}
 				if(r != null && !r.transactionSuccess()) {
-					AreaShop.warn("Something went wrong with paying '" + landlordName + "' " + getFormattedPrice() + " for his sell of region " + getName() + " to " + offlinePlayer.getName());
+					AreaShop.warn("Something went wrong with paying '" + landlordName + "' " + getFormattedPrice() + " for his sell of region " + getRegionId() + " to " + offlinePlayer.getName());
 				}
 			}

@@ -483,7 +474,7 @@ public class BuyRegion extends GeneralRegion {
 	 */
 	@SuppressWarnings("deprecation")
 	public boolean sell(boolean giveMoneyBack, CommandSender executor) {
-		boolean own = executor instanceof Player player && this.isBuyer(player);
+		boolean own = executor instanceof Player && this.isBuyer((Player)executor);
 		if(executor != null) {
 			if(!executor.hasPermission("areashop.sell") && !own) {
 				message(executor, "sell-noPermissionOther");
@@ -502,7 +493,7 @@ public class BuyRegion extends GeneralRegion {
 			}
 		}

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

@@ -527,9 +518,9 @@ public class BuyRegion extends GeneralRegion {
 			EconomyResponse r;
 			if(landlordName != null) {
 				if(landlordPlayer != null && landlordPlayer.getName() != null) {
-					r = economy.withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
+					r = plugin.getEconomy().withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
 				} else {
-					r = economy.withdrawPlayer(landlordName, getWorldName(), moneyBack);
+					r = plugin.getEconomy().withdrawPlayer(landlordName, getWorldName(), moneyBack);
 				}
 				if(r == null || !r.transactionSuccess()) {
 					noPayBack = true;
@@ -538,20 +529,20 @@ public class BuyRegion extends GeneralRegion {

 			// Give back the money
 			OfflinePlayer player = Bukkit.getOfflinePlayer(getBuyer());
-			if(player.hasPlayedBefore() && !noPayBack) {
+			if(player != null && !noPayBack) {
 				EconomyResponse response = null;
 				boolean error = false;
 				try {
 					if(player.getName() != null) {
-						response = economy.depositPlayer(player, getWorldName(), moneyBack);
+						response = plugin.getEconomy().depositPlayer(player, getWorldName(), moneyBack);
 					} else if(getPlayerName() != null) {
-						response = economy.depositPlayer(getPlayerName(), getWorldName(), moneyBack);
+						response = plugin.getEconomy().depositPlayer(getPlayerName(), getWorldName(), moneyBack);
 					}
 				} catch(Exception e) {
 					error = true;
 				}
 				if(error || response == null || !response.transactionSuccess()) {
-					AreaShop.warn("Something went wrong with paying back money to " + getPlayerName() + " while selling region " + getName());
+					AreaShop.warn("Something went wrong with paying back money to " + getPlayerName() + " while selling region " + getRegionId());
 				}
 			}
 		}
@@ -584,10 +575,11 @@ public class BuyRegion extends GeneralRegion {
 			return false;
 		}
 		long lastPlayed = getLastActiveTime();
+		long now = System.currentTimeMillis();
 		//AreaShop.debug("currentTime=" + Calendar.getInstance().getTimeInMillis() + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (Calendar.getInstance().getTimeInMillis()-player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
-		if(Calendar.getInstance().getTimeInMillis() > (lastPlayed + inactiveSetting)) {
-			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);
+		if(now > (lastPlayed + inactiveSetting)) {
+			AreaShop.info("Region " + getRegionId() + " unrented because of inactivity for player " + getPlayerName());
+			AreaShop.debug("currentTime=" + now + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (now - player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
 			return this.sell(true, null);
 		}
 		return false;
@@ -0,0 +1,6 @@
+package me.wiefferink.areashop.regions;
+
+public class BuyRegionMetaImpl extends AbstractRegionMeta {
+
+
+}
@@ -1,11 +0,0 @@
-package me.wiefferink.areashop.regions;
-
-import org.bukkit.command.CommandSender;
-
-import javax.annotation.Nonnull;
-
-public interface ImportJobFactory {
-
-    @Nonnull ImportJob createImportJob(@Nonnull CommandSender commandSender);
-
-}
@@ -0,0 +1,228 @@
+package me.wiefferink.areashop.regions;
+
+import me.wiefferink.areashop.events.NotifyRegionEvent;
+import me.wiefferink.areashop.interfaces.IRegion;
+import me.wiefferink.areashop.regions.util.*;
+import me.wiefferink.interactivemessenger.processing.ReplacementProvider;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+public interface MarketableRegion extends IRegion, Comparable<MarketableRegion>, ReplacementProvider {
+    /**
+     * Get the amount of regions a player has matching a certain limits group (config.yml -- limitGroups)
+     *
+     * @param player     The player to check the amount for
+     * @param limitGroup The group to check
+     * @param regions    All the regions a player has bought or rented
+     * @param exclude    Exclude this region from the count
+     * @return The number of regions that the player has bought or rented matching the limit group (worlds and groups filters)
+     */
+    static int hasRegionsInLimitGroup(OfflinePlayer player, String limitGroup, List<? extends MarketableRegion> regions, MarketableRegion exclude) {
+        int result = 0;
+        for (MarketableRegion region : regions) {
+            final RegionMeta meta = region.regionMeta();
+            if (meta.countForLimits()
+                    // && region.isOwner(player)
+                    && region.matchesLimitGroup(limitGroup)
+                    && (exclude == null || !exclude.getRegionId().equals(region.getRegionId()))) {
+                result++;
+            }
+        }
+        return result;
+    }
+
+    @NotNull RegionMeta regionMeta();
+
+    @NotNull RegionFeatureHelper featureHelper();
+
+    /**
+     * Shared setup of all constructors.
+     */
+    void setup();
+
+    /**
+     * Deregister everything.
+     */
+    void destroy();
+
+    /**
+     * Broadcast an event to indicate that region settings have been changed.
+     * This will update region flags, signs, etc.
+     */
+    void update();
+
+    /**
+     * Broadcast the given event and update the region status.
+     *
+     * @param event The update event that should be broadcasted
+     */
+    void notifyAndUpdate(NotifyRegionEvent<?> event);
+
+    /**
+     * Check if the region has been deleted.
+     *
+     * @return true if the region has been deleted, otherwise false
+     */
+    boolean isDeleted();
+
+    /**
+     * Indicate that this region has been deleted.
+     */
+    void delete();
+
+    /**
+     * Get the minimum corner of the region.
+     *
+     * @return Vector
+     */
+    Vector getMinimumPoint();
+
+    /**
+     * Get the maximum corner of the region.
+     *
+     * @return Vector
+     */
+    Vector getMaximumPoint();
+
+    /**
+     * Get the groups that this region is added to.
+     *
+     * @return A Set with all groups of this region
+     */
+    Set<RegionGroup> getGroups();
+
+    /**
+     * Get a list of names from groups this region is in.
+     *
+     * @return A list of groups this region is part of
+     */
+    List<String> getGroupNames();
+
+    /**
+     * Method to send a message to a CommandSender, using chatprefix if it is a player.
+     * Automatically includes the region in the message, enabling the use of all variables.
+     *
+     * @param target The CommandSender you wan't to send the message to (e.g. a player)
+     * @param key    The key to get the translation
+     * @param prefix Specify if the message should have a prefix
+     * @param params The parameters to inject into the message string
+     */
+    void configurableMessage(Object target, String key, boolean prefix, Object... params);
+
+    void messageNoPrefix(Object target, String key, Object... params);
+
+    void message(Object target, String key, Object... params);
+
+    /**
+     * Save all blocks in a region for restoring later.
+     *
+     * @param fileName The name of the file to save to (extension and folder will be added)
+     * @return true if the region has been saved properly, otherwise false
+     */
+    boolean saveRegionBlocks(String fileName);
+
+    /**
+     * Save all blocks in a region for restoring later.
+     *
+     * @param fileName The name of the file to save to (extension and folder will be added)
+     * @return true if the region has been saved properly, otherwise false
+     */
+    CompletableFuture<Boolean> saveRegionBlocksAsync(String fileName);
+
+    /**
+     * Restore all blocks in a region for restoring later.
+     *
+     * @param fileName The name of the file to save to (extension and folder will be added)
+     * @return true if the region has been restored properly, otherwise false
+     */
+    boolean restoreRegionBlocks(String fileName);
+
+    /**
+     * Restore all blocks in a region for restoring later.
+     *
+     * @param fileName The name of the file to save to (extension and folder will be added)
+     * @return true if the region has been restored properly, otherwise false
+     */
+    CompletableFuture<Boolean> restoreRegionBlocksAsync(String fileName);
+
+    /**
+     * Reset all flags of the region.
+     */
+    void resetRegionFlags();
+
+    /**
+     * Indicate this region needs to be saved, saving will happen by a repeating task.
+     */
+    void saveRequired();
+
+    /**
+     * Check if a save is required.
+     *
+     * @return true if a save is required because some data changed, otherwise false
+     */
+    boolean isSaveRequired();
+
+    /**
+     * Save this region to disk now, using this method could slow down the plugin, normally saveRequired() should be used.
+     *
+     * @return true if the region is saved successfully, otherwise false
+     */
+    boolean saveNow();
+
+    CompletableFuture<Boolean> saveNowAsync();
+
+    /**
+     * Check if the player can buy/rent this region, detailed info in the result object.
+     *
+     * @param type   The type of region to check
+     * @param player The player to check it for
+     * @return LimitResult containing if it is allowed, why and limiting factor
+     */
+    LimitResult limitsAllow(RegionType type, OfflinePlayer player);
+
+    /**
+     * Check if the player can buy/rent this region, detailed info in the result object.
+     *
+     * @param type          The type of region to check
+     * @param offlinePlayer The player to check it for
+     * @param extend        Check for extending of rental regions
+     * @return LimitResult containing if it is allowed, why and limiting factor
+     */
+    LimitResult limitsAllow(RegionType type, OfflinePlayer offlinePlayer, boolean extend);
+
+    /**
+     * Check if this region matches the filters of a limit group.
+     *
+     * @param group The group to check
+     * @return true if the region applies to the limit group, otherwise false
+     */
+    boolean matchesLimitGroup(String group);
+
+    /**
+     * Checks an event and handles saving to and restoring from schematic for it.
+     *
+     * @param type The type of event
+     */
+    void handleSchematicEvent(RegionEvent type);
+
+    /**
+     * Run commands as the CommandsSender, replacing all tags with the relevant values.
+     *
+     * @param sender   The sender that should perform the command
+     * @param commands A list of the commands to run (without slash and with tags)
+     */
+    void runCommands(CommandSender sender, List<String> commands);
+
+    /**
+     * Get the volume of the region (number of blocks inside it).
+     *
+     * @return Number of blocks in the region
+     */
+    long volume();
+}
@@ -1,20 +0,0 @@
-package me.wiefferink.areashop.regions;
-
-import org.bukkit.World;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import javax.annotation.Nonnull;
-
-public interface RegionFactory {
-
-    @Nonnull BuyRegion createBuyRegion(@Nonnull YamlConfiguration yamlConfiguration);
-
-    @Nonnull BuyRegion createBuyRegion(@Nonnull String name, @Nonnull World world);
-
-    @Nonnull RentRegion createRentRegion(@Nonnull YamlConfiguration yamlConfiguration);
-
-    @Nonnull RentRegion createRentRegion(@Nonnull String name, @Nonnull World world);
-
-    @Nonnull RegionGroup createRegionGroup(@Nonnull String name);
-
-}
@@ -1,232 +1,225 @@
-package me.wiefferink.areashop.regions;
-
-import com.google.inject.assistedinject.Assisted;
-import com.google.inject.assistedinject.AssistedInject;
-import me.wiefferink.areashop.managers.IFileManager;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-
-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
-// TODO consider switching to saving lowercase regions
-public class RegionGroup {
-
-	private final Plugin plugin;
-	private final IFileManager fileManager;
-	private final String name;
-	private final Set<String> regions;
-	private Set<String> autoRegions;
-	private boolean autoDirty;
-	private final Set<String> worlds;
-
-	/**
-	 * Constructor, used when creating new groups or restoring them from groups.yml at server boot.
-	 * @param plugin The AreaShop plugin
-	 * @param name   Name of the group, has to be unique
-	 */
-	@AssistedInject
-	RegionGroup(@Nonnull Plugin plugin, @Nonnull IFileManager fileManager, @Assisted String name) {
-		this.plugin = plugin;
-		this.fileManager = fileManager;
-		this.name = name;
-		this.autoDirty = true;
-		setSetting("name", name);
-
-		// Load regions and worlds
-		regions = new HashSet<>(getSettings().getStringList("regions"));
-		worlds = new HashSet<>(getSettings().getStringList("worlds"));
-	}
-
-	/**
-	 * Get automatically added regions.
-	 * @return Set of regions automatically added by the configuration
-	 */
-	public Set<String> getAutoRegions() {
-		if(autoDirty) {
-			autoRegions = new HashSet<>();
-			for(GeneralRegion region : fileManager.getRegionsRef()) {
-				if(worlds.contains(region.getWorldName())) {
-					autoRegions.add(region.getName());
-				}
-			}
-			autoDirty = false;
-		}
-		return autoRegions;
-	}
-
-	/**
-	 * Mark that automatically added regions should be regenerated.
-	 */
-	public void autoDirty() {
-		autoDirty = true;
-	}
-
-	/**
-	 * Adds a world from which all regions should be added to the group.
-	 * @param world World from which all regions should be added
-	 * @return true if the region was not already added, otherwise false
-	 */
-	public boolean addWorld(String world) {
-		if(worlds.add(world)) {
-			setSetting("regionsFromWorlds", new ArrayList<>(worlds));
-			saveRequired();
-			autoDirty();
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Remove a member from the group.
-	 * @param world World to remove
-	 * @return true if the region was in the group before, otherwise false
-	 */
-	public boolean removeWorld(String world) {
-		if(worlds.remove(world)) {
-			setSetting("regionsFromWorlds", new ArrayList<>(worlds));
-			saveRequired();
-			autoDirty();
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Get all worlds from which regions are added automatically.
-	 * @return A list with the names of all worlds (immutable)
-	 */
-	public Set<String> getWorlds() {
-		return new HashSet<>(worlds);
-	}
-
-	/**
-	 * Adds a member to a group.
-	 * @param region The region to add to the group (GeneralRegion or a subclass of it)
-	 * @return true if the region was not already added, otherwise false
-	 */
-	public boolean addMember(GeneralRegion region) {
-		if(regions.add(region.getName())) {
-			setSetting("regions", new ArrayList<>(regions));
-			saveRequired();
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Remove a member from the group.
-	 * @param region The region to remove
-	 * @return true if the region was in the group before, otherwise false
-	 */
-	public boolean removeMember(GeneralRegion region) {
-		if(regions.remove(region.getName())) {
-			setSetting("regions", new ArrayList<>(regions));
-			saveRequired();
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Get all members of the group.
-	 * @return A list with the names of all members of the group (immutable)
-	 */
-	public Set<String> getMembers() {
-		HashSet<String> result = new HashSet<>(regions);
-		result.addAll(getAutoRegions());
-		return result;
-	}
-
-	/**
-	 * Get all manually added members of the group.
-	 * @return A list with the names of all members of the group (immutable)
-	 */
-	public Set<String> getManualMembers() {
-		return new HashSet<>(regions);
-	}
-
-	/**
-	 * Get all members of the group as GeneralRegions.
-	 * @return A Set with all group members
-	 */
-	public Set<GeneralRegion> getMemberRegions() {
-		Set<GeneralRegion> result = new HashSet<>();
-		for(String playerName : getMembers()) {
-			result.add(fileManager.getRegion(playerName));
-		}
-		return result;
-	}
-
-	/**
-	 * Get the name of the group.
-	 * @return The name of the group
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Get the lowercase name of the group (used for getting the config etc).
-	 * @return The name of the group in lowercase
-	 */
-	public String getLowerCaseName() {
-		return getName().toLowerCase();
-	}
-
-	/**
-	 * Check if a region is member of the group.
-	 * @param region Region to check
-	 * @return true if the region is in the group, otherwise false
-	 */
-	public boolean isMember(GeneralRegion region) {
-		return getMembers().contains(region.getName());
-	}
-
-	/**
-	 * Get the priority of the group (higher overwrites).
-	 * @return The priority of the group
-	 */
-	public int getPriority() {
-		return getSettings().getInt("priority");
-	}
-
-	/**
-	 * Get the configurationsection with the settings of this group.
-	 * @return The ConfigurationSection with the settings of the group
-	 */
-	public ConfigurationSection getSettings() {
-		ConfigurationSection result =  fileManager.getGroupSettings(name);
-		if(result != null) {
-			return result;
-		} else {
-			return new YamlConfiguration();
-		}
-	}
-
-	/**
-	 * Set a setting of this group.
-	 * @param path    The path to set
-	 * @param setting The value to set
-	 */
-	public void setSetting(String path, Object setting) {
-		fileManager.setGroupSetting(this, path, setting);
-	}
-
-	/**
-	 * Indicates this file needs to be saved, will actually get saved later by a task.
-	 */
-	public void saveRequired() {
-		fileManager.saveGroupsIsRequired();
-	}
-
-	/**
-	 * Save the groups to disk now, normally saveRequired() is preferred because of performance.
-	 */
-	public void saveNow() {
-		fileManager.saveGroupsNow();
-	}
-}
+package me.wiefferink.areashop.regions;
+
+import me.wiefferink.areashop.AreaShop;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+// TODO consider switching to saving lowercase regions
+public class RegionGroup {
+
+	private final AreaShop plugin;
+	private final String name;
+	private final Set<String> regions;
+	private Set<String> autoRegions;
+	private boolean autoDirty;
+	private final Set<String> worlds;
+
+	/**
+	 * Constructor, used when creating new groups or restoring them from groups.yml at server boot.
+	 * @param plugin The AreaShop plugin
+	 * @param name   Name of the group, has to be unique
+	 */
+	public RegionGroup(AreaShop plugin, String name) {
+		this.plugin = plugin;
+		this.name = name;
+		this.autoDirty = true;
+		setSetting("name", name);
+
+		// Load regions and worlds
+		regions = new HashSet<>(getSettings().getStringList("regions"));
+		worlds = new HashSet<>(getSettings().getStringList("worlds"));
+	}
+
+	/**
+	 * Get automatically added regions.
+	 * @return Set of regions automatically added by the configuration
+	 */
+	public Set<String> getAutoRegions() {
+		if(autoDirty) {
+			autoRegions = new HashSet<>();
+			for(LegacyGeneralRegion region : plugin.getFileManager().getRegions()) {
+				if(worlds.contains(region.getWorldName())) {
+					autoRegions.add(region.getRegionId());
+				}
+			}
+			autoDirty = false;
+		}
+		return autoRegions;
+	}
+
+	/**
+	 * Mark that automatically added regions should be regenerated.
+	 */
+	public void autoDirty() {
+		autoDirty = true;
+	}
+
+	/**
+	 * Adds a world from which all regions should be added to the group.
+	 * @param world World from which all regions should be added
+	 * @return true if the region was not already added, otherwise false
+	 */
+	public boolean addWorld(String world) {
+		if(worlds.add(world)) {
+			setSetting("regionsFromWorlds", new ArrayList<>(worlds));
+			saveRequired();
+			autoDirty();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Remove a member from the group.
+	 * @param world World to remove
+	 * @return true if the region was in the group before, otherwise false
+	 */
+	public boolean removeWorld(String world) {
+		if(worlds.remove(world)) {
+			setSetting("regionsFromWorlds", new ArrayList<>(worlds));
+			saveRequired();
+			autoDirty();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Get all worlds from which regions are added automatically.
+	 * @return A list with the names of all worlds (immutable)
+	 */
+	public Set<String> getWorlds() {
+		return new HashSet<>(worlds);
+	}
+
+	/**
+	 * Adds a member to a group.
+	 * @param region The region to add to the group (GeneralRegion or a subclass of it)
+	 * @return true if the region was not already added, otherwise false
+	 */
+	public boolean addMember(MarketableRegion region) {
+		if(regions.add(region.getRegionId())) {
+			setSetting("regions", new ArrayList<>(regions));
+			saveRequired();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Remove a member from the group.
+	 * @param region The region to remove
+	 * @return true if the region was in the group before, otherwise false
+	 */
+	public boolean removeMember(MarketableRegion region) {
+		if(regions.remove(region.getRegionId())) {
+			setSetting("regions", new ArrayList<>(regions));
+			saveRequired();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Get all members of the group.
+	 * @return A list with the names of all members of the group (immutable)
+	 */
+	public Set<String> getMembers() {
+		HashSet<String> result = new HashSet<>(regions);
+		result.addAll(getAutoRegions());
+		return result;
+	}
+
+	/**
+	 * Get all manually added members of the group.
+	 * @return A list with the names of all members of the group (immutable)
+	 */
+	public Set<String> getManualMembers() {
+		return new HashSet<>(regions);
+	}
+
+	/**
+	 * Get all members of the group as GeneralRegions.
+	 * @return A Set with all group members
+	 */
+	public Set<LegacyGeneralRegion> getMemberRegions() {
+		Set<LegacyGeneralRegion> result = new HashSet<>();
+		for(String playerName : getMembers()) {
+			result.add(plugin.getFileManager().getRegion(playerName));
+		}
+		return result;
+	}
+
+	/**
+	 * Get the name of the group.
+	 * @return The name of the group
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Get the lowercase name of the group (used for getting the config etc).
+	 * @return The name of the group in lowercase
+	 */
+	public String getLowerCaseName() {
+		return getName().toLowerCase();
+	}
+
+	/**
+	 * Check if a region is member of the group.
+	 * @param region Region to check
+	 * @return true if the region is in the group, otherwise false
+	 */
+	public boolean isMember(LegacyGeneralRegion region) {
+		return getMembers().contains(region.getRegionId());
+	}
+
+	/**
+	 * Get the priority of the group (higher overwrites).
+	 * @return The priority of the group
+	 */
+	public int getPriority() {
+		return getSettings().getInt("priority");
+	}
+
+	/**
+	 * Get the configurationsection with the settings of this group.
+	 * @return The ConfigurationSection with the settings of the group
+	 */
+	public ConfigurationSection getSettings() {
+		ConfigurationSection result =  plugin.getFileManager().getGroupSettings(name);
+		if(result != null) {
+			return result;
+		} else {
+			return new YamlConfiguration();
+		}
+	}
+
+	/**
+	 * Set a setting of this group.
+	 * @param path    The path to set
+	 * @param setting The value to set
+	 */
+	public void setSetting(String path, Object setting) {
+		plugin.getFileManager().setGroupSetting(this, path, setting);
+	}
+
+	/**
+	 * Indicates this file needs to be saved, will actually get saved later by a task.
+	 */
+	public void saveRequired() {
+		plugin.getFileManager().saveGroupsIsRequired();
+	}
+
+	/**
+	 * Save the groups to disk now, normally saveRequired() is preferred because of performance.
+	 */
+	public void saveNow() {
+		plugin.getFileManager().saveGroupsNow();
+	}
+}
@@ -0,0 +1,65 @@
+package me.wiefferink.areashop.regions;
+
+import me.wiefferink.areashop.regions.util.RegionStatus;
+import me.wiefferink.areashop.regions.util.RegionType;
+import org.bukkit.World;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.UUID;
+
+public interface RegionMeta {
+
+    void load(@NotNull ConfigurationSection section);
+
+    @NotNull String regionId();
+
+    void regionId(@NotNull String regionId);
+
+    @NotNull String worldName();
+
+    @NotNull Optional<@NotNull UUID> landlord();
+
+    @NotNull Optional<@NotNull String> landlordLastKnownName();
+
+    void removeLandlord();
+
+    void landlord(@NotNull UUID landlord, @NotNull String lastKnownName);
+
+    default void landlord(@NotNull Player player) {
+        landlord(player.getUniqueId(), player.getName());
+    }
+
+    void world(@NotNull World world);
+
+    void world(@NotNull String worldName);
+
+    @NotNull Optional<@NotNull String> schematicProfile();
+
+    void schematicProfile(@Nullable String schematicProfile);
+
+    @NotNull RegionStatus status();
+
+    void status(@NotNull RegionStatus status);
+
+    boolean restoreEnabled();
+
+    void restoreEnabled(boolean enabled);
+
+    boolean restrictedToRegion();
+
+    void restrictedToRegion(boolean restricted);
+
+    boolean restrictedToWorld();
+
+    void restrictedToWorld(boolean restricted);
+
+    boolean countForLimits();
+
+    void countForLimits(boolean counts);
+
+    void saveTo(@NotNull ConfigurationSection configurationSection);
+}
@@ -1,12 +0,0 @@
-package me.wiefferink.areashop.regions;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.assistedinject.FactoryModuleBuilder;
-
-public class RegionModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        install(new FactoryModuleBuilder().build(RegionFactory.class));
-    }
-}
@@ -1,17 +1,12 @@
 package me.wiefferink.areashop.regions;

-import com.google.inject.assistedinject.Assisted;
-import com.google.inject.assistedinject.AssistedInject;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.events.ask.RentingRegionEvent;
 import me.wiefferink.areashop.events.ask.UnrentingRegionEvent;
 import me.wiefferink.areashop.events.notify.RentedRegionEvent;
 import me.wiefferink.areashop.events.notify.UnrentedRegionEvent;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import me.wiefferink.areashop.managers.FeatureManager;
+import me.wiefferink.areashop.regions.util.*;
 import me.wiefferink.areashop.tools.Utils;
-import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -21,8 +16,6 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -31,26 +24,15 @@ import java.util.UUID;

 import static me.wiefferink.areashop.tools.Utils.millisToHumanFormat;

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

 	/**
 	 * Constructor.
 	 * @param config All settings of this region
 	 */
-	@AssistedInject
-	RentRegion(
-			@Nonnull AreaShop plugin,
-			@Nonnull FeatureManager featureManager,
-			@Nonnull WorldEditInterface worldEditInterface,
-			@Nonnull WorldGuardInterface worldGuardInterface,
-			@Nullable Economy economy,
-			@Assisted @Nonnull YamlConfiguration config
-	) {
-		super(plugin, featureManager, worldEditInterface, worldGuardInterface, config);
-		this.economy = economy;
+	public RentRegion(YamlConfiguration config) {
+		super(config);
 	}

 	/**
@@ -58,34 +40,8 @@ public class RentRegion extends GeneralRegion {
 	 * @param name  The name of the region (correct casing)
 	 * @param world The world of the WorldGuard region
 	 */
-	@AssistedInject
-	RentRegion(
-			@Nonnull AreaShop plugin,
-			@Nonnull FeatureManager featureManager,
-			@Nonnull WorldEditInterface worldEditInterface,
-			@Nonnull WorldGuardInterface worldGuardInterface,
-			@Nullable Economy economy,
-			@Assisted @Nonnull String name,
-			@Assisted @Nonnull World world
-	) {
-		super(plugin, featureManager, worldEditInterface, worldGuardInterface, name, world);
-		this.economy = economy;
-	}
-
-
-	@Override
-	public boolean isOwner(UUID player) {
-		return isRenter(player);
-	}
-
-	@Override
-	public UUID getOwner() {
-		return getRenter();
-	}
-
-	@Override
-	public void setOwner(UUID player) {
-		setRenter(player);
+	public RentRegion(String name, World world) {
+		super(name, world);
 	}

 	@Override
@@ -94,11 +50,11 @@ public class RentRegion extends GeneralRegion {
 	}

 	@Override
-	public RegionState getState() {
+	public RegionStatus getState() {
 		if(isRented()) {
-			return RegionState.RENTED;
+			return RegionStatus.RENTED;
 		} else {
-			return RegionState.FORRENT;
+			return RegionStatus.FORRENT;
 		}
 	}

@@ -181,28 +137,43 @@ public class RentRegion extends GeneralRegion {

 	@Override
 	public Object provideReplacement(String variable) {
-		return switch (variable) {
-			case AreaShop.tagPrice -> getFormattedPrice();
-			case AreaShop.tagRawPrice -> getPrice();
-			case AreaShop.tagDuration -> getDurationString();
-			case AreaShop.tagPlayerName -> getPlayerName();
-			case AreaShop.tagPlayerUUID -> getRenter();
-			case AreaShop.tagRentedUntil ->
-					new SimpleDateFormat(plugin.getConfig().getString("timeFormatChat")).format(new Date(getRentedUntil()));
-			case AreaShop.tagRentedUntilShort ->
-					new SimpleDateFormat(plugin.getConfig().getString("timeFormatSign")).format(new Date(getRentedUntil()));
-			case AreaShop.tagTimeLeft -> getTimeLeftString();
-			case AreaShop.tagMoneyBackAmount -> getFormattedMoneyBackAmount();
-			case AreaShop.tagRawMoneyBackAmount -> getMoneyBackAmount();
-			case AreaShop.tagMoneyBackPercentage ->
-					(getMoneyBackPercentage() % 1.0) == 0.0 ? (int) getMoneyBackPercentage() : getMoneyBackPercentage();
-			case AreaShop.tagTimesExtended -> this.getTimesExtended();
-			case AreaShop.tagMaxExtends -> this.getMaxExtends();
-			case AreaShop.tagExtendsLeft -> getMaxExtends() - getTimesExtended();
-			case AreaShop.tagMaxRentTime -> millisToHumanFormat(getMaxRentTime());
-			case AreaShop.tagMaxInactiveTime -> this.getFormattedInactiveTimeUntilUnrent();
-			default -> super.provideReplacement(variable);
-		};
+		switch(variable) {
+			case AreaShop.tagPrice:
+				return getFormattedPrice();
+			case AreaShop.tagRawPrice:
+				return getPrice();
+			case AreaShop.tagDuration:
+				return getDurationString();
+			case AreaShop.tagPlayerName:
+				return getPlayerName();
+			case AreaShop.tagPlayerUUID:
+				return getRenter();
+			case AreaShop.tagRentedUntil:
+				return new SimpleDateFormat(plugin.getConfig().getString("timeFormatChat")).format(new Date(getRentedUntil()));
+			case AreaShop.tagRentedUntilShort:
+				return new SimpleDateFormat(plugin.getConfig().getString("timeFormatSign")).format(new Date(getRentedUntil()));
+			case AreaShop.tagTimeLeft:
+				return getTimeLeftString();
+			case AreaShop.tagMoneyBackAmount:
+				return getFormattedMoneyBackAmount();
+			case AreaShop.tagRawMoneyBackAmount:
+				return getMoneyBackAmount();
+			case AreaShop.tagMoneyBackPercentage:
+				return (getMoneyBackPercentage() % 1.0) == 0.0 ? (int)getMoneyBackPercentage() : getMoneyBackPercentage();
+			case AreaShop.tagTimesExtended:
+				return this.getTimesExtended();
+			case AreaShop.tagMaxExtends:
+				return this.getMaxExtends();
+			case AreaShop.tagExtendsLeft:
+				return getMaxExtends() - getTimesExtended();
+			case AreaShop.tagMaxRentTime:
+				return millisToHumanFormat(getMaxRentTime());
+			case AreaShop.tagMaxInactiveTime:
+				return this.getFormattedInactiveTimeUntilUnrent();
+
+			default:
+				return super.provideReplacement(variable);
+		}
 	}

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

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

 		// Substract the money from the players balance
-		EconomyResponse r = economy.withdrawPlayer(offlinePlayer, getWorldName(), price);
+		EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), price);
 		if(!r.transactionSuccess()) {
 			message(offlinePlayer, "rent-payError");
-			AreaShop.debug("Something went wrong with getting money from " + offlinePlayer.getName() + " while renting " + getName() + ": " + r.errorMessage);
+			AreaShop.debug("Something went wrong with getting money from " + offlinePlayer.getName() + " while renting " + getRegionId() + ": " + r.errorMessage);
 			return false;
 		}
 		// Optionally give money to the landlord
@@ -602,12 +573,12 @@ public class RentRegion extends GeneralRegion {
 		String landlordName = getLandlordName();
 		if(landlordName != null) {
 			if(landlordPlayer != null && landlordPlayer.getName() != null) {
-				r = economy.depositPlayer(landlordPlayer, getWorldName(), price);
+				r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), price);
 			} else {
-				r = economy.depositPlayer(landlordName, getWorldName(), price);
+				r = plugin.getEconomy().depositPlayer(landlordName, getWorldName(), price);
 			}
 			if(r == null || !r.transactionSuccess()) {
-				AreaShop.warn("Something went wrong with paying '" + landlordName + "' " + Utils.formatCurrency(price) + " for his rent of region " + getName() + " to " + offlinePlayer.getName());
+				AreaShop.warn("Something went wrong with paying '" + landlordName + "' " + Utils.formatCurrency(price) + " for his rent of region " + getRegionId() + " to " + offlinePlayer.getName());
 			}
 		}

@@ -668,15 +639,15 @@ public class RentRegion extends GeneralRegion {
 			}
 		}

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

 		// Broadcast and check event
-		UnrentingRegionEvent unrentingRegionEvent = new UnrentingRegionEvent(this);
-		Bukkit.getPluginManager().callEvent(unrentingRegionEvent);
-		if(unrentingRegionEvent.isCancelled()) {
-			message(executor, "general-cancelled", unrentingRegionEvent.getReason());
+		UnrentingRegionEvent event = new UnrentingRegionEvent(this);
+		Bukkit.getPluginManager().callEvent(event);
+		if(event.isCancelled()) {
+			message(executor, "general-cancelled", event.getReason());
 			return false;
 		}

@@ -692,9 +663,9 @@ public class RentRegion extends GeneralRegion {
 			EconomyResponse r;
 			if(landlordName != null) {
 				if(landlordPlayer != null && landlordPlayer.getName() != null) {
-					r = economy.withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
+					r = plugin.getEconomy().withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
 				} else {
-					r = economy.withdrawPlayer(landlordName, getWorldName(), moneyBack);
+					r = plugin.getEconomy().withdrawPlayer(landlordName, getWorldName(), moneyBack);
 				}
 				if(r == null || !r.transactionSuccess()) {
 					noPayBack = true;
@@ -708,15 +679,15 @@ public class RentRegion extends GeneralRegion {
 				boolean error = false;
 				try {
 					if(player.getName() != null) {
-						r = economy.depositPlayer(player, getWorldName(), moneyBack);
+						r = plugin.getEconomy().depositPlayer(player, getWorldName(), moneyBack);
 					} else if(getPlayerName() != null) {
-						r = economy.depositPlayer(getPlayerName(), getWorldName(), moneyBack);
+						r = plugin.getEconomy().depositPlayer(getPlayerName(), getWorldName(), moneyBack);
 					}
 				} catch(Exception e) {
 					error = true;
 				}
 				if(error || r == null || !r.transactionSuccess()) {
-					AreaShop.warn("Something went wrong with paying back to " + getPlayerName() + " money while unrenting region " + getName());
+					AreaShop.warn("Something went wrong with paying back to " + getPlayerName() + " money while unrenting region " + getRegionId());
 				}
 			}
 		}
@@ -730,17 +701,13 @@ public class RentRegion extends GeneralRegion {
 		// Remove friends, the owner and renteduntil values
 		getFriendsFeature().clearFriends();
 		UUID oldRenter = getRenter();
+		setRenter(null);
 		setRentedUntil(null);
 		setTimesExtended(-1);
 		removeLastActiveTime();

 		// Notify about updates
-		Bukkit.getPluginManager().callEvent(new UnrentedRegionEvent(this, oldRenter, Math.max(0, moneyBack)));
-		// Placed here so when event is passed, the player renting can still be accessed
-		setRenter(null);
-		// Update world (has to be after setting renter to null)
-		this.update();
-
+		this.notifyAndUpdate(new UnrentedRegionEvent(this, oldRenter, Math.max(0, moneyBack)));
 		return true;
 	}

@@ -755,10 +722,11 @@ public class RentRegion extends GeneralRegion {
 			return false;
 		}
 		long lastPlayed = getLastActiveTime();
+		final long now = System.currentTimeMillis();
 		//AreaShop.debug("currentTime=" + Calendar.getInstance().getTimeInMillis() + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (Calendar.getInstance().getTimeInMillis()-player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
-		if(Calendar.getInstance().getTimeInMillis() > (lastPlayed + inactiveSetting)) {
-			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);
+		if(now > (lastPlayed + inactiveSetting)) {
+			AreaShop.info("Region " + getRegionId() + " unrented because of inactivity for player " + getPlayerName());
+			AreaShop.debug("currentTime=" + now + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (now - player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
 			return this.unRent(true, null);
 		}
 		return false;
Author	SHA1	Message	Date
Andrew Wong	4f90abd571	Initial work on rewriting regions	2021-03-25 23:09:12 +01:00
Andrew Wong	0015001d62	Add a sign cache, better utilise internal mc code to perform sign validation, add warnings for access to invalidated region objects	2021-03-22 12:33:24 +01:00
Andrew Wong	c8e77c9385	Fix pom, shade in the NMS providers	2021-03-17 15:22:15 +01:00
Andrew Wong	2849693bdc	Experimental work on using internal methods to determine sign validity	2021-03-17 15:19:34 +01:00
Andrew Wong	295a814a9d	Use REGEX to check if a material is a sign	2021-03-17 11:33:08 +01:00
Andrew Wong	ec05272445	Add option to change the logging level of invalid region signs and an option to remove invalid signs by default	2021-03-17 11:15:06 +01:00
Andrew Wong	5872af7466	Improve performance of tab completions	2020-10-15 18:36:11 +02:00
Andrew Wong	a8315e627b	Remove debug message	2020-10-15 12:59:18 +02:00
Andrew Wong	35361308a8	Add a teleportation progress notifier, changeup interal structure of the TeleportFeature	2020-10-15 12:57:19 +02:00
Andrew Wong	0c359cdfdf	Make TeleportFeature#teleport perform location finding async	2020-10-14 22:11:12 +02:00
Andrew Wong	2a03e7612a	Improve the performance for FileManager region getters at the expense of technical debt	2020-10-08 22:13:23 +02:00
Andrew Wong	aaf4e07053	Try to save and restore regions async where possible	2020-10-07 20:50:19 +02:00
Andrew Wong	fa91016613	Add experimental support for async fawe operations...	2020-10-07 20:39:25 +02:00
Andrew Wong	f4bd4ee6c6	Improve performance of block scanning in TeleportFeature	2020-10-07 19:00:40 +02:00
Andrew Wong	44fd7deea5	Keep chunks loaded until the teleport passes	2020-10-07 18:56:36 +02:00
Andrew Wong	2c2f40b0ea	Fix merge conflict	2020-09-25 16:55:13 +02:00
Andrew Wong	07406c3987	Improve the performance of TeleportFeature#teleportPlayer Split chunk loading accross multiple ticks, delay 3 ticks before executing teleport logic	2020-09-25 13:01:09 +02:00
Andrew Wong	82a90b350d	Minor bug fixes	2020-08-22 01:37:33 +02:00
Andrew Wong	151fbe8000	Move away from using BukkitDo; Add TaskChain as a dependency	2020-08-17 21:47:44 +02:00
Andrew Wong	f2a4dd71e3	Update README.md	2020-08-16 23:44:06 +02:00
Andrew Wong	d4cc70f954	Rename version	2020-08-16 23:41:56 +02:00
Andrew Wong	8001047480	Add in the spigot repo	2020-08-16 23:31:29 +02:00
Andrew Wong	af1486a6fa	Create maven.yml	2020-08-16 23:27:40 +02:00
Andrew Wong	36a2d054d6	Bump maven plugin versions	2020-08-16 23:24:37 +02:00
Andrew Wong	7429b0a206	Remove system dependencies. Utilise PaperLib when teleporting. Remove support for pre-1.13. Added support for 1.16.1	2020-08-16 23:17:08 +02:00