Update dependencies and minor buildscript changes

This reverts commit 8cc44cf79f.

.github/workflows/gradle.yml

@@ -0,0 +1,23 @@
+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

.github/workflows/maven.yml

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

.gitignore

@@ -1,25 +1,194 @@
-# Maven stuff
-target
 
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
+# 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
 
-# Locally stored "Eclipse launch configurations"
-*.launch
+### 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
 
-# IntelliJ IDEA
 *.iml
-.idea
-dependency-reduced-pom.xml
+modules.xml
+.idea/misc.xml
+*.ipr
 
-desktop.ini
+# 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)
+.classpath
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# 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

AreaShop/build.gradle.kts

@@ -0,0 +1,120 @@
+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
+    api("io.papermc:paperlib:1.0.8")
+    api("com.github.NLthijs48:InteractiveMessenger:e7749258ca")
+    api("com.github.NLthijs48:BukkitDo:819d51ec2b")
+    api("io.github.baked-libs:dough-data:1.2.0")
+    api("com.google.inject:guice:7.0.0") {
+        exclude("com.google.guava", "guava")
+    }
+    api("com.google.inject.extensions:guice-assistedinject:7.0.0") {
+        exclude("com.google.guava", "guava")
+    }
+    implementation("net.kyori:adventure-text-minimessage:4.14.0")
+    implementation("net.kyori:adventure-platform-bukkit:4.3.0")
+    implementation("org.spongepowered:configurate-yaml:4.0.0")
+
+    // Project submodules
+    api(projects.areashopInterface)
+    api(projects.areashopNms)
+    api(projects.adapters.platform.platformInterface)
+    api(projects.adapters.platform.paper)
+
+    if (!providers.environmentVariable("JITPACK").isPresent) {
+        // We don't need these adapters if we are only publishing an api jar
+        runtimeOnly(projects.adapters.plugins.worldedit)
+        runtimeOnly(projects.adapters.plugins.worldguard)
+        runtimeOnly(projects.adapters.plugins.fastasyncworldedit)
+        runtimeOnly(project(":adapters:platform:bukkit-1-17", "reobf"))
+        runtimeOnly(projects.adapters.platform.bukkitModern)
+    }
+    testImplementation("com.github.seeseemelk:MockBukkit-v1.20:3.57.1")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
+}
+
+
+
+repositories {
+    mavenCentral()
+}
+
+tasks {
+    processResources {
+        filesMatching("plugin.yml") {
+            expand("version" to project.version)
+        }
+    }
+
+    assemble {
+        if (!providers.environmentVariable("JITPACK").isPresent) {
+            dependsOn(shadowJar)
+        }
+    }
+
+    jar {
+        archiveBaseName.set("AreaShop")
+        if (!providers.environmentVariable("JITPACK").isPresent) {
+            archiveClassifier.set("original")
+        } else {
+            archiveClassifier.set("")
+        }
+    }
+
+    if (providers.environmentVariable("JITPACK").isPresent) {
+        artifacts {
+            archives(jar)
+        }
+    }
+
+    java {
+        withSourcesJar()
+    }
+
+    val javaComponent = project.components["java"] as AdhocComponentWithVariants
+    javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
+        skip()
+    }
+
+    shadowJar {
+        archiveClassifier.set("")
+        base {
+            archiveBaseName.set("AreaShop")
+        }
+        val base = "me.wiefferink.areashop.libraries"
+        relocate("me.wiefferink.interactivemessenger", "${base}.interactivemessenger")
+        relocate("me.wiefferink.bukkitdo", "${base}.bukkitdo")
+        relocate("io.papermc.lib", "${base}.paperlib")
+        relocate("io.github.bakedlibs.dough", "${base}.dough")
+        relocate("com.google.inject", "${base}.inject")
+        relocate("com.google.errorprone", "${base}.errorprone")
+        relocate("org.aopalliance", "${base}.aopalliance")
+        relocate("javax.annotation", "${base}.javax.annotation")
+        relocate("jakarta.inject", "${base}.jakarta.inject")
+        relocate("org.jetbrains.annotations", "${base}.jetbrains.annotations")
+    }
+}

AreaShop/pom.xml

@@ -1,300 +0,0 @@
-<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.1-SNAPSHOT</version> <!-- Main plugin version -->
-
-    <repositories>
-        <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
-        </repository>
-        <repository>
-            <id>aikar</id>
-            <url>https://repo.aikar.co/content/groups/aikar/</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <!-- Bukkit, AreaShop aims to support 1.13.2+ -->
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.13.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>
-
-        <!-- JetBrains Annotations -->
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>19.0.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Paper Lib -->
-        <dependency>
-            <groupId>io.papermc</groupId>
-            <artifactId>paperlib</artifactId>
-            <version>1.0.5</version>
-        </dependency>
-
-        <!-- WorldEdit/WorldGuard -->
-        <dependency>
-            <groupId>com.sk89q.worldedit</groupId>
-            <artifactId>worldedit-bukkit</artifactId>
-            <version>7.1.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q.worldguard</groupId>
-            <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.3</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Interfaces that specific WorldGuard and WorldEdit versions are built against -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- WorldGuard implementations -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-7</artifactId>
-            <version>latest</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- WorldEdit implementations -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldedit-7</artifactId>
-            <version>latest</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- FAWE compat -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-fawe-1-15</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- Vault -->
-        <dependency>
-            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>VaultAPI</artifactId>
-            <version>1.7</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- bStats -->
-        <dependency>
-            <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
-            <version>1.6</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 Google Guice & Guice-Assisted-Inject -->
-                                <relocation>
-                                    <pattern>com.google.inject</pattern>
-                                    <shadedPattern>me.wiefferink.areashop.shaded.inject</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

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

@@ -0,0 +1,190 @@
+package me.wiefferink.areashop;
+
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
+
+import me.wiefferink.interactivemessenger.Log;
+import me.wiefferink.interactivemessenger.processing.Message;
+import me.wiefferink.interactivemessenger.source.LanguageManager;
+import me.wiefferink.interactivemessenger.translation.Transifex;
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.net.URISyntaxException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Enumeration;
+import java.util.Collections;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStreamReader;
+
+
+public class ASLanguageManager extends LanguageManager {
+    private JavaPlugin plugin;
+    private String jarLanguagePath;
+    private File languageFolder;
+    private String wgPrefix;
+    private List<String> chatPrefix;
+    private Map<String, List<String>> currentLanguage, defaultLanguage;
+
+    public ASLanguageManager(JavaPlugin plugin,
+                             String jarLanguagePath,
+                             String currentLanguageName,
+                             String defaultLanguageName,
+                             List<String> chatPrefix,
+                             String wgPrefix) {
+        super(plugin, jarLanguagePath, currentLanguageName, defaultLanguageName, chatPrefix);
+        this.plugin = plugin;
+        this.jarLanguagePath = jarLanguagePath;
+        this.chatPrefix = chatPrefix;
+        this.languageFolder = new File(plugin.getDataFolder() + File.separator + jarLanguagePath);
+
+        Message.init(this, plugin.getLogger());
+        saveDefaults();
+        currentLanguage = loadLanguage(currentLanguageName);
+        if (defaultLanguageName.equals(currentLanguageName)) {
+            defaultLanguage = currentLanguage;
+        } else {
+            defaultLanguage = loadLanguage(defaultLanguageName);
+        }
+        this.wgPrefix = wgPrefix;
+    }
+
+    @Override
+    public List<String> getMessage(String key) {
+        List<String> message;
+        if (key.equalsIgnoreCase(Message.CHATLANGUAGEVARIABLE)) {
+            message = chatPrefix;
+        } else if (key.equalsIgnoreCase("wgPrefix")) {
+            message = new ArrayList<>();
+            message.add(wgPrefix);
+        } else if (currentLanguage.containsKey(key)) {
+            message = currentLanguage.get(key);
+        } else {
+            message = defaultLanguage.get(key);
+        }
+        if (message == null) {
+            Log.warn("Did not find message '" + key + "' in the current or default language");
+            return new ArrayList<>();
+        }
+        return new ArrayList<>(message);
+    }
+
+    private void saveDefaults() {
+        // Create the language folder if it not exists
+        if (!languageFolder.exists()) {
+            if (!languageFolder.mkdirs()) {
+                Log.warn("Could not create language directory: " + languageFolder.getAbsolutePath());
+                return;
+            }
+        }
+        File jarPath;
+        try {
+            // Read jar as ZIP file
+            jarPath = new File(plugin.getClass()
+                    .getProtectionDomain()
+                    .getCodeSource()
+                    .getLocation()
+                    .toURI());
+        } catch (URISyntaxException e) {
+            Log.error("Failed to find location of jar file:", ExceptionUtils.getStackTrace(e));
+            return;
+        }
+        try (ZipFile jar = new ZipFile(jarPath);) {
+            Enumeration<? extends ZipEntry> entries = jar.entries();
+
+            // Each entry is a file or directory
+            while (entries.hasMoreElements()) {
+                ZipEntry entry = entries.nextElement();
+
+                // Filter to YAML files in the language directory
+                if (!entry.isDirectory() && entry.getName()
+                        .startsWith(jarLanguagePath + "/") && entry.getName()
+                        .endsWith(".yml")) {
+                    // Save the file to disk
+                    File targetFile = new File(languageFolder.getAbsolutePath() + File.separator + entry.getName()
+                            .substring(entry.getName().lastIndexOf("/")));
+                    try (
+                            InputStream input = jar.getInputStream(entry);
+                            OutputStream output = new FileOutputStream(targetFile)
+                    ) {
+                        byte[] bytes = input.readAllBytes();
+                        output.write(bytes);
+                    } catch (IOException e) {
+                        Log.warn("Something went wrong saving a default language file: " + targetFile.getAbsolutePath());
+                    }
+                }
+            }
+        } catch (
+                IOException e) {
+            Log.error("Failed to read zip file:", ExceptionUtils.getStackTrace(e));
+        }
+    }
+
+    private Map<String, List<String>> loadLanguage(String key) {
+        return loadLanguage(key, true);
+    }
+
+    /**
+     * Loads the specified language
+     *
+     * @param key     The language to load
+     * @param convert try conversion or not (infinite recursion prevention)
+     * @return Map with the messages loaded from the file
+     */
+    private Map<String, List<String>> loadLanguage(String key, boolean convert) {
+        Map<String, List<String>> result = new HashMap<>();
+
+        // Load the language file
+        boolean convertFromTransifex = false;
+        File file = new File(languageFolder.getAbsolutePath() + File.separator + key + ".yml");
+        try (
+                InputStream inputStream = new FileInputStream(file);
+                Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8)
+        ) {
+            // Detect empty language files, happens when the YAML parsers prints an exception (it does return an empty YamlConfiguration though)
+            YamlConfiguration ymlFile = YamlConfiguration.loadConfiguration(reader);
+            if (ymlFile.getKeys(false).isEmpty()) {
+                Log.warn("Language file " + key + ".yml has zero messages.");
+                return result;
+            }
+
+            // Retrieve the messages from the YAML file and create the result
+            if (convert && Transifex.needsConversion(ymlFile)) {
+                convertFromTransifex = true;
+            } else {
+                for (String messageKey : ymlFile.getKeys(false)) {
+                    List<String> toPut;
+                    if (ymlFile.isList(messageKey)) {
+                        toPut = ymlFile.getStringList(messageKey);
+                    } else {
+                        toPut = Collections.singletonList(ymlFile.getString(messageKey));
+                    }
+                    result.put(messageKey, new ArrayList<>(toPut));
+                }
+            }
+        } catch (IOException e) {
+            Log.warn("Could not load language file: " + file.getAbsolutePath());
+        }
+
+        // Do conversion (after block above closed the reader)
+        if (convertFromTransifex) {
+            if (!Transifex.convertFrom(file)) {
+                Log.warn("Failed to convert " + file.getName() + " from the Transifex layout to the AreaShop layout, check the errors above");
+            }
+            return loadLanguage(key, false);
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,39 @@
+package me.wiefferink.areashop;
+
+import me.wiefferink.areashop.features.signs.SignManager;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.managers.CommandManager;
+import me.wiefferink.areashop.managers.FeatureManager;
+import me.wiefferink.areashop.managers.SignLinkerManager;
+
+import javax.annotation.Nonnull;
+
+public interface AreaShopApi extends AreaShopInterface {
+
+    /**
+     * Function to get the CommandManager.
+     *
+     * @return the CommandManager
+     */
+    @Nonnull CommandManager getCommandManager();
+
+    /**
+     * Get the SignLinkerManager.
+     * Handles sign linking mode.
+     *
+     * @return The SignLinkerManager
+     */
+    @Nonnull SignLinkerManager getSignlinkerManager();
+
+    /**
+     * Get the FeatureManager.
+     * Manages region specific features.
+     *
+     * @return The FeatureManager
+     */
+    @Nonnull FeatureManager getFeatureManager();
+
+
+    @Nonnull SignManager getSignManager();
+
+}

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

@@ -0,0 +1,21 @@
+package me.wiefferink.areashop;
+
+public interface MessageBridge {
+    /**
+     * Send a message to a target without a prefix.
+     *
+     * @param target       The target to send the message to
+     * @param key          The key of the language string
+     * @param replacements The replacements to insert in the message
+     */
+    void messageNoPrefix(Object target, String key, Object... replacements);
+
+    /**
+     * Send a message to a target, prefixed by the default chat prefix.
+     *
+     * @param target       The target to send the message to
+     * @param key          The key of the language string
+     * @param replacements The replacements to insert in the message
+     */
+    void message(Object target, String key, Object... replacements);
+}

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

@@ -1,29 +1,54 @@
 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.managers.FileManager;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.RegionFactory;
 import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.bukkitdo.Do;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
+@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";
@@ -52,12 +77,12 @@ public class AddCommand extends CommandAreaShop {
 				&& !sender.hasPermission("areashop.createbuy")
 				&& !sender.hasPermission("areashop.createbuy.member")
 				&& !sender.hasPermission("areashop.createbuy.owner")) {
-			plugin.message(sender, "add-noPermission");
+			messageBridge.message(sender, "add-noPermission");
 			return;
 		}
 
 		if(args.length < 2 || args[1] == null || (!"rent".equalsIgnoreCase(args[1]) && !"buy".equalsIgnoreCase(args[1]))) {
-			plugin.message(sender, "add-help");
+			messageBridge.message(sender, "add-help");
 			return;
 		}
 		Map<String, ProtectedRegion> regions = new HashMap<>();
@@ -68,18 +93,18 @@ public class AddCommand extends CommandAreaShop {
 		}
 		if(args.length == 2) {
 			if(player == null) {
-				plugin.message(sender, "cmd-weOnlyByPlayer");
+				messageBridge.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
-			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 			if(selection == null) {
-				plugin.message(player, "cmd-noSelection");
+				messageBridge.message(player, "cmd-noSelection");
 				return;
 			}
 			world = selection.getWorld();
 			regions = Utils.getWorldEditRegionsInSelection(selection).stream().collect(Collectors.toMap(ProtectedRegion::getId, region -> region));
 			if(regions.isEmpty()) {
-				plugin.message(player, "cmd-noWERegionsFound");
+				messageBridge.message(player, "cmd-noWERegionsFound");
 				return;
 			}
 		} else {
@@ -87,7 +112,7 @@ public class AddCommand extends CommandAreaShop {
 				if(args.length == 4) {
 					world = Bukkit.getWorld(args[3]);
 					if(world == null) {
-						plugin.message(sender, "add-incorrectWorld", args[3]);
+						messageBridge.message(sender, "add-incorrectWorld", args[3]);
 						return;
 					}
 				} else {
@@ -95,19 +120,19 @@ public class AddCommand extends CommandAreaShop {
 				}
 			} else {
 				if(args.length < 4) {
-					plugin.message(sender, "add-specifyWorld");
+					messageBridge.message(sender, "add-specifyWorld");
 					return;
 				} else {
 					world = Bukkit.getWorld(args[3]);
 					if(world == null) {
-						plugin.message(sender, "add-incorrectWorld", args[3]);
+						messageBridge.message(sender, "add-incorrectWorld", args[3]);
 						return;
 					}
 				}
 			}
 			ProtectedRegion region = plugin.getRegionManager(world).getRegion(args[2]);
 			if(region == null) {
-				plugin.message(sender, "cmd-noRegion", args[2]);
+				messageBridge.message(sender, "cmd-noRegion", args[2]);
 				return;
 			}
 			regions.put(args[2], region);
@@ -124,28 +149,29 @@ public class AddCommand extends CommandAreaShop {
 		TreeSet<String> namesBlacklisted = new TreeSet<>();
 		TreeSet<String> namesNoPermission = new TreeSet<>();
 		TreeSet<String> namesAddCancelled = new TreeSet<>(); // Denied by an event listener
-		Utils.runAsBatches(regions.entrySet(),
+		Do.forAll(
 			plugin.getConfig().getInt("adding.regionsPerTick"),
-				(regionEntry) -> {
+			regions.entrySet(),
+			regionEntry -> {
 				String regionName = regionEntry.getKey();
 				ProtectedRegion region = regionEntry.getValue();
 				// Determine if the player is an owner or member of the region
-				boolean isMember = finalPlayer != null && plugin.getWorldGuardHandler().containsMember(region, finalPlayer.getUniqueId());
-				boolean isOwner = finalPlayer != null && plugin.getWorldGuardHandler().containsOwner(region, finalPlayer.getUniqueId());
+				boolean isMember = finalPlayer != null && worldGuardInterface.containsMember(region, finalPlayer.getUniqueId());
+				boolean isOwner = finalPlayer != null && worldGuardInterface.containsOwner(region, finalPlayer.getUniqueId());
 				String type;
 				if(isRent) {
 					type = "rent";
 				} else {
 					type = "buy";
 				}
-				FileManager.AddResult result = plugin.getFileManager().checkRegionAdd(sender, region, world, isRent ? GeneralRegion.RegionType.RENT : GeneralRegion.RegionType.BUY);
-				if(result == FileManager.AddResult.ALREADYADDED) {
+				IFileManager.AddResult result = plugin.getFileManager().checkRegionAdd(sender, region, world, isRent ? GeneralRegion.RegionType.RENT : GeneralRegion.RegionType.BUY);
+				if(result == IFileManager.AddResult.ALREADYADDED) {
 					regionsAlready.add(plugin.getFileManager().getRegion(regionName));
-				} else if(result == FileManager.AddResult.ALREADYADDEDOTHERWORLD) {
+				} else if(result == IFileManager.AddResult.ALREADYADDEDOTHERWORLD) {
 					regionsAlreadyOtherWorld.add(plugin.getFileManager().getRegion(regionName));
-				} else if(result == FileManager.AddResult.BLACKLISTED) {
+				} else if(result == IFileManager.AddResult.BLACKLISTED) {
 					namesBlacklisted.add(regionName);
-				} else if(result == FileManager.AddResult.NOPERMISSION) {
+				} else if(result == IFileManager.AddResult.NOPERMISSION) {
 					namesNoPermission.add(regionName);
 				} else {
 					// Check if the player should be landlord
@@ -153,8 +179,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(plugin.getWorldGuardHandler().getOwners(region).asUniqueIdList());
-					existing.addAll(plugin.getWorldGuardHandler().getMembers(region).asUniqueIdList());
+					existing.addAll(worldGuardInterface.getOwners(region).asUniqueIdList());
+					existing.addAll(worldGuardInterface.getMembers(region).asUniqueIdList());
 
 					AreaShop.debug("regionAddLandlordStatus:", regionName,
 							"landlord:", landlord,
@@ -166,7 +192,7 @@ public class AddCommand extends CommandAreaShop {
 							"memberPermission:", sender.hasPermission("areashop.create" + type + ".member"));
 
 					if(isRent) {
-						RentRegion rent = new RentRegion(regionName, world);
+						RentRegion rent = regionFactory.createRentRegion(regionName, world);
 						// Set landlord
 						if(landlord) {
 							rent.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
@@ -209,7 +235,7 @@ public class AddCommand extends CommandAreaShop {
 
 						regionsSuccess.add(rent);
 					} else {
-						BuyRegion buy = new BuyRegion(regionName, world);
+						BuyRegion buy = regionFactory.createBuyRegion(regionName, world);
 						// Set landlord
 						if(landlord) {
 							buy.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
@@ -253,39 +279,40 @@ public class AddCommand extends CommandAreaShop {
 						regionsSuccess.add(buy);
 					}
 				}
-			}, false).thenAccept(
-			(success) -> {
+			},
+			() -> {
 				if(!regionsSuccess.isEmpty()) {
-					plugin.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
+					messageBridge.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
 				}
 				if(!regionsAlready.isEmpty()) {
-					plugin.message(sender, "add-failed", Utils.combinedMessage(regionsAlready, "region"));
+					messageBridge.message(sender, "add-failed", Utils.combinedMessage(regionsAlready, "region"));
 				}
 				if(!regionsAlreadyOtherWorld.isEmpty()) {
-					plugin.message(sender, "add-failedOtherWorld", Utils.combinedMessage(regionsAlreadyOtherWorld, "region"));
+					messageBridge.message(sender, "add-failedOtherWorld", Utils.combinedMessage(regionsAlreadyOtherWorld, "region"));
 				}
 				if(!regionsRentCancelled.isEmpty()) {
-					plugin.message(sender, "add-rentCancelled", Utils.combinedMessage(regionsRentCancelled, "region"));
+					messageBridge.message(sender, "add-rentCancelled", Utils.combinedMessage(regionsRentCancelled, "region"));
 				}
 				if(!regionsBuyCancelled.isEmpty()) {
-					plugin.message(sender, "add-buyCancelled", Utils.combinedMessage(regionsBuyCancelled, "region"));
+					messageBridge.message(sender, "add-buyCancelled", Utils.combinedMessage(regionsBuyCancelled, "region"));
 				}
 				if(!namesBlacklisted.isEmpty()) {
-					plugin.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
+					messageBridge.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
 				}
 				if(!namesNoPermission.isEmpty()) {
-					plugin.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
-					plugin.message(sender, "add-noPermissionOwnerMember");
+					messageBridge.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
+					messageBridge.message(sender, "add-noPermissionOwnerMember");
 				}
 				if(!namesAddCancelled.isEmpty()) {
-					plugin.message(sender, "add-rentCancelled", Utils.createCommaSeparatedList(namesAddCancelled));
+					messageBridge.message(sender, "add-rentCancelled", Utils.createCommaSeparatedList(namesAddCancelled));
 				}
-			});
+			}
+		);
 	}
 
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new LinkedList<>();
+		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
 			if(sender.hasPermission("areashop.createrent")) {
 				result.add("rent");
@@ -294,8 +321,7 @@ public class AddCommand extends CommandAreaShop {
 				result.add("buy");
 			}
 		} else if(toComplete == 3) {
-			if(sender instanceof Player) {
-				Player player = (Player)sender;
+			if(sender instanceof Player player) {
 				if(sender.hasPermission("areashop.createrent") || sender.hasPermission("areashop.createbuy")) {
 					for(ProtectedRegion region : plugin.getRegionManager(player.getWorld()).getRegions().values()) {
 						result.add(region.getId());

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

@@ -1,135 +1,142 @@
 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.Bukkit;
-import org.bukkit.OfflinePlayer;
 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 {
 
-	@Override
-	public String getCommandStart() {
-		return "areashop addfriend";
-	}
+    @Inject
+    private MessageBridge messageBridge;
+    @Inject
+    private IFileManager fileManager;
+    @Inject
+    private Plugin plugin;
 
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.addfriendall") || target.hasPermission("areashop.addfriend")) {
-			return "help-addFriend";
-		}
-		return null;
-	}
+    @Inject
+    private OfflinePlayerHelper offlinePlayerHelper;
 
-	@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;
-		}
+    @Inject
+    private BukkitSchedulerExecutor executor;
 
-		if(args.length < 2) {
-			plugin.message(sender, "addfriend-help");
-			return;
-		}
+    @Override
+    public String getCommandStart() {
+        return "areashop addfriend";
+    }
 
-		GeneralRegion region;
-		if(args.length <= 2) {
-			if(sender instanceof Player) {
-				// get the region by location
-				List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
-				if(regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if(regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					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;
-					}
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.addfriendall") || target.hasPermission("areashop.addfriend")) {
+            return "help-addFriend";
+        }
+        return null;
+    }
 
-					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 void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.addfriend") && !sender.hasPermission("areashop.addfriendall")) {
+            messageBridge.message(sender, "addfriend-noPermission");
+            return;
+        }
 
-	@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;
-	}
+        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;
+    }
 }
 
 

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

@@ -1,128 +1,132 @@
 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.SignsFeature;
+import me.wiefferink.areashop.features.signs.SignManager;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
 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 {
 
-    @Override
-    public String getCommandStart() {
-        return "areashop addsign";
-    }
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private SignManager signManager;
+	@Inject
+	private Plugin plugin;
 
-    @Override
-    public String getHelp(CommandSender target) {
-        if (target.hasPermission("areashop.addsign")) {
-            return "help-addsign";
-        }
-        return null;
-    }
+	@Override
+	public String getCommandStart() {
+		return "areashop addsign";
+	}
 
-    @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 String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.addsign")) {
+			return "help-addsign";
+		}
+		return null;
+	}
 
-        // 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;
-        }
+	@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;
+		}
 
-        GeneralRegion region;
-        if (args.length > 1) {
-            // Get region by argument
-            region = plugin.getFileManager().getRegion(args[1]);
-            if (region == null) {
-                plugin.message(sender, "cmd-notRegistered", args[1]);
-                return;
-            }
-        } else {
-            // Get region by sign position
-            List<GeneralRegion> regions = Utils.getImportantRegions(block.getLocation());
-            if (regions.isEmpty()) {
-                plugin.message(sender, "addsign-noRegions");
-                return;
-            } else if (regions.size() > 1) {
-                plugin.message(sender, "addsign-couldNotDetect", regions.get(0).getName(), regions.get(1).getName());
-                return;
-            }
-            region = regions.get(0);
-        }
-        String profile = null;
-        if (args.length > 2) {
-            profile = args[2];
-            Set<String> profiles = plugin.getConfig().getConfigurationSection("signProfiles").getKeys(false);
-            if (!profiles.contains(profile)) {
-                plugin.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles), region);
-                return;
-            }
-        }
-        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-        if (regionSign != null) {
-            plugin.message(sender, "addsign-alreadyRegistered", regionSign.getRegion());
-            return;
-        }
+		// 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;
+		}
 
-        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();
-    }
+		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;
+		}
 
-    @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;
-    }
+		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;
+	}
 
 }
 

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

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

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

@@ -1,8 +1,13 @@
 package me.wiefferink.areashop.commands;
 
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.tools.SimpleMessageBridge;
 import me.wiefferink.interactivemessenger.processing.Message;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
@@ -16,11 +21,9 @@ import java.util.Map;
  */
 public abstract class CommandAreaShop {
 
-	final AreaShop plugin = AreaShop.getInstance();
-
 	private final Map<String, CommandTime> lastUsed;
 
-	public CommandAreaShop() {
+	protected CommandAreaShop() {
 		lastUsed = new HashMap<>();
 	}
 
@@ -84,7 +87,8 @@ public abstract class CommandAreaShop {
 			return true;
 		}
 
-		message.prefix().append(Message.fromKey("confirm-yes").replacements(command)).send(sender);
+		Message m = message.prefix().append(Message.fromKey("confirm-yes").replacements(command));
+		SimpleMessageBridge.send(m, sender);
 		lastUsed.put(sender.getName(), new CommandTime(command, now));
 		return false;
 	}

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

@@ -1,7 +1,12 @@
 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.RentRegion;
@@ -13,8 +18,16 @@ 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";
@@ -35,24 +48,23 @@ public class DelCommand extends CommandAreaShop {
 
 				&& !sender.hasPermission("areashop.destroyrent")
 				&& !sender.hasPermission("areashop.destroyrent.landlord")) {
-			plugin.message(sender, "del-noPermission");
+			messageBridge.message(sender, "del-noPermission");
 			return;
 		}
 		if(args.length < 2) {
 			// Only players can have a selection
-			if(!(sender instanceof Player)) {
-				plugin.message(sender, "cmd-weOnlyByPlayer");
+			if(!(sender instanceof Player player)) {
+				messageBridge.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
-			Player player = (Player)sender;
-			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 			if(selection == null) {
-				plugin.message(player, "cmd-noSelection");
+				messageBridge.message(player, "cmd-noSelection");
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
 			if(regions == null || regions.isEmpty()) {
-				plugin.message(player, "cmd-noRegionsFound");
+				messageBridge.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			// Start removing the regions that he has permission for
@@ -73,7 +85,7 @@ public class DelCommand extends CommandAreaShop {
 					}
 				}
 
-				DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
+				DeletingRegionEvent event = fileManager.deleteRegion(region, true);
 				if (event.isCancelled()) {
 					regionsCancelled.add(region);
 				} else {
@@ -83,44 +95,44 @@ public class DelCommand extends CommandAreaShop {
 
 			// Send messages
 			if(!namesSuccess.isEmpty()) {
-				plugin.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
+				messageBridge.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
 			}
 			if(!regionsFailed.isEmpty()) {
-				plugin.message(sender, "del-failed", Utils.combinedMessage(regionsFailed, "region"));
+				messageBridge.message(sender, "del-failed", Utils.combinedMessage(regionsFailed, "region"));
 			}
 			if(!regionsCancelled.isEmpty()) {
-				plugin.message(sender, "del-cancelled", Utils.combinedMessage(regionsCancelled, "region"));
+				messageBridge.message(sender, "del-cancelled", Utils.combinedMessage(regionsCancelled, "region"));
 			}
 		} else {
-			GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+			GeneralRegion region = fileManager.getRegion(args[1]);
 			if(region == null) {
-				plugin.message(sender, "cmd-notRegistered", args[1]);
+				messageBridge.message(sender, "cmd-notRegistered", args[1]);
 				return;
 			}
 			boolean isLandlord = sender instanceof Player && region.isLandlord(((Player)sender).getUniqueId());
 			if(region instanceof RentRegion) {
 				// Remove the rent if the player has permission
 				if(sender.hasPermission("areashop.destroyrent") || (isLandlord && sender.hasPermission("areashop.destroyrent.landlord"))) {
-					DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
+					DeletingRegionEvent event = fileManager.deleteRegion(region, true);
 					if (event.isCancelled()) {
-						plugin.message(sender, "general-cancelled", event.getReason());
+						messageBridge.message(sender, "general-cancelled", event.getReason());
 					} else {
-						plugin.message(sender, "destroy-successRent", region);
+						messageBridge.message(sender, "destroy-successRent", region);
 					}
 				} else {
-					plugin.message(sender, "destroy-noPermissionRent", region);
+					messageBridge.message(sender, "destroy-noPermissionRent", region);
 				}
 			} else if(region instanceof BuyRegion) {
 				// Remove the buy if the player has permission
 				if(sender.hasPermission("areashop.destroybuy") || (isLandlord && sender.hasPermission("areashop.destroybuy.landlord"))) {
-					DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
+					DeletingRegionEvent event = fileManager.deleteRegion(region, true);
 					if (event.isCancelled()) {
-						plugin.message(sender, "general-cancelled", event.getReason());
+						messageBridge.message(sender, "general-cancelled", event.getReason());
 					} else {
-						plugin.message(sender, "destroy-successBuy", region);
+						messageBridge.message(sender, "destroy-successBuy", region);
 					}
 				} else {
-					plugin.message(sender, "destroy-noPermissionBuy", region);
+					messageBridge.message(sender, "destroy-noPermissionBuy", region);
 				}
 			}
 		}
@@ -130,7 +142,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 = plugin.getFileManager().getRegionNames();
+			result = fileManager.getRegionNames();
 		}
 		return result;
 	}

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

@@ -1,120 +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.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class DelfriendCommand extends CommandAreaShop {
 
-	@Override
-	public String getCommandStart() {
-		return "areashop delfriend";
-	}
+    @Inject
+    private MessageBridge messageBridge;
+    @Inject
+    private IFileManager fileManager;
 
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.delfriendall") || target.hasPermission("areashop.delfriend")) {
-			return "help-delFriend";
-		}
-		return null;
-	}
+    @Inject
+    private OfflinePlayerHelper offlinePlayerHelper;
 
-	/**
-	 * 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 player = (Player)person;
-			return region.isOwner(player) && player.hasPermission("areashop.delfriend");
-		}
-		return false;
-	}
+    @Inject
+    private BukkitSchedulerExecutor executor;
 
-	@SuppressWarnings("deprecation")
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.delfriend") && !sender.hasPermission("areashop.delfriendall")) {
-			plugin.message(sender, "delfriend-noPermission");
-			return;
-		}
-		if(args.length < 2) {
-			plugin.message(sender, "delfriend-help");
-			return;
-		}
-		GeneralRegion region;
-		if(args.length <= 2) {
-			if(sender instanceof Player) {
-				// get the region by location
-				List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
-				if(regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if(regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					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 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) {
@@ -124,7 +138,7 @@ public class DelfriendCommand extends CommandAreaShop {
 				result.add(player.getName());
 			}
 		} else if(toComplete == 3) {
-			result.addAll(plugin.getFileManager().getRegionNames());
+			result.addAll(fileManager.getRegionNames());
 		}
 		return result;
 	}

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

@@ -1,7 +1,10 @@
 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.SignsFeature;
+import me.wiefferink.areashop.features.signs.SignManager;
 import me.wiefferink.areashop.tools.Materials;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -11,9 +14,16 @@ 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";
@@ -30,35 +40,37 @@ public class DelsignCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.delsign")) {
-			plugin.message(sender, "delsign-noPermission");
+			messageBridge.message(sender, "delsign-noPermission");
 			return;
 		}
-		if(!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
-		Player player = (Player)sender;
 
 		// Get the sign
 		Block block = null;
 		BlockIterator blockIterator = new BlockIterator(player, 100);
 		while(blockIterator.hasNext() && block == null) {
 			Block next = blockIterator.next();
-			if(next.getType() != Material.AIR) {
+			if(!next.getType().isAir()) {
 				block = next;
 			}
 		}
 		if(block == null || !Materials.isSign(block.getType())) {
-			plugin.message(sender, "delsign-noSign");
+			messageBridge.message(sender, "delsign-noSign");
 			return;
 		}
-		RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-		if(regionSign == null) {
-			plugin.message(sender, "delsign-noRegion");
+		Optional<RegionSign> optionalSign = signManager.removeSign(block.getLocation());
+		if(optionalSign.isEmpty()) {
+			messageBridge.message(sender, "delsign-noRegion");
 			return;
 		}
-		plugin.message(sender, "delsign-success", regionSign.getRegion());
+		RegionSign regionSign = optionalSign.get();
+		messageBridge.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

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

@@ -1,20 +1,35 @@
 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";
@@ -31,21 +46,20 @@ public class FindCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.find")) {
-			plugin.message(sender, "find-noPermission");
+			messageBridge.message(sender, "find-noPermission");
 			return;
 		}
-		if(!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
 		if(args.length <= 1 || args[1] == null || (!args[1].equalsIgnoreCase("buy") && !args[1].equalsIgnoreCase("rent"))) {
-			plugin.message(sender, "find-help");
+			messageBridge.message(sender, "find-help");
 			return;
 		}
-		Player player = (Player)sender;
 		double balance = 0.0;
-		if(plugin.getEconomy() != null) {
-			balance = plugin.getEconomy().getBalance(player);
+		if(economy != null) {
+			balance = economy.getBalance(player);
 		}
 		double maxPrice = 0;
 		boolean maxPriceSet = false;
@@ -56,23 +70,23 @@ public class FindCommand extends CommandAreaShop {
 				maxPrice = Double.parseDouble(args[2]);
 				maxPriceSet = true;
 			} catch(NumberFormatException e) {
-				plugin.message(sender, "find-wrongMaxPrice", args[2]);
+				messageBridge.message(sender, "find-wrongMaxPrice", args[2]);
 				return;
 			}
 		}
 		// Parse optional group argument
 		if(args.length >= 4) {
-			group = plugin.getFileManager().getGroup(args[3]);
+			group = fileManager.getGroup(args[3]);
 			if(group == null) {
-				plugin.message(sender, "find-wrongGroup", args[3]);
+				messageBridge.message(sender, "find-wrongGroup", args[3]);
 				return;
 			}
 		}
 
 		// Find buy regions
 		if(args[1].equalsIgnoreCase("buy")) {
-			List<BuyRegion> regions = plugin.getFileManager().getBuys();
-			List<BuyRegion> results = new ArrayList<>();
+			Collection<BuyRegion> regions = fileManager.getBuysRef();
+			List<BuyRegion> results = new LinkedList<>();
 			for(BuyRegion region : regions) {
 				if(!region.isSold()
 						&& ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))
@@ -91,9 +105,9 @@ public class FindCommand extends CommandAreaShop {
 
 				// Teleport
 				if(maxPriceSet) {
-					plugin.message(player, "find-successMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup, region);
+					messageBridge.message(player, "find-successMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup, region);
 				} else {
-					plugin.message(player, "find-success", "buy", Utils.formatCurrency(balance), onlyInGroup, region);
+					messageBridge.message(player, "find-success", "buy", Utils.formatCurrency(balance), onlyInGroup, region);
 				}
 				region.getTeleportFeature().teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);
 			} else {
@@ -102,17 +116,17 @@ public class FindCommand extends CommandAreaShop {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
 				}
 				if(maxPriceSet) {
-					plugin.message(player, "find-noneFoundMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup);
+					messageBridge.message(player, "find-noneFoundMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup);
 				} else {
-					plugin.message(player, "find-noneFound", "buy", Utils.formatCurrency(balance), onlyInGroup);
+					messageBridge.message(player, "find-noneFound", "buy", Utils.formatCurrency(balance), onlyInGroup);
 				}
 			}
 		}
 
 		// Find rental regions
 		else {
-			List<RentRegion> regions = plugin.getFileManager().getRents();
-			List<RentRegion> results = new ArrayList<>(regions.size());
+			Collection<RentRegion> regions = fileManager.getRentsRef();
+			List<RentRegion> results = new LinkedList<>();
 			for(RentRegion region : regions) {
 				if(!region.isRented()
 						&& ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))
@@ -131,9 +145,9 @@ public class FindCommand extends CommandAreaShop {
 
 				// Teleport
 				if(maxPriceSet) {
-					plugin.message(player, "find-successMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup, region);
+					messageBridge.message(player, "find-successMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup, region);
 				} else {
-					plugin.message(player, "find-success", "rent", Utils.formatCurrency(balance), onlyInGroup, region);
+					messageBridge.message(player, "find-success", "rent", Utils.formatCurrency(balance), onlyInGroup, region);
 				}
 				region.getTeleportFeature().teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);
 			} else {
@@ -142,9 +156,9 @@ public class FindCommand extends CommandAreaShop {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
 				}
 				if(maxPriceSet) {
-					plugin.message(player, "find-noneFoundMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup);
+					messageBridge.message(player, "find-noneFoundMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup);
 				} else {
-					plugin.message(player, "find-noneFound", "rent", Utils.formatCurrency(balance), onlyInGroup);
+					messageBridge.message(player, "find-noneFound", "rent", Utils.formatCurrency(balance), onlyInGroup);
 				}
 			}
 		}

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

@@ -1,7 +1,13 @@
 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;
@@ -11,8 +17,19 @@ 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";
@@ -29,32 +46,31 @@ public class GroupaddCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.groupadd")) {
-			plugin.message(sender, "groupadd-noPermission");
+			messageBridge.message(sender, "groupadd-noPermission");
 			return;
 		}
 		if(args.length < 2 || args[1] == null) {
-			plugin.message(sender, "groupadd-help");
+			messageBridge.message(sender, "groupadd-help");
 			return;
 		}
-		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
+		RegionGroup group = fileManager.getGroup(args[1]);
 		if(group == null) {
-			group = new RegionGroup(plugin, args[1]);
-			plugin.getFileManager().addGroup(group);
+			group = regionFactory.createRegionGroup(args[1]);
+			fileManager.addGroup(group);
 		}
 		if(args.length == 2) {
-			if(!(sender instanceof Player)) {
-				plugin.message(sender, "cmd-weOnlyByPlayer");
+			if(!(sender instanceof Player player)) {
+				messageBridge.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
-			Player player = (Player)sender;
-			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 			if(selection == null) {
-				plugin.message(player, "cmd-noSelection");
+				messageBridge.message(player, "cmd-noSelection");
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
 			if(regions.isEmpty()) {
-				plugin.message(player, "cmd-noRegionsFound");
+				messageBridge.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
@@ -67,24 +83,24 @@ public class GroupaddCommand extends CommandAreaShop {
 				}
 			}
 			if(!regionsSuccess.isEmpty()) {
-				plugin.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
+				messageBridge.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
 			if(!regionsFailed.isEmpty()) {
-				plugin.message(player, "groupadd-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
+				messageBridge.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);
+			fileManager.updateRegions(new ArrayList<>(regionsSuccess), player);
 		} else {
-			GeneralRegion region = plugin.getFileManager().getRegion(args[2]);
+			GeneralRegion region = fileManager.getRegion(args[2]);
 			if(region == null) {
-				plugin.message(sender, "cmd-notRegistered", args[2]);
+				messageBridge.message(sender, "cmd-notRegistered", args[2]);
 				return;
 			}
 			if(group.addMember(region)) {
 				region.update();
-				plugin.message(sender, "groupadd-success", group.getName(), group.getMembers().size(), region);
+				messageBridge.message(sender, "groupadd-success", group.getName(), group.getMembers().size(), region);
 			} else {
-				plugin.message(sender, "groupadd-failed", group.getName(), region);
+				messageBridge.message(sender, "groupadd-failed", group.getName(), region);
 			}
 		}
 	}
@@ -93,9 +109,9 @@ public class GroupaddCommand extends CommandAreaShop {
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result = plugin.getFileManager().getGroupNames();
+			result = fileManager.getGroupNames();
 		} else if(toComplete == 3) {
-			result = plugin.getFileManager().getRegionNames();
+			result = fileManager.getRegionNames();
 		}
 		return result;
 	}

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

@@ -1,7 +1,13 @@
 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;
@@ -11,8 +17,18 @@ 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";
@@ -29,33 +45,32 @@ public class GroupdelCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.groupdel")) {
-			plugin.message(sender, "groupdel-noPermission");
+			messageBridge.message(sender, "groupdel-noPermission");
 			return;
 		}
 		if(args.length < 2 || args[1] == null) {
-			plugin.message(sender, "groupdel-help");
+			messageBridge.message(sender, "groupdel-help");
 			return;
 		}
-		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
+		RegionGroup group = fileManager.getGroup(args[1]);
 		if(group == null) {
-			plugin.message(sender, "groupdel-wrongGroup", args[1]);
+			messageBridge.message(sender, "groupdel-wrongGroup", args[1]);
 			return;
 		}
 
 		if(args.length == 2) {
-			if(!(sender instanceof Player)) {
-				plugin.message(sender, "cmd-weOnlyByPlayer");
+			if(!(sender instanceof Player player)) {
+				messageBridge.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
-			Player player = (Player)sender;
-			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 			if(selection == null) {
-				plugin.message(player, "cmd-noSelection");
+				messageBridge.message(player, "cmd-noSelection");
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
 			if(regions.isEmpty()) {
-				plugin.message(player, "cmd-noRegionsFound");
+				messageBridge.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
@@ -68,25 +83,25 @@ public class GroupdelCommand extends CommandAreaShop {
 				}
 			}
 			if(!regionsSuccess.isEmpty()) {
-				plugin.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
+				messageBridge.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
 			if(!regionsFailed.isEmpty()) {
-				plugin.message(player, "groupdel-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
+				messageBridge.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);
+			fileManager.updateRegions(regionsSuccess, player);
 			group.saveRequired();
 		} else {
-			GeneralRegion region = plugin.getFileManager().getRegion(args[2]);
+			GeneralRegion region = fileManager.getRegion(args[2]);
 			if(region == null) {
-				plugin.message(sender, "cmd-notRegistered", args[2]);
+				messageBridge.message(sender, "cmd-notRegistered", args[2]);
 				return;
 			}
 			if(group.removeMember(region)) {
 				region.update();
-				plugin.message(sender, "groupdel-success", group.getName(), group.getMembers().size(), region);
+				messageBridge.message(sender, "groupdel-success", group.getName(), group.getMembers().size(), region);
 			} else {
-				plugin.message(sender, "groupdel-failed", group.getName(), region);
+				messageBridge.message(sender, "groupdel-failed", group.getName(), region);
 			}
 		}
 	}
@@ -95,9 +110,9 @@ public class GroupdelCommand extends CommandAreaShop {
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result = plugin.getFileManager().getGroupNames();
+			result = fileManager.getGroupNames();
 		} else if(toComplete == 3) {
-			result = plugin.getFileManager().getRegionNames();
+			result = fileManager.getRegionNames();
 		}
 		return result;
 	}

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

@@ -1,5 +1,9 @@
 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;
@@ -8,8 +12,14 @@ 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";
@@ -27,23 +37,23 @@ public class GroupinfoCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.groupinfo")) {
-			plugin.message(sender, "groupinfo-noPermission");
+			messageBridge.message(sender, "groupinfo-noPermission");
 			return;
 		}
 		if(args.length < 2 || args[1] == null) {
-			plugin.message(sender, "groupinfo-help");
+			messageBridge.message(sender, "groupinfo-help");
 			return;
 		}
-		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
+		RegionGroup group = fileManager.getGroup(args[1]);
 		if(group == null) {
-			plugin.message(sender, "groupinfo-noGroup", args[1]);
+			messageBridge.message(sender, "groupinfo-noGroup", args[1]);
 			return;
 		}
 		Set<String> members = group.getMembers();
 		if(members.isEmpty()) {
-			plugin.message(sender, "groupinfo-noMembers", group.getName());
+			messageBridge.message(sender, "groupinfo-noMembers", group.getName());
 		} else {
-			plugin.message(sender, "groupinfo-members", group.getName(), Utils.createCommaSeparatedList(members));
+			messageBridge.message(sender, "groupinfo-members", group.getName(), Utils.createCommaSeparatedList(members));
 		}
 	}
 
@@ -51,7 +61,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 = plugin.getFileManager().getGroupNames();
+			result = fileManager.getGroupNames();
 		}
 		return result;
 	}

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

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

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

@@ -1,9 +1,20 @@
 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";
@@ -19,6 +30,6 @@ public class HelpCommand extends CommandAreaShop {
 
 	@Override
 	public void execute(CommandSender sender, String[] args) {
-		plugin.getCommandManager().showHelp(sender);
+		commandManager.showHelp(sender);
 	}
 }

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

@@ -1,11 +1,16 @@
 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:
@@ -13,6 +18,10 @@ 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() {
@@ -36,17 +45,17 @@ public class ImportCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.import")) {
-			plugin.message(sender, "import-noPermission");
+			messageBridge.message(sender, "import-noPermission");
 			return;
 		}
 
 		if(args.length < 2) {
-			plugin.message(sender, "import-help");
+			messageBridge.message(sender, "import-help");
 			return;
 		}
 
 		if(!"RegionForSale".equalsIgnoreCase(args[1])) {
-			plugin.message(sender, "import-wrongSource");
+			messageBridge.message(sender, "import-wrongSource");
 			return;
 		}
 
@@ -54,7 +63,7 @@ public class ImportCommand extends CommandAreaShop {
 			return;
 		}
 
-		new ImportJob(sender);
+		importJobFactory.createImportJob(sender).execute();
 	}
 
 	@Override

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

@@ -1,21 +1,42 @@
 package me.wiefferink.areashop.commands;
 
+import io.github.bakedlibs.dough.blocks.BlockPosition;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import me.wiefferink.areashop.AreaShop;
+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.SimpleMessageBridge;
 import me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.interactivemessenger.processing.Message;
-import org.bukkit.Location;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.apache.logging.log4j.message.SimpleMessage;
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 // TODO fix '/as info' help message hitting replacement limit (improve depth tracking?)
 // TODO add info about autoExtend
+@Singleton
 public class InfoCommand extends CommandAreaShop {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop info";
@@ -46,7 +67,7 @@ public class InfoCommand extends CommandAreaShop {
 			try {
 				page = Integer.parseInt(pageInput);
 			} catch(NumberFormatException e) {
-				plugin.message(sender, "info-wrongPage", pageInput);
+				messageBridge.message(sender, "info-wrongPage", pageInput);
 				return;
 			}
 		}
@@ -54,11 +75,11 @@ public class InfoCommand extends CommandAreaShop {
 			regions.removeIf(generalRegion -> !filterGroup.isMember(generalRegion));
 		}
 		if(regions.isEmpty()) {
-			plugin.message(sender, "info-noRegions");
+			messageBridge.message(sender, "info-noRegions");
 		} else {
 			// First sort by type, then by name
 			regions.sort((one, two) -> {
-				int typeCompare = Integer.compare(getTypeOrder(two), getTypeOrder(one));
+				int typeCompare = getTypeOrder(two).compareTo(getTypeOrder(one));
 				if(typeCompare != 0) {
 					return typeCompare;
 				} else {
@@ -70,7 +91,7 @@ public class InfoCommand extends CommandAreaShop {
 			if(filterGroup != null) {
 				limitedToGroup = Message.fromKey("info-limitedToGroup").replacements(filterGroup.getName());
 			}
-			plugin.message(sender, keyHeader, limitedToGroup);
+			messageBridge.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
@@ -82,24 +103,22 @@ public class InfoCommand extends CommandAreaShop {
 			for(int i = (page - 1) * itemsPerPage; i < page * itemsPerPage && i < regions.size(); i++) {
 				String state;
 				GeneralRegion region = regions.get(i);
-				if(region instanceof RentRegion) {
-					if(region.isAvailable()) {
+				if(region.getType() == GeneralRegion.RegionType.RENT) {
+					if(region.getOwner() == null) {
 						state = "Forrent";
 					} else {
 						state = "Rented";
 					}
-				} else if (region instanceof BuyRegion){
-					if(region.isAvailable()) {
+				} else {
+					if(region.getOwner() == null) {
 						state = "Forsale";
 					} else if(!((BuyRegion)region).isInResellingMode()) {
 						state = "Sold";
 					} else {
 						state = "Reselling";
 					}
-				} else {
-					state = region.getState().getValue();
 				}
-				plugin.messageNoPrefix(sender, "info-entry" + state, region);
+				messageBridge.messageNoPrefix(sender, "info-entry" + state, region);
 				linesPrinted++;
 			}
 			Message footer = Message.empty();
@@ -125,7 +144,7 @@ public class InfoCommand extends CommandAreaShop {
 				for(int i = linesPrinted; i < maximumItems - 1; i++) {
 					sender.sendMessage(" ");
 				}
-				footer.send(sender);
+				SimpleMessageBridge.send(footer, sender);
 			}
 		}
 	}
@@ -135,15 +154,15 @@ public class InfoCommand extends CommandAreaShop {
 	 * @param region The region to get the order for
 	 * @return An integer for sorting by type
 	 */
-	private int getTypeOrder(GeneralRegion region) {
+	private Integer getTypeOrder(GeneralRegion region) {
 		if(region.getType() == GeneralRegion.RegionType.RENT) {
-			if(region.isAvailable()) {
+			if(region.getOwner() == null) {
 				return 1;
 			} else {
 				return 2;
 			}
 		} else {
-			if(region.isAvailable()) {
+			if(region.getOwner() == null) {
 				return 3;
 			} else if(!((BuyRegion)region).isInResellingMode()) {
 				return 4;
@@ -156,7 +175,7 @@ public class InfoCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.info")) {
-			plugin.message(sender, "info-noPermission");
+			messageBridge.message(sender, "info-noPermission");
 			return;
 		}
 		if(args.length > 1 && args[1] != null) {
@@ -165,9 +184,9 @@ public class InfoCommand extends CommandAreaShop {
 			Set<String> groupFilters = new HashSet<>(Arrays.asList("all", "rented", "forrent", "sold", "forsale", "reselling"));
 			if(groupFilters.contains(args[1].toLowerCase()) && args.length > 2) {
 				if(!Utils.isNumeric(args[2])) {
-					filterGroup = plugin.getFileManager().getGroup(args[2]);
+					filterGroup = fileManager.getGroup(args[2]);
 					if(filterGroup == null) {
-						plugin.message(sender, "info-noFiltergroup", args[2]);
+						messageBridge.message(sender, "info-noFiltergroup", args[2]);
 						return;
 					}
 					// Pass page number to args[2] if available
@@ -179,48 +198,48 @@ public class InfoCommand extends CommandAreaShop {
 
 			// All regions
 			if(args[1].equalsIgnoreCase("all")) {
-				showSortedPagedList(sender, plugin.getFileManager().getRegions(), filterGroup, "info-allHeader", (args.length > 2 ? args[2] : null), "info 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 = plugin.getFileManager().getRents();
+				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 = plugin.getFileManager().getRents();
+				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 = plugin.getFileManager().getBuys();
+				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 = plugin.getFileManager().getBuys();
+				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 = plugin.getFileManager().getBuys();
+				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 = plugin.getFileManager().getRegions();
-				for(RegionGroup group : plugin.getFileManager().getGroups()) {
+				List<GeneralRegion> regions = new ArrayList<>(fileManager.getRegionsRef());
+				for(RegionGroup group : fileManager.getGroups()) {
 					regions.removeAll(group.getMemberRegions());
 				}
 				if(regions.isEmpty()) {
-					plugin.message(sender, "info-nogroupNone");
+					messageBridge.message(sender, "info-nogroupNone");
 				} else {
 					showSortedPagedList(sender, regions, filterGroup, "info-nogroupHeader", (args.length > 2 ? args[2] : null), "info nogroup");
 				}
@@ -228,207 +247,211 @@ public class InfoCommand extends CommandAreaShop {
 
 			// Region info
 			else if(args[1].equalsIgnoreCase("region")) {
-				RentRegion rent = null;
-				BuyRegion buy = null;
-				if(args.length > 2) {
-					rent = plugin.getFileManager().getRent(args[2]);
-					buy = plugin.getFileManager().getBuy(args[2]);
-				} else {
-					if(sender instanceof Player) {
-						// get the region by location
-						List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
-						if(regions.isEmpty()) {
-							plugin.message(sender, "cmd-noRegionsAtLocation");
-							return;
-						} else if(regions.size() > 1) {
-							plugin.message(sender, "cmd-moreRegionsAtLocation");
-							return;
-						} else {
-							if(regions.get(0) instanceof RentRegion) {
-								rent = (RentRegion)regions.get(0);
-							} else if(regions.get(0) instanceof BuyRegion) {
-								buy = (BuyRegion)regions.get(0);
-							}
-						}
+				if(args.length > 1) {
+					RentRegion rent = null;
+					BuyRegion buy = null;
+					if(args.length > 2) {
+						rent = fileManager.getRent(args[2]);
+						buy = fileManager.getBuy(args[2]);
 					} else {
-						plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+						if(sender instanceof Player) {
+							// get the region by location
+							List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+							if(regions.isEmpty()) {
+								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 && buy == null) {
-					plugin.message(sender, "info-regionNotExisting", args[2]);
-					return;
-				}
-
-				if(rent != null) {
-					plugin.message(sender, "info-regionHeaderRent", rent);
-					if(rent.isRented()) {
-						plugin.messageNoPrefix(sender, "info-regionRented", rent);
-						plugin.messageNoPrefix(sender, "info-regionExtending", rent);
-						// Money back
-						if(UnrentCommand.canUse(sender, rent)) {
-							plugin.messageNoPrefix(sender, "info-regionMoneyBackRentClick", rent);
-						} else {
-							plugin.messageNoPrefix(sender, "info-regionMoneyBackRent", rent);
-						}
-						// Friends
-						if(!rent.getFriendsFeature().getFriendNames().isEmpty()) {
-							String messagePart = "info-friend";
-							if(DelfriendCommand.canUse(sender, rent)) {
-								messagePart = "info-friendRemove";
-							}
-							plugin.messageNoPrefix(sender, "info-regionFriends", rent, Utils.combinedMessage(rent.getFriendsFeature().getFriendNames(), messagePart));
-						}
-					} else {
-						plugin.messageNoPrefix(sender, "info-regionCanBeRented", rent);
-					}
-					if(rent.getLandlordName() != null) {
-						plugin.messageNoPrefix(sender, "info-regionLandlord", rent);
-					}
-					// Maximum extends
-					if(rent.getMaxExtends() != -1) {
-						if(rent.getMaxExtends() == 0) {
-							plugin.messageNoPrefix(sender, "info-regionNoExtending", rent);
-						} else if(rent.isRented()) {
-							plugin.messageNoPrefix(sender, "info-regionExtendsLeft", rent);
-						} else {
-							plugin.messageNoPrefix(sender, "info-regionMaxExtends", rent);
-						}
-					}
-					// If maxExtends is zero it does not make sense to show this message
-					if(rent.getMaxRentTime() != -1 && rent.getMaxExtends() != 0) {
-						plugin.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
-					}
-					if(rent.getInactivityThresholdMillis() != -1) {
-						plugin.messageNoPrefix(sender, "info-regionInactiveUnrent", rent);
-					}
-					// Teleport
-					Message tp = Message.fromKey("info-prefix");
-					boolean foundSomething = false;
-					if(TeleportCommand.canUse(sender, rent)) {
-						foundSomething = true;
-						tp.append(Message.fromKey("info-regionTeleport").replacements(rent));
-					}
-					if(SetteleportCommand.canUse(sender, rent)) {
-						if(foundSomething) {
-							tp.append(", ");
-						}
-						foundSomething = true;
-						tp.append(Message.fromKey("info-setRegionTeleport").replacements(rent));
-					}
-					if(foundSomething) {
-						tp.append(".");
-						tp.send(sender);
-					}
-					// Signs
-					List<String> signLocations = new ArrayList<>();
-					for(Location location : rent.getSignsFeature().getSignLocations()) {
-						signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
-					}
-					if(!signLocations.isEmpty()) {
-						plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
-					}
-					// Groups
-					if(sender.hasPermission("areashop.groupinfo") && !rent.getGroupNames().isEmpty()) {
-						plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(rent.getGroupNames()));
-					}
-					// Restoring
-					if(rent.isRestoreEnabled()) {
-						plugin.messageNoPrefix(sender, "info-regionRestoringRent", rent);
-					}
-					// Restrictions
-					if(!rent.isRented()) {
-						if(rent.restrictedToRegion()) {
-							plugin.messageNoPrefix(sender, "info-regionRestrictedRegionRent", rent);
-						} else if(rent.restrictedToWorld()) {
-							plugin.messageNoPrefix(sender, "info-regionRestrictedWorldRent", rent);
-						}
-					}
-					plugin.messageNoPrefix(sender, "info-regionFooterRent", rent);
-				} else if(buy != null) {
-					plugin.message(sender, "info-regionHeaderBuy", buy);
-					if(buy.isSold()) {
-						if(buy.isInResellingMode()) {
-							plugin.messageNoPrefix(sender, "info-regionReselling", buy);
-							plugin.messageNoPrefix(sender, "info-regionReselPrice", buy);
-						} else {
-							plugin.messageNoPrefix(sender, "info-regionBought", buy);
-						}
-						// Money back
-						if(!buy.getBooleanSetting("buy.sellDisabled")) {
-							if (SellCommand.canUse(sender, buy)) {
-								plugin.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
+					if(rent != null) {
+						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 {
-								plugin.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
+								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);
 							}
 						}
-						// Friends
-						if(!buy.getFriendsFeature().getFriendNames().isEmpty()) {
-							String messagePart = "info-friend";
-							if(DelfriendCommand.canUse(sender, buy)) {
-								messagePart = "info-friendRemove";
-							}
-							plugin.messageNoPrefix(sender, "info-regionFriends", buy, Utils.combinedMessage(buy.getFriendsFeature().getFriendNames(), messagePart));
+						// If maxExtends is zero it does not make sense to show this message
+						if(rent.getMaxRentTime() != -1 && rent.getMaxExtends() != 0) {
+							messageBridge.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
+						}
+						if(rent.getInactiveTimeUntilUnrent() != -1) {
+							messageBridge.messageNoPrefix(sender, "info-regionInactiveUnrent", rent);
+						}
+						// Teleport
+						Message tp = Message.fromKey("info-prefix");
+						boolean foundSomething = false;
+						if(TeleportCommand.canUse(sender, rent)) {
+							foundSomething = true;
+							tp.append(Message.fromKey("info-regionTeleport").replacements(rent));
+						}
+						if(SetteleportCommand.canUse(sender, rent)) {
+							if(foundSomething) {
+								tp.append(", ");
+							}
+							foundSomething = true;
+							tp.append(Message.fromKey("info-setRegionTeleport").replacements(rent));
 						}
-					} else {
-						plugin.messageNoPrefix(sender, "info-regionCanBeBought", buy);
-					}
-					if(buy.getLandlord() != null) {
-						plugin.messageNoPrefix(sender, "info-regionLandlord", buy);
-					}
-					if(buy.getInactivityThresholdMillis() != -1) {
-						plugin.messageNoPrefix(sender, "info-regionInactiveSell", buy);
-					}
-					// Teleport
-					Message tp = Message.fromKey("info-prefix");
-					boolean foundSomething = false;
-					if(TeleportCommand.canUse(sender, buy)) {
-						foundSomething = true;
-						tp.append(Message.fromKey("info-regionTeleport").replacements(buy));
-					}
-					if(SetteleportCommand.canUse(sender, buy)) {
 						if(foundSomething) {
-							tp.append(", ");
+							tp.append(".");
+							SimpleMessageBridge.send(tp, sender);
 						}
-						foundSomething = true;
-						tp.append(Message.fromKey("info-setRegionTeleport").replacements(buy));
-					}
-					if(foundSomething) {
-						tp.append(".");
-						tp.send(sender);
-					}
-					// Signs
-					List<String> signLocations = new ArrayList<>();
-					for(Location location : buy.getSignsFeature().getSignLocations()) {
-						signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
-					}
-					if(!signLocations.isEmpty()) {
-						plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
-					}
-					// Groups
-					if(sender.hasPermission("areashop.groupinfo") && !buy.getGroupNames().isEmpty()) {
-						plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(buy.getGroupNames()));
-					}
-					// Restoring
-					if(buy.isRestoreEnabled()) {
-						plugin.messageNoPrefix(sender, "info-regionRestoringBuy", buy);
-					}
-					// Restrictions
-					if(!buy.isSold()) {
-						if(buy.restrictedToRegion()) {
-							plugin.messageNoPrefix(sender, "info-regionRestrictedRegionBuy", buy);
-						} else if(buy.restrictedToWorld()) {
-							plugin.messageNoPrefix(sender, "info-regionRestrictedWorldBuy", buy);
+						// Signs
+						List<String> signLocations = new ArrayList<>();
+						for(BlockPosition location : rent.getSignsFeature().signManager().allSignLocations()) {
+							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getX(), location.getY(), location.getZ()).getPlain());
 						}
+						if(!signLocations.isEmpty()) {
+							messageBridge.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
+						}
+						// Groups
+						if(sender.hasPermission("areashop.groupinfo") && !rent.getGroupNames().isEmpty()) {
+							messageBridge.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(rent.getGroupNames()));
+						}
+						// 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
+						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(".");
+							SimpleMessageBridge.send(tp, sender);
+						}
+						// Signs
+						List<String> signLocations = new ArrayList<>();
+						for(BlockPosition location : buy.getSignsFeature().signManager().allSignLocations()) {
+							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getX(), location.getY(), location.getZ()).getPlain());
+						}
+						if(!signLocations.isEmpty()) {
+							messageBridge.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
+						}
+						// Groups
+						if(sender.hasPermission("areashop.groupinfo") && !buy.getGroupNames().isEmpty()) {
+							messageBridge.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(buy.getGroupNames()));
+						}
+						// 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);
 					}
-					plugin.messageNoPrefix(sender, "info-regionFooterBuy", buy);
+				} else {
+					messageBridge.message(sender, "info-regionHelp");
 				}
 			} else {
-				plugin.message(sender, "info-help");
+				messageBridge.message(sender, "info-help");
 			}
 		} else {
-			plugin.message(sender, "info-help");
+			messageBridge.message(sender, "info-help");
 		}
 	}
 
@@ -443,8 +466,8 @@ public class InfoCommand extends CommandAreaShop {
 					result.add(player.getName());
 				}
 			} else if(start[2].equalsIgnoreCase("region")) {
-				result.addAll(plugin.getFileManager().getBuyNames());
-				result.addAll(plugin.getFileManager().getRentNames());
+				result.addAll(fileManager.getBuyNames());
+				result.addAll(fileManager.getRentNames());
 			}
 		}
 		return result;

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

@@ -1,5 +1,10 @@
 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;
@@ -8,10 +13,17 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.StringJoiner;
 
+@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";
@@ -28,17 +40,16 @@ public class LinksignsCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.linksigns")) {
-			plugin.message(sender, "linksigns-noPermission");
+			messageBridge.message(sender, "linksigns-noPermission");
 			return;
 		}
-		if(!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
 
-		Player player = (Player)sender;
-		if(plugin.getSignlinkerManager().isInSignLinkMode(player)) {
-			plugin.getSignlinkerManager().exitSignLinkMode(player);
+		if(signLinkerManager.isInSignLinkMode(player)) {
+			signLinkerManager.exitSignLinkMode(player);
 		} else {
 			// Get the profile
 			String profile = null;
@@ -48,16 +59,19 @@ public class LinksignsCommand extends CommandAreaShop {
 				if(signProfilesSection != null) {
 					Set<String> profiles = signProfilesSection.getKeys(false);
 					if(!profiles.contains(profile)) {
-						StringJoiner joiner = new StringJoiner(", ");
+						ArrayList<String> message = new ArrayList<>();
 						for(String p : profiles) {
-							Message.fromKey("addsign-profile").replacements(p).get().forEach(joiner::add);
+							if(!message.isEmpty()) {
+								message.add(", ");
+							}
+							message.addAll(Message.fromKey("addsign-profile").replacements(p).get());
 						}
-						plugin.message(sender, "addsign-wrongProfile", joiner.toString());
+						messageBridge.message(sender, "addsign-wrongProfile", Message.fromList(message));
 						return;
 					}
 				}
 			}
-			plugin.getSignlinkerManager().enterSignLinkMode(player, profile);
+			signLinkerManager.enterSignLinkMode(player, profile);
 		}
 	}
 

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

@@ -1,10 +1,15 @@
 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.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -14,8 +19,20 @@ 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";
@@ -32,76 +49,77 @@ public class MeCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.me")) {
-			plugin.message(sender, "me-noPermission");
+			messageBridge.message(sender, "me-noPermission");
 			return;
 		}
 		OfflinePlayer player = null;
 		if(!(sender instanceof Player)) {
 			if(args.length <= 1) {
-				plugin.message(sender, "me-notAPlayer");
+				messageBridge.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) {
+			// 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 : plugin.getFileManager().getRents()) {
-			if(region.isOwner(player)) {
+		for(RentRegion region : fileManager.getRentsRef()) {
+			if(region.isOwner(target)) {
 				rentRegions.add(region);
 			}
 		}
 		Set<BuyRegion> buyRegions = new HashSet<>();
-		for(BuyRegion region : plugin.getFileManager().getBuys()) {
-			if(region.isOwner(player)) {
+		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 : plugin.getFileManager().getRegions()) {
-			if(region.getFriendsFeature().getFriends().contains(player.getUniqueId())) {
+		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) {
-			plugin.message(sender, "me-header", player.getName());
+		if(!foundSome) {
+			messageBridge.message(sender, "me-nothing", target.getName());
+			return;
 		}
+		messageBridge.message(sender, "me-header", target.getName());
 		if(!rentRegions.isEmpty()) {
 			for(RentRegion region : rentRegions) {
-				plugin.messageNoPrefix(sender, "me-rentLine", region);
+				messageBridge.messageNoPrefix(sender, "me-rentLine", region);
 			}
 		}
 		if(!buyRegions.isEmpty()) {
 			for(BuyRegion region : buyRegions) {
-				plugin.messageNoPrefix(sender, "me-buyLine", region);
+				messageBridge.messageNoPrefix(sender, "me-buyLine", region);
 			}
 		}
 		if(!friendRegions.isEmpty()) {
 			for(GeneralRegion region : friendRegions) {
-				plugin.messageNoPrefix(sender, "me-friendLine", region);
+				messageBridge.messageNoPrefix(sender, "me-friendLine", region);
 			}
 		}
-
-		if(!foundSome) {
-			plugin.message(sender, "me-nothing", player.getName());
-		} else {
-			plugin.messageNoPrefix(sender, "me-clickHint");
-		}
+		messageBridge.messageNoPrefix(sender, "me-clickHint");
 	}
 
 	@Override

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

@@ -1,7 +1,15 @@
 package me.wiefferink.areashop.commands;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.tools.SimpleMessageBridge;
 import me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.interactivemessenger.processing.Message;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -10,8 +18,12 @@ 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";
@@ -26,18 +38,18 @@ public class MessageCommand extends CommandAreaShop {
 	@Override
 	public void execute(final CommandSender sender, final String[] args) {
 		if(!sender.hasPermission("areashop.message")) {
-			plugin.message(sender, "message-noPermission");
+			messageBridge.message(sender, "message-noPermission");
 			return;
 		}
 
 		if(args.length < 3) {
-			plugin.message(sender, "message-help");
+			messageBridge.message(sender, "message-help");
 			return;
 		}
 
 		Player player = Bukkit.getPlayer(args[1]);
 		if(player == null) {
-			plugin.message(sender, "message-notOnline", args[1]);
+			messageBridge.message(sender, "message-notOnline", args[1]);
 			return;
 		}
 
@@ -45,7 +57,8 @@ public class MessageCommand extends CommandAreaShop {
 		System.arraycopy(args, 2, messageArgs, 0, args.length - 2);
 		String message = StringUtils.join(messageArgs, " ");
 
-		Message.fromString(message).send(player);
+		Message m = Message.fromString(message);
+		SimpleMessageBridge.send(m, player);
 	}
 
 	@Override

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

@@ -1,9 +1,19 @@
 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";
@@ -23,7 +33,7 @@ public class ReloadCommand extends CommandAreaShop {
 			// Reload the configuration files and update all region flags/signs
 			plugin.reload(sender);
 		} else {
-			plugin.message(sender, "reload-noPermission");
+			messageBridge.message(sender, "reload-noPermission");
 		}
 	}
 }

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

@@ -1,5 +1,9 @@
 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;
@@ -8,8 +12,14 @@ 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";
@@ -26,18 +36,17 @@ public class RentCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.rent")) {
-			plugin.message(sender, "rent-noPermission");
+			messageBridge.message(sender, "rent-noPermission");
 			return;
 		}
-		if(!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
-		Player player = (Player)sender;
 		if(args.length > 1 && args[1] != null) {
-			RentRegion rent = plugin.getFileManager().getRent(args[1]);
+			RentRegion rent = fileManager.getRent(args[1]);
 			if(rent == null) {
-				plugin.message(sender, "rent-notRentable", args[1]);
+				messageBridge.message(sender, "rent-notRentable", args[1]);
 			} else {
 				rent.rent(player);
 			}
@@ -45,9 +54,9 @@ public class RentCommand extends CommandAreaShop {
 			// get the region by location
 			List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
 			if(regions.isEmpty()) {
-				plugin.message(sender, "cmd-noRegionsAtLocation");
+				messageBridge.message(sender, "cmd-noRegionsAtLocation");
 			} else if(regions.size() > 1) {
-				plugin.message(sender, "cmd-moreRegionsAtLocation");
+				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 			} else {
 				regions.get(0).rent(player);
 			}
@@ -58,7 +67,7 @@ public class RentCommand extends CommandAreaShop {
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			for(RentRegion region : plugin.getFileManager().getRents()) {
+			for(RentRegion region : fileManager.getRentsRef()) {
 				if(!region.isRented()) {
 					result.add(region.getName());
 				}

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

@@ -1,5 +1,9 @@
 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;
@@ -8,8 +12,14 @@ 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";
@@ -26,24 +36,24 @@ public class ResellCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.resell") && !sender.hasPermission("areashop.resellall")) {
-			plugin.message(sender, "resell-noPermissionOther");
+			messageBridge.message(sender, "resell-noPermissionOther");
 			return;
 		}
 
 		if(args.length <= 1) {
-			plugin.message(sender, "resell-help");
+			messageBridge.message(sender, "resell-help");
 			return;
 		}
 		double price;
 		try {
 			price = Double.parseDouble(args[1]);
 		} catch(NumberFormatException e) {
-			plugin.message(sender, "resell-wrongPrice", args[1]);
+			messageBridge.message(sender, "resell-wrongPrice", args[1]);
 			return;
 		}
 
 		if(price < 0) {
-			plugin.message(sender, "resell-wrongPrice", args[1]);
+			messageBridge.message(sender, "resell-wrongPrice", args[1]);
 			return;
 		}
 
@@ -53,53 +63,53 @@ public class ResellCommand extends CommandAreaShop {
 				// get the region by location
 				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
+					messageBridge.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
+					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					buy = regions.get(0);
 				}
 			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			buy = plugin.getFileManager().getBuy(args[2]);
+			buy = fileManager.getBuy(args[2]);
 			if(buy == null) {
-				plugin.message(sender, "resell-notRegistered", args[2]);
+				messageBridge.message(sender, "resell-notRegistered", args[2]);
 				return;
 			}
 		}
 		if(buy == null) {
-			plugin.message(sender, "cmd-noRegionsAtLocation");
+			messageBridge.message(sender, "cmd-noRegionsAtLocation");
 			return;
 		}
 		if(!buy.isSold()) {
-			plugin.message(sender, "resell-notBought", buy);
+			messageBridge.message(sender, "resell-notBought", buy);
 			return;
 		}
 		if(sender.hasPermission("areashop.resellall")) {
 			buy.enableReselling(price);
 			buy.update();
-			plugin.message(sender, "resell-success", buy);
+			messageBridge.message(sender, "resell-success", buy);
 		} else if(sender.hasPermission("areashop.resell") && sender instanceof Player) {
-			if(!buy.isTransactionHolder((Player)sender)) {
-				plugin.message(sender, "resell-noPermissionOther", buy);
+			if(!buy.isOwner((Player)sender)) {
+				messageBridge.message(sender, "resell-noPermissionOther", buy);
 				return;
 			}
 
 			if(buy.getBooleanSetting("buy.resellDisabled")) {
-				plugin.message(sender, "resell-disabled", buy);
+				messageBridge.message(sender, "resell-disabled", buy);
 				return;
 			}
 
 			buy.enableReselling(price);
 			buy.update();
-			plugin.message(sender, "resell-success", buy);
+			messageBridge.message(sender, "resell-success", buy);
 		} else {
-			plugin.message(sender, "resell-noPermission", buy);
+			messageBridge.message(sender, "resell-noPermission", buy);
 		}
 	}
 
@@ -107,7 +117,7 @@ public class ResellCommand extends CommandAreaShop {
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 3) {
-			for(BuyRegion region : plugin.getFileManager().getBuys()) {
+			for(BuyRegion region : fileManager.getBuysRef()) {
 				if(region.isSold() && !region.isInResellingMode()) {
 					result.add(region.getName());
 				}

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

@@ -1,5 +1,9 @@
 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;
@@ -10,8 +14,14 @@ 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";
@@ -28,21 +38,21 @@ public class SchematiceventCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.schematicevents")) {
-			plugin.message(sender, "schemevent-noPermission");
+			messageBridge.message(sender, "schemevent-noPermission");
 			return;
 		}
 
 		if(args.length < 3 || args[1] == null || args[2] == null) {
-			plugin.message(sender, "schemevent-help");
+			messageBridge.message(sender, "schemevent-help");
 			return;
 		}
-		GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+		GeneralRegion region = fileManager.getRegion(args[1]);
 		if(region == null) {
-			plugin.message(sender, "cmd-notRegistered", args[1]);
+			messageBridge.message(sender, "cmd-notRegistered", args[1]);
 			return;
 		}
 		if(region.getRegion() == null) {
-			plugin.message(sender, "general-noRegion", region);
+			messageBridge.message(sender, "general-noRegion", region);
 			return;
 		}
 		GeneralRegion.RegionEvent event = null;
@@ -58,21 +68,21 @@ public class SchematiceventCommand extends CommandAreaShop {
 			for(GeneralRegion.RegionEvent value : GeneralRegion.RegionEvent.values()) {
 				values.add(value.getValue().toLowerCase());
 			}
-			plugin.message(sender, "schemevent-wrongEvent", args[2], Utils.createCommaSeparatedList(values), region);
+			messageBridge.message(sender, "schemevent-wrongEvent", args[2], Utils.createCommaSeparatedList(values), region);
 			return;
 		}
 		region.handleSchematicEvent(event);
 		region.update();
-		plugin.message(sender, "schemevent-success", args[2], region);
+		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(plugin.getFileManager().getRegionNames());
+			result.addAll(fileManager.getRegionNames());
 		} else if(toComplete == 3) {
-			GeneralRegion region = plugin.getFileManager().getRegion(start[2]);
+			GeneralRegion region = fileManager.getRegion(start[2]);
 			if(region != null) {
 				if(region instanceof RentRegion) {
 					result.addAll(Arrays.asList("created", "deleted", "rented", "unrented"));

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

@@ -1,8 +1,11 @@
 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.TransactionalRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -10,89 +13,93 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class SellCommand extends CommandAreaShop {
 
-    /**
-     * Check if a person can sell the region.
-     *
-     * @param person The person to check
-     * @param region The region to check for
-     * @return true if the person can sell it, otherwise false
-     */
-    public static boolean canUse(CommandSender person, GeneralRegion region) {
-        if (person.hasPermission("areashop.sell")) {
-            return true;
-        }
-        if (person instanceof Player && region instanceof TransactionalRegion) {
-            Player player = (Player) person;
-            return ((TransactionalRegion) region).isTransactionHolder(player) && person.hasPermission("areashop.sellown");
-        }
-        return false;
-    }
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
+	@Override
+	public String getCommandStart() {
+		return "areashop sell";
+	}
 
-    @Override
-    public String getCommandStart() {
-        return "areashop sell";
-    }
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.sell") || target.hasPermission("areashop.sellown")) {
+			return "help-sell";
+		}
+		return null;
+	}
 
-    @Override
-    public String getHelp(CommandSender target) {
-        if (target.hasPermission("areashop.sell") || target.hasPermission("areashop.sellown")) {
-            return "help-sell";
-        }
-        return null;
-    }
+	/**
+	 * Check if a person can sell the region.
+	 * @param person The person to check
+	 * @param region The region to check for
+	 * @return true if the person can sell it, otherwise false
+	 */
+	public static boolean canUse(CommandSender person, GeneralRegion region) {
+		if(person.hasPermission("areashop.sell")) {
+			return true;
+		}
+		if(person instanceof Player player) {
+			return region.isOwner(player) && person.hasPermission("areashop.sellown");
+		}
+		return false;
+	}
 
-    @Override
-    public void execute(CommandSender sender, String[] args) {
-        if (!sender.hasPermission("areashop.sell") && !sender.hasPermission("areashop.sellown")) {
-            plugin.message(sender, "sell-noPermission");
-            return;
-        }
-        BuyRegion buy;
-        if (args.length <= 1) {
-            if (sender instanceof Player) {
-                // get the region by location
-                List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player) sender).getLocation());
-                if (regions.isEmpty()) {
-                    plugin.message(sender, "cmd-noRegionsAtLocation");
-                    return;
-                } else if (regions.size() > 1) {
-                    plugin.message(sender, "cmd-moreRegionsAtLocation");
-                    return;
-                } else {
-                    buy = regions.get(0);
-                }
-            } else {
-                plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
-                return;
-            }
-        } else {
-            buy = plugin.getFileManager().getBuy(args[1]);
-        }
-        if (buy == null) {
-            plugin.message(sender, "sell-notRegistered");
-            return;
-        }
-        if (!buy.isSold()) {
-            plugin.message(sender, "sell-notBought", buy);
-            return;
-        }
-        buy.sell(true, sender);
-    }
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.sell") && !sender.hasPermission("areashop.sellown")) {
+			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 : plugin.getFileManager().getBuys()) {
-                if (region.isSold()) {
-                    result.add(region.getName());
-                }
-            }
-        }
-        return result;
-    }
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(BuyRegion region : fileManager.getBuysRef()) {
+				if(region.isSold()) {
+					result.add(region.getName());
+				}
+			}
+		}
+		return result;
+	}
 }
 
 

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

@@ -0,0 +1,77 @@
+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.plugin.Plugin;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Singleton
+public class SetTransferCommand extends CommandAreaShop {
+
+    @Inject
+    private MessageBridge messageBridge;
+    @Inject
+    private IFileManager fileManager;
+    @Inject
+    private Plugin plugin;
+
+    @Override
+    public String getCommandStart() {
+        return "areashop settransfer";
+    }
+
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.settransfer")) {
+            return "help-settransfer";
+        }
+        return null;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.settransfer")) {
+            messageBridge.message(sender, "settransfer-noPermission");
+            return;
+        }
+        if (args.length <= 2 || args[1] == null || args[2] == null) {
+            messageBridge.message(sender, "settransfer-help");
+            return;
+        }
+        GeneralRegion region = fileManager.getRegion(args[1]);
+        if (region == null) {
+            messageBridge.message(sender, "settransfer-notRegistered", args[1]);
+            return;
+        }
+        boolean value;
+        if (args[2].equalsIgnoreCase("true")) {
+            value = true;
+        } else if (args[2].equalsIgnoreCase("false")) {
+            value = false;
+        } else {
+            messageBridge.message(sender, "settransfer-invalidSetting", args[2]);
+            return;
+        }
+        region.setTransferEnabled(value);
+        messageBridge.message(sender, "settransfer-success", args[2], 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");
+        }
+        return result;
+    }
+}

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

@@ -1,15 +1,28 @@
 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";
@@ -26,11 +39,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)) {
-			plugin.message(sender, "setduration-noPermission");
+			messageBridge.message(sender, "setduration-noPermission");
 			return;
 		}
 		if(args.length < 3 || args[1] == null || args[2] == null) {
-			plugin.message(sender, "setduration-help");
+			messageBridge.message(sender, "setduration-help");
 			return;
 		}
 		int regionArgument = 3;
@@ -43,48 +56,48 @@ public class SetdurationCommand extends CommandAreaShop {
 				// get the region by location
 				List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
+					messageBridge.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
+					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					rent = regions.get(0);
 				}
 			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			rent = plugin.getFileManager().getRent(args[regionArgument]);
+			rent = fileManager.getRent(args[regionArgument]);
 		}
 		if(rent == null) {
-			plugin.message(sender, "setduration-notRegistered", args[regionArgument]);
+			messageBridge.message(sender, "setduration-notRegistered", args[regionArgument]);
 			return;
 		}
 		if(!sender.hasPermission("areashop.setduration") && !(sender instanceof Player && rent.isLandlord(((Player)sender).getUniqueId()))) {
-			plugin.message(sender, "setduration-noLandlord", rent);
+			messageBridge.message(sender, "setduration-noLandlord", rent);
 			return;
 		}
 		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
 			rent.setDuration(null);
 			rent.update();
-			plugin.message(sender, "setduration-successRemoved", rent);
+			messageBridge.message(sender, "setduration-successRemoved", rent);
 			return;
 		}
 		try {
 			Integer.parseInt(args[1]);
 		} catch(NumberFormatException e) {
-			plugin.message(sender, "setduration-wrongAmount", args[1], rent);
+			messageBridge.message(sender, "setduration-wrongAmount", args[1], rent);
 			return;
 		}
 		if(!Utils.checkTimeFormat(args[1] + " " + args[2])) {
-			plugin.message(sender, "setduration-wrongFormat", args[1] + " " + args[2], rent);
+			messageBridge.message(sender, "setduration-wrongFormat", args[1] + " " + args[2], rent);
 			return;
 		}
 		rent.setDuration(args[1] + " " + args[2]);
 		rent.update();
-		plugin.message(sender, "setduration-success", rent);
+		messageBridge.message(sender, "setduration-success", rent);
 	}
 
 	@Override
@@ -97,7 +110,7 @@ public class SetdurationCommand extends CommandAreaShop {
 			result.addAll(plugin.getConfig().getStringList("months"));
 			result.addAll(plugin.getConfig().getStringList("years"));
 		} else if(toComplete == 4) {
-			result = plugin.getFileManager().getRentNames();
+			result = fileManager.getRentNames();
 		}
 		return result;
 	}

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

@@ -1,87 +1,100 @@
 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.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class SetlandlordCommand extends CommandAreaShop {
 
-	@Override
-	public String getCommandStart() {
-		return "areashop setlandlord";
-	}
+    @Inject
+    private MessageBridge messageBridge;
+    @Inject
+    private IFileManager fileManager;
+    @Inject
+    private OfflinePlayerHelper offlinePlayerHelper;
+    @Inject
+    private BukkitSchedulerExecutor executor;
 
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.setlandlord")) {
-			return "help-setlandlord";
-		}
-		return null;
-	}
+    @Override
+    public String getCommandStart() {
+        return "areashop setlandlord";
+    }
 
-	@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]);
-		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()) {
-					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 String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.setlandlord")) {
+            return "help-setlandlord";
+        }
+        return null;
+    }
 
-	@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;
-	}
+    @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;
+    }
 
 }

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

@@ -1,12 +1,15 @@
 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.regions.TransactionalRegion;
+import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
 import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -15,116 +18,119 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.UUID;
 
+@Singleton
 public class SetownerCommand extends CommandAreaShop {
 
-	@Override
-	public String getCommandStart() {
-		return "areashop setowner";
-	}
+    @Inject
+    private MessageBridge messageBridge;
+    @Inject
+    private IFileManager fileManager;
+    @Inject
+    private OfflinePlayerHelper offlinePlayerHelper;
+    @Inject
+    private BukkitSchedulerExecutor executor;
 
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.setownerrent") || target.hasPermission("areashop.setownerbuy")) {
-			return "help-setowner";
-		}
-		return null;
-	}
+    @Override
+    public String getCommandStart() {
+        return "areashop setowner";
+    }
 
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.setownerrent") && !sender.hasPermission("areashop.setownerbuy")) {
-			plugin.message(sender, "setowner-noPermission");
-			return;
-		}
-		GeneralRegion region;
-		if(args.length < 2) {
-			plugin.message(sender, "setowner-help");
-			return;
-		}
-		if(args.length == 2) {
-			if(sender instanceof Player) {
-				// get the region by location
-				List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
-				if(regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if(regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					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;
-		}
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.setownerrent") || target.hasPermission("areashop.setownerbuy")) {
+            return "help-setowner";
+        }
+        return null;
+    }
 
-		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;
-		}
+    @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);
+            }
 
-		UUID uuid = null;
-		@SuppressWarnings("deprecation")
-		OfflinePlayer player = Bukkit.getOfflinePlayer(args[1]);
-		if(player.hasPlayedBefore()) {
-			uuid = player.getUniqueId();
-		}
-		if(uuid == null) {
-			plugin.message(sender, "setowner-noPlayer", args[1], region);
-			return;
-		}
+        } else {
+            region = fileManager.getRegion(args[2]);
+        }
+        if (region == null) {
+            messageBridge.message(sender, "setowner-notRegistered");
+            return;
+        }
 
-		if(region instanceof RentRegion) {
-			RentRegion rent = (RentRegion)region;
-			if(rent.isTransactionHolder(uuid)) {
-				// extend
-				rent.setRentedUntil(rent.getRentedUntil() + rent.getDuration());
-				plugin.message(sender, "setowner-succesRentExtend", region);
-			} else {
-				// change
-				if(!rent.isRented()) {
-					rent.setRentedUntil(System.currentTimeMillis()  + rent.getDuration());
-				}
-				plugin.message(sender, "setowner-succesRent", region);
-			}
-			rent.setTransactionHolder(uuid);
-		}
-		if(region instanceof BuyRegion) {
-			BuyRegion buy = (BuyRegion)region;
-			buy.setTransactionHolder(uuid);
-			plugin.message(sender, "setowner-succesBuy", region);
-		}
-		if (region instanceof TransactionalRegion) {
-			region.getFriendsFeature().deleteFriend(((TransactionalRegion) region).getTransactionHolder(), null);
-		}
-		region.update();
-		region.saveRequired();
-	}
+        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;
+        }
 
-	@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;
-	}
+        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;
+    }
 }
 
 

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

@@ -1,5 +1,9 @@
 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;
@@ -10,8 +14,14 @@ 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";
@@ -28,11 +38,11 @@ public class SetpriceCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setprice") && (!sender.hasPermission("areashop.setprice.landlord") && sender instanceof Player)) {
-			plugin.message(sender, "setprice-noPermission");
+			messageBridge.message(sender, "setprice-noPermission");
 			return;
 		}
 		if(args.length < 2 || args[1] == null) {
-			plugin.message(sender, "setprice-help");
+			messageBridge.message(sender, "setprice-help");
 			return;
 		}
 		GeneralRegion region;
@@ -41,52 +51,52 @@ public class SetpriceCommand extends CommandAreaShop {
 				// get the region by location
 				List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
+					messageBridge.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
+					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					region = regions.get(0);
 				}
 			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			region = plugin.getFileManager().getRegion(args[2]);
+			region = fileManager.getRegion(args[2]);
 		}
 		if(region == null) {
-			plugin.message(sender, "setprice-notRegistered", args[2]);
+			messageBridge.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);
+			messageBridge.message(sender, "setprice-noLandlord", region);
 			return;
 		}
 		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
 			if(region instanceof RentRegion) {
-				((RentRegion)region).setPrice(0);
+				((RentRegion)region).setPrice(null);
 			} else if(region instanceof BuyRegion) {
-				((BuyRegion)region).setPrice(0);
+				((BuyRegion)region).setPrice(null);
 			}
 			region.update();
-			plugin.message(sender, "setprice-successRemoved", region);
+			messageBridge.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);
+			messageBridge.message(sender, "setprice-wrongPrice", args[1], region);
 			return;
 		}
 		if(region instanceof RentRegion) {
 			((RentRegion)region).setPrice(price);
-			plugin.message(sender, "setprice-successRent", region);
+			messageBridge.message(sender, "setprice-successRent", region);
 		} else if(region instanceof BuyRegion) {
 			((BuyRegion)region).setPrice(price);
-			plugin.message(sender, "setprice-successBuy", region);
+			messageBridge.message(sender, "setprice-successBuy", region);
 		}
 		region.update();
 	}
@@ -95,7 +105,7 @@ public class SetpriceCommand extends CommandAreaShop {
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 3) {
-			result = plugin.getFileManager().getRegionNames();
+			result = fileManager.getRegionNames();
 		}
 		return result;
 	}

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

@@ -1,13 +1,27 @@
 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";
@@ -24,16 +38,16 @@ public class SetrestoreCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setrestore")) {
-			plugin.message(sender, "setrestore-noPermission");
+			messageBridge.message(sender, "setrestore-noPermission");
 			return;
 		}
 		if(args.length <= 2 || args[1] == null || args[2] == null) {
-			plugin.message(sender, "setrestore-help");
+			messageBridge.message(sender, "setrestore-help");
 			return;
 		}
-		GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+		GeneralRegion region = fileManager.getRegion(args[1]);
 		if(region == null) {
-			plugin.message(sender, "setrestore-notRegistered", args[1]);
+			messageBridge.message(sender, "setrestore-notRegistered", args[1]);
 			return;
 		}
 		Boolean value = null;
@@ -49,9 +63,9 @@ public class SetrestoreCommand extends CommandAreaShop {
 		}
 		if(args.length > 3) {
 			region.setSchematicProfile(args[3]);
-			plugin.message(sender, "setrestore-successProfile", valueString, args[3], region);
+			messageBridge.message(sender, "setrestore-successProfile", valueString, args[3], region);
 		} else {
-			plugin.message(sender, "setrestore-success", valueString, region);
+			messageBridge.message(sender, "setrestore-success", valueString, region);
 		}
 		region.update();
 	}
@@ -60,13 +74,16 @@ public class SetrestoreCommand extends CommandAreaShop {
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result = plugin.getFileManager().getRegionNames();
+			result = fileManager.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));
+			ConfigurationSection schemProfiles = fileManager.getConfig().getConfigurationSection("schematicProfiles");
+			if (schemProfiles != null) {
+				result.addAll(schemProfiles.getKeys(false));
+			}
 		}
 		return result;
 	}

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

@@ -1,6 +1,10 @@
 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;
@@ -11,8 +15,14 @@ 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";
@@ -33,10 +43,9 @@ public class SetteleportCommand extends CommandAreaShop {
 	 * @return true if the person can set the teleport location, otherwise false
 	 */
 	public static boolean canUse(CommandSender person, GeneralRegion region) {
-		if(!(person instanceof Player)) {
+		if(!(person instanceof Player player)) {
 			return false;
 		}
-		Player player = (Player)person;
 		return player.hasPermission("areashop.setteleportall")
 				|| region.isOwner(player) && player.hasPermission("areashop.setteleport");
 	}
@@ -44,35 +53,34 @@ public class SetteleportCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setteleport") && !sender.hasPermission("areashop.setteleportall")) {
-			plugin.message(sender, "setteleport-noPermission");
+			messageBridge.message(sender, "setteleport-noPermission");
 			return;
 		}
-		if(!(sender instanceof Player)) {
-			plugin.message(sender, "onlyByPlayer");
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "onlyByPlayer");
 			return;
 		}
-		Player player = (Player)sender;
 		GeneralRegion region;
 		if(args.length < 2) {
 			// get the region by location
 			List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
 			if(regions.isEmpty()) {
-				plugin.message(sender, "cmd-noRegionsAtLocation");
+				messageBridge.message(sender, "cmd-noRegionsAtLocation");
 				return;
 			} else if(regions.size() > 1) {
-				plugin.message(sender, "cmd-moreRegionsAtLocation");
+				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 				return;
 			} else {
 				region = regions.get(0);
 			}
 		} else {
-			region = plugin.getFileManager().getRegion(args[1]);
+			region = fileManager.getRegion(args[1]);
 		}
 
 		boolean owner;
 
 		if(region == null) {
-			plugin.message(player, "setteleport-noRentOrBuy", args[1]);
+			messageBridge.message(player, "setteleport-noRentOrBuy", args[1]);
 			return;
 		}
 		if(region instanceof RentRegion) {
@@ -81,10 +89,10 @@ public class SetteleportCommand extends CommandAreaShop {
 			owner = player.getUniqueId().equals(((BuyRegion)region).getBuyer());
 		}
 		if(!player.hasPermission("areashop.setteleport")) {
-			plugin.message(player, "setteleport-noPermission", region);
+			messageBridge.message(player, "setteleport-noPermission", region);
 			return;
 		} else if(!owner && !player.hasPermission("areashop.setteleportall")) {
-			plugin.message(player, "setteleport-noPermissionOther", region);
+			messageBridge.message(player, "setteleport-noPermissionOther", region);
 			return;
 		}
 
@@ -92,23 +100,23 @@ public class SetteleportCommand extends CommandAreaShop {
 		if(args.length > 2 && args[2] != null && (args[2].equalsIgnoreCase("reset") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) {
 			region.getTeleportFeature().setTeleport(null);
 			region.update();
-			plugin.message(player, "setteleport-reset", region);
+			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()))) {
-			plugin.message(player, "setteleport-notInside", region);
+			messageBridge.message(player, "setteleport-notInside", region);
 			return;
 		}
 		region.getTeleportFeature().setTeleport(player.getLocation());
 		region.update();
-		plugin.message(player, "setteleport-success", region);
+		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(plugin.getFileManager().getRegionNames());
+			result.addAll(fileManager.getRegionNames());
 		} else if(toComplete == 3) {
 			result.add("reset");
 		}

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

@@ -2,27 +2,47 @@ 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.regions.BuyRegion;
+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.regions.RentRegion;
 import me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.Location;
 import org.bukkit.block.BlockFace;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import 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";
@@ -40,18 +60,17 @@ public class StackCommand extends CommandAreaShop {
 	public void execute(CommandSender sender, String[] args) {
 		// Check permission
 		if(!sender.hasPermission("areashop.stack")) {
-			plugin.message(sender, "stack-noPermission");
+			messageBridge.message(sender, "stack-noPermission");
 			return;
 		}
 		// Only from ingame
-		if(!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof final Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
-		final Player player = (Player)sender;
 		// Specify enough arguments
 		if(args.length < 5) {
-			plugin.message(sender, "stack-help");
+			messageBridge.message(sender, "stack-help");
 			return;
 		}
 		// Check amount
@@ -62,7 +81,7 @@ public class StackCommand extends CommandAreaShop {
 			// Incorrect number
 		}
 		if(tempAmount <= 0) {
-			plugin.message(player, "stack-wrongAmount", args[1]);
+			messageBridge.message(player, "stack-wrongAmount", args[1]);
 			return;
 		}
 		// Check gap
@@ -70,27 +89,27 @@ public class StackCommand extends CommandAreaShop {
 		try {
 			gap = Integer.parseInt(args[2]);
 		} catch(NumberFormatException e) {
-			plugin.message(player, "stack-wrongGap", args[2]);
+			messageBridge.message(player, "stack-wrongGap", args[2]);
 			return;
 		}
 		// Check region type
 		if(!"rent".equalsIgnoreCase(args[4]) && !"buy".equalsIgnoreCase(args[4])) {
-			plugin.message(sender, "stack-help");
+			messageBridge.message(sender, "stack-help");
 			return;
 		}
 		// Get WorldEdit selection
-		final WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+		final WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 		if(selection == null) {
-			plugin.message(player, "stack-noSelection");
+			messageBridge.message(player, "stack-noSelection");
 			return;
 		}
 		// Get or create group
 		RegionGroup group = null;
 		if(args.length > 5) {
-			group = plugin.getFileManager().getGroup(args[5]);
+			group = fileManager.getGroup(args[5]);
 			if(group == null) {
-				group = new RegionGroup(plugin, args[5]);
-				plugin.getFileManager().addGroup(group);
+				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)
@@ -101,7 +120,7 @@ public class StackCommand extends CommandAreaShop {
 			facing = BlockFace.UP;
 		}
 		if(!(facing == BlockFace.NORTH || facing == BlockFace.EAST || facing == BlockFace.SOUTH || facing == BlockFace.WEST || facing == BlockFace.UP || facing == BlockFace.DOWN)) {
-			plugin.message(player, "stack-unclearDirection", facing.toString().toLowerCase().replace('_', '-'));
+			messageBridge.message(player, "stack-unclearDirection", facing.toString().toLowerCase().replace('_', '-'));
 			return;
 		}
 		Vector shift = new Vector(0, 0, 0);
@@ -138,8 +157,8 @@ public class StackCommand extends CommandAreaShop {
 		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);
+		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());
@@ -176,24 +195,24 @@ public class StackCommand extends CommandAreaShop {
 							tooHigh++;
 							continue;
 						}
-						ProtectedCuboidRegion region = plugin.getWorldGuardHandler().createCuboidRegion(regionName, minimum,maximum);
+						ProtectedCuboidRegion region = worldGuardInterface.createCuboidRegion(regionName, minimum,maximum);
 						manager.addRegion(region);
 
 						// Add the region to AreaShop
 						GeneralRegion newRegion;
 						if(rentRegions) {
-							newRegion = new RentRegion(regionName, selection.getWorld());
+							newRegion = regionFactory.createRentRegion(regionName, selection.getWorld());
 
 						} else {
-							newRegion = new BuyRegion(regionName, selection.getWorld());
+							newRegion = regionFactory.createBuyRegion(regionName, selection.getWorld());
 						}
 
 						if(finalGroup != null) {
 							finalGroup.addMember(newRegion);
 						}
-						AddingRegionEvent event = plugin.getFileManager().addRegion(newRegion);
+						AddingRegionEvent event = fileManager.addRegion(newRegion);
 						if (event.isCancelled()) {
-							plugin.message(player, "general-cancelled", event.getReason());
+							messageBridge.message(player, "general-cancelled", event.getReason());
 							continue;
 						}
 						newRegion.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
@@ -210,7 +229,7 @@ public class StackCommand extends CommandAreaShop {
 						if(tooLow > 0) {
 							wrong.append(Message.fromKey("stack-tooLow").replacements(tooLow));
 						}
-						plugin.message(player, "stack-addComplete", added, wrong);
+						messageBridge.message(player, "stack-addComplete", added, wrong);
 					}
 					this.cancel();
 				}
@@ -245,7 +264,7 @@ public class StackCommand extends CommandAreaShop {
 			result.add("rent");
 			result.add("buy");
 		} else if(toComplete == 6) {
-			result.addAll(plugin.getFileManager().getGroupNames());
+			result.addAll(fileManager.getGroupNames());
 		}
 		return result;
 	}

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

@@ -1,5 +1,9 @@
 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;
@@ -8,8 +12,14 @@ 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";
@@ -26,7 +36,7 @@ public class StopresellCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.stopresell") && !sender.hasPermission("areashop.stopresellall")) {
-			plugin.message(sender, "stopresell-noPermissionOther");
+			messageBridge.message(sender, "stopresell-noPermissionOther");
 			return;
 		}
 
@@ -36,47 +46,47 @@ public class StopresellCommand extends CommandAreaShop {
 				// get the region by location
 				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
+					messageBridge.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
+					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					buy = regions.get(0);
 				}
 			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			buy = plugin.getFileManager().getBuy(args[1]);
+			buy = fileManager.getBuy(args[1]);
 			if(buy == null) {
-				plugin.message(sender, "stopresell-notRegistered", args[1]);
+				messageBridge.message(sender, "stopresell-notRegistered", args[1]);
 				return;
 			}
 		}
 		if(buy == null) {
-			plugin.message(sender, "cmd-noRegionsAtLocation");
+			messageBridge.message(sender, "cmd-noRegionsAtLocation");
 			return;
 		}
 		if(!buy.isInResellingMode()) {
-			plugin.message(sender, "stopresell-notResell", buy);
+			messageBridge.message(sender, "stopresell-notResell", buy);
 			return;
 		}
 		if(sender.hasPermission("areashop.stopresellall")) {
 			buy.disableReselling();
 			buy.update();
-			plugin.message(sender, "stopresell-success", buy);
+			messageBridge.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);
+				messageBridge.message(sender, "stopresell-success", buy);
 			} else {
-				plugin.message(sender, "stopresell-noPermissionOther", buy);
+				messageBridge.message(sender, "stopresell-noPermissionOther", buy);
 			}
 		} else {
-			plugin.message(sender, "stopresell-noPermission", buy);
+			messageBridge.message(sender, "stopresell-noPermission", buy);
 		}
 	}
 
@@ -84,7 +94,7 @@ public class StopresellCommand extends CommandAreaShop {
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			for(BuyRegion region : plugin.getFileManager().getBuys()) {
+			for(BuyRegion region : fileManager.getBuysRef()) {
 				if(region.isSold() && region.isInResellingMode()) {
 					result.add(region.getName());
 				}

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

@@ -1,5 +1,9 @@
 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.entity.Player;
@@ -7,8 +11,14 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class TeleportCommand extends CommandAreaShop {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop tp";
@@ -29,10 +39,9 @@ public class TeleportCommand extends CommandAreaShop {
 	 * @return true if the person can teleport to it, otherwise false
 	 */
 	public static boolean canUse(CommandSender person, GeneralRegion region) {
-		if(!(person instanceof Player)) {
+		if(!(person instanceof Player 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")
@@ -42,21 +51,20 @@ public class TeleportCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.teleport") && !sender.hasPermission("areashop.teleportall") && !sender.hasPermission("areashop.teleportavailable") && !sender.hasPermission("areashop.teleportavailablesign") && !sender.hasPermission("areashop.teleportsign") && !sender.hasPermission("areashop.teleportsignall") && !sender.hasPermission("areashop.teleportfriend") && !sender.hasPermission("teleportfriendsign")) {
-			plugin.message(sender, "teleport-noPermission");
+			messageBridge.message(sender, "teleport-noPermission");
 			return;
 		}
-		if(!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
 		if(args.length <= 1 || args[1] == null) {
-			plugin.message(sender, "teleport-help");
+			messageBridge.message(sender, "teleport-help");
 			return;
 		}
-		Player player = (Player)sender;
-		GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+		GeneralRegion region = fileManager.getRegion(args[1]);
 		if(region == null) {
-			plugin.message(player, "teleport-noRentOrBuy", args[1]);
+			messageBridge.message(player, "teleport-noRentOrBuy", args[1]);
 			return;
 		}
 
@@ -65,14 +73,14 @@ public class TeleportCommand extends CommandAreaShop {
 						|| args[2].equalsIgnoreCase("yes")
 						|| args[2].equalsIgnoreCase("true")
 		);
-		region.getTeleportFeature().teleportPlayer(player, toSign, true);
+		region.getTeleportFeature().teleportPlayer(player, toSign);
 	}
 
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result.addAll(plugin.getFileManager().getRegionNames());
+			result.addAll(fileManager.getRegionNames());
 		} else if(toComplete == 3) {
 			result.add("sign");
 		}

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

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

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

@@ -0,0 +1,150 @@
+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.OfflinePlayer;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+@Singleton
+public class TransferCommand extends CommandAreaShop {
+
+    @Inject
+    private MessageBridge messageBridge;
+    @Inject
+    private IFileManager fileManager;
+    @Inject
+    private Plugin plugin;
+    @Inject
+    private Server server;
+
+    @Override
+    public String getCommandStart() {
+        return "areashop transfer";
+    }
+
+    @Override
+    public String getHelp(CommandSender target) {
+        if (!target.hasPermission("areashop.transfer")) {
+            return null;
+        }
+        return "help-transfer";
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.transfer")) {
+            this.messageBridge.message(sender, "transfer-noPermission");
+            return;
+        }
+        if (sender instanceof Player player) {
+            handlePlayer(player, args);
+        } else {
+            this.messageBridge.message(sender, "cmd-onlyByPlayer");
+        }
+    }
+
+    private void handlePlayer(Player player, String[] args) {
+        if (args.length < 2) {
+            this.messageBridge.message(player, "transfer-help");
+            return;
+        }
+        String targetPlayerName = args[1];
+        if (targetPlayerName.equals(player.getName())) {
+            this.messageBridge.message(player, "transfer-transferSelf");
+            return;
+        }
+        GeneralRegion region;
+        if (args.length > 2) {
+            String targetRegionName = args[2];
+            region = this.fileManager.getRegion(targetRegionName);
+            if (region == null) {
+                messageBridge.message(player, "cmd-noRegion");
+                return;
+            }
+        } else {
+            List<GeneralRegion> regions = Utils.getImportantRegions(player.getLocation());
+            if (regions.isEmpty()) {
+                messageBridge.message(player, "cmd-noRegionsAtLocation");
+                return;
+            } else if (regions.size() > 1) {
+                messageBridge.message(player, "cmd-moreRegionsAtLocation");
+                return;
+            }
+            region = regions.get(0);
+        }
+        if (!region.isTransferEnabled()) {
+            this.messageBridge.message(player, "transfer-disabled");
+            return;
+        }
+        @SuppressWarnings("deprecation")
+        OfflinePlayer targetPlayer = this.server.getOfflinePlayer(targetPlayerName);
+        if (!targetPlayer.hasPlayedBefore()) {
+            // Unknown player
+            this.messageBridge.message(player, "transfer-noPlayer", targetPlayerName);
+            return;
+        }
+        if (region.isLandlord(player.getUniqueId())) {
+            // Transfer ownership if same as landlord
+            region.setOwner(targetPlayer.getUniqueId());
+            region.setLandlord(targetPlayer.getUniqueId(), targetPlayerName);
+            this.messageBridge.message(player, "transfer-transferred-owner", targetPlayerName, region);
+            if (targetPlayer.isOnline()) {
+                this.messageBridge.message(targetPlayer.getPlayer(), "transfer-transferred-owner", targetPlayerName, region);
+            }
+            return;
+        }
+        if (!region.isOwner(player.getUniqueId())) {
+            // Cannot transfer tenant if we aren't the current tenant
+            this.messageBridge.message(player, "transfer-notCurrentTenant");
+            return;
+        }
+        // Swap the owner/occupant (renter or buyer)
+        region.setOwner(targetPlayer.getUniqueId());
+        this.messageBridge.message(player, "transfer-transferred-tenant", targetPlayerName, region);
+        if (targetPlayer.isOnline()) {
+            this.messageBridge.message(targetPlayer.getPlayer(), "transfer-transferred-tenant", targetPlayerName, region);
+        }
+    }
+
+    @Override
+    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+        if (toComplete == 2) {
+            Collection<? extends Player> players = this.server.getOnlinePlayers();
+            List<String> ret = new ArrayList<>(players.stream()
+                    .map(Player::getName)
+                    .toList());
+            if (sender instanceof Player player) {
+                ret.remove(player.getName());
+            }
+            return ret;
+        } else if (toComplete == 3) {
+            if (!(sender instanceof Player player)) {
+                return this.fileManager.getRegionNames();
+            }
+            UUID uuid = player.getUniqueId();
+            return new ArrayList<>(this.fileManager.getRegions()
+                    .stream()
+                    .filter(region -> region.isOwner(uuid) || region.isLandlord(uuid))
+                    .map(GeneralRegion::getName)
+                    .toList());
+        }
+        return Collections.emptyList();
+    }
+}

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

@@ -1,8 +1,11 @@
 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.regions.TransactionalRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -10,89 +13,93 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class UnrentCommand extends CommandAreaShop {
 
-    /**
-     * Check if a person can unrent the region.
-     *
-     * @param person The person to check
-     * @param region The region to check for
-     * @return true if the person can unrent it, otherwise false
-     */
-    public static boolean canUse(CommandSender person, GeneralRegion region) {
-        if (person.hasPermission("areashop.unrent")) {
-            return true;
-        }
-        if (person instanceof Player && region instanceof TransactionalRegion) {
-            Player player = (Player) person;
-            return ((TransactionalRegion) region).isTransactionHolder(player) && person.hasPermission("areashop.unrentown");
-        }
-        return false;
-    }
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
+	@Override
+	public String getCommandStart() {
+		return "areashop unrent";
+	}
 
-    @Override
-    public String getCommandStart() {
-        return "areashop unrent";
-    }
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.unrent") || target.hasPermission("areashop.unrentown")) {
+			return "help-unrent";
+		}
+		return null;
+	}
 
-    @Override
-    public String getHelp(CommandSender target) {
-        if (target.hasPermission("areashop.unrent") || target.hasPermission("areashop.unrentown")) {
-            return "help-unrent";
-        }
-        return null;
-    }
+	/**
+	 * Check if a person can unrent the region.
+	 * @param person The person to check
+	 * @param region The region to check for
+	 * @return true if the person can unrent it, otherwise false
+	 */
+	public static boolean canUse(CommandSender person, GeneralRegion region) {
+		if(person.hasPermission("areashop.unrent")) {
+			return true;
+		}
+		if(person instanceof Player player) {
+			return region.isOwner(player) && person.hasPermission("areashop.unrentown");
+		}
+		return false;
+	}
 
-    @Override
-    public void execute(CommandSender sender, String[] args) {
-        if (!sender.hasPermission("areashop.unrent") && !sender.hasPermission("areashop.unrentown")) {
-            plugin.message(sender, "unrent-noPermission");
-            return;
-        }
-        RentRegion rent;
-        if (args.length <= 1) {
-            if (sender instanceof Player) {
-                // get the region by location
-                List<RentRegion> regions = Utils.getImportantRentRegions(((Player) sender).getLocation());
-                if (regions.isEmpty()) {
-                    plugin.message(sender, "cmd-noRegionsAtLocation");
-                    return;
-                } else if (regions.size() > 1) {
-                    plugin.message(sender, "cmd-moreRegionsAtLocation");
-                    return;
-                } else {
-                    rent = regions.get(0);
-                }
-            } else {
-                plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
-                return;
-            }
-        } else {
-            rent = plugin.getFileManager().getRent(args[1]);
-        }
-        if (rent == null) {
-            plugin.message(sender, "unrent-notRegistered");
-            return;
-        }
-        if (!rent.isRented()) {
-            plugin.message(sender, "unrent-notRented", rent);
-            return;
-        }
-        rent.unRent(true, sender);
-    }
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.unrent") && !sender.hasPermission("areashop.unrentown")) {
+			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 : plugin.getFileManager().getRents()) {
-                if (region.isRented()) {
-                    result.add(region.getName());
-                }
-            }
-        }
-        return result;
-    }
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(RentRegion region : fileManager.getRentsRef()) {
+				if(region.isRented()) {
+					result.add(region.getName());
+				}
+			}
+		}
+		return result;
+	}
 }
 
 

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

@@ -1,5 +1,8 @@
 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;
@@ -22,8 +25,14 @@ 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
@@ -36,7 +45,7 @@ public class CommandsFeature extends RegionFeature {
 			return;
 		}
 		List<String> commands = eventCommandProfileSection.getStringList(event.getValue() + "." + (before ? "before" : "after"));
-		if(commands == null || commands.isEmpty()) {
+		if(commands.isEmpty()) {
 			return;
 		}
 		region.runCommands(Bukkit.getConsoleSender(), commands);

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

@@ -1,5 +1,7 @@
 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;
@@ -19,8 +21,16 @@ 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());

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

@@ -0,0 +1,19 @@
+package me.wiefferink.areashop.features;
+
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.regions.GeneralRegion;
+
+import javax.annotation.Nonnull;
+
+public interface FeatureFactory {
+
+    @Nonnull
+    SignsFeature createSignsFeature(@Nonnull GeneralRegion generalRegion);
+
+    @Nonnull
+    TeleportFeature createTeleportFeature(@Nonnull GeneralRegion generalRegion);
+
+    @Nonnull
+    FriendsFeature createFriendsFeature(@Nonnull GeneralRegion generalRegion);
+
+}

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

@@ -1,5 +1,10 @@
 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;
@@ -7,6 +12,7 @@ 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;
@@ -15,7 +21,12 @@ import java.util.UUID;
 
 public class FriendsFeature extends RegionFeature {
 
-	public FriendsFeature(GeneralRegion region) {
+	@Inject
+	private MessageBridge messageBridge;
+	
+	@AssistedInject
+	public FriendsFeature(@Nonnull AreaShop plugin, @Assisted @Nonnull GeneralRegion region) {
+		super(plugin);
 		setRegion(region);
 	}
 
@@ -30,7 +41,7 @@ public class FriendsFeature extends RegionFeature {
 		AddedFriendEvent event = new AddedFriendEvent(getRegion(), Bukkit.getOfflinePlayer(player), by);
 		Bukkit.getPluginManager().callEvent(event);
 		if(event.isCancelled()) {
-			plugin.message(by, "general-cancelled", event.getReason(), this);
+			messageBridge.message(by, "general-cancelled", event.getReason(), this);
 			return false;
 		}
 
@@ -52,16 +63,17 @@ public class FriendsFeature extends RegionFeature {
 		DeletedFriendEvent event = new DeletedFriendEvent(getRegion(), Bukkit.getOfflinePlayer(player), by);
 		Bukkit.getPluginManager().callEvent(event);
 		if(event.isCancelled()) {
-			plugin.message(by, "general-cancelled", event.getReason(), this);
+			messageBridge.message(by, "general-cancelled", event.getReason(), this);
 			return false;
 		}
 
-		List<String> friends = getRegion().getConfig().getStringList("general.friends");
+		Set<String> friends = new HashSet<>(getRegion().getConfig().getStringList("general.friends"));
 		friends.remove(player.toString());
-		if(friends.isEmpty()) {
+		List<String> list = new ArrayList<>(friends);
+		if(list.isEmpty()) {
 			getRegion().setSetting("general.friends", null);
 		} else {
-			getRegion().setSetting("general.friends", friends);
+			getRegion().setSetting("general.friends", list);
 		}
 		return true;
 	}

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

@@ -2,10 +2,11 @@ package me.wiefferink.areashop.features;
 
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.regions.GeneralRegion;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 
+import javax.annotation.Nonnull;
+
 /*
 Possible future feature classes:
 - RestrictedToRegion feature
@@ -28,11 +29,14 @@ Possible future feature classes:
  */
 
 public abstract class RegionFeature implements Listener {
-	public static final AreaShop plugin = AreaShop.getInstance();
 
-	protected YamlConfiguration config = plugin.getConfig();
+	protected final AreaShop plugin;
 	private GeneralRegion region;
 
+	protected RegionFeature(@Nonnull AreaShop plugin) {
+		this.plugin = plugin;
+	}
+
 	/**
 	 * Set the region for this feature.
 	 * @param region Feature region

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

@@ -5,20 +5,34 @@ 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.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) {
@@ -69,7 +83,6 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 		boolean result = true;
 
 		Set<String> flagNames = flags.getKeys(false);
-		WorldGuardPlugin worldGuard = plugin.getWorldGuard();
 
 		// Get the region
 		ProtectedRegion worldguardRegion = region.getRegion();
@@ -81,14 +94,14 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 		for(String flagName : flagNames) {
 			String value = Message.fromString(flags.getString(flagName)).replacements(region).getPlain();
 			// In the config normal Bukkit color codes are used, those only need to be translated on 5.X WorldGuard versions
-			if(plugin.getWorldGuard().getDescription().getVersion().startsWith("5.")) {
+			if(worldGuard.getDescription().getVersion().startsWith("5.")) {
 				value = translateBukkitToWorldGuardColors(value);
 			}
 			if(flagName.equalsIgnoreCase("members")) {
-				plugin.getWorldGuardHandler().setMembers(worldguardRegion, parseAccessSet(value));
+				worldGuardInterface.setMembers(worldguardRegion, parseAccessSet(value));
 				//AreaShop.debug("  Flag " + flagName + " set: " + members.toUserFriendlyString());
 			} else if(flagName.equalsIgnoreCase("owners")) {
-				plugin.getWorldGuardHandler().setOwners(worldguardRegion, parseAccessSet(value));
+				worldGuardInterface.setOwners(worldguardRegion, parseAccessSet(value));
 				//AreaShop.debug("  Flag " + flagName + " set: " + owners.toUserFriendlyString());
 			} else if(flagName.equalsIgnoreCase("priority")) {
 				try {
@@ -123,7 +136,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 				String flagSetting = null;
 				com.sk89q.worldguard.protection.flags.RegionGroup groupValue = null;
 
-				Flag<?> foundFlag = plugin.getWorldGuardHandler().fuzzyMatchFlag(flagName);
+				Flag<?> foundFlag = worldGuardInterface.fuzzyMatchFlag(flagName);
 				if(foundFlag == null) {
 					AreaShop.warn("Found wrong flag in flagProfiles section: " + flagName + ", check if that is the correct WorldGuard flag");
 					continue;
@@ -145,7 +158,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 							if(part.startsWith("g:")) {
 								if(part.length() > 2) {
 									try {
-										groupValue = plugin.getWorldGuardHandler().parseFlagGroupInput(groupFlag, part.substring(2));
+										groupValue = worldGuardInterface.parseFlagGroupInput(groupFlag, part.substring(2));
 									} catch(InvalidFlagFormat e) {
 										AreaShop.warn("Found wrong group value for flag " + flagName);
 									}
@@ -229,7 +242,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 = plugin.getWorldGuardHandler().parseFlagInput(flag, value);
+		V next = worldGuardInterface.parseFlagInput(flag, value);
 
 		if(!Objects.equals(current, next)) {
 			region.setFlag(flag, next);

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

@@ -1,9 +1,16 @@
 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 me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.managers.SignErrorLogger;
+import me.wiefferink.areashop.platform.adapter.BlockBehaviourHelper;
 import me.wiefferink.areashop.regions.GeneralRegion;
 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;
@@ -11,6 +18,7 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.WallSign;
@@ -18,6 +26,7 @@ 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;
 
@@ -26,259 +35,261 @@ import java.util.List;
  */
 public class RegionSign {
 
-    private final SignsFeature signsFeature;
-    private final String key;
+	private final BlockBehaviourHelper blockHelper;
+	private final SignErrorLogger errorLogger;
 
-    public RegionSign(SignsFeature signsFeature, String key) {
-        this.signsFeature = signsFeature;
-        this.key = key;
-    }
+	private final SignsFeature signsFeature;
+	private final String key;
 
-    /**
-     * Get the location of this sign.
-     *
-     * @return The location of this sign
-     */
-    public Location getLocation() {
-        return Utils.configToLocation(getRegion().getConfig().getConfigurationSection("general.signs." + key + ".location"));
-    }
 
-    /**
-     * Location string to be used as key in maps.
-     *
-     * @return Location string
-     */
-    public String getStringLocation() {
-        return SignsFeature.locationToString(getLocation());
-    }
+	@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;
+	}
 
-    /**
-     * Chunk string to be used as key in maps.
-     *
-     * @return Chunk string
-     */
-    public String getStringChunk() {
-        return SignsFeature.chunkToString(getLocation());
-    }
+	public BlockPosition getPosition() {
+		return new BlockPosition(getLocation());
+	}
 
-    /**
-     * Get the region this sign is linked to.
-     *
-     * @return The region this sign is linked to
-     */
-    public GeneralRegion getRegion() {
-        return signsFeature.getRegion();
-    }
+	/**
+	 * Get the location of this sign.
+	 * @return The location of this sign
+	 */
+	public Location getLocation() {
+		return Utils.configToLocation(getRegion().getConfig().getConfigurationSection("general.signs." + key + ".location"));
+	}
 
-    /**
-     * Remove this sign from the region.
-     */
-    public void remove() {
-        getLocation().getBlock().setType(Material.AIR);
-        signsFeature.getSignsRef().remove(getStringLocation());
-        SignsFeature.getAllSigns().remove(getStringLocation());
-        SignsFeature.getSignsByChunk().get(getStringChunk()).remove(this);
-        getRegion().setSetting("general.signs." + key, null);
-    }
+	/**
+	 * Location string to be used as key in maps.
+	 * @return Location string
+	 */
+	public String getStringLocation() {
+		return SignsFeature.locationToString(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"));
-    }
+	/**
+	 * Chunk string to be used as key in maps.
+	 * @return Chunk string
+	 */
+	public String getStringChunk() {
+		return SignsFeature.chunkToString(getLocation());
+	}
 
-    /**
-     * Get the facing of the sign as saved in the config.
-     *
-     * @return BlockFace the sign faces, or null if unknown
-     */
-    public BlockFace getFacing() {
-        try {
-            return BlockFace.valueOf(getRegion().getConfig().getString("general.signs." + key + ".facing"));
-        } catch (NullPointerException | IllegalArgumentException e) {
-            return null;
-        }
-    }
+	/**
+	 * Get the region this sign is linked to.
+	 * @return The region this sign is linked to
+	 */
+	public GeneralRegion getRegion() {
+		return signsFeature.getRegion();
+	}
 
-    /**
-     * Get the material of the sign as saved in the config.
-     *
-     * @return Material of the sign, usually {@link Material#WALL_SIGN}, {@link Material#SIGN}, or one of the other wood types (different result for 1.13-), Material.AIR if none.
-     */
-    public Material getMaterial() {
-        String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
-        Material result = Materials.signNameToMaterial(name);
-        return result == null ? Material.AIR : result;
-    }
+	/**
+	 * 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
+	}
 
-    /**
-     * 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 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"));
+	}
 
-        if (getRegion().isDeleted()) {
-            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;
+		}
+	}
 
-        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;
-        }
+	/**
+	 * 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;
+	}
 
-        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
+	/**
+	 * 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 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;
-        }
+		if(getRegion().isDeleted()) {
+			return false;
+		}
 
-        // Place the sign back (with proper rotation and type) after it has been hidden or (indirectly) destroyed
-        if (!Materials.isSign(block.getType())) {
-            Material signType = getMaterial();
-            if (signType.name().contains("SIGN")) {
-                // Don't do physics here, we first need to update the direction
-                block.setType(signType, false);
-                BlockData data = block.getBlockData();
-                if (data instanceof WallSign) {
-                    ((WallSign) data).setFacing(getFacing());
-                } else if (data instanceof Sign) {
-                    ((org.bukkit.block.data.type.Sign) data).setRotation(getFacing());
-                }
-                block.setBlockData(data, true);
+		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;
+		}
 
-                // Check if the sign has popped
-                if (!Materials.isSign(block.getType())) {
-                    AreaShop.warn("Setting sign", key, "of region", getRegion().getName(), "failed, could not set sign block back");
-                    return false;
-                }
-            } else {
-                AreaShop.warn("Setting sign", key, "of region", getRegion().getName(), "failed, RegionSign material was: " + signType.name());
-            }
-        }
+		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
 
-        // Save current rotation and type
-        if (!regionConfig.isString("general.signs." + key + ".signType")) {
-            getRegion().setSetting("general.signs." + key + ".signType", block.getType().name());
-        }
-        if (!regionConfig.isString("general.signs." + key + ".facing")) {
-            final BlockFace rotation;
-            if (Materials.isSign(block.getType())) {
-                BlockData data = block.getBlockData();
-                if (data instanceof org.bukkit.block.data.type.Sign) {
-                    rotation = ((org.bukkit.block.data.type.Sign) block.getBlockData()).getRotation();
-                } else if (data instanceof WallSign) {
-                    rotation = ((WallSign) data).getFacing();
-                } else {
-                    rotation = null;
-                }
-            } else {
-                rotation = null;
-            }
-            getRegion().setSetting("general.signs." + key + ".facing", rotation == null ? null : rotation.toString());
-        }
+		// 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;
+		}
 
-        // Apply replacements and color and then set it on the sign
-        Sign signState = (Sign) block.getState();
-        for (int i = 0; i < signLines.length; i++) {
-            if (signLines[i] == null) {
-                signState.setLine(i, "");
-                continue;
-            }
-            signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
-            signLines[i] = Utils.applyColors(signLines[i]);
-            signState.setLine(i, signLines[i]);
-        }
-        signState.update();
-        return true;
-    }
+		// 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);
 
-    /**
-     * 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;
-        }
+			BlockState blockState = PaperLib.getBlockState(block, false).getState();
+			BlockData blockData = blockState.getBlockData();
 
-        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
-        if (stateConfig == null) {
-            return false;
-        }
+			if(blockData instanceof WallSign) {
+				((WallSign) blockData).setFacing(getFacing());
+			} else if(blockData instanceof org.bukkit.block.data.type.Sign) {
+				((org.bukkit.block.data.type.Sign) blockData).setRotation(getFacing());
+			} else {
+				errorLogger.submitWarning("Failed to update the facing direction of the sign at" + getStringLocation() + "to " + getFacing() + ", region:" + getRegion().getName());
+				return false;
+			}
+			block.setBlockData(blockData);
 
-        // Check the lines for the timeleft tag
-        for (int i = 1; i <= 4; i++) {
-            String line = stateConfig.getString("line" + i);
-            if (line != null && !line.isEmpty() && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
-                return true;
-            }
-        }
-        return false;
-    }
+			// Check if the sign has popped
+			if(!Materials.isSign(block.getType())) {
+				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());
+		// 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());
+		}
 
-        // 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);
+		// Apply replacements and color and then set it on the sign
+		Sign signState = (Sign) PaperLib.getBlockState(block, false).getState();
+		for(int i = 0; i < signLines.length; i++) {
+			if(signLines[i] == null) {
+				signState.setLine(i, "");
+				continue;
+			}
+			signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
+			signLines[i] = Utils.applyColors(signLines[i]);
+			signState.setLine(i, signLines[i]);
+		}
+		signState.update(false, false);
+		return true;
+	}
 
-        // Run 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);
+	/**
+	 * 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;
+		}
 
-        return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
-    }
+		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+		if(stateConfig == null) {
+			return false;
+		}
 
-    @Override
-    public boolean equals(Object object) {
-        return object instanceof RegionSign && ((RegionSign) object).getRegion().equals(this.getRegion()) && ((RegionSign) object).key.equals(this.key);
-    }
+		// 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;
+	}
 
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(key, getRegion().getName());
-    }
+	/**
+	 * 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());
+
+		// Run player commands if specified
+		List<String> playerCommands = new ArrayList<>();
+		for(String command : stateConfig.getStringList(clickType.getValue() + "Player")) {
+			// TODO move variable checking code to InteractiveMessenger?
+			playerCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+		}
+		getRegion().runCommands(clicker, playerCommands);
+
+		// Run console commands if specified
+		List<String> consoleCommands = new ArrayList<>();
+		for(String command : stateConfig.getStringList(clickType.getValue() + "Console")) {
+			consoleCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+		}
+		getRegion().runCommands(Bukkit.getConsoleSender(), consoleCommands);
+
+		return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		return object instanceof RegionSign && ((RegionSign)object).getRegion().equals(this.getRegion()) && ((RegionSign)object).key.equals(this.key);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hashCode(key, getRegion().getName());
+	}
 }

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

@@ -0,0 +1,83 @@
+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 org.bukkit.World;
+
+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) {
+            World world = position.getWorld();
+            ChunkPosition chunkPosition = new ChunkPosition(world, position.getChunkX(), position.getChunkZ());
+            this.signsByChunk.remove(chunkPosition.getPosition());
+            // Remove the sign from the region
+        }
+        return Optional.ofNullable(removed);
+    }
+
+    public void removeSign(RegionSign regionSign) {
+        BlockPosition blockPosition = regionSign.getPosition();
+        this.allSigns.remove(blockPosition.getPosition());
+        ChunkPosition chunkPosition = new ChunkPosition(blockPosition.getChunk());
+        long packedChunkPos = chunkPosition.getPosition();
+        Collection<RegionSign> signs = this.signsByChunk.get(packedChunkPos);
+        if (signs != null) {
+            signs.remove(regionSign);
+            if (signs.isEmpty()) {
+                this.signsByChunk.remove(packedChunkPos);
+            }
+        }
+    }
+
+    public void clear() {
+        this.allSigns.clear();
+        this.signsByChunk.clear();
+    }
+
+}

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

@@ -0,0 +1,10 @@
+package me.wiefferink.areashop.features.signs;
+
+
+import javax.annotation.Nonnull;
+
+public interface SignFactory {
+
+    @Nonnull RegionSign createRegionSign(@Nonnull SignsFeature signsFeature, @Nonnull String key);
+
+}

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

@@ -0,0 +1,449 @@
+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.platform.adapter.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.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) {
+        SignsFeature signsFeature = event.getRegion().getSignsFeature();
+        signsFeature.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);
+        }
+    }
+
+}

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

@@ -0,0 +1,115 @@
+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 removeSign(new BlockPosition(location));
+    }
+
+    public Optional<RegionSign> removeSign(BlockPosition blockPosition) {
+        return getCacheForWorld(blockPosition.getWorld()).flatMap(cache -> cache.removeSign(blockPosition));
+    }
+
+    /**
+     * 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();
+    }
+
+}

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

@@ -1,636 +1,108 @@
 package me.wiefferink.areashop.features.signs;
 
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+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.events.ask.AddingRegionEvent;
-import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
 import me.wiefferink.areashop.features.RegionFeature;
-import me.wiefferink.areashop.managers.FileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.tools.Materials;
 import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Sign;
-import org.bukkit.block.data.type.WallSign;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockPhysicsEvent;
-import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.world.ChunkLoadEvent;
 
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
 
 public class SignsFeature extends RegionFeature {
 
-    private static final Map<String, RegionSign> allSigns = new ConcurrentHashMap<>();
-    private static final Map<String, List<RegionSign>> signsByChunk = new ConcurrentHashMap<>();
+	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);
+		}
+	}
 
-    private Map<String, RegionSign> signs;
+	/**
+	 * 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();
+	}
 
-    public SignsFeature() {
+	/**
+	 * 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);
+	}
 
-    }
+	@Override
+	public void shutdown() {
 
-    /**
-     * Constructor.
-     *
-     * @param region The region to bind to
-     */
-    public SignsFeature(GeneralRegion region) {
-        setRegion(region);
-        signs = new HashMap<>();
-        // Setup current signs
-        ConfigurationSection signSection = region.getConfig().getConfigurationSection("general.signs");
-        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.getName() + " does not have a proper location");
-                    continue;
-                }
-                signs.put(sign.getStringLocation(), sign);
-                signsByChunk.computeIfAbsent(sign.getStringChunk(), key -> new ArrayList<>())
-                        .add(sign);
-            }
-            allSigns.putAll(signs);
-        }
-    }
+	}
 
-    /**
-     * 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();
-    }
+	public SignManager signManager() {
+		return this.internalSignManager;
+	}
 
-    /**
-     * Convert a chunk to a string to use as map key.
-     *
-     * @param location The location to get the key for
-     * @return A string to use in a map for a chunk
-     */
-    public static String chunkToString(Location location) {
-        return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
-    }
-
-    /**
-     * Convert a chunk to a string to use as map key.
-     * Use a Location argument to prevent chunk loading!
-     *
-     * @param chunk The location to get the key for
-     * @return A string to use in a map for a chunk
-     */
-    public static String chunkToString(Chunk chunk) {
-        return chunk.getWorld().getName() + ";" + chunk.getX() + ";" + chunk.getZ();
-    }
-
-    /**
-     * Get a sign by a location.
-     *
-     * @param location The location to get the sign for
-     * @return The RegionSign that is at the location, or null if none
-     */
-    public static RegionSign getSignByLocation(Location location) {
-        return allSigns.get(locationToString(location));
-    }
-
-    /**
-     * Get the map with all signs.
-     *
-     * @return Map with all signs: locationString -&gt; RegionSign
-     */
-    public static Map<String, RegionSign> getAllSigns() {
-        return allSigns;
-    }
-
-    /**
-     * Get the map with signs by chunk.
-     *
-     * @return Map with signs by chunk: chunkString -&gt; List&lt;RegionSign&gt;
-     */
-    public static Map<String, List<RegionSign>> getSignsByChunk() {
-        return signsByChunk;
-    }
-
-    @Override
-    public void shutdown() {
-        // Deregister signs from the registry
-        if (signs != null) {
-            for (Map.Entry<String, RegionSign> entry : signs.entrySet()) {
-                allSigns.remove(entry.getKey());
-                signsByChunk.get(entry.getValue().getStringChunk()).remove(entry.getValue());
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onSignBreak(BlockBreakEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-        Block block = event.getBlock();
-        // Check if it is a sign
-        if (Materials.isSign(block.getType())) {
-            // Check if the rent sign is really the same as a saved rent
-            RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-            if (regionSign == null) {
-                return;
-            }
-            // Remove the sign of the rental region if the player has permission
-            if (event.getPlayer().hasPermission("areashop.delsign")) {
-                regionSign.remove();
-                plugin.message(event.getPlayer(), "delsign-success", regionSign.getRegion());
-            } else { // Cancel the breaking of the sign
-                event.setCancelled(true);
-                plugin.message(event.getPlayer(), "delsign-noPermission", regionSign.getRegion());
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onIndirectSignBreak(BlockPhysicsEvent event) {
-        // Check if the block is a sign
-        if (!Materials.isSign(event.getBlock().getType())) {
-            return;
-        }
-        final Block block = event.getBlock();
-        final BlockData blockData = block.getBlockData();
-        final Block attachedBlock;
-        if (blockData instanceof WallSign) {
-            attachedBlock = block.getRelative(((WallSign) blockData).getFacing().getOppositeFace());
-        } else if (blockData instanceof Sign) {
-            attachedBlock = block.getRelative(BlockFace.DOWN);
-        } else {
-            attachedBlock = null;
-        }
-
-        // Check if still attached to a block
-        // TODO: signs cannot be placed on all blocks, improve this check to isSolid()?
-        if (attachedBlock == null || attachedBlock.getType() != Material.AIR) {
-            return;
-        }
-
-        // Check if the sign is really the same as a saved rent
-        RegionSign regionSign = SignsFeature.getSignByLocation(event.getBlock().getLocation());
-        if (regionSign == null) {
-            return;
-        }
-
-        // Remove the sign so that it does not fall on the floor as an item (next region update will place it back when possible)
-        AreaShop.debug("onIndirectSignBreak: Removed block of sign for", regionSign.getRegion().getName(), "at", regionSign.getStringLocation());
-        event.getBlock().setType(Material.AIR);
-        event.setCancelled(true);
-    }
-
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onSignClick(PlayerInteractEvent event) {
-        Block block = event.getClickedBlock();
-        if (block == null) {
-            return;
-        }
-
-        // Only listen to left and right clicks on blocks
-        if (!(event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)) {
-            return;
-        }
-
-        // Only care about clicking blocks
-        if (!Materials.isSign(block.getType())) {
-            return;
-        }
-
-        // Check if this sign belongs to a region
-        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-        if (regionSign == null) {
-            return;
-        }
-
-        // Ignore players that are in sign link mode (which will handle the event itself)
-        Player player = event.getPlayer();
-        if (plugin.getSignlinkerManager().isInSignLinkMode(player)) {
-            return;
-        }
-
-        // Get the clicktype
-        GeneralRegion.ClickType clickType = null;
-        if (player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
-            clickType = GeneralRegion.ClickType.SHIFTLEFTCLICK;
-        } else if (!player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
-            clickType = GeneralRegion.ClickType.LEFTCLICK;
-        } else if (player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-            clickType = GeneralRegion.ClickType.SHIFTRIGHTCLICK;
-        } else if (!player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-            clickType = GeneralRegion.ClickType.RIGHTCLICK;
-        }
-
-        boolean ran = regionSign.runSignCommands(player, clickType);
-
-        // Only cancel event if at least one command has been executed
-        event.setCancelled(ran);
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onSignChange(SignChangeEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-        Player player = event.getPlayer();
-        if (!plugin.isReady()) {
-            plugin.message(player, "general-notReady");
-            return;
-        }
-
-        final BlockFace rotation;
-        final BlockData data = event.getBlock().getBlockData();
-        if (data instanceof Sign) {
-            rotation = ((Sign) data).getRotation();
-        } else if (data instanceof WallSign) {
-            rotation = ((WallSign) data).getFacing();
-        } else {
-            rotation = null;
-        }
-
-        final String line0 = event.getLine(0) == null ? "" : event.getLine(0);
-
-        // Check if the sign is meant for this plugin
-        if (line0.contains(plugin.getConfig().getString("signTags.rent"))) {
-            if (!player.hasPermission("areashop.createrent") && !player.hasPermission("areashop.createrent.member") && !player.hasPermission("areashop.createrent.owner")) {
-                plugin.message(player, "setup-noPermissionRent");
-                return;
-            }
-
-            // Get the other lines
-            String secondLine = event.getLine(1);
-            String thirdLine = event.getLine(2);
-            String fourthLine = event.getLine(3);
-
-            // Get the regionManager for accessing regions
-            RegionManager regionManager = plugin.getRegionManager(event.getPlayer().getWorld());
-
-            // If the secondLine does not contain a name try to find the region by location
-            if (secondLine == null || secondLine.isEmpty()) {
-                Set<ProtectedRegion> regions = plugin.getWorldGuardHandler().getApplicableRegionsSet(event.getBlock().getLocation());
-                if (regions != null) {
-                    boolean first = true;
-                    ProtectedRegion candidate = null;
-                    for (ProtectedRegion pr : regions) {
-                        if (first) {
-                            candidate = pr;
-                            first = false;
-                        } else {
-                            if (pr.getPriority() > candidate.getPriority()) {
-                                candidate = pr;
-                            } else if (pr.getParent() != null && pr.getParent().equals(candidate)) {
-                                candidate = pr;
-                            } else {
-                                plugin.message(player, "setup-couldNotDetect", candidate.getId(), pr.getId());
-                                return;
-                            }
-                        }
-                    }
-                    if (candidate != null) {
-                        secondLine = candidate.getId();
-                    }
-                }
-            }
-
-            boolean priceSet = fourthLine != null && !fourthLine.isEmpty();
-            boolean durationSet = thirdLine != null && !thirdLine.isEmpty();
-            // check if all the lines are correct
-            if (secondLine == null || secondLine.isEmpty()) {
-                plugin.message(player, "setup-noRegion");
-                return;
-            }
-            ProtectedRegion region = regionManager.getRegion(secondLine);
-            if (region == null) {
-                plugin.message(player, "cmd-noRegion", secondLine);
-                return;
-            }
-
-            FileManager.AddResult addResult = plugin.getFileManager().checkRegionAdd(player, regionManager.getRegion(secondLine), event.getPlayer().getWorld(), GeneralRegion.RegionType.RENT);
-
-            switch (addResult) {
-                case BLACKLISTED:
-                    plugin.message(player, "setup-blacklisted", secondLine);
-                    break;
-                case ALREADYADDED:
-                    plugin.message(player, "setup-alreadyRentSign");
-                    break;
-                case ALREADYADDEDOTHERWORLD:
-                    plugin.message(player, "setup-alreadyOtherWorld");
-                    break;
-                case NOPERMISSION:
-                    plugin.message(player, "setup-noPermission", secondLine);
-                    break;
-                default:
-                    if (thirdLine != null && !thirdLine.isEmpty() && !Utils.checkTimeFormat(thirdLine)) {
-                        plugin.message(player, "setup-wrongDuration");
-                        break;
-                    }
-                    double price = 0.0;
-                    if (priceSet) {
-                        // Check the fourth line
-                        try {
-                            price = Double.parseDouble(fourthLine);
-                        } catch (NumberFormatException e) {
-                            plugin.message(player, "setup-wrongPrice");
-                            return;
-                        }
-                    }
-
-                    // Add rent to the FileManager
-                    final RentRegion rent = new RentRegion(secondLine, event.getPlayer().getWorld());
-                    boolean isMember = plugin.getWorldGuardHandler().containsMember(rent.getRegion(), player.getUniqueId());
-                    boolean isOwner = plugin.getWorldGuardHandler().containsOwner(rent.getRegion(), player.getUniqueId());
-                    boolean landlord = (!player.hasPermission("areashop.createrent")
-                            && ((player.hasPermission("areashop.createrent.owner") && isOwner)
-                            || (player.hasPermission("areashop.createrent.member") && isMember)));
-
-                    if (landlord) {
-                        rent.setLandlord(player.getUniqueId(), player.getName());
-                    }
-                    if (priceSet) {
-                        rent.setPrice(price);
-                    }
-                    if (durationSet) {
-                        rent.setDuration(thirdLine);
-                    }
-                    rent.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), rotation, null);
-
-                    AddingRegionEvent addingRegionEvent = plugin.getFileManager().addRegion(rent);
-                    if (addingRegionEvent.isCancelled()) {
-                        plugin.message(player, "general-cancelled", addingRegionEvent.getReason());
-                        return;
-                    }
-
-                    rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-                    plugin.message(player, "setup-rentSuccess", rent);
-                    // Update the region after the event has written its lines
-                    Bukkit.getScheduler().runTask(plugin, rent::update);
-
-            }
-        } else if (line0.contains(plugin.getConfig().getString("signTags.buy"))) {
-            // Check for permission
-            if (!player.hasPermission("areashop.createbuy") && !player.hasPermission("areashop.createbuy.member") && !player.hasPermission("areashop.createbuy.owner")) {
-                plugin.message(player, "setup-noPermissionBuy");
-                return;
-            }
-
-            // Get the other lines
-            String secondLine = event.getLine(1);
-            String thirdLine = event.getLine(2);
-
-            // Get the regionManager for accessing regions
-            RegionManager regionManager = plugin.getRegionManager(event.getPlayer().getWorld());
-
-            // If the secondLine does not contain a name try to find the region by location
-            if (secondLine == null || secondLine.isEmpty()) {
-                Set<ProtectedRegion> regions = plugin.getWorldGuardHandler().getApplicableRegionsSet(event.getBlock().getLocation());
-                if (regions != null) {
-                    boolean first = true;
-                    ProtectedRegion candidate = null;
-                    for (ProtectedRegion pr : regions) {
-                        if (first) {
-                            candidate = pr;
-                            first = false;
-                        } else {
-                            if (pr.getPriority() > candidate.getPriority()) {
-                                candidate = pr;
-                            } else if (pr.getParent() != null && pr.getParent().equals(candidate)) {
-                                candidate = pr;
-                            } else {
-                                plugin.message(player, "setup-couldNotDetect", candidate.getId(), pr.getId());
-                                return;
-                            }
-                        }
-                    }
-                    if (candidate != null) {
-                        secondLine = candidate.getId();
-                    }
-                }
-            }
-
-            boolean priceSet = thirdLine != null && !thirdLine.isEmpty();
-            // Check if all the lines are correct
-            if (secondLine == null || secondLine.isEmpty()) {
-                plugin.message(player, "setup-noRegion");
-                return;
-            }
-            ProtectedRegion region = regionManager.getRegion(secondLine);
-            if (region == null) {
-                plugin.message(player, "cmd-noRegion", secondLine);
-                return;
-            }
-            FileManager.AddResult addResult = plugin.getFileManager().checkRegionAdd(player, region, event.getPlayer().getWorld(), GeneralRegion.RegionType.BUY);
-            if (addResult == FileManager.AddResult.BLACKLISTED) {
-                plugin.message(player, "setup-blacklisted", secondLine);
-            } else if (addResult == FileManager.AddResult.ALREADYADDED) {
-                plugin.message(player, "setup-alreadyRentSign");
-            } else if (addResult == FileManager.AddResult.ALREADYADDEDOTHERWORLD) {
-                plugin.message(player, "setup-alreadyOtherWorld");
-            } else if (addResult == FileManager.AddResult.NOPERMISSION) {
-                plugin.message(player, "setup-noPermission", secondLine);
-            } else {
-                double price = 0.0;
-                if (priceSet) {
-                    // Check the fourth line
-                    try {
-                        price = Double.parseDouble(thirdLine);
-                    } catch (NumberFormatException e) {
-                        plugin.message(player, "setup-wrongPrice");
-                        return;
-                    }
-                }
-
-                // Add buy to the FileManager
-                final BuyRegion buy = new BuyRegion(secondLine, event.getPlayer().getWorld());
-                boolean isMember = plugin.getWorldGuardHandler().containsMember(buy.getRegion(), player.getUniqueId());
-                boolean isOwner = plugin.getWorldGuardHandler().containsOwner(buy.getRegion(), player.getUniqueId());
-                boolean landlord = (!player.hasPermission("areashop.createbuy")
-                        && ((player.hasPermission("areashop.createbuy.owner") && isOwner)
-                        || (player.hasPermission("areashop.createbuy.member") && isMember)));
-
-                if (landlord) {
-                    buy.setLandlord(player.getUniqueId(), player.getName());
-                }
-                if (priceSet) {
-                    buy.setPrice(price);
-                }
-                buy.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), rotation, null);
-
-                AddingRegionEvent addingRegionEvent = plugin.getFileManager().addRegion(buy);
-                if (addingRegionEvent.isCancelled()) {
-                    plugin.message(player, "general-cancelled", addingRegionEvent.getReason());
-                    return;
-                }
-
-                buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-                plugin.message(player, "setup-buySuccess", buy);
-                // Update the region after the event has written its lines
-                Bukkit.getScheduler().runTask(plugin, buy::update);
-            }
-        } else if (event.getLine(0).contains(plugin.getConfig().getString("signTags.add"))) {
-            // Check for permission
-            if (!player.hasPermission("areashop.addsign")) {
-                plugin.message(player, "addsign-noPermission");
-                return;
-            }
-
-            // Get the other lines
-            String secondLine = event.getLine(1);
-            String thirdLine = event.getLine(2);
-
-            GeneralRegion region;
-            if (secondLine != null && !secondLine.isEmpty()) {
-                // Get region by secondLine of the sign
-                region = plugin.getFileManager().getRegion(secondLine);
-                if (region == null) {
-                    plugin.message(player, "addSign-notRegistered", secondLine);
-                    return;
-                }
-            } else {
-                // Get region by sign position
-                List<GeneralRegion> regions = Utils.getImportantRegions(event.getBlock().getLocation());
-                if (regions.isEmpty()) {
-                    plugin.message(player, "addsign-noRegions");
-                    return;
-                } else if (regions.size() > 1) {
-                    plugin.message(player, "addsign-couldNotDetectSign", regions.get(0).getName(), regions.get(1).getName());
-                    return;
-                }
-                region = regions.get(0);
-            }
-            String profile = thirdLine == null || thirdLine.isEmpty() ? null : thirdLine;
-            region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), rotation, profile);
-            if (profile == null) {
-                plugin.message(player, "addsign-success", region);
-            } else {
-                plugin.message(player, "addsign-successProfile", thirdLine, region);
-            }
-
-            // Update the region later because this event will do it first
-            Bukkit.getScheduler().runTask(plugin, region::update);
-        }
-    }
-
-    @EventHandler
-    public void regionUpdate(UpdateRegionEvent event) {
-        event.getRegion().getSignsFeature().update();
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onChunkLoad(ChunkLoadEvent event) {
-        List<RegionSign> chunkSigns = signsByChunk.get(chunkToString(event.getChunk()));
-        if (chunkSigns == null) {
-            return;
-        }
-        int batchSize = Math.max(chunkSigns.size() / 10, 10);
-        Utils.runAsBatches(chunkSigns, batchSize, RegionSign::update, false);
-    }
-
-    /**
-     * Update all signs connected to this region.
-     *
-     * @return true if all signs are updated correctly, false if one or more updates failed
-     */
-    public boolean update() {
-        boolean result = true;
-        for (RegionSign sign : signs.values()) {
-            result &= sign.update();
-        }
-        return result;
-    }
-
-    /**
-     * Check if any of the signs need periodic updating.
-     *
-     * @return true if one or more of the signs need periodic updating, otherwise false
-     */
-    public boolean needsPeriodicUpdate() {
-        for (RegionSign sign : signs.values()) {
-            if (sign.needsPeriodicUpdate()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get the signs of this region.
-     *
-     * @return List of signs
-     */
-    public Collection<RegionSign> getSigns() {
-        return new HashSet<>(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 + ".";
-        getRegion().setSetting(signPath + "location", Utils.locationToConfig(location));
-        getRegion().setSetting(signPath + "facing", facing != null ? facing.name() : null);
-        getRegion().setSetting(signPath + "signType", signType != null ? signType.name() : null);
-        if (profile != null && !profile.isEmpty()) {
-            getRegion().setSetting(signPath + "profile", profile);
-        }
-        // Add to the map
-        RegionSign sign = new RegionSign(this, i + "");
-        signs.put(sign.getStringLocation(), sign);
-        allSigns.put(sign.getStringLocation(), sign);
-        signsByChunk.computeIfAbsent(sign.getStringChunk(), key -> new ArrayList<>())
-                .add(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);
+	}
 
 }

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

@@ -0,0 +1,50 @@
+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.platform.adapter.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;
+    }
+
+}

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

@@ -1,11 +1,12 @@
 package me.wiefferink.areashop.listeners;
 
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.regions.TransactionalRegion;
 import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.bukkitdo.Do;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -15,121 +16,123 @@ 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.LinkedList;
 import java.util.List;
 
 /**
  * Notify region expiry and track activity time.
  */
 public final class PlayerLoginLogoutListener implements Listener {
-    private final AreaShop plugin;
 
-    /**
-     * Constructor.
-     *
-     * @param plugin The AreaShop plugin
-     */
-    public PlayerLoginLogoutListener(AreaShop plugin) {
-        this.plugin = plugin;
-    }
+	private final AreaShop plugin;
+	private final 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();
+	/**
+	 * Constructor.
+	 * @param plugin The AreaShop plugin
+	 */
+	public PlayerLoginLogoutListener(@Nonnull AreaShop plugin, @Nonnull MessageBridge messageBridge) {
+		this.plugin = plugin;
+		this.messageBridge = messageBridge;
+	}
 
-        // Schedule task to check for notifications, prevents a lag spike at login
-        Utils.runCancellingTaskTimer(() -> {
-            // Delay until all regions are loaded
-            if (!plugin.isReady()) {
-                return true;
-            }
-            if (!player.isOnline()) {
-                return false;
-            }
-            // Notify for rents that almost run out
-            for (GeneralRegion generalRegion : plugin.getFileManager().getRegions()) {
-                if (!(generalRegion instanceof RentRegion)) {
-                    continue;
-                }
-                final RentRegion region = (RentRegion) generalRegion;
-                if (region.isTransactionHolder(player)) {
-                    String warningSetting = region.getStringSetting("rent.warningOnLoginTime");
-                    if (warningSetting == null || warningSetting.isEmpty()) {
-                        continue;
-                    }
-                    long warningTime = Utils.durationStringToLong(warningSetting);
-                    if (region.getTimeLeft() < warningTime) {
-                        // Send the warning message later to let it appear after general MOTD messages
-                        AreaShop.getInstance().message(player, "rent-expireWarning", region);
-                    }
-                }
-            }
+	/**
+	 * 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();
 
-            // Notify admins for plugin updates
-            AreaShop.getInstance().notifyUpdate(player);
-            return false;
-        }, 25, 25, false);
+		// 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);
+					}
+				}
+			}
 
-        // Check if the player has regions that use an old name of him and update them
-        Utils.runCancellingTaskTimer(() -> {
-            if (!plugin.isReady()) {
-                return true;
-            }
+			// Notify admins for plugin updates
+			this.plugin.notifyUpdate(player);
+			return false;
+		});
 
-            List<GeneralRegion> regions = new LinkedList<>();
-            for (GeneralRegion region : plugin.getFileManager().getRegions()) {
-                if (region instanceof TransactionalRegion && ((TransactionalRegion) region).isTransactionHolder(player)) {
-                    regions.add(region);
-                }
-            }
-            final String name = player.getName();
-            Utils.runAsBatches(regions,
-                    plugin.getConfig().getInt("nameupdate.regionsPerTick"),
-                    (region) -> {
-                        if (region instanceof BuyRegion || region instanceof RentRegion) {
-                            String key = region instanceof BuyRegion ? "buy.buyerName" : "rent.renterName";
-                            if (!name.equals(region.getStringSetting("buy.buyerName"))) {
-                                region.setSetting(key, player.getName());
-                                region.update();
-                            }
-                        }
-                    }, false);
-            return false;
-        }, 22, 10, false);
-    }
+		// 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;
+			}
 
-    // Active time updates
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerLogout(PlayerQuitEvent event) {
-        updateLastActive(event.getPlayer());
-    }
+			List<GeneralRegion> regions = new ArrayList<>();
+			for(GeneralRegion region : plugin.getFileManager().getRegionsRef()) {
+				if(region.isOwner(player)) {
+					regions.add(region);
+				}
+			}
 
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerKick(PlayerKickEvent 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;
+		});
+	}
 
-    /**
-     * Update the last active time for all regions the player is owner off.
-     *
-     * @param player The player to update the active times for
-     */
-    private void updateLastActive(Player player) {
-        for (GeneralRegion region : plugin.getFileManager().getRegions()) {
-            if (region instanceof TransactionalRegion && ((TransactionalRegion) region).isTransactionHolder(player)) {
-                region.updateLastActiveTime();
-            }
-        }
-    }
+	// 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();
+			}
+		}
+	}
 }
 
 

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

@@ -1,5 +1,10 @@
 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;
@@ -24,6 +29,7 @@ import me.wiefferink.areashop.commands.RentCommand;
 import me.wiefferink.areashop.commands.ResellCommand;
 import me.wiefferink.areashop.commands.SchematiceventCommand;
 import me.wiefferink.areashop.commands.SellCommand;
+import me.wiefferink.areashop.commands.SetTransferCommand;
 import me.wiefferink.areashop.commands.SetdurationCommand;
 import me.wiefferink.areashop.commands.SetlandlordCommand;
 import me.wiefferink.areashop.commands.SetownerCommand;
@@ -33,58 +39,69 @@ import me.wiefferink.areashop.commands.SetteleportCommand;
 import me.wiefferink.areashop.commands.StackCommand;
 import me.wiefferink.areashop.commands.StopresellCommand;
 import me.wiefferink.areashop.commands.TeleportCommand;
+import me.wiefferink.areashop.commands.TransferCommand;
 import me.wiefferink.areashop.commands.UnrentCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+@Singleton
 public class CommandManager extends Manager implements CommandExecutor, TabCompleter {
-	private final ArrayList<CommandAreaShop> commands;
+	private final List<CommandAreaShop> commands;
+	private final AreaShop plugin;
+	private final MessageBridge messageBridge;
 
 	/**
 	 * Constructor.
 	 */
-	public CommandManager() {
-		commands = new ArrayList<>();
-		commands.add(new HelpCommand());
-		commands.add(new RentCommand());
-		commands.add(new UnrentCommand());
-		commands.add(new BuyCommand());
-		commands.add(new SellCommand());
-		commands.add(new MeCommand());
-		commands.add(new InfoCommand());
-		commands.add(new TeleportCommand());
-		commands.add(new SetteleportCommand());
-		commands.add(new AddfriendCommand());
-		commands.add(new DelfriendCommand());
-		commands.add(new FindCommand());
-		commands.add(new ResellCommand());
-		commands.add(new StopresellCommand());
-		commands.add(new SetrestoreCommand());
-		commands.add(new SetpriceCommand());
-		commands.add(new SetownerCommand());
-		commands.add(new SetdurationCommand());
-		commands.add(new ReloadCommand());
-		commands.add(new GroupaddCommand());
-		commands.add(new GroupdelCommand());
-		commands.add(new GrouplistCommand());
-		commands.add(new GroupinfoCommand());
-		commands.add(new SchematiceventCommand());
-		commands.add(new AddCommand());
-		commands.add(new DelCommand());
-		commands.add(new AddsignCommand());
-		commands.add(new DelsignCommand());
-		commands.add(new LinksignsCommand());
-		commands.add(new StackCommand());
-		commands.add(new SetlandlordCommand());
-		commands.add(new MessageCommand());
-		commands.add(new ImportCommand());
+	@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(TransferCommand.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(SetTransferCommand.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));
 
 		// Register commands in bukkit
 		plugin.getCommand("AreaShop").setExecutor(this);
@@ -105,13 +122,13 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 	 */
 	public void showHelp(CommandSender target) {
 		if(!target.hasPermission("areashop.help")) {
-			plugin.message(target, "help-noPermission");
+			messageBridge.message(target, "help-noPermission");
 			return;
 		}
 		// Add all messages to a list
 		ArrayList<String> messages = new ArrayList<>();
-		plugin.message(target, "help-header");
-		plugin.message(target, "help-alias");
+		messageBridge.message(target, "help-header");
+		messageBridge.message(target, "help-alias");
 		for(CommandAreaShop command : commands) {
 			String help = command.getHelp(target);
 			if(help != null && !help.isEmpty()) {
@@ -120,14 +137,14 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 		}
 		// Send the messages to the target
 		for(String message : messages) {
-			plugin.messageNoPrefix(target, message);
+			messageBridge.messageNoPrefix(target, message);
 		}
 	}
 
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String alias, String[] args) {
 		if(!plugin.isReady()) {
-			plugin.message(sender, "general-notReady");
+			messageBridge.message(sender, "general-notReady");
 			return true;
 		}
 
@@ -153,9 +170,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])) {
-					plugin.message(sender, "reload-updateCommandChanged");
+					messageBridge.message(sender, "reload-updateCommandChanged");
 				} else {
-					plugin.message(sender, "cmd-notValid");
+					messageBridge.message(sender, "cmd-notValid");
 				}
 			}
 		}

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

@@ -1,8 +1,13 @@
 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;
@@ -10,57 +15,61 @@ import me.wiefferink.areashop.features.WorldGuardRegionFlagsFeature;
 import me.wiefferink.areashop.features.signs.SignsFeature;
 import me.wiefferink.areashop.regions.GeneralRegion;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
+import javax.annotation.Nonnull;
 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 {
 
-	// List of defined features
-	private static final Set<Class<? extends RegionFeature>> featureClasses = new HashSet<>(Arrays.asList(
-			DebugFeature.class,
-			SignsFeature.class,
-			FriendsFeature.class,
+	private static final Collection<Class<? extends RegionFeature>> globalFeatureClasses = Arrays.asList(
+			CommandsFeature.class,
 			WorldGuardRegionFlagsFeature.class,
-			TeleportFeature.class,
-			CommandsFeature.class
-	));
+			DebugFeature.class
+	);
 	// One instance of each feature, registered for event handling
-	private final Set<RegionFeature> globalFeatures;
-	private final Map<Class<? extends RegionFeature>, Constructor<? extends RegionFeature>> regionFeatureConstructors;
+	private final Set<RegionFeature> globalFeatures = new HashSet<>();
+	private final Map<Class<? extends RegionFeature>, Function<GeneralRegion, ? extends RegionFeature>> regionFeatureConstructors = new HashMap<>();
 
 	/**
 	 * Constructor.
 	 */
-	public FeatureManager() {
+	@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) {
 		// Instantiate and register global features (one per type, for event handling)
-		globalFeatures = new HashSet<>();
-		for(Class<? extends RegionFeature> clazz : featureClasses) {
+		for(Class<? extends RegionFeature> clazz : globalFeatureClasses) {
 			try {
-				Constructor<? extends RegionFeature> constructor = clazz.getConstructor();
-				RegionFeature feature = constructor.newInstance();
+				RegionFeature feature = injector.getInstance(clazz);
 				feature.listen();
 				globalFeatures.add(feature);
-			} catch(InstantiationException | IllegalAccessException | InvocationTargetException | IllegalArgumentException e) {
+			} catch(ProvisionException e) {
 				AreaShop.error("Failed to instantiate global feature:", clazz, e);
-			} catch(NoSuchMethodException e) {
-				// Feature does not have a global part
 			}
 		}
+	}
 
-		// Setup constructors for region specific features
-		regionFeatureConstructors = new HashMap<>();
-		for(Class<? extends RegionFeature> clazz : featureClasses) {
+	private <T extends RegionFeature> Function<GeneralRegion, T> wrapInstantiator(Class<T> clazz, Function<GeneralRegion, T> function
+	) {
+		return region -> {
 			try {
-				regionFeatureConstructors.put(clazz, clazz.getConstructor(GeneralRegion.class));
-			} catch(NoSuchMethodException | IllegalArgumentException e) {
-				// The feature does not have a region specific part
+				return function.apply(region);
+			} catch (Throwable e) {
+				AreaShop.error("Failed to instantiate feature", clazz, "for region", region, e, e.getCause());
+				return null;
 			}
-		}
+		};
 	}
 
 	@Override
@@ -77,12 +86,7 @@ public class FeatureManager extends Manager {
 	 * @return The feature class
 	 */
 	public RegionFeature getRegionFeature(GeneralRegion region, Class<? extends RegionFeature> featureClazz) {
-		try {
-			return regionFeatureConstructors.get(featureClazz).newInstance(region);
-		} catch(InstantiationException | InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
-			AreaShop.error("Failed to instantiate feature", featureClazz, "for region", region, e, e.getCause());
-		}
-		return null;
+		return regionFeatureConstructors.get(featureClazz).apply(region);
 	}
 
 }

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

@@ -0,0 +1,399 @@
+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;
+        }
+    }
+}

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

@@ -1,11 +1,7 @@
 package me.wiefferink.areashop.managers;
 
-import me.wiefferink.areashop.AreaShop;
-
 public abstract class Manager {
 
-	final AreaShop plugin = AreaShop.getInstance();
-
 	/**
 	 * Called at shutdown of the plugin.
 	 */

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

@@ -0,0 +1,79 @@
+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.");
+        }
+    }
+}

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

@@ -1,18 +1,20 @@
 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.SignsFeature;
+import me.wiefferink.areashop.features.signs.SignManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
 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;
@@ -27,14 +29,23 @@ 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;
 
-	public SignLinkerManager() {
+	@Inject
+	private AreaShop plugin;
+	@Inject
+	private SignManager signManager;
+	@Inject
+	private MessageBridge messageBridge;
+
+	SignLinkerManager() {
 		signLinkers = new HashMap<>();
 		eventsRegistered = false;
 	}
@@ -53,8 +64,8 @@ public class SignLinkerManager extends Manager implements Listener {
 	 */
 	public void enterSignLinkMode(Player player, String profile) {
 		signLinkers.put(player.getUniqueId(), new SignLinker(player, profile));
-		plugin.message(player, "linksigns-first");
-		plugin.message(player, "linksigns-next");
+		messageBridge.message(player, "linksigns-first");
+		messageBridge.message(player, "linksigns-next");
 		if(!eventsRegistered) {
 			eventsRegistered = true;
 			plugin.getServer().getPluginManager().registerEvents(this, plugin);
@@ -71,7 +82,7 @@ public class SignLinkerManager extends Manager implements Listener {
 			eventsRegistered = false;
 			HandlerList.unregisterAll(this);
 		}
-		plugin.message(player, "linksigns-stopped");
+		messageBridge.message(player, "linksigns-stopped");
 	}
 
 	/**
@@ -107,13 +118,13 @@ public class SignLinkerManager extends Manager implements Listener {
 						for(GeneralRegion region : regions) {
 							names.add(region.getName());
 						}
-						plugin.message(player, "linksigns-multipleRegions", Utils.createCommaSeparatedList(names));
-						plugin.message(player, "linksigns-multipleRegionsAdvice");
+						messageBridge.message(player, "linksigns-multipleRegions", Utils.createCommaSeparatedList(names));
+						messageBridge.message(player, "linksigns-multipleRegionsAdvice");
 						return;
 					}
 				}
 				// No regions found within the maximum range
-				plugin.message(player, "linksigns-noRegions");
+				messageBridge.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);
@@ -124,25 +135,17 @@ public class SignLinkerManager extends Manager implements Listener {
 					}
 				}
 				if(block == null || !Materials.isSign(block.getType())) {
-					plugin.message(player, "linksigns-noSign");
+					messageBridge.message(player, "linksigns-noSign");
 					return;
 				}
 
-				RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-				if(regionSign != null) {
-					plugin.message(player, "linksigns-alreadyRegistered", regionSign.getRegion());
+				Optional<RegionSign> optional = signManager.signFromLocation(block.getLocation());
+				if(optional.isPresent()) {
+					RegionSign regionSign = optional.get();
+					messageBridge.message(player, "linksigns-alreadyRegistered", regionSign.getRegion());
 					return;
 				}
-				final BlockData blockData = block.getBlockData();
-				final BlockFace rotation;
-				if (blockData instanceof Sign) {
-					rotation = ((Sign) blockData).getRotation();
-				} else if (blockData instanceof WallSign) {
-					rotation = ((WallSign) blockData).getFacing();
-				} else {
-					rotation = null;
-				}
-				linker.setSign(block.getLocation(), block.getType(), rotation);
+				linker.setSign(block.getLocation(), block.getType(), SignUtils.getSignFacing(block));
 			}
 		}
 	}
@@ -181,7 +184,7 @@ public class SignLinkerManager extends Manager implements Listener {
 			this.region = region;
 			hasRegion = true;
 			if(!isComplete()) {
-				plugin.message(linker, "linksigns-regionFound", region);
+				messageBridge.message(linker, "linksigns-regionFound", region);
 			}
 			finish();
 		}
@@ -192,7 +195,7 @@ public class SignLinkerManager extends Manager implements Listener {
 			this.facing = facing;
 			hasSign = true;
 			if(!isComplete()) {
-				plugin.message(linker, "linksigns-signFound", location.getBlockX(), location.getBlockY(), location.getBlockZ());
+				messageBridge.message(linker, "linksigns-signFound", location.getBlockX(), location.getBlockY(), location.getBlockZ());
 			}
 			finish();
 		}
@@ -201,14 +204,14 @@ public class SignLinkerManager extends Manager implements Listener {
 			if(isComplete()) {
 				region.getSignsFeature().addSign(location, type, facing, profile);
 				if(profile == null) {
-					plugin.message(linker, "addsign-success", region);
+					messageBridge.message(linker, "addsign-success", region);
 				} else {
-					plugin.message(linker, "addsign-successProfile", region, profile);
+					messageBridge.message(linker, "addsign-successProfile", region, profile);
 				}
 				region.update();
 				reset();
 
-				plugin.message(linker, "linksigns-next");
+				messageBridge.message(linker, "linksigns-next");
 			}
 		}
 

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

@@ -0,0 +1,76 @@
+package me.wiefferink.areashop.modules;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Singleton;
+import com.google.inject.assistedinject.FactoryModuleBuilder;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.features.FeatureFactory;
+import me.wiefferink.areashop.features.signs.SignManager;
+import me.wiefferink.areashop.features.signs.SignsModule;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.managers.CommandManager;
+import me.wiefferink.areashop.managers.FeatureManager;
+import me.wiefferink.areashop.managers.FileManager;
+import me.wiefferink.areashop.managers.IFileManager;
+import me.wiefferink.areashop.managers.SignErrorLogger;
+import me.wiefferink.areashop.managers.SignLinkerManager;
+import me.wiefferink.areashop.platform.adapter.PlatformAdapter;
+import me.wiefferink.areashop.regions.ImportJobFactory;
+import me.wiefferink.areashop.regions.RegionModule;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.plugin.Plugin;
+
+import javax.annotation.Nonnull;
+import java.util.Arrays;
+
+public class AreaShopModule extends AbstractModule {
+
+    private final AreaShop instance;
+    private final WorldGuardInterface worldGuardInterface;
+    private final WorldEditInterface worldEditInterface;
+    private final PlatformAdapter platformAdapter;
+    private final MessageBridge messageBridge;
+    private final SignErrorLogger signErrorLogger;
+    private final AbstractModule[] extras;
+
+    public AreaShopModule(@Nonnull AreaShop instance,
+                          @Nonnull MessageBridge messageBridge,
+                          @Nonnull PlatformAdapter platformAdapter,
+                          @Nonnull WorldEditInterface worldEditInterface,
+                          @Nonnull WorldGuardInterface worldGuardInterface,
+                          @Nonnull SignErrorLogger signErrorLogger,
+                          @Nonnull AbstractModule... extras
+    ) {
+        this.instance = instance;
+        this.messageBridge = messageBridge;
+        this.platformAdapter = platformAdapter;
+        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).toInstance(this.messageBridge);
+        bind(WorldGuardInterface.class).toInstance(this.worldGuardInterface);
+        bind(SignManager.class).asEagerSingleton();
+        bind(WorldEditInterface.class).toInstance(this.worldEditInterface);
+        bind(SignErrorLogger.class).toInstance(this.signErrorLogger);
+        // Setup managers
+        bind(IFileManager.class).to(FileManager.class).asEagerSingleton();
+        bind(FeatureManager.class).in(Singleton.class);
+        bind(CommandManager.class).in(Singleton.class);
+        bind(SignLinkerManager.class).in(Singleton.class);
+        install(new SignsModule());
+        install(new RegionModule());
+        install(new FactoryModuleBuilder().build(FeatureFactory.class));
+        install(new FactoryModuleBuilder().build(ImportJobFactory.class));
+        requestStaticInjection(Utils.class);
+    }
+}

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

@@ -0,0 +1,34 @@
+package me.wiefferink.areashop.modules;
+
+import com.google.inject.AbstractModule;
+import org.bukkit.Server;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.inventory.ItemFactory;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.ServicesManager;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scoreboard.ScoreboardManager;
+
+import javax.annotation.Nonnull;
+
+public class BukkitModule extends AbstractModule {
+
+    private final Server server;
+
+    public BukkitModule(@Nonnull Server server) {
+        this.server = server;
+    }
+
+    @Override
+    protected void configure() {
+        bind(Server.class).toInstance(this.server);
+        bind(PluginManager.class).toInstance(this.server.getPluginManager());
+        bind(BukkitScheduler.class).toInstance(this.server.getScheduler());
+        bind(PluginManager.class).toInstance(this.server.getPluginManager());
+        bind(ServicesManager.class).toInstance(this.server.getServicesManager());
+        bind(ItemFactory.class).toInstance(this.server.getItemFactory());
+        bind(ConsoleCommandSender.class).toInstance(this.server.getConsoleSender());
+        bind(ScoreboardManager.class).toInstance(this.server.getScoreboardManager());
+    }
+
+}

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

@@ -0,0 +1,37 @@
+package me.wiefferink.areashop.modules;
+
+import com.google.inject.AbstractModule;
+import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import net.milkbowl.vault.economy.Economy;
+import net.milkbowl.vault.permission.Permission;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class DependencyModule extends AbstractModule {
+
+    private final WorldEditPlugin worldEditPlugin;
+    private final WorldGuardPlugin worldGuardPlugin;
+    private final Economy economy;
+    private final Permission permission;
+
+   public DependencyModule(@Nonnull WorldEditPlugin worldEditPlugin,
+                           @Nonnull WorldGuardPlugin worldGuardPlugin,
+                           @Nullable Economy economy,
+                           @Nullable Permission permission
+   ) {
+       this.worldEditPlugin = worldEditPlugin;
+       this.worldGuardPlugin = worldGuardPlugin;
+       this.economy = economy;
+       this.permission = permission;
+   }
+
+    @Override
+    protected void configure() {
+        bind(WorldEditPlugin.class).toInstance(this.worldEditPlugin);
+        bind(WorldGuardPlugin.class).toInstance(this.worldGuardPlugin);
+        bind(Economy.class).toInstance(this.economy);
+        bind(Permission.class).toInstance(this.permission);
+    }
+}

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

@@ -0,0 +1,29 @@
+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.platform.adapter.BlockBehaviourHelper;
+import me.wiefferink.areashop.platform.adapter.PlatformAdapter;
+import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
+import org.jetbrains.annotations.NotNull;
+
+public class PlatformModule extends AbstractModule {
+
+    private final MinecraftPlatform minecraftPlatform;
+    private final PlatformAdapter platformAdapter;
+
+    public PlatformModule(@NotNull MinecraftPlatform platform,
+                          @NotNull PlatformAdapter platformAdapter) {
+        this.minecraftPlatform = platform;
+        this.platformAdapter = platformAdapter;
+    }
+    @Override
+    protected void configure() {
+        bind(MinecraftPlatform.class).toInstance(this.minecraftPlatform);
+        bind(OfflinePlayerHelper.class).toInstance(this.minecraftPlatform.offlinePlayerHelper());
+        bind(PlatformAdapter.class).toInstance(this.platformAdapter);
+        bind(BlockBehaviourHelper.class).toInstance(this.platformAdapter.blockBehaviourHelper());
+        bind(BukkitSchedulerExecutor.class).asEagerSingleton();
+    }
+}

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

@@ -1,16 +1,17 @@
-package me.wiefferink.areashop.commands;
+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.SignsFeature;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RegionGroup;
-import me.wiefferink.areashop.regions.RentRegion;
+import 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;
@@ -20,33 +21,52 @@ 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
 	 */
-	public ImportJob(CommandSender sender) {
+	@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 = AreaShop.getInstance();
-		execute();
+		this.plugin = plugin;
+		this.signManager = signManager;
+		this.fileManager = fileManager;
+		this.worldGuardInterface = worldGuardInterface;
+		this.messageBridge = messageBridge;
 	}
 
 	/**
 	 * Execute the job.
 	 */
-	private void execute() {
+	public void execute() {
 		// Check for RegionForSale data
 		File regionForSaleFolder = new File(plugin.getDataFolder().getParentFile().getAbsolutePath(), "RegionForSale");
 		if(!regionForSaleFolder.exists()) {
@@ -70,8 +90,8 @@ public class ImportJob {
 		message("import-start");
 
 		// Group with settings for all imported regions
-		RegionGroup regionForSaleGroup = new RegionGroup(plugin, "RegionForSale");
-		plugin.getFileManager().addGroup(regionForSaleGroup);
+		RegionGroup regionForSaleGroup = regionFactory.createRegionGroup("RegionForSale");
+		fileManager.addGroup(regionForSaleGroup);
 
 		// Import /RegionForSale/config.yml settings
 		File regionForSaleConfigFile = new File(regionForSaleFolder.getAbsolutePath(), "config.yml");
@@ -149,11 +169,11 @@ public class ImportJob {
 				worldConfig = new YamlConfiguration();
 			} else {
 				// RegionGroup with all world settings
-				RegionGroup worldGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName());
+				RegionGroup worldGroup = regionFactory.createRegionGroup("RegionForSale-" + worldFolder.getName());
 				importRegionSettings(worldConfig, worldGroup.getSettings(), null, false);
 				worldGroup.setSetting("priority", 1);
 				worldGroup.addWorld(worldFolder.getName());
-				plugin.getFileManager().addGroup(regionForSaleGroup);
+				fileManager.addGroup(regionForSaleGroup);
 				worldGroup.saveRequired();
 			}
 
@@ -185,7 +205,7 @@ public class ImportJob {
 					}
 
 					// Import parent region settings into a RegionGroup
-					RegionGroup parentRegionGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName() + "-" + parentRegionName);
+					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();
@@ -197,7 +217,7 @@ public class ImportJob {
 
 			// Read and import regions
 			for(String regionKey : regions.getKeys(false)) {
-				GeneralRegion existingRegion = plugin.getFileManager().getRegion(regionKey);
+				GeneralRegion existingRegion = fileManager.getRegion(regionKey);
 				if(existingRegion != null) {
 					if(world.getName().equalsIgnoreCase(existingRegion.getWorldName())) {
 						messageNoPrefix("import-alreadyAdded", regionKey);
@@ -240,9 +260,9 @@ public class ImportJob {
 				// Create region
 				GeneralRegion region;
 				if(rentable || (owner != null && !isBought)) {
-					region = new RentRegion(regionKey, world);
+					region = regionFactory.createRentRegion(regionKey, world);
 				} else {
-					region = new BuyRegion(regionKey, world);
+					region = regionFactory.createBuyRegion(regionKey, world);
 				}
 				AddingRegionEvent event = plugin.getFileManager().addRegion(region);
 				if (event.isCancelled()) {
@@ -263,12 +283,12 @@ public class ImportJob {
 						existing.add(offlinePlayer.getUniqueId());
 					}
 				}
-				for(UUID uuid : plugin.getWorldGuardHandler().getOwners(worldGuardRegion).asUniqueIdList()) {
+				for(UUID uuid : worldGuardInterface.getOwners(worldGuardRegion).asUniqueIdList()) {
 					if(!existing.contains(uuid)) {
 						existing.add(uuid);
 					}
 				}
-				for(UUID uuid : plugin.getWorldGuardHandler().getMembers(worldGuardRegion).asUniqueIdList()) {
+				for(UUID uuid : worldGuardInterface.getMembers(worldGuardRegion).asUniqueIdList()) {
 					if(!existing.contains(uuid)) {
 						existing.add(uuid);
 					}
@@ -290,9 +310,9 @@ public class ImportJob {
 		}
 
 		// Update all regions
-		plugin.getFileManager().updateAllRegions(sender);
+		fileManager.updateAllRegions(sender);
 		// Write all imported regions and settings to disk
-		plugin.getFileManager().saveRequiredFiles();
+		fileManager.saveRequiredFiles();
 	}
 
 	/**
@@ -338,7 +358,9 @@ public class ImportJob {
 
 		// Determine unit and add that to the price
 		String unitSuffix = "";
-		if("m3".equalsIgnoreCase(unit)) {
+		if("region".equalsIgnoreCase(unit)) {
+			// add nothing
+		} else if("m3".equalsIgnoreCase(unit)) {
 			unitSuffix = "*%volume%";
 		} else { // m2 or nothing (in case not set, we should actually look in parent files to correctly set this...)
 			unitSuffix = "*(%volume%/%height%)"; // This is better than width*depth because of polygon regions
@@ -371,8 +393,7 @@ public class ImportJob {
 
 		// Set rented until
 		if(from.isLong("info.last-withdrawal")
-				&& region instanceof RentRegion) {
-			RentRegion rentRegion = (RentRegion)region;
+				&& 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());
@@ -397,8 +418,9 @@ public class ImportJob {
 				}
 
 				// Check if this location is already added to a region
-				RegionSign regionSign = SignsFeature.getSignByLocation(location);
-				if(regionSign != null) {
+				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());
 					}
@@ -422,7 +444,7 @@ public class ImportJob {
 		}
 	}
 
-	private static final List<TimeUnit> timeUnitLookup = new ArrayList<TimeUnit>() {
+	private static final List<TimeUnit> timeUnitLookup = new ArrayList<>() {
 		{
 			add(new TimeUnit(60 * 24 * 30 * 12, "year"));
 			add(new TimeUnit(60 * 24 * 30, "month"));
@@ -457,10 +479,10 @@ public class ImportJob {
 	 * @param replacements The replacements to insert in the message
 	 */
 	public void messageNoPrefix(String key, Object... replacements) {
-		plugin.messageNoPrefix(sender, key, replacements);
+		messageBridge.messageNoPrefix(sender, key, replacements);
 
 		if(!(sender instanceof ConsoleCommandSender)) {
-			plugin.messageNoPrefix(Bukkit.getConsoleSender(), key, replacements);
+			messageBridge.messageNoPrefix(Bukkit.getConsoleSender(), key, replacements);
 		}
 	}
 
@@ -470,10 +492,10 @@ public class ImportJob {
 	 * @param replacements The replacements to insert in the message
 	 */
 	public void message(String key, Object... replacements) {
-		plugin.message(sender, key, replacements);
+		messageBridge.message(sender, key, replacements);
 
 		if(!(sender instanceof ConsoleCommandSender)) {
-			plugin.message(Bukkit.getConsoleSender(), key, replacements);
+			messageBridge.message(Bukkit.getConsoleSender(), key, replacements);
 		}
 	}
 }

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

@@ -0,0 +1,11 @@
+package me.wiefferink.areashop.regions;
+
+import org.bukkit.command.CommandSender;
+
+import javax.annotation.Nonnull;
+
+public interface ImportJobFactory {
+
+    @Nonnull ImportJob createImportJob(@Nonnull CommandSender commandSender);
+
+}

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

@@ -0,0 +1,20 @@
+package me.wiefferink.areashop.regions;
+
+import org.bukkit.World;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import javax.annotation.Nonnull;
+
+public interface RegionFactory {
+
+    @Nonnull BuyRegion createBuyRegion(@Nonnull YamlConfiguration yamlConfiguration);
+
+    @Nonnull BuyRegion createBuyRegion(@Nonnull String name, @Nonnull World world);
+
+    @Nonnull RentRegion createRentRegion(@Nonnull YamlConfiguration yamlConfiguration);
+
+    @Nonnull RentRegion createRentRegion(@Nonnull String name, @Nonnull World world);
+
+    @Nonnull RegionGroup createRegionGroup(@Nonnull String name);
+
+}

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

@@ -1,9 +1,13 @@
 package me.wiefferink.areashop.regions;
 
-import me.wiefferink.areashop.AreaShop;
+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;
@@ -11,7 +15,8 @@ import java.util.Set;
 // TODO consider switching to saving lowercase regions
 public class RegionGroup {
 
-	private final AreaShop plugin;
+	private final Plugin plugin;
+	private final IFileManager fileManager;
 	private final String name;
 	private final Set<String> regions;
 	private Set<String> autoRegions;
@@ -23,8 +28,10 @@ public class RegionGroup {
 	 * @param plugin The AreaShop plugin
 	 * @param name   Name of the group, has to be unique
 	 */
-	public RegionGroup(AreaShop plugin, String name) {
+	@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);
@@ -41,7 +48,7 @@ public class RegionGroup {
 	public Set<String> getAutoRegions() {
 		if(autoDirty) {
 			autoRegions = new HashSet<>();
-			for(GeneralRegion region : plugin.getFileManager().getRegions()) {
+			for(GeneralRegion region : fileManager.getRegionsRef()) {
 				if(worlds.contains(region.getWorldName())) {
 					autoRegions.add(region.getName());
 				}
@@ -149,7 +156,7 @@ public class RegionGroup {
 	public Set<GeneralRegion> getMemberRegions() {
 		Set<GeneralRegion> result = new HashSet<>();
 		for(String playerName : getMembers()) {
-			result.add(plugin.getFileManager().getRegion(playerName));
+			result.add(fileManager.getRegion(playerName));
 		}
 		return result;
 	}
@@ -192,7 +199,7 @@ public class RegionGroup {
 	 * @return The ConfigurationSection with the settings of the group
 	 */
 	public ConfigurationSection getSettings() {
-		ConfigurationSection result =  plugin.getFileManager().getGroupSettings(name);
+		ConfigurationSection result =  fileManager.getGroupSettings(name);
 		if(result != null) {
 			return result;
 		} else {
@@ -206,20 +213,20 @@ public class RegionGroup {
 	 * @param setting The value to set
 	 */
 	public void setSetting(String path, Object setting) {
-		plugin.getFileManager().setGroupSetting(this, path, setting);
+		fileManager.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();
+		fileManager.saveGroupsIsRequired();
 	}
 
 	/**
 	 * Save the groups to disk now, normally saveRequired() is preferred because of performance.
 	 */
 	public void saveNow() {
-		plugin.getFileManager().saveGroupsNow();
+		fileManager.saveGroupsNow();
 	}
 }

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

@@ -0,0 +1,12 @@
+package me.wiefferink.areashop.regions;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.assistedinject.FactoryModuleBuilder;
+
+public class RegionModule extends AbstractModule {
+
+    @Override
+    protected void configure() {
+        install(new FactoryModuleBuilder().build(RegionFactory.class));
+    }
+}

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

@@ -1,240 +0,0 @@
-package me.wiefferink.areashop.regions;
-
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.util.UUID;
-
-public abstract class TransactionalRegion extends GeneralRegion {
-
-    private final String key;
-
-    private final RegionType type;
-    private UUID transactionHolder;
-    private String transactionHolderName;
-    private double price;
-    private double moneyBackPercentage;
-    private long inactivityThresholdMillis;
-
-    public TransactionalRegion(YamlConfiguration config, RegionType regionType) {
-        super(config);
-        this.type = regionType;
-        this.key = regionType.name().toLowerCase() + ".";
-        this.moneyBackPercentage = config.getDouble(this.key + "moneyBack");
-    }
-
-    public TransactionalRegion(String name, World world, RegionType type) {
-        super(name, world);
-        this.type = type;
-        this.key = type.name().toLowerCase() + ".";
-    }
-
-    protected final void setInactivityThresholdMillis(long inactivityThresholdMillis) {
-        this.inactivityThresholdMillis = inactivityThresholdMillis;
-    }
-
-    @Override
-    public RegionType getType() {
-        return type;
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return !isSold();
-    }
-
-    /**
-     * Get the UUID of the owner of this region.
-     *
-     * @return The UUID of the owner of this region
-     */
-    public UUID getTransactionHolder() {
-        return transactionHolder;
-    }
-
-    /**
-     * Set the buyer of this region. WARNING - May trigger disk lookup for offline players!
-     *
-     * @param transactionHolder The UUID of the player that should be set as buyer
-     */
-    public void setTransactionHolder(UUID transactionHolder) {
-        if (transactionHolder == null) {
-            this.transactionHolder = null;
-            this.transactionHolderName = null;
-        } else {
-            this.transactionHolder = transactionHolder;
-            String name = Utils.toName(transactionHolder);
-            this.transactionHolderName = name.isEmpty() ? null : name;
-        }
-    }
-
-    /**
-     * Set the buyer of this region.
-     *
-     * @param player The instance of the player.
-     */
-    public void setTransactionHolder(final OfflinePlayer player) {
-        if (player == null) {
-            this.transactionHolder = null;
-            this.transactionHolderName = null;
-        } else {
-            String name = player.getName();
-            this.transactionHolderName = name == null || name.isEmpty() ? null : name;
-        }
-    }
-
-    @Override
-    public void setOwner(UUID player) {
-        setTransactionHolder(player);
-    }
-
-    /**
-     * Check if a player is the buyer/holder of this region.
-     *
-     * @param player Player to check
-     * @return true if this player owns this region, otherwise false
-     */
-    public boolean isTransactionHolder(OfflinePlayer player) {
-        return player != null && player.getUniqueId().equals(transactionHolder);
-    }
-
-    public boolean isTransactionHolder(UUID player) {
-        UUID buyer = getTransactionHolder();
-        return !(buyer == null || player == null) && buyer.equals(player);
-    }
-
-    /**
-     * Get the name of the player that owns this region.
-     *
-     * @return The name of the player that owns this region, if unavailable by UUID it will return the old cached name, if that is unavailable it will return <UNKNOWN>
-     */
-    public String getPlayerName() {
-        return this.transactionHolderName == null ? "<UNKNOWN>" : transactionHolderName;
-    }
-
-    /**
-     * Check if the region is sold.
-     *
-     * @return true if the region is sold, otherwise false
-     */
-    public boolean isSold() {
-        return this.transactionHolder != null;
-    }
-
-    /**
-     * Get the price of the region.
-     *
-     * @return The price of the region
-     */
-    public double getPrice() {
-        return price;
-    }
-
-    /**
-     * Change the price of the region.
-     *
-     * @param price The price to set this region to
-     */
-    public void setPrice(double price) {
-        this.price = price;
-        super.config.set(key + "price", price);
-    }
-
-    /**
-     * Get the formatted string of the price (includes prefix and suffix).
-     *
-     * @return The formatted string of the price
-     */
-    public String getFormattedPrice() {
-        return Utils.formatCurrency(getPrice());
-    }
-
-    /**
-     * Get the moneyBack percentage.
-     *
-     * @return The % of money the player will get back when selling
-     */
-    public double getMoneyBackPercentage() {
-        return moneyBackPercentage;
-    }
-
-    /**
-     * Get the amount of money that should be paid to the player when selling the region.
-     *
-     * @return The amount of money the player should get back
-     */
-    public double getMoneyBackAmount() {
-        return getPrice() * (moneyBackPercentage / 100D);
-    }
-
-    /**
-     * Get the formatted string of the amount of the moneyBack amount.
-     *
-     * @return String with currency symbols and proper fractional part
-     */
-    public String getFormattedMoneyBackAmount() {
-        return Utils.formatCurrency(getMoneyBackAmount());
-    }
-
-    @Override
-    public Object provideReplacement(String variable) {
-        switch (variable) {
-            case AreaShop.tagPrice:
-                return getFormattedPrice();
-            case AreaShop.tagRawPrice:
-                return getPrice();
-            case AreaShop.tagPlayerName:
-                return getPlayerName();
-            case AreaShop.tagPlayerUUID:
-                return getTransactionHolder();
-            case AreaShop.tagMoneyBackAmount:
-                return getFormattedMoneyBackAmount();
-            case AreaShop.tagRawMoneyBackAmount:
-                return getMoneyBackAmount();
-            case AreaShop.tagMoneyBackPercentage:
-                return getMoneyBackPercentage() % 1.0 == 0.0 ? (int) getMoneyBackPercentage() : getMoneyBackPercentage();
-            case AreaShop.tagMaxInactiveTime:
-                return this.getFormattedInactivityThreshold();
-            default:
-                return super.provideReplacement(variable);
-        }
-    }
-
-    public long getInactivityThresholdMillis() {
-        return this.inactivityThresholdMillis;
-    }
-
-    /**
-     * Get a human readable string indicating how long the player can be offline until automatic unrent.
-     *
-     * @return String indicating the inactive time until unrent
-     */
-    public String getFormattedInactivityThreshold() {
-        return Utils.millisToHumanFormat(this.inactivityThresholdMillis);
-    }
-
-    @Override
-    public boolean checkInactivity(final OfflinePlayer player) {
-        if (isDeleted() || !isSold()) {
-            return false;
-        }
-        long inactiveSetting = getInactivityThresholdMillis();
-        if (inactiveSetting <= 0) {
-            return false;
-        }
-        if (player.isOnline()) {
-            return false;
-        }
-        long lastPlayed = getLastActiveTime();
-        long now = System.currentTimeMillis();
-        if (now > (lastPlayed + inactiveSetting)) {
-            AreaShop.info("Region " + getName() + " unrented because of inactivity for player " + getPlayerName());
-            AreaShop.debug("currentTime=" + now + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (now - player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
-            return true;
-        }
-        return false;
-    }
-}

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

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

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

@@ -0,0 +1,26 @@
+package me.wiefferink.areashop.tools;
+
+
+import jakarta.inject.Inject;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.Executor;
+
+public class BukkitSchedulerExecutor implements Executor {
+
+    private final Plugin plugin;
+    private final BukkitScheduler scheduler;
+
+    @Inject
+    public BukkitSchedulerExecutor(@NotNull Plugin plugin, @NotNull BukkitScheduler scheduler) {
+        this.plugin = plugin;
+        this.scheduler = scheduler;
+    }
+
+    @Override
+    public void execute(@NotNull Runnable command) {
+        this.scheduler.runTask(this.plugin, command);
+    }
+}

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

@@ -1,28 +0,0 @@
-package me.wiefferink.areashop.tools;
-
-import org.bukkit.Chunk;
-
-public class ChunkUtils {
-
-    private final long twoPower32 = Integer.MAX_VALUE + 1L;
-
-    public static long getPackedChunkCoords(Chunk chunk) {
-        return packToLong(chunk.getX(), chunk.getZ());
-    }
-
-    public static long packToLong(int primary, int secondary) {
-        return (long) primary & 0xffffffffL | ((long) secondary & 0xffffffffL) << 32;
-    }
-
-    public static int getChunkX(long packed) {
-        return (int) packed;
-    }
-
-    public static int getChunkZ(long packed) {
-        return (int) (packed >> 32);
-    }
-
-    public static int[] getChunkCoords(long packed) {
-        return new int[]{(int) packed, (int) (packed >> 32)};
-    }
-}

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

@@ -20,7 +20,7 @@ public class GithubUpdateCheck {
 
 	public static final String API_HOST = "https://api.github.com/repos";
 	public static final String API_LATEST_RELEASE = "releases/latest";
-	public static final String USER_AGENT = "GithubUpdateCheck by NLThijs48";
+	public static final String USER_AGENT = "md5sha256 AreaShop GithubUpdateCheck";
 	public static final boolean DEBUG = false;
 
 	private final String author;

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

@@ -0,0 +1,89 @@
+package me.wiefferink.areashop.tools;
+
+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);
+        }
+    }
+
+
+}

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

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

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

@@ -0,0 +1,152 @@
+package me.wiefferink.areashop.tools;
+
+/**
+ * Parse math from a string
+ * Adapted from:
+ * https://stackoverflow.com/questions/3422673/how-to-evaluate-a-math-expression-given-in-string-form
+ */
+public final class OperandParser {
+
+    private final String str;
+
+    private OperandParser(final String str) {
+        this.str = str;
+    }
+
+    public static double parse(final String str) throws ParseException {
+        return new OperandParser(str).parse();
+    }
+
+
+    private int pos = -1, ch;
+
+    private void nextChar() {
+        ch = (++pos < str.length()) ? str.charAt(pos) : -1;
+    }
+
+    private boolean eat(int charToEat) {
+        while (ch == ' ') nextChar();
+        if (ch == charToEat) {
+            nextChar();
+            return true;
+        }
+        return false;
+    }
+
+    private double parse() throws ParseException {
+        nextChar();
+        double x = parseExpression();
+        if (pos < str.length())
+        {
+            throw new ParseException("Unexpected: " + (char) ch);
+        }
+        return x;
+    }
+
+    // Grammar:
+    // expression = term | expression `+` term | expression `-` term
+    // term = factor | term `*` factor | term `/` factor
+    // factor = `+` factor | `-` factor | `(` expression `)`
+    //        | number | functionName factor | factor `^` factor
+
+    private double parseExpression() throws ParseException {
+        double x = parseTerm();
+        for (; ; ) {
+            if (eat('+')) {
+                // addition
+                x += parseTerm();
+            }
+            else if (eat('-')) {
+                // subtraction
+                x -= parseTerm();
+            }
+            else return x;
+        }
+    }
+
+    private double parseTerm() throws ParseException {
+        double x = parseFactor();
+        for (; ; ) {
+            if (eat('*')) {
+                // multiplication
+                x *= parseFactor();
+            }
+            else if (eat('/')) {
+                // division
+                x /= parseFactor();
+            }
+            else return x;
+        }
+    }
+
+    private double parseFactor() throws ParseException {
+        if (eat('+')) {
+            // unary plus
+            return parseFactor();
+        }
+        if (eat('-')) {
+            // unary minus
+            return -parseFactor();
+        }
+
+        double x;
+        int startPos = this.pos;
+        if (eat('(')) {
+            // parentheses
+            x = parseExpression();
+            eat(')');
+        } else if ((ch >= '0' && ch <= '9') || ch == '.') {
+            // numbers
+            while ((ch >= '0' && ch <= '9') || ch == '.') {
+                nextChar();
+            }
+            x = Double.parseDouble(str.substring(startPos, this.pos));
+        } else if (ch >= 'a' && ch <= 'z') {
+            // functions
+            while (ch >= 'a' && ch <= 'z') {
+                nextChar();
+            }
+            String func = str.substring(startPos, this.pos);
+            x = parseFactor();
+            x = switch (func) {
+                case "sqrt" -> Math.sqrt(x);
+                case "sin" -> Math.sin(Math.toRadians(x));
+                case "cos" -> Math.cos(Math.toRadians(x));
+                case "tan" -> Math.tan(Math.toRadians(x));
+                default -> throw new ParseException("Unknown function: " + func);
+            };
+        } else {
+            throw new ParseException("Unexpected: " + (char) ch);
+        }
+
+        if (eat('^')) {
+            // exponentiation
+            x = Math.pow(x, parseFactor());
+        }
+
+        return x;
+    }
+
+    public static class ParseException extends Exception {
+
+        public ParseException() {
+        }
+
+        public ParseException(String message) {
+            super(message);
+        }
+
+        public ParseException(String message, Throwable cause) {
+            super(message, cause);
+        }
+
+        public ParseException(Throwable cause) {
+            super(cause);
+        }
+
+        public ParseException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+            super(message, cause, enableSuppression, writableStackTrace);
+        }
+    }
+
+}

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

@@ -0,0 +1,97 @@
+package me.wiefferink.areashop.tools;
+
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Sign;
+import org.bukkit.block.data.type.WallSign;
+
+/**
+ * Sign Utilities class
+ */
+public final class SignUtils {
+
+    private SignUtils() {
+
+    }
+
+    /**
+     * Get the {@link BlockFace} of a sign block
+     * If the passed {@link Block} is not an instance of either
+     * a {@link Sign} or {@link WallSign}, this method will return <code>null</code>
+     *
+     * @param block The sign
+     * @return Returns the {@link BlockFace} of the sign or <code>null</code>
+     */
+    public static BlockFace getSignFacing(Block block) {
+        if (block == null) {
+            return null;
+        }
+
+        BlockState blockState = block.getState();
+        BlockData blockData = blockState.getBlockData();
+
+        if (blockData instanceof WallSign wallSign) {
+            return wallSign.getFacing();
+        } else if (blockData instanceof org.bukkit.block.data.type.Sign sign) {
+            return sign.getRotation();
+        }
+        return null;
+    }
+
+    /**
+     * Set the {@link BlockFace} in which the sign will face
+     * If the passed {@link Block} is not an instance of either
+     * a {@link Sign} or {@link WallSign}, this method will return <code>null</code>.
+     *
+     * @param block  The sign block
+     * @param facing The new {@link BlockFace} the sign should face
+     * @return Returns <code>true</code> if the sign was successfully placed, <code>false</code> otherwise
+     */
+    public static boolean setSignFacing(Block block, BlockFace facing) {
+        if (block == null || facing == null) {
+            return false;
+        }
+
+        BlockState blockState = block.getState();
+        BlockData blockData = blockState.getBlockData();
+
+        if (blockData instanceof WallSign wallSign) {
+            wallSign.setFacing(facing);
+        } else if (blockData instanceof org.bukkit.block.data.type.Sign sign) {
+            sign.setRotation(facing);
+        } else {
+            return false;
+        }
+        block.setBlockData(blockData);
+        return true;
+    }
+
+    /**
+     * Get the {@link Block} which a given sign is attached to.
+     * This method will return <code>null</code> if the passed {@link Block}
+     * is not an instance of either a {@link Sign} or {@link WallSign}.
+     *
+     * @param block The sign {@link Block}
+     * @return Returns the block which the sign is attached to or null
+     */
+    public static Block getSignAttachedTo(Block block) {
+        if (block == null) {
+            return null;
+        }
+
+        BlockState blockState = block.getState();
+
+        BlockData blockData = blockState.getBlockData();
+
+        if (blockData instanceof WallSign wallSign) {
+            return block.getRelative(wallSign.getFacing().getOppositeFace());
+        } else if (blockData instanceof Sign) {
+            return block.getRelative(BlockFace.DOWN);
+        }
+
+        return null;
+    }
+
+}

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

@@ -0,0 +1,81 @@
+package me.wiefferink.areashop.tools;
+
+import com.google.inject.Singleton;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.interactivemessenger.Log;
+import me.wiefferink.interactivemessenger.generators.ConsoleGenerator;
+import me.wiefferink.interactivemessenger.generators.TellrawGenerator;
+import me.wiefferink.interactivemessenger.parsers.YamlParser;
+import me.wiefferink.interactivemessenger.processing.Message;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.util.List;
+import java.util.logging.Logger;
+
+@Singleton
+public class SimpleMessageBridge implements MessageBridge {
+
+    /**
+     * Send a message to a target without a prefix.
+     * @param target       The target to send the message to
+     * @param key          The key of the language string
+     * @param replacements The replacements to insert in the message
+     */
+    @Override
+    public void messageNoPrefix(Object target, String key, Object... replacements) {
+        Message m = Message.fromKey(key).replacements(replacements);
+        send(m, target);
+    }
+
+    public static void send(Message message, Object target) {
+        if(AreaShop.useMiniMessage()) {
+
+            if(target instanceof Audience audience) {
+                if(message.get() == null || message.get().isEmpty() || (message.get().size() == 1 && message.get()
+                        .get(0)
+                        .isEmpty())) {
+                    return;
+                }
+                message.doReplacements();
+
+                StringBuilder messageStr = new StringBuilder();
+                for(String line : message.get()) {
+                    messageStr.append(line);
+                }
+
+                MiniMessage mm = MiniMessage.miniMessage();
+                Component parsed = mm.deserialize(messageStr.toString());
+                audience.sendMessage(parsed);
+            }
+            else {
+                AreaShop.error("AreaShop sent a non-supported Object as the Audience for a Message!");
+            }
+        } else {
+            message.send(target);
+        }
+    }
+
+    /**
+     * Send a message to a target, prefixed by the default chat prefix.
+     * @param target       The target to send the message to
+     * @param key          The key of the language string
+     * @param replacements The replacements to insert in the message
+     */
+    @Override
+    public void message(Object target, String key, Object... replacements) {
+        Message m = Message.fromKey(key).prefix().replacements(replacements);
+        send(m, target);
+    }
+
+}

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

@@ -0,0 +1,42 @@
+package me.wiefferink.areashop.tools;
+
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public class SpigotOfflinePlayerHelper implements OfflinePlayerHelper {
+
+    private final Plugin plugin;
+
+    public SpigotOfflinePlayerHelper(@NotNull Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public CompletableFuture<Optional<UUID>> lookupUuidAsync(String username) {
+        return lookupOfflinePlayerAsync(username).thenApply(player -> {
+            if (player.hasPlayedBefore()) {
+                return Optional.of(player.getUniqueId());
+            }
+            return Optional.empty();
+        });
+    }
+
+    @Override
+    public CompletableFuture<OfflinePlayer> lookupOfflinePlayerAsync(String username) {
+        final CompletableFuture<OfflinePlayer> future = new CompletableFuture<>();
+        final Server server = this.plugin.getServer();
+        server.getScheduler().runTaskAsynchronously(this.plugin, () -> {
+            @SuppressWarnings("deprecation")
+            OfflinePlayer player = server.getOfflinePlayer(username);
+            future.complete(player);
+        });
+        return future;
+    }
+}

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

@@ -0,0 +1,20 @@
+package me.wiefferink.areashop.tools;
+
+import me.wiefferink.areashop.adapters.platform.MinecraftPlatform;
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+public class SpigotPlatform implements MinecraftPlatform {
+
+    private final OfflinePlayerHelper offlinePlayerHelper;
+
+    public SpigotPlatform(@NotNull Plugin plugin) {
+        this.offlinePlayerHelper = new SpigotOfflinePlayerHelper(plugin);
+    }
+
+    @Override
+    public OfflinePlayerHelper offlinePlayerHelper() {
+        return this.offlinePlayerHelper;
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/tools/version/PreReleaseType.java

@@ -0,0 +1,40 @@
+package me.wiefferink.areashop.tools.version;
+
+import javax.annotation.Nullable;
+import java.util.Locale;
+
+public enum PreReleaseType {
+
+    UNKNOWN("unknown"),
+
+    ALPHA("alpha"),
+    BETA("beta"),
+    SNAPSHOT("snapshot"),
+    RELEASE_CANDIDATE("rc");
+
+    private static final PreReleaseType[] VALUES = values();
+
+    private final String asString;
+
+    PreReleaseType(String asString) {
+        this.asString = asString;
+    }
+
+    @Nullable
+    public static PreReleaseType parse(String release) {
+        if (release.isEmpty()) {
+            return null;
+        }
+        String sanitized = release.toLowerCase(Locale.ENGLISH);
+        for (PreReleaseType preReleaseType : VALUES) {
+            if (preReleaseType.asString.equals(sanitized)) {
+                return preReleaseType;
+            }
+        }
+        return UNKNOWN;
+    }
+
+    public String asString() {
+        return this.asString;
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/tools/version/Version.java

@@ -0,0 +1,54 @@
+package me.wiefferink.areashop.tools.version;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public record Version(String original, VersionData versionData) {
+
+    /**
+     * Semver pattern, cg1 = major, cg2 = minor, cg3 = patch, cg4 = prerelease and cg5 = buildmetadata
+     * Taken from https://semver.org/ and https://regex101.com/r/vkijKf/1/
+     */
+    public static final Pattern SEMVER_PATTERN = Pattern.compile(
+            "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$");
+
+
+    public static Version parse(String version) {
+        Matcher matcher = SEMVER_PATTERN.matcher(version);
+        if (!matcher.find()) {
+            throw new IllegalArgumentException("Invalid version: " + version);
+        }
+        String majorRaw = matcher.group(1);
+        String minorRaw = matcher.group(2);
+        String patchRaw = matcher.group(3);
+        String preReleaseRaw = matcher.group(4);
+        int major;
+        int minor;
+        try {
+            major = Integer.parseInt(majorRaw);
+            minor = Integer.parseInt(minorRaw);
+        } catch (NumberFormatException ex) {
+            throw new IllegalArgumentException("Invalid version: " + version);
+        }
+        if (patchRaw == null || patchRaw.isEmpty()) {
+            return new Version(version, new VersionData(major, minor, 0, null));
+        }
+        int patch;
+        try {
+            patch = Integer.parseInt(patchRaw);
+        } catch (NumberFormatException ex) {
+            throw new IllegalArgumentException("Invalid version: " + version);
+        }
+        if (preReleaseRaw == null || preReleaseRaw.isEmpty()) {
+            return new Version(version, new VersionData(major, minor, patch, null));
+        }
+        PreReleaseType releaseType = PreReleaseType.parse(preReleaseRaw);
+        return new Version(version, new VersionData(major, minor, patch, releaseType));
+    }
+
+    @Override
+    public String toString() {
+        return this.original;
+    }
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/tools/version/VersionData.java

@@ -0,0 +1,54 @@
+package me.wiefferink.areashop.tools.version;
+
+import org.jetbrains.annotations.NotNull;
+
+public record VersionData(int major, int minor, int patch, PreReleaseType preReleaseType)
+        implements Comparable<VersionData> {
+
+
+    public VersionData(int major, int minor, int patch) {
+        this(major, minor, patch, null);
+    }
+
+    public VersionData(int major, int minor) {
+        this(major, minor, 0);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%d.%d.%d", major, minor, patch);
+    }
+
+    public boolean isNewerThan(VersionData other) {
+        return compareTo(other) > 0;
+    }
+
+    public boolean isOlderThan(VersionData other) {
+        return compareTo(other) < 0;
+    }
+
+
+    @Override
+    public int compareTo(@NotNull VersionData o) {
+        int majorComp = Integer.compare(this.major, o.major);
+        if (majorComp != 0) {
+            return majorComp;
+        }
+        int minorComp = Integer.compare(this.minor, o.minor);
+        if (minorComp != 0) {
+            return minorComp;
+        }
+        int patchComp = Integer.compare(this.patch, o.patch);
+        if (patchComp != 0) {
+            return patchComp;
+        }
+        if (this.preReleaseType == null && o.preReleaseType == null) {
+            return 0;
+        }
+        if (this.preReleaseType == null) {
+            return 1;
+        }
+        return this.preReleaseType.compareTo(o.preReleaseType);
+    }
+}
+

AreaShop/src/main/java/me/wiefferink/areashop/tools/version/VersionUtil.java

@@ -0,0 +1,22 @@
+package me.wiefferink.areashop.tools.version;
+
+public class VersionUtil {
+
+    public static VersionData MC_1_17_1 = new VersionData(1, 17, 1);
+
+    public static Version parseMinecraftVersion(String minecraftVersion) {
+        // Expecting 1.X.X-R0.1-SNAPSHOT
+        int stripLength = "-R0.1-SNAPSHOT".length();
+        int length = minecraftVersion.length();
+        if (length <= stripLength) {
+            throw new IllegalArgumentException("Invalid minecraft version: " + minecraftVersion);
+        }
+        String strippedVersion = minecraftVersion.substring(0, length - stripLength);
+        try {
+            return Version.parse(strippedVersion);
+        } catch (IllegalArgumentException ex) {
+            throw new IllegalArgumentException("Invalid minecraft version: " + minecraftVersion, ex);
+        }
+    }
+
+}

AreaShop/src/main/resources/config.yml

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

AreaShop/src/main/resources/default.yml

@@ -34,6 +34,8 @@ general:
   landlordName: ''
   # Disable to prevent counting this region towards limits set by 'limitGroups' in config.yml.
   countForLimits: true
+  # Whether transferring tenant <--> tenant and landlord <--> landlord should be enabled
+  transferMode: false
 
   ##### Set the layout and functions of the signs.
   # The following sections can be added for performing certain commands when the sign is clicked:
@@ -120,18 +122,18 @@ general:
       block-break: 'deny g:non_members'
       block-place: 'deny g:non_members'
     forrent:
-      greeting: '%lang:prefix%%lang:greeting-forrent%'
+      greeting: '%lang:wgPrefix%%lang:greeting-forrent%'
     rented:
       members: '%uuid%, %friendsuuid%'
-      greeting: '%lang:prefix%%lang:greeting-rented%'
+      greeting: '%lang:wgPrefix%%lang:greeting-rented%'
     forsale:
-      greeting: '%lang:prefix%%lang:greeting-forsale%'
+      greeting: '%lang:wgPrefix%%lang:greeting-forsale%'
     sold:
       members: '%uuid%, %friendsuuid%'
-      greeting: '%lang:prefix%%lang:greeting-bought%'
+      greeting: '%lang:wgPrefix%%lang:greeting-bought%'
     resell:
       members: '%uuid%, %friendsuuid%'
-      greeting: '%lang:prefix%%lang:greeting-resale%'
+      greeting: '%lang:wgPrefix%%lang:greeting-resale%'
 
   ##### Save and restore schematics to clean up regions.
   # After 'save:' or 'restore:' you enter the name of the file to restore from/to (.schematic is added automatically).

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

@@ -13,30 +13,30 @@
 "action": "[gold][bold]<%0%>[/bold]"
 "button": "[bold]<%0%>[/bold]"
 "command":
-- "[bold]%0%[/bold]"
-- "    hover: %lang:action|Benutze %1%|%"
-- "    command: %1%"
+  - "[bold]%0%[/bold]"
+  - "    hover: %lang:action|Benutze %1%|%"
+  - "    command: %1%"
 "helpCommand":
-- "[gold]%0% [gray]-[reset]"
-- "    hover: %lang:action|Benutze %0%|%"
-- "    command: %0%"
+  - "[gold]%0% [gray]-[reset]"
+  - "    hover: %lang:action|Benutze %0%|%"
+  - "    command: %0%"
 "region": "%lang:tRegion|%region%|%"
 "tRegion":
-- "[bold]%0%[/bold]"
-- "    hover: Region %0%"
-- "    hover: %lang:action|Region information|%"
-- "    command: /areashop info region %0%"
+  - "[bold]%0%[/bold]"
+  - "    hover: Region %0%"
+  - "    hover: %lang:action|Region information|%"
+  - "    command: /areashop info region %0%"
 "player": "%lang:tPlayer|%player%|%"
 "tPlayer":
-- "[bold]%0%[/bold]"
-- "    hover: Spieler %0%"
-- "    hover: %lang:action|Regionen von %0%|%"
-- "    command: /areashop info player %0%"
+  - "[bold]%0%[/bold]"
+  - "    hover: Spieler %0%"
+  - "    hover: %lang:action|Regionen von %0%|%"
+  - "    command: /areashop info player %0%"
 "landlord":
-- "[bold]%landlord%[/bold]"
-- "    hover: Vermieter %landlord%"
-- "    hover: %lang:action|Regionen von %landlord%|%"
-- "    command: /areashop info player %landlord%"
+  - "[bold]%landlord%[/bold]"
+  - "    hover: Vermieter %landlord%"
+  - "    hover: %lang:action|Regionen von %landlord%|%"
+  - "    command: /areashop info player %landlord%"
 "total-maximum": "Du kannst nicht mehr als %0% Region(en) mieten/kaufen (Du hast bereits %1% in Gruppe '%2%')."
 "confirm-yes": " [gray]Klicken um %lang:command|den Command zu bestätigen|1%0%|%[gray] oder zu wiederholen."
 "general-notReady": "AreaShop ist noch nicht vollständig geladen, bitte warten."
@@ -142,15 +142,15 @@
 "reload-noPermission": "Du hast keine Berechtigungen um die Konfigurationsdateien neu zu laden."
 "reload-updateCommandChanged": "'/as updaterents' und '/as updatebuys' wurden entfernt, bitte benutze '/as reload' um die Regionen neu zu laden."
 "info-help":
-- "/as info[break]"
-- "    %lang:command|all|/as info all|%[break]"
-- "    %lang:command|rented|/as info rented|% [Gruppe] [Seite][break]"
-- "    %lang:command|forrent|/as info forrent|% [Gruppe] [Seite][break]"
-- "    %lang:command|sold|/as info sold|% [Gruppe] [Seite][break]"
-- "    %lang:command|forsale|/as info forsale|% [Gruppe] [Seite][break]"
-- "    %lang:command|reselling|/as info reselling|% [Gruppe] [Seite][break]"
-- "    %lang:command|nogroup|/as info nogroup [Seite]|%[break]"
-- "    %lang:command|region|/as info region|% [Region]"
+  - "/as info[break]"
+  - "    %lang:command|all|/as info all|%[break]"
+  - "    %lang:command|rented|/as info rented|% [Gruppe] [Seite][break]"
+  - "    %lang:command|forrent|/as info forrent|% [Gruppe] [Seite][break]"
+  - "    %lang:command|sold|/as info sold|% [Gruppe] [Seite][break]"
+  - "    %lang:command|forsale|/as info forsale|% [Gruppe] [Seite][break]"
+  - "    %lang:command|reselling|/as info reselling|% [Gruppe] [Seite][break]"
+  - "    %lang:command|nogroup|/as info nogroup [Seite]|%[break]"
+  - "    %lang:command|region|/as info region|% [Region]"
 "info-noPermission": "Du hast keine Berechtigung, Informationen über Regionen zu erhalten."
 "info-allHeader": "Alle Regionen%0%:"
 "info-rentedHeader": "Gemietete Regionen%0%:"
@@ -171,11 +171,11 @@
 "info-entryReselling": "[darkgreen][bold]►[reset] %lang:region%: [gray]Verkauft an %lang:player% (Weiterverkauf)."
 "info-pageStatus": "[gold]Seite %0%/%1%"
 "info-pageNoPrevious":
-- "    [darkgray][bold]◄Vorherige[/bold]    "
-- "    hover: Das ist bereits die erste Seite."
+  - "    [darkgray][bold]◄Vorherige[/bold]    "
+  - "    hover: Das ist bereits die erste Seite."
 "info-pageNoNext":
-- "    [darkgray][bold]Nächste►[/bold]"
-- "    hover: Das ist bereits die letzte Seite."
+  - "    [darkgray][bold]Nächste►[/bold]"
+  - "    hover: Das ist bereits die letzte Seite."
 "info-playerHelp": "/as info player <Spielername>."
 "info-playerRents": "Gemietete Regionen von %lang:tPlayer|%0%|%: [gray]%1%"
 "info-playerNoRents": "%lang:tPlayer|%0%|% hat bisher keine Region(en) gemietet."
@@ -188,66 +188,66 @@
 "info-regionBought": "[darkgreen][bold]►[reset] Gekauft von %lang:player%."
 "info-regionReselling": "[darkgreen][bold]►[reset] Gekauft von %lang:player%, derzeit Weiterverkauf."
 "info-regionExtending":
-- "[darkgreen][bold]►[reset] "
-- "[bold]Verlängern für[/bold]"
-- "    hover: Miete verlängern für %region%"
-- "    hover: mit %duration% für %price%"
-- "    hover: %lang:action|Mieter Verlängern für %region%|%"
-- "    command: /areashop rent %region%"
-- ": [gray]%price% für %duration%."
+  - "[darkgreen][bold]►[reset] "
+  - "[bold]Verlängern für[/bold]"
+  - "    hover: Miete verlängern für %region%"
+  - "    hover: mit %duration% für %price%"
+  - "    hover: %lang:action|Mieter Verlängern für %region%|%"
+  - "    command: /areashop rent %region%"
+  - ": [gray]%price% für %duration%."
 "info-regionCanBeRented":
-- "[darkgreen][bold]►[reset] "
-- "[bold]Mieten für[/bold]"
-- "    hover: Miete %region% für %price% für %duration%"
-- "    hover: %lang:action|Miete %region%|%"
-- "    command: /areashop rent %region%"
-- ": [gray]%price% für %duration%."
+  - "[darkgreen][bold]►[reset] "
+  - "[bold]Mieten für[/bold]"
+  - "    hover: Miete %region% für %price% für %duration%"
+  - "    hover: %lang:action|Miete %region%|%"
+  - "    command: /areashop rent %region%"
+  - ": [gray]%price% für %duration%."
 "info-regionCanBeBought":
-- "[darkgreen][bold]►[reset] "
-- "[bold]Kaufen für[/bold]"
-- "    hover: Kaufe %region% für %price%"
-- "    hover: %lang:action|Kaufe %region%|%"
-- "    command: /areashop buy %region%"
-- ": [gray]%price%."
+  - "[darkgreen][bold]►[reset] "
+  - "[bold]Kaufen für[/bold]"
+  - "    hover: Kaufe %region% für %price%"
+  - "    hover: %lang:action|Kaufe %region%|%"
+  - "    command: /areashop buy %region%"
+  - ": [gray]%price%."
 "info-regionReselPrice": "[darkgreen][bold]►[reset] Weiterverkaufspreis:  [gray]%resellprice% (Du kannst es von %lang:player% kaufen)."
 "info-regionFriends": "[darkgreen][bold]►[reset] Hinzugefügte Freunde: [gray]%0%."
 "info-friend": "%lang:tPlayer|%0%|%"
 "info-friendRemove":
-- "%lang:info-friend|%0%|%"
-- "[red]✕[gray]"
-- "    hover: Region %region%"
-- "    hover: %lang:action|Lösche %0% als Freund|%"
-- "    command: /areashop delfriend %0% %region%"
+  - "%lang:info-friend|%0%|%"
+  - "[red]✕[gray]"
+  - "    hover: Region %region%"
+  - "    hover: %lang:action|Lösche %0% als Freund|%"
+  - "    command: /areashop delfriend %0% %region%"
 "info-regionMoneyBackBuy": "[darkgreen][bold]►[reset] Verkaufpreis: [gray]%moneyback% (%moneybackpercent%% des Kaufpreises)."
 "info-regionMoneyBackBuyClick":
-- "[darkgreen][bold]►[reset] "
-- "[bold]Verkaufsrückzahlung[/bold]"
-- "    hover: Verkaufe %region% und bekomme %moneyback% zurück"
-- "    hover: %lang:action|Verkaufe %region%|%"
-- "    command: /areashop sell %region%"
-- ": [gray]%moneyback% (%moneybackpercent%% des Kaufpreises)."
+  - "[darkgreen][bold]►[reset] "
+  - "[bold]Verkaufsrückzahlung[/bold]"
+  - "    hover: Verkaufe %region% und bekomme %moneyback% zurück"
+  - "    hover: %lang:action|Verkaufe %region%|%"
+  - "    command: /areashop sell %region%"
+  - ": [gray]%moneyback% (%moneybackpercent%% des Kaufpreises)."
 "info-regionMoneyBackRent": "[darkgreen][bold]►[reset] Rückzahlung bei Mietkündigung: [gray]%moneyback% (%moneybackpercent%% der verbleibenden Zeit)."
 "info-regionMoneyBackRentClick":
-- "[darkgreen][bold]►[reset] "
-- "[bold]Mietrückzahlung[/bold]"
-- "    hover: Entmiete %region% und bekomme %moneyback% zurück"
-- "    hover: %lang:action|Unrent %region%|%"
-- "    command: /areashop unrent %region%"
-- ": [gray]%moneyback% (%moneybackpercent%% der verbleibenden Zeit)."
+  - "[darkgreen][bold]►[reset] "
+  - "[bold]Mietrückzahlung[/bold]"
+  - "    hover: Entmiete %region% und bekomme %moneyback% zurück"
+  - "    hover: %lang:action|Unrent %region%|%"
+  - "    command: /areashop unrent %region%"
+  - ": [gray]%moneyback% (%moneybackpercent%% der verbleibenden Zeit)."
 "info-regionMaxExtends": "[darkgreen][bold]►[reset] Maximale Anzahl an Verlängerungen: [gray]%maxextends% ."
 "info-regionNoExtending": "[darkgreen][bold]►[reset] Miete kann nicht verlängert werden."
 "info-regionExtendsLeft": "[darkgreen][bold]►[reset] Verbleibende Mietverlängerungen: [gray]%extendsleft% von %maxextends% ."
 "info-regionMaxRentTime": "[darkgreen][bold]►[reset] Miete im Voraus: [gray]Maximal %maxrenttime%."
 "info-prefix": "[darkgreen][bold]►[reset] "
 "info-regionTeleport":
-- "[bold]Gehe zu der Region[/bold]"
-- "    hover: %lang:action|Teleport to %region%|%"
-- "    command: /areashop tp %region%"
+  - "[bold]Gehe zu der Region[/bold]"
+  - "    hover: %lang:action|Teleport to %region%|%"
+  - "    command: /areashop tp %region%"
 "info-setRegionTeleport":
-- "[bold]Setze den Teleport Punkt[/bold]"
-- "    hover: %region%"
-- "    hover: %lang:action|Set teleport location|%"
-- "    command: /areashop settp %region%"
+  - "[bold]Setze den Teleport Punkt[/bold]"
+  - "    hover: %region%"
+  - "    hover: %lang:action|Set teleport location|%"
+  - "    command: /areashop settp %region%"
 "info-regionSigns": "[darkgreen][bold]►[reset] Verbundene Schilder: [gray]%0%."
 "info-regionSignLocation": "[gray](%0%, %1%, %2%, %3%)[reset]"
 "info-regionGroups": "[darkgreen][bold]►[reset] Zugewiesene Gruppen: [gray]%0%."
@@ -377,10 +377,10 @@
 "addsign-couldNotDetectSign": "Mehrere Regionen um das Schild herum gefunden, bitte gewünschte Region in die zweite Zeile eintragen (zwei der gefundenen Regionen: %lang:tRegion|%0%|% und %lang:tRegion|%1%|%)."
 "addsign-wrongProfile": "Das eingetragene Profil existiert nicht. Bitte benutze eines der folgenden (überprüfe config): [gray]%0%."
 "addsign-profile":
-- "[bold]%0%[/bold]"
-- "    hover: Schildprofil %0%"
-- "    hover: %lang:action|Use this profile|%"
-- "    command: /areashop linksigns %0%"
+  - "[bold]%0%[/bold]"
+  - "    hover: Schildprofil %0%"
+  - "    hover: %lang:action|Use this profile|%"
+  - "    command: /areashop linksigns %0%"
 "addsign-success": "Das Schild wurde hinzugefügt zu %lang:region%."
 "addsign-successProfile": "Das Schild wurde zu %lang:region% mit dem Profil  %0% hinzugefügt."
 "addsign-alreadyRegistered": "Dieses Schild ist bereits für die Region %lang:region% registriert."
@@ -393,16 +393,16 @@
 "me-header": "Regionen von %lang:tPlayer|%0%|%:"
 "me-notAPlayer": "Du bist kein Spieler, darum können dir keine Regionen gehören."
 "me-rentLine":
-- "[darkgreen][bold]►[reset] %lang:region% [gray]("
-- "%timeleft% übrig"
-- "    hover: bis %until%"
-- ")."
+  - "[darkgreen][bold]►[reset] %lang:region% [gray]("
+  - "%timeleft% übrig"
+  - "    hover: bis %until%"
+  - ")."
 "me-buyLine": "[darkgreen][bold]►[reset] %lang:region%."
 "me-friendLine":
-- "[darkgreen][bold]►[reset] %lang:region% [gray]("
-- "Im Besitz von %lang:player%"
-- "    hover: Du wurdest als Freund hinzugefügt"
-- ")."
+  - "[darkgreen][bold]►[reset] %lang:region% [gray]("
+  - "Im Besitz von %lang:player%"
+  - "    hover: Du wurdest als Freund hinzugefügt"
+  - ")."
 "me-nothing": "%lang:tPlayer|%0%|% hat keine gemieteten oder gekaufen Regionen und wurde nicht als Freund zu einem hinzugefügt."
 "me-noPlayer": "%0% konnte nicht gefunden werden, möglicherweise war er nie auf diesem Server."
 "me-clickHint": "[gray][italic]Klicke auf eine Region, um weitere Details zu erhalten."
@@ -457,13 +457,13 @@
 "linksigns-noPermission": "Du hast keine Berechtigungen um den Schilder-Massenverbindungsmodus zu benutzen."
 "linksigns-stopped": "Schilder-Verbindungsmodus verlassen."
 "stack-help":
-- "/as stack <Menge> <Abstand> <Name> <rent|buy> [Gruppe]."
-- "[gray]<Menge> Nummer der Regionen, die erstellt werden."
-- "[gray]<Abstand> Block-Abstand zwischen den Regionen."
-- "[gray]<Name> Namen der Regionen (Nummer wird dahinter sein)."
-- "[gray]<rent|buy> Macht die Regionen zu kauf- oder Mietregionen"
-- "[gray][Gruppe] Eine Gruppe, die zu den erstellten Regionen hinzugefügt wird."
-- "Die Regionen werden in deiner Blickrichtung erstellt."
+  - "/as stack <Menge> <Abstand> <Name> <rent|buy> [Gruppe]."
+  - "[gray]<Menge> Nummer der Regionen, die erstellt werden."
+  - "[gray]<Abstand> Block-Abstand zwischen den Regionen."
+  - "[gray]<Name> Namen der Regionen (Nummer wird dahinter sein)."
+  - "[gray]<rent|buy> Macht die Regionen zu kauf- oder Mietregionen"
+  - "[gray][Gruppe] Eine Gruppe, die zu den erstellten Regionen hinzugefügt wird."
+  - "Die Regionen werden in deiner Blickrichtung erstellt."
 "stack-accepted": "Erstelle %0% %1% Regionen mit %2% Blöcken Abstand, Namen beginnend mit %3% und einer Zahl dahinter. %4%"
 "stack-addToGroup": "Gruppe '%0%' wird zu den erstellten Regionen hinzugefügt."
 "stack-noPermission": "Du hast keine Berechtigungen um Regionen massenweise in AreaShop zu erstellen und hinzuzufügen."
@@ -482,30 +482,30 @@
 "message-noPermission": "Du hast keine Berechtigung AreaShop Nachrichten zu senden."
 "message-notOnline": "%0% ist nicht online."
 "confirm-rent":
-- "%lang:prefix%Bist du sicher, dass du %lang:tRegion|%0%|% mieten willst?"
-- "[darkgreen][bold]►[reset] %lang:button|Klick zum Mieten %0%|%"
-- "hover: %lang:action|Rent %0%|%"
-- "command: /areashop rent %0%"
+  - "%lang:prefix%Bist du sicher, dass du %lang:tRegion|%0%|% mieten willst?"
+  - "[darkgreen][bold]►[reset] %lang:button|Klick zum Mieten %0%|%"
+  - "hover: %lang:action|Rent %0%|%"
+  - "command: /areashop rent %0%"
 "confirm-extend":
-- "%lang:prefix%Bist du sicher, dass du %lang:tRegion|%0%|% verlängern willst?"
-- "[darkgreen][bold]►[reset] %lang:button|Klick zum Verlängern %0%|%"
-- "hover: %lang:action|Verlängern %0%|%"
-- "command: /areashop rent %0%"
+  - "%lang:prefix%Bist du sicher, dass du %lang:tRegion|%0%|% verlängern willst?"
+  - "[darkgreen][bold]►[reset] %lang:button|Klick zum Verlängern %0%|%"
+  - "hover: %lang:action|Verlängern %0%|%"
+  - "command: /areashop rent %0%"
 "confirm-unrent":
-- "%lang:prefix%Bist du sicher, dass du %lang:tRegion|%0%|% nicht länger mieten möchtest?"
-- "[darkgreen][bold]►[reset] %lang:button|Klick zum Auflösen %0%|%"
-- "hover: %lang:action|Mietvertrag auslösen %0%|%"
-- "command: /areashop unrent %0%"
+  - "%lang:prefix%Bist du sicher, dass du %lang:tRegion|%0%|% nicht länger mieten möchtest?"
+  - "[darkgreen][bold]►[reset] %lang:button|Klick zum Auflösen %0%|%"
+  - "hover: %lang:action|Mietvertrag auslösen %0%|%"
+  - "command: /areashop unrent %0%"
 "confirm-buy":
-- "%lang:prefix% Bist du sicher das du %lang:tRegion|%0%|% kaufen möchtest?[break]"
-- "[darkgreen][bold]►[reset] %lang:button|Click to buy %0%|%"
-- "    hover: %lang:action|Buy %0%|%"
-- "    command: /areashop buy %0% "
+  - "%lang:prefix% Bist du sicher das du %lang:tRegion|%0%|% kaufen möchtest?[break]"
+  - "[darkgreen][bold]►[reset] %lang:button|Click to buy %0%|%"
+  - "    hover: %lang:action|Buy %0%|%"
+  - "    command: /areashop buy %0% "
 "confirm-sell":
-- "%lang:prefix% Bist du sicher, dass du %lang:tRegion|%0%|% verkaufen willst?[break]"
-- "[darkgreen][bold]►[reset] %lang:button|Klick zum Verkaufen von %0%|%"
-- "    hover: %lang:action|Verkaufe %0%|%"
-- "    command: /areashop sell %0% "
+  - "%lang:prefix% Bist du sicher, dass du %lang:tRegion|%0%|% verkaufen willst?[break]"
+  - "[darkgreen][bold]►[reset] %lang:button|Klick zum Verkaufen von %0%|%"
+  - "    hover: %lang:action|Verkaufe %0%|%"
+  - "    command: /areashop sell %0% "
 "timeleft-years": "%0% Jahre"
 "timeleft-months": "%0% Monate"
 "timeleft-days": "%0% Tage"
@@ -518,4 +518,4 @@
 "greeting-rented": "%region% ist vermietet an %player% bis %until%."
 "greeting-forsale": "%region% kann gekauft werden für %price%."
 "greeting-bought": "%region% ist Eigentum von %player%."
-"greeting-resale": "%region% kann für %resellprice% von 1%player% gekauft werden."
+"greeting-resale": "%region% kann für %resellprice% von 1%player% gekauft werden."