From 8096c3ddfc4948032346cac51abb3bbaa781e243 Mon Sep 17 00:00:00 2001
From: Thomas Meaney <thomas.meaney@icloud.com>
Date: Wed, 25 Jun 2025 23:10:00 +0200
Subject: [PATCH 01/11] Make config fields statically accessible

---
 .../api/world/util/WorldPermissions.java      |   5 +-
 buildsystem-core/build.gradle.kts             | 152 ++++++
 .../buildsystem/BuildSystemPlugin.java        |  52 +-
 .../de/eintosti/buildsystem/Messages.java     |   3 +-
 .../buildsystem/command/SpawnCommand.java     |   3 +-
 .../buildsystem/command/TimeCommand.java      |   8 +-
 .../buildsystem/command/WorldsCommand.java    |   2 +-
 .../subcommand/worlds/InfoSubCommand.java     |   2 -
 .../subcommand/worlds/ItemSubCommand.java     |   9 +-
 .../subcommand/worlds/SetItemSubCommand.java  |   2 -
 .../eintosti/buildsystem/config/Config.java   | 496 ++++++++++++++++++
 .../buildsystem/config/ConfigValues.java      | 392 --------------
 .../BuildModePreventationListener.java        |   8 +-
 .../listener/EntityDamageListener.java        |   8 +-
 .../listener/NavigatorListener.java           |  10 +-
 .../listener/PlayerChangedWorldListener.java  |  19 +-
 .../PlayerCommandPreprocessListener.java      |  11 +-
 .../PlayerInventoryClearListener.java         |   6 +-
 .../listener/PlayerJoinListener.java          |  16 +-
 .../listener/PlayerQuitListener.java          |   3 +-
 .../listener/SettingsInteractListener.java    |   8 +-
 .../listener/WeatherChangeListener.java       |   9 +-
 .../listener/WorldManipulateListener.java     |   3 +-
 .../buildsystem/player/BuildPlayerImpl.java   |   2 -
 .../buildsystem/player/PlayerServiceImpl.java |  24 +-
 .../player/settings/SettingsInventory.java    |  14 +-
 .../player/settings/SettingsManager.java      |   8 +-
 .../buildsystem/storage/WorldStorageImpl.java |   6 +-
 .../storage/yaml/YamlWorldStorage.java        |   2 +-
 .../eintosti/buildsystem/util/FileUtils.java  |  26 +
 .../buildsystem/util/StringCleaner.java       |  16 +-
 .../util/inventory/InventoryUtils.java        |   3 +-
 .../util/inventory/MaterialUtils.java         |   3 -
 .../buildsystem/world/BuildWorldImpl.java     |   3 +-
 .../buildsystem/world/WorldServiceImpl.java   |   8 +-
 .../world/creation/BuildWorldCreatorImpl.java |  41 +-
 .../buildsystem/world/data/WorldDataImpl.java |  39 +-
 .../world/modification/EditInventory.java     |  50 +-
 .../world/util/WorldTeleporterImpl.java       |   3 +-
 .../world/util/WorldUnloaderImpl.java         |  20 +-
 .../src/main/resources/config.yml             |  14 +-
 .../src/main/resources/plugin.yml             | 123 -----
 42 files changed, 861 insertions(+), 771 deletions(-)
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
 delete mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/config/ConfigValues.java
 delete mode 100644 buildsystem-core/src/main/resources/plugin.yml

diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/util/WorldPermissions.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/util/WorldPermissions.java
index 503a7628..9a9b40a7 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/util/WorldPermissions.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/util/WorldPermissions.java
@@ -18,6 +18,7 @@
 package de.eintosti.buildsystem.api.world.util;
 
 import de.eintosti.buildsystem.api.world.BuildWorld;
+import de.eintosti.buildsystem.api.world.builder.Builder;
 import de.eintosti.buildsystem.api.world.data.BuildWorldStatus;
 import java.util.function.Supplier;
 import org.bukkit.entity.Player;
@@ -48,13 +49,13 @@ public interface WorldPermissions {
     boolean canEnter(Player player);
 
     /**
-     * Determines if the given {@link Player} can modify the {@link de.eintosti.buildsystem.api.world.BuildWorld} they are currently in.
+     * Determines if the given {@link Player} can modify the {@link BuildWorld} they are currently in.
      * <p>
      * Modifications might be disallowed due to:
      * <ul>
      *     <li>The world having its {@link BuildWorldStatus} set to {@link BuildWorldStatus#ARCHIVE}.</li>
      *     <li>A world setting is enabled that specifically prohibits certain events (e.g., block placement/breaking).</li>
-     *     <li>The world is configured to only allow designated {@link de.eintosti.buildsystem.api.world.builder.Builder}s, and the player is neither a builder nor the world's creator.</li>
+     *     <li>The world is configured to only allow designated {@link Builder}s, and the player is neither a builder nor the world's creator.</li>
      * </ul>
      * However, a player can bypass these restrictions if:
      * <ul>
diff --git a/buildsystem-core/build.gradle.kts b/buildsystem-core/build.gradle.kts
index 960b6c1d..e9224dd8 100644
--- a/buildsystem-core/build.gradle.kts
+++ b/buildsystem-core/build.gradle.kts
@@ -1,10 +1,12 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
 
 applyCoreConfiguration()
 
 plugins {
     id("java-library")
     id("com.gradleup.shadow") version "8.3.7"
+    id("de.eldoria.plugin-yml.bukkit") version "0.7.1"
 }
 
 project.description = "Core"
@@ -49,6 +51,8 @@ dependencies {
     implementation(libs.fastboard)
     implementation(libs.nbt) { isTransitive = false }
     implementation(libs.bstats)
+
+    library("net.lingala.zip4j", "zip4j", "2.11.5")
 }
 
 tasks.named("assemble") {
@@ -72,4 +76,152 @@ tasks.processResources {
     filesMatching("plugin.yml") {
         expand(props)
     }
+}
+
+bukkit {
+    name = "BuildSystem"
+    version = "${project.version}"
+    description = "Powerful, easy to use system for builders"
+    author = "einTosti"
+    website = "https://buildsystem.eintosti.de"
+
+    main = "de.eintosti.buildsystem.BuildSystemPlugin"
+    apiVersion = "1.13"
+    softDepend = listOf("LuckPerms", "PlaceholderAPI", "WorldEdit", "AxiomPaper")
+
+    commands {
+        register("back") {
+            description = "Teleports you to your previous location."
+            usage = "/<command>"
+        }
+        register("blocks") {
+            description = "Opens a menu with secret blocks."
+            usage = "/<command>"
+        }
+        register("build") {
+            description = "Bypass build restrictions."
+            usage = "/<command> [player]"
+        }
+        register("buildsystem") {
+            description = "Overview of all plugin commands."
+            usage = "/<command>"
+        }
+        register("config") {
+            description = "Reload the config."
+            usage = "/<command> reload"
+        }
+        register("day") {
+            description = "Set a world's time to daytime."
+            usage = "/<command> [world]"
+        }
+        register("explosions") {
+            description = "Toggle explosions within a world."
+            usage = "/<command> [world]"
+        }
+        register("gamemode") {
+            description = "Change your gamemode."
+            aliases = listOf("gm")
+            usage = "/<command> <mode> [player]"
+        }
+        register("night") {
+            description = "Set a world's time to nighttime."
+            usage = "/<command> [world]"
+        }
+        register("noai") {
+            description = "Disable all the entity AIs in a world."
+            usage = "/<command> [world]"
+        }
+        register("physics") {
+            description = "Toggle block physics."
+            usage = "/<command> [world]"
+        }
+        register("settings") {
+            description = "Manage user settings."
+            usage = "/<command>"
+        }
+        register("setup") {
+            description = "Change the default items in used in the navigator."
+            usage = "/<command>"
+        }
+        register("skull") {
+            description = "Receive a player's skull."
+            usage = "/<command> [name]"
+        }
+        register("spawn") {
+            description = "Teleport to the spawn."
+            usage = "/<command>"
+        }
+        register("speed") {
+            description = "Change your flying/walking speed."
+            aliases = listOf("s")
+            usage = "/<command> [1-5]"
+        }
+        register("top") {
+            description = "Teleports you to the highest location."
+            usage = "/<command>"
+        }
+        register("worlds") {
+            description = "Open the world menu."
+            aliases = listOf("w")
+            usage = "/<command>"
+        }
+    }
+    permissions {
+        register("buildsystem.help") {
+            children = listOf("buildsystem.help.buildsystem", "buildsystem.help.worlds")
+            description = "Permission for help commands."
+            default = BukkitPluginDescription.Permission.Default.TRUE
+        }
+        register("buildsystem.navigator") {
+            description = "Open the worlds navigator."
+            default = BukkitPluginDescription.Permission.Default.TRUE
+        }
+        register("buildsystem.navigator.item") {
+            description = "Receive and use the navigator."
+            default = BukkitPluginDescription.Permission.Default.TRUE
+        }
+        register("buildsystem.create") {
+            children = listOf(
+                "buildsystem.create.private",
+                "buildsystem.create.type.normal",
+                "buildsystem.create.type.flat",
+                "buildsystem.create.type.nether",
+                "buildsystem.create.type.end",
+                "buildsystem.create.type.void"
+            )
+            description = "Permission for creating world types."
+            default = BukkitPluginDescription.Permission.Default.TRUE
+        }
+        register("buildsystem.setstatus") {
+            children = listOf(
+                "buildsystem.setstatus.hidden",
+                "buildsystem.setstatus.archive",
+                "buildsystem.setstatus.finished",
+                "buildsystem.setstatus.almostfinished",
+                "buildsystem.setstatus.inprogress",
+                "buildsystem.setstatus.notstarted"
+            )
+            description = "Permission for setting world status."
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
+        register("buildsystem.gamemode") {
+            children = listOf("buildsystem.gamemode.survival", "buildsystem.gamemode.creative", "buildsystem.gamemode.adventure", "buildsystem.gamemode.spectator")
+            description = "Permission for changing own gamemode."
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
+        register("buildsystem.gamemode.other") {
+            children =
+                listOf("buildsystem.gamemode.survival.other", "buildsystem.gamemode.creative.other", "buildsystem.gamemode.adventure.other", "buildsystem.gamemode.spectator.other")
+            description = "Permission for changing other player's gamemode."
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
+        register("buildsystem.physics.message") {
+            description = "Receive the message that physics are disabled in a world."
+            default = BukkitPluginDescription.Permission.Default.TRUE
+        }
+        register("buildsystem.updates") {
+            description = "Receive update messages."
+            default = BukkitPluginDescription.Permission.Default.OP
+        }
+    }
 }
\ No newline at end of file
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
index 577fc6c0..9d22152c 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
@@ -39,7 +39,12 @@
 import de.eintosti.buildsystem.command.TimeCommand;
 import de.eintosti.buildsystem.command.TopCommand;
 import de.eintosti.buildsystem.command.WorldsCommand;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config;
+import de.eintosti.buildsystem.config.Config.Folder;
+import de.eintosti.buildsystem.config.Config.Settings.Archive;
+import de.eintosti.buildsystem.config.Config.Settings.Builder;
+import de.eintosti.buildsystem.config.Config.World;
+import de.eintosti.buildsystem.config.Config.World.Unload;
 import de.eintosti.buildsystem.expansion.luckperms.LuckPermsExpansion;
 import de.eintosti.buildsystem.expansion.placeholderapi.PlaceholderApiExpansion;
 import de.eintosti.buildsystem.listener.AsyncPlayerChatListener;
@@ -115,8 +120,6 @@ public class BuildSystemPlugin extends JavaPlugin {
     private SettingsManager settingsManager;
     private SpawnManager spawnManager;
     private WorldServiceImpl worldService;
-
-    private ConfigValues configValues;
     private CustomizableIcons customizableIcons;
 
     private LuckPermsExpansion luckPermsExpansion;
@@ -126,15 +129,15 @@ public class BuildSystemPlugin extends JavaPlugin {
 
     @Override
     public void onLoad() {
-        createTemplateFolder();
+        this.getConfig().options().copyDefaults(true);
+        this.saveConfig();
+        Config.load(this);
         Messages.createMessageFile();
+        createTemplateFolder();
     }
 
     @Override
     public void onEnable() {
-        this.getConfig().options().copyDefaults(true);
-        this.saveConfig();
-
         initClasses();
 
         registerCommands();
@@ -191,7 +194,6 @@ public void onDisable() {
     }
 
     private void initClasses() {
-        this.configValues = new ConfigValues(this);
         this.customizableIcons = new CustomizableIcons(this);
 
         this.armorStandManager = new ArmorStandManager();
@@ -264,16 +266,14 @@ private void registerListeners() {
 
     private void registerStats() {
         Metrics metrics = new Metrics(this, METRICS_ID);
-        metrics.addCustomChart(new SimplePie("archive_vanish", () -> String.valueOf(configValues.isArchiveVanish())));
-        metrics.addCustomChart(new SimplePie("block_world_edit", () -> String.valueOf(configValues.isBlockWorldEditNonBuilder())));
-        metrics.addCustomChart(new SimplePie("join_quit_messages", () -> String.valueOf(configValues.isJoinQuitMessages())));
-        metrics.addCustomChart(new SimplePie("lock_weather", () -> String.valueOf(configValues.isLockWeather())));
-        metrics.addCustomChart(new SimplePie("scoreboard", () -> String.valueOf(configValues.isScoreboard())));
-        metrics.addCustomChart(new SimplePie("teleport_after_creation", () -> String.valueOf(configValues.isTeleportAfterCreation())));
-        metrics.addCustomChart(new SimplePie("update_checker", () -> String.valueOf(configValues.isUpdateChecker())));
-        metrics.addCustomChart(new SimplePie("unload_worlds", () -> String.valueOf(configValues.isUnloadWorlds())));
-        metrics.addCustomChart(new SimplePie("void_block", () -> String.valueOf(configValues.isVoidBlock())));
-        metrics.addCustomChart(new AdvancedPie("navigator_type", new Callable<Map<String, Integer>>() {
+        metrics.addCustomChart(new SimplePie("archive_vanish", () -> String.valueOf(Archive.vanish)));
+        metrics.addCustomChart(new SimplePie("block_world_edit", () -> String.valueOf(Builder.blockWorldEditNonBuilder)));
+        metrics.addCustomChart(new SimplePie("join_quit_messages", () -> String.valueOf(Config.Messages.joinQuitMessages)));
+        metrics.addCustomChart(new SimplePie("lock_weather", () -> String.valueOf(World.lockWeather)));
+        metrics.addCustomChart(new SimplePie("scoreboard", () -> String.valueOf(Config.Settings.scoreboard)));
+        metrics.addCustomChart(new SimplePie("update_checker", () -> String.valueOf(Config.Settings.updateChecker)));
+        metrics.addCustomChart(new SimplePie("unload_worlds", () -> String.valueOf(Unload.enabled)));
+        metrics.addCustomChart(new AdvancedPie("navigator_type", new Callable<>() {
             @Override
             public Map<String, Integer> call() {
                 Map<String, Integer> valueMap = new HashMap<>();
@@ -288,8 +288,8 @@ private int getPlayersWithNavigator(NavigatorType navigatorType) {
                         .count();
             }
         }));
-        metrics.addCustomChart(new SimplePie("folder_override_permissions", () -> String.valueOf(configValues.isFolderOverridePermissions())));
-        metrics.addCustomChart(new SimplePie("folder_override_projects", () -> String.valueOf(configValues.isFolderOverrideProjects())));
+        metrics.addCustomChart(new SimplePie("folder_override_permissions", () -> String.valueOf(Folder.overridePermissions)));
+        metrics.addCustomChart(new SimplePie("folder_override_projects", () -> String.valueOf(Folder.overrideProjects)));
     }
 
     private void registerExpansions() {
@@ -311,7 +311,7 @@ private void registerExpansions() {
 
         boolean isWorldEdit = pluginManager.getPlugin("WorldEdit") != null
                 || pluginManager.getPlugin("FastAsyncWorldEdit") != null;
-        if (isWorldEdit && configValues.isBlockWorldEditNonBuilder()) {
+        if (isWorldEdit && Builder.blockWorldEditNonBuilder) {
             new EditSessionListener(this);
         }
     }
@@ -327,7 +327,7 @@ private void unregisterExpansions() {
     }
 
     private void performUpdateCheck() {
-        if (!configValues.isUpdateChecker()) {
+        if (!Config.Settings.updateChecker) {
             return;
         }
 
@@ -378,12 +378,12 @@ public void reloadConfigData(boolean init) {
         }
 
         reloadConfig();
-        configValues.setConfigValues();
+        Config.load(this);
 
         if (init) {
             worldService.getWorldStorage().getBuildWorlds().forEach(buildWorld -> buildWorld.getUnloader().manageUnload());
 
-            if (configValues.isScoreboard()) {
+            if (Config.Settings.scoreboard) {
                 getSettingsManager().startScoreboard();
             } else {
                 getSettingsManager().stopScoreboard();
@@ -419,10 +419,6 @@ public WorldServiceImpl getWorldService() {
         return worldService;
     }
 
-    public ConfigValues getConfigValues() {
-        return configValues;
-    }
-
     public CustomizableIcons getCustomizableIcons() {
         return customizableIcons;
     }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java
index b786cb60..90b3150d 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java
@@ -19,6 +19,7 @@
 
 import de.eintosti.buildsystem.api.world.data.BuildWorldStatus;
 import de.eintosti.buildsystem.api.world.data.BuildWorldType;
+import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.util.color.ColorAPI;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -1048,7 +1049,7 @@ private static String replacePlaceholders(String query, Map.Entry<String, Object
 
     public static String formatDate(long millis) {
         return millis > 0
-                ? new SimpleDateFormat(PLUGIN.getConfigValues().getDateFormat()).format(millis)
+                ? new SimpleDateFormat(Config.Messages.dateFormat).format(millis)
                 : "-";
     }
 }
\ No newline at end of file
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/SpawnCommand.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/SpawnCommand.java
index 71d1ed4f..9971790e 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/SpawnCommand.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/SpawnCommand.java
@@ -20,6 +20,7 @@
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.Messages;
 import de.eintosti.buildsystem.api.world.BuildWorld;
+import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.storage.WorldStorageImpl;
 import de.eintosti.buildsystem.world.SpawnManager;
 import java.util.Locale;
@@ -56,7 +57,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
             case 0 -> {
                 if (!spawnManager.teleport(player)) {
                     Messages.sendMessage(player, "spawn_unavailable");
-                } else if (plugin.getConfigValues().isSpawnTeleportMessage()) {
+                } else if (Config.Messages.spawnTeleportMessage) {
                     Messages.sendMessage(player, "spawn_teleported");
                 }
             }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/TimeCommand.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/TimeCommand.java
index 1b013fb1..4171f888 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/TimeCommand.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/TimeCommand.java
@@ -21,7 +21,7 @@
 import de.eintosti.buildsystem.Messages;
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.util.WorldPermissions;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.World.Default.Time;
 import java.util.Locale;
 import java.util.Map;
 import org.bukkit.Bukkit;
@@ -35,11 +35,9 @@
 public class TimeCommand implements CommandExecutor {
 
     private final BuildSystemPlugin plugin;
-    private final ConfigValues configValues;
 
     public TimeCommand(BuildSystemPlugin plugin) {
         this.plugin = plugin;
-        this.configValues = plugin.getConfigValues();
         plugin.getCommand("day").setExecutor(this);
         plugin.getCommand("night").setExecutor(this);
     }
@@ -70,7 +68,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
 
                 switch (args.length) {
                     case 0, 1 -> {
-                        world.setTime(configValues.getNoonTime());
+                        world.setTime(Time.noon);
                         Messages.sendMessage(player, "day_set", Map.entry("%world%", world.getName()));
                     }
                     default -> Messages.sendMessage(player, "day_usage");
@@ -85,7 +83,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
 
                 switch (args.length) {
                     case 0, 1 -> {
-                        world.setTime(configValues.getNightTime());
+                        world.setTime(Time.night);
                         Messages.sendMessage(player, "night_set", Map.entry("%world%", world.getName()));
                     }
                     default -> {
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/WorldsCommand.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/WorldsCommand.java
index 1dbe4549..4fe77fff 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/WorldsCommand.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/WorldsCommand.java
@@ -97,7 +97,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
             case IMPORT_ALL -> new ImportAllSubCommand(plugin);
             case IMPORT -> new ImportSubCommand(plugin, worldName);
             case INFO -> new InfoSubCommand(plugin, worldName);
-            case ITEM -> new ItemSubCommand(plugin);
+            case ITEM -> new ItemSubCommand();
             case REMOVE_BUILDER -> new RemoveBuilderSubCommand(plugin, player.getWorld().getName());
             case REMOVE_SPAWN -> new RemoveSpawnSubCommand(plugin);
             case RENAME -> new RenameSubCommand(plugin, worldName);
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/InfoSubCommand.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/InfoSubCommand.java
index 738babb8..7e6eb34c 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/InfoSubCommand.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/InfoSubCommand.java
@@ -33,11 +33,9 @@
 
 public class InfoSubCommand implements SubCommand {
 
-    private final BuildSystemPlugin plugin;
     private final BuildWorld buildWorld;
 
     public InfoSubCommand(BuildSystemPlugin plugin, String worldName) {
-        this.plugin = plugin;
         this.buildWorld = plugin.getWorldService().getWorldStorage().getBuildWorld(worldName);
     }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/ItemSubCommand.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/ItemSubCommand.java
index c09c0884..5d36381a 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/ItemSubCommand.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/ItemSubCommand.java
@@ -17,10 +17,10 @@
  */
 package de.eintosti.buildsystem.command.subcommand.worlds;
 
-import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.Messages;
 import de.eintosti.buildsystem.command.subcommand.Argument;
 import de.eintosti.buildsystem.command.subcommand.SubCommand;
+import de.eintosti.buildsystem.config.Config.Settings.Navigator;
 import de.eintosti.buildsystem.tabcomplete.WorldsTabComplete;
 import de.eintosti.buildsystem.util.inventory.InventoryUtils;
 import org.bukkit.entity.Player;
@@ -28,10 +28,7 @@
 
 public class ItemSubCommand implements SubCommand {
 
-    private final BuildSystemPlugin plugin;
-
-    public ItemSubCommand(BuildSystemPlugin plugin) {
-        this.plugin = plugin;
+    public ItemSubCommand() {
     }
 
     @Override
@@ -42,7 +39,7 @@ public void execute(Player player, String[] args) {
         }
 
         ItemStack navigator = InventoryUtils.createItem(
-                plugin.getConfigValues().getNavigatorItem(),
+                Navigator.item,
                 Messages.getString("navigator_item", player)
         );
         player.getInventory().addItem(navigator);
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/SetItemSubCommand.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/SetItemSubCommand.java
index 116752d6..45894b69 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/SetItemSubCommand.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/SetItemSubCommand.java
@@ -32,11 +32,9 @@
 
 public class SetItemSubCommand implements SubCommand {
 
-    private final BuildSystemPlugin plugin;
     private final BuildWorld buildWorld;
 
     public SetItemSubCommand(BuildSystemPlugin plugin, String worldName) {
-        this.plugin = plugin;
         this.buildWorld = plugin.getWorldService().getWorldStorage().getBuildWorld(worldName);
     }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
new file mode 100644
index 00000000..36c557c0
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
@@ -0,0 +1,496 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.eintosti.buildsystem.config;
+
+import com.cryptomorin.xseries.XMaterial;
+import de.eintosti.buildsystem.config.Config.Settings.Archive;
+import de.eintosti.buildsystem.config.Config.Settings.BuildMode;
+import de.eintosti.buildsystem.config.Config.Settings.Builder;
+import de.eintosti.buildsystem.config.Config.Settings.Navigator;
+import de.eintosti.buildsystem.config.Config.Settings.SaveFromDeath;
+import de.eintosti.buildsystem.config.Config.World.Backup;
+import de.eintosti.buildsystem.config.Config.World.Default;
+import de.eintosti.buildsystem.config.Config.World.Default.Permission;
+import de.eintosti.buildsystem.config.Config.World.Default.Settings.BuildersEnabled;
+import de.eintosti.buildsystem.config.Config.World.Default.Time;
+import de.eintosti.buildsystem.config.Config.World.Limits;
+import de.eintosti.buildsystem.config.Config.World.Unload;
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.bukkit.Difficulty;
+import org.bukkit.GameMode;
+import org.bukkit.GameRule;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.java.JavaPlugin;
+
+/**
+ * Manages the plugin's configuration, loading and providing access to various settings.
+ */
+public class Config {
+
+    /**
+     * Stores messages related configurations.
+     */
+    public static class Messages {
+
+        /**
+         * Whether a message should be sent to the player when teleporting to a world's spawn.
+         */
+        public static boolean spawnTeleportMessage = false;
+        /**
+         * Whether join and quit messages should be enabled.
+         */
+        public static boolean joinQuitMessages = true;
+        /**
+         * The date format used for various date displays.
+         */
+        public static String dateFormat = "dd/MM/yyyy";
+    }
+
+    /**
+     * Stores general settings for the plugin.
+     */
+    public static class Settings {
+
+        /**
+         * Whether the update checker should be enabled.
+         */
+        public static boolean updateChecker = true;
+        /**
+         * Whether the scoreboard should be enabled.
+         */
+        public static boolean scoreboard = true;
+
+        /**
+         * Stores archive-related settings.
+         */
+        public static class Archive {
+
+            /**
+             * Whether players should be vanished when entering an archived world.
+             */
+            public static boolean vanish = true;
+            /**
+             * Whether the gamemode should be changed when entering an archived world.
+             */
+            public static boolean changeGamemode = true;
+            /**
+             * The gamemode players are set to when entering an archived world.
+             */
+            public static GameMode worldGameMode = GameMode.ADVENTURE;
+        }
+
+        /**
+         * Stores settings related to saving players from death.
+         */
+        public static class SaveFromDeath {
+
+            /**
+             * Whether saving players from death should be enabled.
+             */
+            public static boolean enabled = true;
+            /**
+             * Whether players should be teleported to the map spawn after being saved from death.
+             */
+            public static boolean teleportToMapSpawn = true;
+        }
+
+        /**
+         * Stores build mode related settings.
+         */
+        public static class BuildMode {
+
+            /**
+             * Whether items should be dropped when a player dies in build mode.
+             */
+            public static boolean dropItems = true;
+            /**
+             * Whether players can move items in their inventory in build mode.
+             */
+            public static boolean moveItems = true;
+        }
+
+        /**
+         * Stores builder-related settings.
+         */
+        public static class Builder {
+
+            /**
+             * Whether WorldEdit usage should be blocked for non-builders.
+             */
+            public static boolean blockWorldEditNonBuilder = true;
+            /**
+             * The {@link XMaterial} of the WorldEdit wand.
+             */
+            public static XMaterial worldEditWand = XMaterial.WOODEN_AXE;
+        }
+
+        /**
+         * Stores navigator-related settings.
+         */
+        public static class Navigator {
+
+            /**
+             * The {@link XMaterial} of the navigator item.
+             */
+            public static XMaterial item = XMaterial.CLOCK;
+            /**
+             * Whether the navigator item should be given to players on join.
+             */
+            public static boolean giveItemOnJoin = true;
+        }
+    }
+
+    /**
+     * Stores world-related configurations.
+     */
+    public static class World {
+
+        /**
+         * Whether the weather should be locked in worlds.
+         */
+        public static boolean lockWeather = true;
+        /**
+         * A regex string of invalid characters for world names.
+         */
+        public static String invalidCharacters = "^\b$";
+        /**
+         * The delay in seconds for the /build import all command.
+         */
+        public static int importAllDelay = 30;
+
+        /**
+         * Stores default world settings.
+         */
+        public static class Default {
+
+            /**
+             * The default world border size.
+             */
+            public static int worldBoarderSize = 6000000;
+            /**
+             * The default difficulty for new worlds.
+             */
+            public static Difficulty difficulty = Difficulty.PEACEFUL;
+            /**
+             * Default game rules for new worlds.
+             */
+            public static Map<GameRule<?>, Object> gameRules = Map.of(
+                    GameRule.DO_DAYLIGHT_CYCLE, false,
+                    GameRule.DO_MOB_SPAWNING, false,
+                    GameRule.DO_FIRE_TICK, false
+            );
+
+            /**
+             * Stores permission-related settings for default worlds.
+             */
+            public static class Permission {
+
+                /**
+                 * The permission required to access public worlds by default.
+                 */
+                public static String publicPermission = "-";
+                /**
+                 * The permission required to access private worlds by default. The `%world%` placeholder will be replaced with the world name.
+                 */
+                public static String privatePermission = "worlds.%world%";
+            }
+
+            /**
+             * Stores time-related settings for default worlds.
+             */
+            public static class Time {
+
+                /**
+                 * The time of sunrise in ticks.
+                 */
+                public static int sunrise = 0;
+                /**
+                 * The time of noon in ticks.
+                 */
+                public static int noon = 6000;
+                /**
+                 * The time of night in ticks.
+                 */
+                public static int night = 18000;
+            }
+
+            /**
+             * Stores various settings for default worlds.
+             */
+            public static class Settings {
+
+                /**
+                 * Whether physics should be enabled by default.
+                 */
+                public static boolean physics = true;
+                /**
+                 * Whether explosions should be enabled by default.
+                 */
+                public static boolean explosions = true;
+                /**
+                 * Whether mob AI should be enabled by default.
+                 */
+                public static boolean mobAi = true;
+                /**
+                 * Whether block breaking should be enabled by default.
+                 */
+                public static boolean blockBreaking = true;
+                /**
+                 * Whether block placement should be enabled by default.
+                 */
+                public static boolean blockPlacement = true;
+                /**
+                 * Whether block interactions should be enabled by default.
+                 */
+                public static boolean blockInteractions = true;
+
+                /**
+                 * Stores settings for builders being enabled by default.
+                 */
+                public static class BuildersEnabled {
+
+                    /**
+                     * Whether builders are enabled by default for public worlds.
+                     */
+                    public static boolean publicBuilders = false;
+                    /**
+                     * Whether builders are enabled by default for private worlds.
+                     */
+                    public static boolean privateBuilders = true;
+                }
+            }
+        }
+
+        /**
+         * Stores world limit settings.
+         */
+        public static class Limits {
+
+            /**
+             * The maximum number of public worlds a player can have. -1 for unlimited.
+             */
+            public static int publicWorlds = -1;
+            /**
+             * The maximum number of private worlds a player can have. -1 for unlimited.
+             */
+            public static int privateWorlds = -1;
+        }
+
+        /**
+         * Stores world unload settings.
+         */
+        public static class Unload {
+
+            /**
+             * Whether world unloading is enabled.
+             */
+            public static boolean enabled = true;
+            /**
+             * The time until a world is unloaded after all players have left (HH:mm:ss).
+             */
+            public static String timeUntilUnload = "01:00:00";
+            /**
+             * A set of worlds that should not be unloaded.
+             */
+            public static Set<String> blacklistedWorlds = Set.of("world", "world_nether", "worth_the_end");
+        }
+
+        /**
+         * Stores backup-related settings.
+         */
+        public static class Backup {
+
+            /**
+             * Whether world backups are enabled.
+             */
+            public static boolean enabled = true;
+            /**
+             * The interval in seconds between automatic backups.
+             */
+            public static int backupInterval = 900;
+            /**
+             * The maximum number of backups to keep per world.
+             */
+            public static int maxBackupsPerWorld = 9;
+        }
+    }
+
+    /**
+     * Stores folder-related settings.
+     */
+    public static class Folder {
+
+        /**
+         * Whether permissions should be overridden for folders.
+         */
+        public static boolean overridePermissions = true;
+        /**
+         * Whether projects should be overridden for folders.
+         */
+        public static boolean overrideProjects = false;
+    }
+
+    /**
+     * Loads the configuration values from the plugin's config.yml into the static fields.
+     *
+     * @param plugin The JavaPlugin instance.
+     */
+    public static void load(final JavaPlugin plugin) {
+        FileConfiguration config = plugin.getConfig();
+
+        // Messages
+        Messages.spawnTeleportMessage = config.getBoolean("messages.spawn-teleport-message", false);
+        Messages.joinQuitMessages = config.getBoolean("messages.join-quit-messages", true);
+        Messages.dateFormat = config.getString("messages.date-format", "dd/MM/yyyy");
+
+        // Settings
+        Settings.updateChecker = config.getBoolean("settings.update-checker", true);
+        Settings.scoreboard = config.getBoolean("settings.scoreboard", true);
+        // Settings - Archive
+        Archive.vanish = config.getBoolean("settings.archive.vanish", true);
+        Archive.changeGamemode = config.getBoolean("settings.archive.change-gamemode", true);
+        Archive.worldGameMode = parseGameMode(config.getString("settings.archive.world-game-mode"));
+        // Settings - Save from death
+        SaveFromDeath.enabled = config.getBoolean("settings.save-from-death.enable", true);
+        SaveFromDeath.teleportToMapSpawn = config.getBoolean("settings.save-from-death.teleport-to-map-spawn", true);
+        // Settings - Build mode
+        BuildMode.dropItems = config.getBoolean("settings.build-mode.drop-items", true);
+        BuildMode.moveItems = config.getBoolean("settings.build-mode.move-items", true);
+        // Settings - Builder
+        Builder.blockWorldEditNonBuilder = config.getBoolean("settings.builder.block-worldedit-non-builder", true);
+        Builder.worldEditWand = parseWorldEditWand(plugin);
+        // Settings - Navigator
+        Navigator.item = XMaterial.valueOf(config.getString("settings.navigator.item", "CLOCK"));
+        Navigator.giveItemOnJoin = config.getBoolean("settings.navigator.give-item-on-join", true);
+
+        // World
+        World.lockWeather = config.getBoolean("world.lock-weather", true);
+        World.invalidCharacters = config.getString("world.invalid-characters", "^\b$");
+        World.importAllDelay = config.getInt("world.import-all.delay", 30);
+        // World - Default
+        Default.worldBoarderSize = config.getInt("world.default.worldborder.size", 6000000);
+        Default.difficulty = Difficulty.valueOf(config.getString("world.default.difficulty", "PEACEFUL").toUpperCase(Locale.ROOT));
+        Default.gameRules = config.getConfigurationSection("world.default.gamerules")
+                .getValues(true)
+                .entrySet()
+                .stream()
+                .map(entry -> {
+                    GameRule<?> rule = GameRule.getByName(entry.getKey());
+                    return rule != null ? Map.entry(rule, entry.getValue()) : null;
+                })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+        // World - Default - Permission
+        Permission.publicPermission = config.getString("world.default.permission.public", "-");
+        Permission.privatePermission = config.getString("world.default.permission.private", "-");
+        // World - Default - Time
+        Time.sunrise = config.getInt("world.default.time.sunrise", 0);
+        Time.noon = config.getInt("world.default.time.noon", 6000);
+        Time.night = config.getInt("world.default.time.night", 18000);
+        // World - Default - Settings
+        Default.Settings.physics = config.getBoolean("world.default.settings.physics", true);
+        Default.Settings.explosions = config.getBoolean("world.default.settings.explosions", true);
+        Default.Settings.mobAi = config.getBoolean("world.default.settings.mob-ai", true);
+        Default.Settings.blockBreaking = config.getBoolean("world.default.settings.block-breaking", true);
+        Default.Settings.blockPlacement = config.getBoolean("world.default.settings.block-placement", true);
+        Default.Settings.blockInteractions = config.getBoolean("world.default.settings.block-interactions", true);
+        // World - Default - Settings - Builders Enabled
+        BuildersEnabled.publicBuilders = config.getBoolean("world.default.settings.builders-enabled.public", false);
+        BuildersEnabled.privateBuilders = config.getBoolean("world.default.settings.builders-enabled.private", true);
+        // World - Limits
+        Limits.publicWorlds = config.getInt("world.default.settings.public-worlds", -1);
+        Limits.privateWorlds = config.getInt("world.default.settings.private-worlds", -1);
+        // World - Unload
+        Unload.enabled = config.getBoolean("world.unload.enabled", false);
+        Unload.timeUntilUnload = config.getString("world.unload.time-until-unload", "01:00:00");
+        Unload.blacklistedWorlds = new HashSet<>(config.getStringList("world.unload.blacklisted-worlds"));
+        // World - Backup
+        Backup.enabled = config.getBoolean("world.backup.enabled", true);
+        Backup.backupInterval = config.getInt("world.backup.backup-interval", 900);
+        Backup.maxBackupsPerWorld = config.getInt("world.backup.max-backups-per-world", 9);
+
+        // Folder
+        Folder.overridePermissions = config.getBoolean("folder.override-permissions", true);
+        Folder.overrideProjects = config.getBoolean("folder.override-projects", false);
+    }
+
+    /**
+     * Parsing the {@link GameMode} from a string. Defaulting to {@link GameMode#ADVENTURE} if the string is not a valid {@link GameMode}.
+     *
+     * @param gameModeName The name of the {@link GameMode} to parse.
+     * @return The parsed {@link GameMode}.
+     */
+    private static GameMode parseGameMode(@Nullable String gameModeName) {
+        if (gameModeName == null) {
+            return GameMode.ADVENTURE;
+        }
+
+        return Arrays.stream(GameMode.values())
+                .filter(gameMode -> gameMode.name().equalsIgnoreCase(gameModeName))
+                .findAny()
+                .orElse(GameMode.ADVENTURE);
+    }
+
+    /**
+     * Parses the WorldEdit wand from the plugin's configuration.
+     *
+     * @param plugin The JavaPlugin instance.
+     * @return The parsed {@link XMaterial} for the WorldEdit wand.
+     */
+    private static XMaterial parseWorldEditWand(JavaPlugin plugin) {
+        File pluginDir = plugin.getDataFolder().getParentFile();
+        File configFile = null;
+
+        File weConfig = new File(pluginDir + File.separator + "WorldEdit", "config.yml");
+        if (weConfig.exists()) {
+            configFile = weConfig;
+        }
+
+        File faweConfig = new File(pluginDir + File.separator + "FastAsyncWorldEdit", "worldedit-config.yml");
+        if (faweConfig.exists()) {
+            configFile = faweConfig;
+        }
+
+        XMaterial defaultWand = XMaterial.WOODEN_AXE;
+        if (configFile == null) {
+            return defaultWand;
+        }
+
+        YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+        String wand = config.getString("wand-item");
+        if (wand == null) {
+            return defaultWand;
+        }
+
+        String namespace = "minecraft:";
+        if (wand.toLowerCase(Locale.ROOT).startsWith(namespace)) {
+            wand = wand.substring(namespace.length());
+        }
+
+        return XMaterial.matchXMaterial(wand).orElse(defaultWand);
+    }
+}
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/ConfigValues.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/ConfigValues.java
deleted file mode 100644
index 23f67e22..00000000
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/ConfigValues.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright (c) 2018-2025, Thomas Meaney
- * Copyright (c) contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package de.eintosti.buildsystem.config;
-
-import com.cryptomorin.xseries.XMaterial;
-import de.eintosti.buildsystem.BuildSystemPlugin;
-import java.io.File;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.Nullable;
-import org.bukkit.Difficulty;
-import org.bukkit.GameMode;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-public class ConfigValues {
-
-    private final BuildSystemPlugin plugin;
-
-    private String dateFormat;
-    private String timeUntilUnload;
-    private String defaultPublicPermission;
-    private String defaultPrivatePermission;
-    private String invalidNameCharacters;
-
-    private XMaterial navigatorItem;
-    private XMaterial worldEditWand;
-    private Difficulty worldDifficulty;
-
-    private boolean archiveChangeGameMode;
-    private GameMode archiveWorldGameMode;
-
-    private boolean archiveVanish;
-    private boolean scoreboard;
-    private boolean spawnTeleportMessage;
-    private boolean joinQuitMessages;
-    private boolean teleportAfterCreation;
-    private boolean buildModeDropItems;
-    private boolean buildModeMoveItems;
-    private boolean lockWeather;
-    private boolean unloadWorlds;
-    private boolean voidBlock;
-    private boolean updateChecker;
-    private boolean blockWorldEditNonBuilder;
-    private boolean giveNavigatorOnJoin;
-    private boolean worldPhysics;
-    private boolean worldExplosions;
-    private boolean worldMobAi;
-    private boolean worldBlockBreaking;
-    private boolean worldBlockPlacement;
-    private boolean worldBlockInteractions;
-    private boolean[] worldBuildersEnabled;
-    private boolean saveFromDeath;
-    private boolean teleportToMapSpawn;
-    private boolean folderOverridePermissions;
-    private boolean folderOverrideProjects;
-
-    private int sunriseTime;
-    private int noonTime;
-    private int nightTime;
-    private int worldBorderSize;
-    private int importDelay;
-    private int maxPublicWorldAmount;
-    private int maxPrivateWorldAmount;
-
-    private Map<String, String> defaultGameRules;
-    private Set<String> blackListedWorldsToUnload;
-
-    public ConfigValues(BuildSystemPlugin plugin) {
-        this.plugin = plugin;
-        setConfigValues();
-    }
-
-    public void setConfigValues() {
-        final FileConfiguration config = plugin.getConfig();
-
-        // Messages
-        this.spawnTeleportMessage = config.getBoolean("messages.spawn-teleport-message", false);
-        this.joinQuitMessages = config.getBoolean("messages.join-quit-messages", true);
-        this.dateFormat = config.getString("messages.date-format", "dd/MM/yyyy");
-
-        // Save from death
-        this.saveFromDeath = config.getBoolean("settings.save-from-death.enable", true);
-        this.teleportToMapSpawn = config.getBoolean("settings.save-from-death.teleport-to-map-spawn", true);
-
-        // Settings
-        this.updateChecker = config.getBoolean("settings.update-checker", true);
-        this.scoreboard = config.getBoolean("settings.scoreboard", true);
-        this.archiveVanish = config.getBoolean("settings.archive-vanish", true);
-        this.teleportAfterCreation = config.getBoolean("settings.teleport-after-creation", true);
-        this.buildModeDropItems = config.getBoolean("settings.build-mode.drop-items", true);
-        this.buildModeMoveItems = config.getBoolean("settings.build-mode.move-items", true);
-        this.archiveChangeGameMode = config.getBoolean("settings.archive-should-change-gamemode", true);
-        this.archiveWorldGameMode = parseGameMode(config.getString("settings.archive-world-game-mode"));
-
-        this.blockWorldEditNonBuilder = config.getBoolean("settings.builder.block-worldedit-non-builder", true);
-        this.worldEditWand = parseWorldEditWand();
-
-        this.navigatorItem = XMaterial.valueOf(config.getString("settings.navigator.item", "CLOCK"));
-        this.giveNavigatorOnJoin = config.getBoolean("settings.navigator.give-item-on-join", true);
-
-        // World
-        this.defaultPublicPermission = config.getString("world.default.permission.public", "-");
-        this.defaultPrivatePermission = config.getString("world.default.permission.private", "-");
-        this.lockWeather = config.getBoolean("world.lock-weather", true);
-        this.invalidNameCharacters = config.getString("world.invalid-characters", "^\b$");
-        this.worldDifficulty = Difficulty.valueOf(
-                config.getString("world.default.difficulty", "PEACEFUL").toUpperCase(Locale.ROOT)
-        );
-        this.sunriseTime = config.getInt("world.default.time.sunrise", 0);
-        this.noonTime = config.getInt("world.default.time.noon", 6000);
-        this.nightTime = config.getInt("world.default.time.night", 18000);
-
-        this.worldBorderSize = config.getInt("world.default.worldborder.size", 6000000);
-
-        Map<String, String> defaultGameRules = new HashMap<>();
-        ConfigurationSection configurationSection = config.getConfigurationSection("world.default.gamerules");
-        if (configurationSection != null) {
-            for (Map.Entry<String, Object> entry : configurationSection.getValues(true).entrySet()) {
-                String name = entry.getKey();
-                String value = entry.getValue().toString();
-                defaultGameRules.put(name, value);
-            }
-        }
-        this.defaultGameRules = defaultGameRules;
-
-        this.worldPhysics = config.getBoolean("world.default.settings.physics", true);
-        this.worldExplosions = config.getBoolean("world.default.settings.explosions", true);
-        this.worldMobAi = config.getBoolean("world.default.settings.mob-ai", true);
-        this.worldBlockBreaking = config.getBoolean("world.default.settings.block-breaking", true);
-        this.worldBlockPlacement = config.getBoolean("world.default.settings.block-placement", true);
-        this.worldBlockInteractions = config.getBoolean("world.default.settings.block-interactions", true);
-        this.worldBuildersEnabled = new boolean[]{
-                config.getBoolean("world.default.settings.builders-enabled.public", false),
-                config.getBoolean("world.default.settings.builders-enabled.private", true)
-        };
-
-        this.unloadWorlds = config.getBoolean("world.unload.enabled", true);
-        this.timeUntilUnload = config.getString("world.unload.time-until-unload", "01:00:00");
-        this.blackListedWorldsToUnload = new HashSet<>(config.getStringList("world.unload.blacklisted-worlds"));
-
-        this.importDelay = config.getInt("world.import-all.delay", 30);
-
-        this.maxPublicWorldAmount = config.getInt("world.max-amount.public", -1);
-        this.maxPrivateWorldAmount = config.getInt("world.max-amount.private", -1);
-
-        this.voidBlock = config.getBoolean("world.void-block", true);
-
-        // Folder
-        this.folderOverridePermissions = config.getBoolean("folder.override-permissions", true);
-        this.folderOverrideProjects = config.getBoolean("folder.override-projects", false);
-    }
-
-    /**
-     * Parsing the {@link GameMode} from a string. Defaulting to {@link GameMode#ADVENTURE} if the string is not a valid {@link GameMode}.
-     *
-     * @param gameModeName The name of the {@link GameMode} to parse.
-     * @return The parsed {@link GameMode}.
-     */
-    private GameMode parseGameMode(@Nullable String gameModeName) {
-        if (gameModeName == null) {
-            return GameMode.ADVENTURE;
-        }
-
-        return Arrays.stream(GameMode.values())
-                .filter(gameMode -> gameMode.name().equalsIgnoreCase(gameModeName))
-                .findAny()
-                .orElse(GameMode.ADVENTURE);
-    }
-
-    private XMaterial parseWorldEditWand() {
-        File pluginDir = plugin.getDataFolder().getParentFile();
-        File configFile = null;
-
-        File weConfig = new File(pluginDir + File.separator + "WorldEdit", "config.yml");
-        if (weConfig.exists()) {
-            configFile = weConfig;
-        }
-
-        File faweConfig = new File(pluginDir + File.separator + "FastAsyncWorldEdit", "worldedit-config.yml");
-        if (faweConfig.exists()) {
-            configFile = faweConfig;
-        }
-
-        XMaterial defaultWand = XMaterial.WOODEN_AXE;
-        if (configFile == null) {
-            return defaultWand;
-        }
-
-        YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-        String wand = config.getString("wand-item");
-        if (wand == null) {
-            return defaultWand;
-        }
-
-        String namespace = "minecraft:";
-        if (wand.toLowerCase(Locale.ROOT).startsWith(namespace)) {
-            wand = wand.substring(namespace.length());
-        }
-
-        return XMaterial.matchXMaterial(wand).orElse(defaultWand);
-    }
-
-    public String getDateFormat() {
-        return dateFormat;
-    }
-
-    public Difficulty getWorldDifficulty() {
-        return worldDifficulty;
-    }
-
-    public long getTimeUntilUnload() {
-        String[] timeArray = timeUntilUnload.split(":");
-        int hours = Integer.parseInt(timeArray[0]);
-        int minutes = Integer.parseInt(timeArray[1]);
-        int seconds = Integer.parseInt(timeArray[2]);
-        return hours * 3600L + minutes * 60L + seconds;
-    }
-
-    public boolean isArchiveVanish() {
-        return archiveVanish;
-    }
-
-    public boolean shouldArchiveChangeGameMode() {
-        return archiveChangeGameMode;
-    }
-
-    public GameMode getArchiveWorldGameMode() {
-        return archiveWorldGameMode;
-    }
-
-    public boolean isTeleportAfterCreation() {
-        return teleportAfterCreation;
-    }
-
-    public boolean isBuildModeDropItems() {
-        return buildModeDropItems;
-    }
-
-    public boolean isBuildModeMoveItems() {
-        return buildModeMoveItems;
-    }
-
-    public boolean isScoreboard() {
-        return scoreboard;
-    }
-
-    public boolean isSpawnTeleportMessage() {
-        return spawnTeleportMessage;
-    }
-
-    public boolean isJoinQuitMessages() {
-        return joinQuitMessages;
-    }
-
-    public boolean isLockWeather() {
-        return lockWeather;
-    }
-
-    public boolean isUnloadWorlds() {
-        return unloadWorlds;
-    }
-
-    public boolean isVoidBlock() {
-        return voidBlock;
-    }
-
-    public boolean isUpdateChecker() {
-        return updateChecker;
-    }
-
-    public boolean isBlockWorldEditNonBuilder() {
-        return blockWorldEditNonBuilder;
-    }
-
-    public boolean isGiveNavigatorOnJoin() {
-        return giveNavigatorOnJoin;
-    }
-
-    public boolean isWorldPhysics() {
-        return worldPhysics;
-    }
-
-    public boolean isWorldExplosions() {
-        return worldExplosions;
-    }
-
-    public boolean isWorldMobAi() {
-        return worldMobAi;
-    }
-
-    public boolean isWorldBlockBreaking() {
-        return worldBlockBreaking;
-    }
-
-    public boolean isWorldBlockPlacement() {
-        return worldBlockPlacement;
-    }
-
-    public boolean isWorldBlockInteractions() {
-        return worldBlockInteractions;
-    }
-
-    public boolean isWorldBuildersEnabled(boolean privateWorld) {
-        int i = privateWorld ? 1 : 0;
-        return worldBuildersEnabled[i];
-    }
-
-    public XMaterial getNavigatorItem() {
-        return navigatorItem;
-    }
-
-    public XMaterial getWorldEditWand() {
-        return worldEditWand;
-    }
-
-    public int getSunriseTime() {
-        return sunriseTime;
-    }
-
-    public int getNoonTime() {
-        return noonTime;
-    }
-
-    public int getNightTime() {
-        return nightTime;
-    }
-
-    public int getWorldBorderSize() {
-        return worldBorderSize;
-    }
-
-    public int getImportDelay() {
-        return importDelay;
-    }
-
-    public int getMaxWorldAmount(boolean privateWorld) {
-        return privateWorld ? maxPrivateWorldAmount : maxPublicWorldAmount;
-    }
-
-    public Map<String, String> getDefaultGameRules() {
-        return defaultGameRules;
-    }
-
-    public Set<String> getBlackListedWorldsToUnload() {
-        return blackListedWorldsToUnload;
-    }
-
-    public String getDefaultPermission(boolean privateWorld) {
-        return (privateWorld ? defaultPrivatePermission : defaultPublicPermission);
-    }
-
-    public boolean isSaveFromDeath() {
-        return saveFromDeath;
-    }
-
-    public boolean isTeleportToMapSpawn() {
-        return teleportToMapSpawn;
-    }
-
-    public String getInvalidNameCharacters() {
-        return invalidNameCharacters;
-    }
-
-    public boolean isFolderOverridePermissions() {
-        return folderOverridePermissions;
-    }
-
-    public boolean isFolderOverrideProjects() {
-        return folderOverrideProjects;
-    }
-}
\ No newline at end of file
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/BuildModePreventationListener.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/BuildModePreventationListener.java
index fcfa35ad..565c8943 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/BuildModePreventationListener.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/BuildModePreventationListener.java
@@ -19,7 +19,7 @@
 
 import com.cryptomorin.xseries.inventory.XInventoryView;
 import de.eintosti.buildsystem.BuildSystemPlugin;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.Settings.BuildMode;
 import de.eintosti.buildsystem.player.PlayerServiceImpl;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -30,11 +30,9 @@
 
 public class BuildModePreventationListener implements Listener {
 
-    private final ConfigValues configValues;
     private final PlayerServiceImpl playerManager;
 
     public BuildModePreventationListener(BuildSystemPlugin plugin) {
-        this.configValues = plugin.getConfigValues();
         this.playerManager = plugin.getPlayerService();
         plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
@@ -46,7 +44,7 @@ public BuildModePreventationListener(BuildSystemPlugin plugin) {
      */
     @EventHandler
     public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if (configValues.isBuildModeDropItems()) {
+        if (BuildMode.dropItems) {
             return;
         }
 
@@ -62,7 +60,7 @@ public void onPlayerDropItem(PlayerDropItemEvent event) {
      */
     @EventHandler
     public void onInventoryClick(InventoryClickEvent event) {
-        if (configValues.isBuildModeMoveItems()) {
+        if (BuildMode.moveItems) {
             return;
         }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/EntityDamageListener.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/EntityDamageListener.java
index 6bafd487..0cde57a8 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/EntityDamageListener.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/EntityDamageListener.java
@@ -20,7 +20,7 @@
 import com.cryptomorin.xseries.XSound;
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.api.world.BuildWorld;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.Settings.SaveFromDeath;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;
@@ -32,11 +32,9 @@
 public class EntityDamageListener implements Listener {
 
     private final BuildSystemPlugin plugin;
-    private final ConfigValues configValues;
 
     public EntityDamageListener(BuildSystemPlugin plugin) {
         this.plugin = plugin;
-        this.configValues = plugin.getConfigValues();
         plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
@@ -47,14 +45,14 @@ public void onEntityDamage(EntityDamageEvent event) {
         }
 
         // Teleport player up if void damage is taken
-        if (event.getCause() != EntityDamageEvent.DamageCause.VOID || !configValues.isSaveFromDeath()) {
+        if (event.getCause() != EntityDamageEvent.DamageCause.VOID || !SaveFromDeath.enabled) {
             return;
         }
 
         Player player = (Player) event.getEntity();
         Location teleportLoc = player.getLocation().clone().add(0, 200, 0);
 
-        if (configValues.isTeleportToMapSpawn()) {
+        if (SaveFromDeath.teleportToMapSpawn) {
             BuildWorld buildWorld = plugin.getWorldService().getWorldStorage().getBuildWorld(player.getWorld());
             if (buildWorld != null) {
                 Location spawn = buildWorld.getData().getCustomSpawnLocation();
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/NavigatorListener.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/NavigatorListener.java
index 2dcd1d01..b4666a07 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/NavigatorListener.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/NavigatorListener.java
@@ -30,7 +30,7 @@
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.data.BuildWorldStatus;
 import de.eintosti.buildsystem.api.world.display.NavigatorCategory;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.Settings.Navigator;
 import de.eintosti.buildsystem.navigator.ArmorStandManager;
 import de.eintosti.buildsystem.navigator.inventory.ArchivedWorldsInventory;
 import de.eintosti.buildsystem.navigator.inventory.DisplayablesInventory;
@@ -65,8 +65,6 @@ public class NavigatorListener implements Listener {
     private static final double MIN_HEIGHT = 1.4409877061843872;
 
     private final BuildSystemPlugin plugin;
-    private final ConfigValues configValues;
-
     private final ArmorStandManager armorStandManager;
     private final PlayerServiceImpl playerService;
     private final SettingsManager settingsManager;
@@ -74,8 +72,6 @@ public class NavigatorListener implements Listener {
 
     public NavigatorListener(BuildSystemPlugin plugin) {
         this.plugin = plugin;
-        this.configValues = plugin.getConfigValues();
-
         this.armorStandManager = plugin.getArmorStandManager();
         this.playerService = plugin.getPlayerService();
         this.settingsManager = plugin.getSettingsManager();
@@ -113,7 +109,7 @@ public void manageNavigatorItemInteraction(PlayerInteractEvent event) {
         }
 
         XMaterial xMaterial = XMaterial.matchXMaterial(itemStack);
-        if (xMaterial != configValues.getNavigatorItem() || !itemMeta.getDisplayName().equals(Messages.getString("navigator_item", player))) {
+        if (xMaterial != Navigator.item || !itemMeta.getDisplayName().equals(Messages.getString("navigator_item", player))) {
             return;
         }
 
@@ -144,7 +140,7 @@ private void openNavigator(Player player) {
 
         String findItemName = Messages.getString("navigator_item", player);
         ItemStack replaceItem = InventoryUtils.createItem(XMaterial.BARRIER, Messages.getString("barrier_item", player));
-        InventoryUtils.replaceItem(player, findItemName, configValues.getNavigatorItem(), replaceItem);
+        InventoryUtils.replaceItem(player, findItemName, Navigator.item, replaceItem);
     }
 
     private void summonNewNavigator(Player player) {
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerChangedWorldListener.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerChangedWorldListener.java
index 8693ba95..6adf58fd 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerChangedWorldListener.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerChangedWorldListener.java
@@ -24,7 +24,8 @@
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.data.BuildWorldStatus;
 import de.eintosti.buildsystem.api.world.data.BuildWorldType;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.Settings.Archive;
+import de.eintosti.buildsystem.config.Config.World.Unload;
 import de.eintosti.buildsystem.navigator.ArmorStandManager;
 import de.eintosti.buildsystem.player.PlayerServiceImpl;
 import de.eintosti.buildsystem.player.settings.SettingsManager;
@@ -47,8 +48,6 @@
 
 public class PlayerChangedWorldListener implements Listener {
 
-    private final ConfigValues configValues;
-
     private final ArmorStandManager armorStandManager;
     private final PlayerServiceImpl playerManager;
     private final SettingsManager settingsManager;
@@ -59,8 +58,6 @@ public class PlayerChangedWorldListener implements Listener {
     private final Map<UUID, ItemStack[]> playerArmor;
 
     public PlayerChangedWorldListener(BuildSystemPlugin plugin) {
-        this.configValues = plugin.getConfigValues();
-
         this.armorStandManager = plugin.getArmorStandManager();
         this.playerManager = plugin.getPlayerService();
         this.settingsManager = plugin.getSettingsManager();
@@ -81,7 +78,7 @@ public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
         event.getPlayer().setAllowFlight(true);
 
         BuildWorld oldWorld = worldStorage.getBuildWorld(event.getFrom());
-        if (oldWorld != null && configValues.isUnloadWorlds()) {
+        if (oldWorld != null && Unload.enabled) {
             oldWorld.getUnloader().resetUnloadTask();
         }
 
@@ -131,9 +128,7 @@ private void setGoldBlock(BuildWorld buildWorld) {
             return;
         }
 
-        if (configValues.isVoidBlock()) {
-            bukkitWorld.getBlockAt(0, 64, 0).setType(Material.GOLD_BLOCK);
-        }
+        bukkitWorld.getBlockAt(0, 64, 0).setType(Material.GOLD_BLOCK);
     }
 
     @SuppressWarnings("deprecation")
@@ -172,7 +167,7 @@ private void checkWorldStatus(Player player) {
             playerInventory.clear();
             setSpectatorMode(player);
 
-            if (configValues.isArchiveVanish()) {
+            if (Archive.vanish) {
                 player.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 0, false, false), false);
                 Bukkit.getOnlinePlayers().forEach(pl -> pl.hidePlayer(player));
             }
@@ -188,8 +183,8 @@ private void checkWorldStatus(Player player) {
 
     private void setSpectatorMode(Player player) {
         // Checking if the game mode should be set to adventure mode on archive worlds
-        if (configValues.shouldArchiveChangeGameMode()) {
-            player.setGameMode(configValues.getArchiveWorldGameMode());
+        if (Archive.changeGamemode) {
+            player.setGameMode(Archive.worldGameMode);
         }
         player.setSaturation(20);
         player.setHealth(20);
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerCommandPreprocessListener.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerCommandPreprocessListener.java
index 8ebbaae5..013dbefb 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerCommandPreprocessListener.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerCommandPreprocessListener.java
@@ -23,7 +23,8 @@
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.builder.Builders;
 import de.eintosti.buildsystem.api.world.data.BuildWorldStatus;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.Settings.Builder;
+import de.eintosti.buildsystem.config.Config.Settings.Navigator;
 import de.eintosti.buildsystem.event.player.PlayerInventoryClearEvent;
 import de.eintosti.buildsystem.player.settings.SettingsManager;
 import de.eintosti.buildsystem.storage.WorldStorageImpl;
@@ -218,17 +219,13 @@ public class PlayerCommandPreprocessListener implements Listener {
     );
 
     private final BuildSystemPlugin plugin;
-    private final ConfigValues configValues;
     private final SettingsManager settingsManager;
     private final WorldStorageImpl worldStorage;
 
     public PlayerCommandPreprocessListener(BuildSystemPlugin plugin) {
         this.plugin = plugin;
-        this.configValues = plugin.getConfigValues();
-
         this.settingsManager = plugin.getSettingsManager();
         this.worldStorage = plugin.getWorldService().getWorldStorage();
-
         plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
@@ -242,7 +239,7 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
         Player player = event.getPlayer();
 
         if (command.equalsIgnoreCase("/clear")) {
-            ItemStack navigatorItem = InventoryUtils.createItem(configValues.getNavigatorItem(), Messages.getString("navigator_item", player));
+            ItemStack navigatorItem = InventoryUtils.createItem(Navigator.item, Messages.getString("navigator_item", player));
             if (!player.getInventory().contains(navigatorItem)) {
                 return;
             }
@@ -257,7 +254,7 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
             return;
         }
 
-        if (configValues.isBlockWorldEditNonBuilder()) {
+        if (Builder.blockWorldEditNonBuilder) {
             if (!DISABLED_COMMANDS.contains(command)) {
                 return;
             }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerInventoryClearListener.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerInventoryClearListener.java
index 99414801..4142777e 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerInventoryClearListener.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerInventoryClearListener.java
@@ -20,6 +20,7 @@
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.Messages;
 import de.eintosti.buildsystem.api.player.settings.Settings;
+import de.eintosti.buildsystem.config.Config.Settings.Navigator;
 import de.eintosti.buildsystem.event.player.PlayerInventoryClearEvent;
 import de.eintosti.buildsystem.player.settings.SettingsManager;
 import de.eintosti.buildsystem.util.inventory.InventoryUtils;
@@ -31,13 +32,10 @@
 
 public class PlayerInventoryClearListener implements Listener {
 
-    private final BuildSystemPlugin plugin;
     private final SettingsManager settingsManager;
 
     public PlayerInventoryClearListener(BuildSystemPlugin plugin) {
-        this.plugin = plugin;
         this.settingsManager = plugin.getSettingsManager();
-
         plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
@@ -51,7 +49,7 @@ public void onPlayerInventoryClear(PlayerInventoryClearEvent event) {
 
         PlayerInventory playerInventory = player.getInventory();
         ItemStack navigatorItem = InventoryUtils.createItem(
-                plugin.getConfigValues().getNavigatorItem(), Messages.getString("navigator_item", player)
+                Navigator.item, Messages.getString("navigator_item", player)
         );
         event.getNavigatorSlots().forEach(slot -> playerInventory.setItem(slot, navigatorItem));
     }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerJoinListener.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerJoinListener.java
index 928e778c..fd42212d 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerJoinListener.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerJoinListener.java
@@ -25,7 +25,8 @@
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.data.BuildWorldStatus;
 import de.eintosti.buildsystem.api.world.data.WorldData;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config;
+import de.eintosti.buildsystem.config.Config.Settings.Archive;
 import de.eintosti.buildsystem.player.LogoutLocationImpl;
 import de.eintosti.buildsystem.player.PlayerServiceImpl;
 import de.eintosti.buildsystem.player.settings.SettingsImpl;
@@ -49,8 +50,6 @@
 public class PlayerJoinListener implements Listener {
 
     private final BuildSystemPlugin plugin;
-    private final ConfigValues configValues;
-
     private final PlayerServiceImpl playerManager;
     private final SettingsManager settingsManager;
     private final SpawnManager spawnManager;
@@ -58,20 +57,17 @@ public class PlayerJoinListener implements Listener {
 
     public PlayerJoinListener(BuildSystemPlugin plugin) {
         this.plugin = plugin;
-        this.configValues = plugin.getConfigValues();
-
         this.playerManager = plugin.getPlayerService();
         this.settingsManager = plugin.getSettingsManager();
         this.spawnManager = plugin.getSpawnManager();
         this.worldStorage = plugin.getWorldService().getWorldStorage();
-
         plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void sendPlayerJoinMessage(PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        String message = plugin.getConfigValues().isJoinQuitMessages()
+        String message = Config.Messages.joinQuitMessages
                 ? Messages.getString("player_join", player, Map.entry("%player%", player.getName()))
                 : null;
         event.setJoinMessage(message);
@@ -97,8 +93,8 @@ public void onPlayerJoin(PlayerJoinEvent event) {
                 Messages.sendMessage(player, "physics_deactivated_in_world", Map.entry("%world%", worldName));
             }
 
-            if (configValues.isArchiveVanish() && worldData.status().get() == BuildWorldStatus.ARCHIVE) {
-                player.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 0, false, false), false);
+            if (Archive.vanish && worldData.status().get() == BuildWorldStatus.ARCHIVE) {
+                player.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, PotionEffect.INFINITE_DURATION, 0, false, false), false);
                 Bukkit.getOnlinePlayers().forEach(pl -> pl.hidePlayer(player));
             }
         }
@@ -182,7 +178,7 @@ private void manageSettings(Player player, Settings settings) {
     }
 
     private void performUpdateCheck(Player player) {
-        if (!configValues.isUpdateChecker()) {
+        if (!Config.Settings.updateChecker) {
             return;
         }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerQuitListener.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerQuitListener.java
index ebdb16ae..098e5547 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerQuitListener.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerQuitListener.java
@@ -22,6 +22,7 @@
 import de.eintosti.buildsystem.api.player.BuildPlayer;
 import de.eintosti.buildsystem.api.player.CachedValues;
 import de.eintosti.buildsystem.api.player.settings.Settings;
+import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.player.LogoutLocationImpl;
 import de.eintosti.buildsystem.player.PlayerServiceImpl;
 import de.eintosti.buildsystem.player.settings.SettingsManager;
@@ -49,7 +50,7 @@ public PlayerQuitListener(BuildSystemPlugin plugin) {
     @EventHandler(priority = EventPriority.LOWEST)
     public void sendPlayerQuitMessage(PlayerQuitEvent event) {
         Player player = event.getPlayer();
-        String message = plugin.getConfigValues().isJoinQuitMessages()
+        String message = Config.Messages.joinQuitMessages
                 ? Messages.getString("player_quit", player, Map.entry("%player%", player.getName()))
                 : null;
         event.setQuitMessage(message);
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/SettingsInteractListener.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/SettingsInteractListener.java
index 157bd0cb..9b47723c 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/SettingsInteractListener.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/SettingsInteractListener.java
@@ -28,7 +28,7 @@
 import de.eintosti.buildsystem.api.world.builder.Builders;
 import de.eintosti.buildsystem.api.world.data.BuildWorldStatus;
 import de.eintosti.buildsystem.api.world.data.WorldData;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.player.customblocks.CustomBlocksManager;
 import de.eintosti.buildsystem.player.settings.SettingsManager;
 import de.eintosti.buildsystem.storage.WorldStorageImpl;
@@ -65,18 +65,14 @@ public class SettingsInteractListener implements Listener {
             XMaterial.BIG_DRIPLEAF, XMaterial.SMALL_DRIPLEAF, XMaterial.SEAGRASS, XMaterial.SWEET_BERRIES
     ), XMaterial.class);
 
-    private final ConfigValues configValues;
     private final CustomBlocksManager customBlocksManager;
-
     private final SettingsManager settingsManager;
     private final WorldStorageImpl worldStorage;
 
     private final Set<UUID> cachePlayers;
 
     public SettingsInteractListener(BuildSystemPlugin plugin) {
-        this.configValues = plugin.getConfigValues();
         this.customBlocksManager = plugin.getCustomBlocksManager();
-
         this.settingsManager = plugin.getSettingsManager();
         this.worldStorage = plugin.getWorldService().getWorldStorage();
 
@@ -266,7 +262,7 @@ public void manageDisabledInteractSetting(PlayerInteractEvent event) {
 
         Material material = itemStack.getType();
         XMaterial xMaterial = XMaterial.matchXMaterial(material);
-        if (xMaterial == configValues.getWorldEditWand()) {
+        if (xMaterial == Config.Settings.Builder.worldEditWand) {
             return;
         }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/WeatherChangeListener.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/WeatherChangeListener.java
index b935952c..91bb815d 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/WeatherChangeListener.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/WeatherChangeListener.java
@@ -18,7 +18,7 @@
 package de.eintosti.buildsystem.listener;
 
 import de.eintosti.buildsystem.BuildSystemPlugin;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.World;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -27,16 +27,13 @@
 
 public class WeatherChangeListener implements Listener {
 
-    private final ConfigValues configValues;
-
     public WeatherChangeListener(BuildSystemPlugin plugin) {
-        this.configValues = plugin.getConfigValues();
         plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onWeatherChange(WeatherChangeEvent event) {
-        if (!configValues.isLockWeather()) {
+        if (!World.lockWeather) {
             return;
         }
 
@@ -47,7 +44,7 @@ public void onWeatherChange(WeatherChangeEvent event) {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onThunderChange(ThunderChangeEvent event) {
-        if (!configValues.isLockWeather()) {
+        if (!World.lockWeather) {
             return;
         }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/WorldManipulateListener.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/WorldManipulateListener.java
index e908dd17..71e11203 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/WorldManipulateListener.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/WorldManipulateListener.java
@@ -22,6 +22,7 @@
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.data.BuildWorldStatus;
 import de.eintosti.buildsystem.api.world.data.WorldData;
+import de.eintosti.buildsystem.config.Config.Settings.Builder;
 import de.eintosti.buildsystem.event.EventDispatcher;
 import de.eintosti.buildsystem.event.world.BuildWorldManipulationEvent;
 import de.eintosti.buildsystem.storage.WorldStorageImpl;
@@ -81,7 +82,7 @@ public void onPlayerArmorStandManipulate(PlayerArmorStandManipulateEvent event)
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerInteract(PlayerInteractEvent event) {
         ItemStack itemStack = event.getItem();
-        if (itemStack != null && itemStack.getType() == plugin.getConfigValues().getWorldEditWand().get()) {
+        if (itemStack != null && itemStack.getType() == Builder.worldEditWand.get()) {
             return;
         }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/BuildPlayerImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/BuildPlayerImpl.java
index 3d68efa0..3be4cc57 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/BuildPlayerImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/BuildPlayerImpl.java
@@ -21,7 +21,6 @@
 import de.eintosti.buildsystem.api.player.CachedValues;
 import de.eintosti.buildsystem.api.player.LogoutLocation;
 import de.eintosti.buildsystem.api.player.settings.Settings;
-import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.display.NavigatorCategory;
 import java.util.UUID;
 import javax.annotation.Nullable;
@@ -33,7 +32,6 @@ public class BuildPlayerImpl implements BuildPlayer {
     private final Settings settings;
     private final CachedValues cachedValues;
 
-    private BuildWorld cachedWorld;
     private LogoutLocation logoutLocation;
     private Location previousLocation;
     private NavigatorCategory lastLookedAt;
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/PlayerServiceImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/PlayerServiceImpl.java
index b134817b..dfe1502c 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/PlayerServiceImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/PlayerServiceImpl.java
@@ -29,7 +29,9 @@
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.data.Visibility;
 import de.eintosti.buildsystem.api.world.display.NavigatorCategory;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.Settings;
+import de.eintosti.buildsystem.config.Config.Settings.Navigator;
+import de.eintosti.buildsystem.config.Config.World.Limits;
 import de.eintosti.buildsystem.navigator.ArmorStandManager;
 import de.eintosti.buildsystem.player.settings.SettingsManager;
 import de.eintosti.buildsystem.storage.WorldStorageImpl;
@@ -60,8 +62,6 @@ public class PlayerServiceImpl implements PlayerService {
     private static final double MAX_LOOK_HEIGHT = 0.16481381407766063;
 
     private final BuildSystemPlugin plugin;
-    private final ConfigValues configValues;
-
     private final PlayerStorage playerStorage;
 
     private final Set<Player> openNavigator;
@@ -69,8 +69,6 @@ public class PlayerServiceImpl implements PlayerService {
 
     public PlayerServiceImpl(BuildSystemPlugin plugin) {
         this.plugin = plugin;
-        this.configValues = plugin.getConfigValues();
-
         this.playerStorage = new PlayerStorageFactory(plugin).createStorage();
 
         this.openNavigator = new HashSet<>();
@@ -103,7 +101,9 @@ public boolean canCreateWorld(Player player, Visibility visibility) {
         boolean showPrivateWorlds = visibility == Visibility.PRIVATE;
         WorldStorageImpl worldStorage = plugin.getWorldService().getWorldStorage();
 
-        int maxWorldAmountConfig = configValues.getMaxWorldAmount(showPrivateWorlds);
+        int maxWorldAmountConfig = showPrivateWorlds
+                ? Limits.privateWorlds
+                : Limits.publicWorlds;
         if (maxWorldAmountConfig >= 0 && worldStorage.getBuildWorlds().size() >= maxWorldAmountConfig) {
             return false;
         }
@@ -154,7 +154,7 @@ public int getMaxWorlds(Player player, Visibility visibility) {
     }
 
     public void forceUpdateSidebar(BuildWorld buildWorld) {
-        if (!configValues.isScoreboard()) {
+        if (!Settings.scoreboard) {
             return;
         }
 
@@ -168,14 +168,14 @@ public void forceUpdateSidebar(BuildWorld buildWorld) {
 
     public void forceUpdateSidebar(Player player) {
         SettingsManager settingsManager = plugin.getSettingsManager();
-        if (!configValues.isScoreboard() || !settingsManager.getSettings(player).isScoreboard()) {
+        if (!Settings.scoreboard || !settingsManager.getSettings(player).isScoreboard()) {
             return;
         }
         settingsManager.updateScoreboard(player);
     }
 
     public void giveNavigator(Player player) {
-        if (!configValues.isGiveNavigatorOnJoin()) {
+        if (!Navigator.giveItemOnJoin) {
             return;
         }
 
@@ -187,9 +187,8 @@ public void giveNavigator(Player player) {
             return;
         }
 
-        XMaterial navigatorMaterial = configValues.getNavigatorItem();
         ItemStack itemStack = InventoryUtils.createItem(
-                navigatorMaterial,
+                Navigator.item,
                 Messages.getString("navigator_item", player)
         );
         PlayerInventory playerInventory = player.getInventory();
@@ -225,13 +224,12 @@ public void closeNavigator(Player player) {
     }
 
     private void replaceBarrier(Player player) {
-        XMaterial navigatorMaterial = configValues.getNavigatorItem();
         InventoryUtils.replaceItem(
                 player,
                 Messages.getString("navigator_back", player),
                 XMaterial.BARRIER,
                 InventoryUtils.createItem(
-                        navigatorMaterial,
+                        Navigator.item,
                         Messages.getString("navigator_item", player)
                 )
         );
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/settings/SettingsInventory.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/settings/SettingsInventory.java
index e6229f8d..d2734496 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/settings/SettingsInventory.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/settings/SettingsInventory.java
@@ -25,7 +25,8 @@
 import de.eintosti.buildsystem.api.navigator.settings.NavigatorType;
 import de.eintosti.buildsystem.api.player.settings.DesignColor;
 import de.eintosti.buildsystem.api.player.settings.Settings;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config;
+import de.eintosti.buildsystem.config.Config.Settings.Navigator;
 import de.eintosti.buildsystem.util.inventory.BuildSystemHolder;
 import de.eintosti.buildsystem.util.inventory.BuildSystemInventory;
 import de.eintosti.buildsystem.util.inventory.InventoryUtils;
@@ -42,12 +43,10 @@
 public class SettingsInventory extends BuildSystemInventory {
 
     private final BuildSystemPlugin plugin;
-    private final ConfigValues configValues;
     private final SettingsManager settingsManager;
 
     public SettingsInventory(BuildSystemPlugin plugin) {
         this.plugin = plugin;
-        this.configValues = plugin.getConfigValues();
         this.settingsManager = plugin.getSettingsManager();
     }
 
@@ -66,15 +65,14 @@ private Inventory getInventory(Player player) {
         addSettingsItem(player, inventory, 14, XMaterial.ENDER_EYE, settings.isHidePlayers(), "settings_hideplayers_item", "settings_hideplayers_lore");
         addSettingsItem(player, inventory, 15, XMaterial.OAK_SIGN, settings.isInstantPlaceSigns(), "settings_instantplacesigns_item", "settings_instantplacesigns_lore");
         addSettingsItem(player, inventory, 20, XMaterial.SLIME_BLOCK, settings.isKeepNavigator(), "settings_keep_navigator_item", "settings_keep_navigator_lore");
-        addSettingsItem(player, inventory, 21, configValues.getNavigatorItem(),
-                settings.getNavigatorType() == NavigatorType.NEW, "settings_new_navigator_item", "settings_new_navigator_lore");
+        addSettingsItem(player, inventory, 21, Navigator.item, settings.getNavigatorType() == NavigatorType.NEW, "settings_new_navigator_item", "settings_new_navigator_lore");
         addSettingsItem(player, inventory, 22, XMaterial.GOLDEN_CARROT, settings.isNightVision(), "settings_nightvision_item", "settings_nightvision_lore");
         addSettingsItem(player, inventory, 23, XMaterial.BRICKS, settings.isNoClip(), "settings_no_clip_item", "settings_no_clip_lore");
         addSettingsItem(player, inventory, 24, XMaterial.IRON_TRAPDOOR, settings.isOpenTrapDoors(), "settings_open_trapdoors_item", "settings_open_trapdoors_lore");
         addSettingsItem(player, inventory, 29, XMaterial.FERN, settings.isPlacePlants(), "settings_placeplants_item", "settings_placeplants_lore");
         addSettingsItem(player, inventory, 30, XMaterial.PAPER, settings.isScoreboard(),
-                configValues.isScoreboard() ? "settings_scoreboard_item" : "settings_scoreboard_disabled_item",
-                configValues.isScoreboard() ? "settings_scoreboard_lore" : "settings_scoreboard_disabled_lore");
+                Config.Settings.scoreboard ? "settings_scoreboard_item" : "settings_scoreboard_disabled_item",
+                Config.Settings.scoreboard ? "settings_scoreboard_lore" : "settings_scoreboard_disabled_lore");
         addSettingsItem(player, inventory, 31, XMaterial.SMOOTH_STONE_SLAB, settings.isSlabBreaking(), "settings_slab_breaking_item", "settings_slab_breaking_lore");
         addSettingsItem(player, inventory, 32, XMaterial.MAGMA_CREAM, settings.isSpawnTeleport(), "settings_spawnteleport_item", "settings_spawnteleport_lore");
 
@@ -197,7 +195,7 @@ public void onClick(InventoryClickEvent event) {
                 settings.setPlacePlants(!settings.isPlacePlants());
                 break;
             case 30:
-                if (!configValues.isScoreboard()) {
+                if (!Config.Settings.scoreboard) {
                     XSound.ENTITY_ITEM_BREAK.play(player);
                     return;
                 }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/settings/SettingsManager.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/settings/SettingsManager.java
index d789d254..d4401772 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/settings/SettingsManager.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/player/settings/SettingsManager.java
@@ -23,7 +23,7 @@
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.builder.Builders;
 import de.eintosti.buildsystem.api.world.data.WorldData;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.world.WorldServiceImpl;
 import fr.mrmicky.fastboard.FastBoard;
 import java.util.HashMap;
@@ -37,14 +37,12 @@
 public class SettingsManager {
 
     private final BuildSystemPlugin plugin;
-    private final ConfigValues configValues;
     private final WorldServiceImpl worldService;
 
     private final Map<UUID, FastBoard> boards;
 
     public SettingsManager(BuildSystemPlugin plugin) {
         this.plugin = plugin;
-        this.configValues = plugin.getConfigValues();
         this.worldService = plugin.getWorldService();
 
         this.boards = new HashMap<>();
@@ -79,7 +77,7 @@ public void startScoreboard(Player player, Settings settings) {
      * @param player The player object
      */
     public void startScoreboard(Player player) {
-        if (!configValues.isScoreboard()) {
+        if (!Config.Settings.scoreboard) {
             return;
         }
 
@@ -102,7 +100,7 @@ public void startScoreboard(Player player) {
      * Set each player's scoreboard if they have {@link SettingsImpl#isScoreboard} enabled.
      */
     public void startScoreboard() {
-        if (!configValues.isScoreboard()) {
+        if (!Config.Settings.scoreboard) {
             return;
         }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/WorldStorageImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/WorldStorageImpl.java
index 198e5d0b..ece234e3 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/WorldStorageImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/WorldStorageImpl.java
@@ -22,7 +22,7 @@
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.data.Visibility;
 import de.eintosti.buildsystem.api.world.display.Folder;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.World.Unload;
 import de.eintosti.buildsystem.world.creation.BuildWorldCreatorImpl;
 import java.io.File;
 import java.util.ArrayList;
@@ -155,7 +155,7 @@ public boolean isCorrectVisibility(boolean privateWorld, Visibility visibility)
     }
 
     public void loadWorlds() {
-        boolean loadAllWorlds = !plugin.getConfigValues().isUnloadWorlds();
+        boolean loadAllWorlds = !Unload.enabled;
         if (loadAllWorlds) {
             logger.info("*** All worlds will be loaded now ***");
         } else {
@@ -185,7 +185,7 @@ public void loadWorlds() {
      */
     private LoadResult loadWorld(BuildWorld buildWorld, boolean alwaysLoad) {
         String worldName = buildWorld.getName();
-        if (!alwaysLoad && !plugin.getConfigValues().getBlackListedWorldsToUnload().contains(worldName)) {
+        if (!alwaysLoad && !Unload.blacklistedWorlds.contains(worldName)) {
             return LoadResult.NOT_BLACKLISTED;
         }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlWorldStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlWorldStorage.java
index 2d1dffb5..e6ec8159 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlWorldStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlWorldStorage.java
@@ -206,7 +206,7 @@ private WorldDataImpl parseWorldData(String worldName) {
         return new WorldDataImpl(
                 worldName, customSpawn, permission, project, difficulty, material, worldStatus, blockBreaking,
                 blockInteractions, blockPlacement, buildersEnabled, explosions, mobAi, physics, privateWorld,
-                lastLoaded, lastUnloaded, lastEdited, plugin.getConfigValues()
+                lastLoaded, lastUnloaded, lastEdited
         );
     }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java
index 5c7bcd13..205e348e 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java
@@ -18,6 +18,7 @@
 package de.eintosti.buildsystem.util;
 
 import com.google.common.collect.Sets;
+import de.eintosti.buildsystem.api.world.BuildWorld;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,7 +30,12 @@
 import java.util.Comparator;
 import java.util.Set;
 import java.util.stream.Stream;
+import net.lingala.zip4j.ZipFile;
+import net.lingala.zip4j.model.ExcludeFileFilter;
+import net.lingala.zip4j.model.ZipParameters;
+import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public final class FileUtils {
 
@@ -134,4 +140,24 @@ public static long getDirectoryCreation(File file) {
         }
         return creation;
     }
+
+    @Nullable
+    public static File zipWorld(File storage, BuildWorld buildWorld) {
+        try (ZipFile zipFile = new ZipFile(storage.getAbsolutePath() + ".zip")) {
+            File worldContainer = new File(Bukkit.getWorldContainer(), buildWorld.getName());
+
+            ExcludeFileFilter excludeFileFilter = Sets.newHashSet(
+                    new File(worldContainer, "uid.dat"),
+                    new File(worldContainer, "session.lock")
+            )::contains;
+            ZipParameters zipParameters = new ZipParameters();
+            zipParameters.setExcludeFileFilter(excludeFileFilter);
+
+            zipFile.addFolder(worldContainer, zipParameters);
+            return zipFile.getFile();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/StringCleaner.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/StringCleaner.java
index f5d3cdd8..8d512b2f 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/StringCleaner.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/StringCleaner.java
@@ -17,25 +17,17 @@
  */
 package de.eintosti.buildsystem.util;
 
-import de.eintosti.buildsystem.BuildSystemPlugin;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.World;
 import java.util.Arrays;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.Nullable;
 
 public class StringCleaner {
 
-    private static final BuildSystemPlugin PLUGIN = JavaPlugin.getPlugin(BuildSystemPlugin.class);
-
     public static final String INVALID_NAME_CHARACTERS = "[^A-Za-z\\d/_-]";
 
     private StringCleaner() {
     }
 
-    private static String getConfigInvalidNameCharacters() {
-        return PLUGIN.getConfigValues().getInvalidNameCharacters();
-    }
-
     /**
      * Checks if the input string contains any invalid characters as defined by {@link #INVALID_NAME_CHARACTERS} and {@link ConfigValues#getInvalidNameCharacters()}.
      *
@@ -43,7 +35,7 @@ private static String getConfigInvalidNameCharacters() {
      * @return {@code true} if the input contains invalid characters, {@code false} otherwise
      */
     public static boolean hasInvalidNameCharacters(String input) {
-        return Arrays.stream(input.split("")).anyMatch(c -> c.matches(INVALID_NAME_CHARACTERS) || c.matches(getConfigInvalidNameCharacters()));
+        return Arrays.stream(input.split("")).anyMatch(c -> c.matches(INVALID_NAME_CHARACTERS) || c.matches(World.invalidCharacters));
     }
 
     /**
@@ -55,7 +47,7 @@ public static boolean hasInvalidNameCharacters(String input) {
     @Nullable
     public static String firstInvalidChar(String input) {
         return Arrays.stream(input.split(""))
-                .filter(c -> c.matches(INVALID_NAME_CHARACTERS) || c.matches(getConfigInvalidNameCharacters()))
+                .filter(c -> c.matches(INVALID_NAME_CHARACTERS) || c.matches(World.invalidCharacters))
                 .findFirst()
                 .orElse(null);
     }
@@ -69,7 +61,7 @@ public static String firstInvalidChar(String input) {
     public static String sanitize(String input) {
         return input
                 .replaceAll(INVALID_NAME_CHARACTERS, "")
-                .replaceAll(getConfigInvalidNameCharacters(), "")
+                .replaceAll(World.invalidCharacters, "")
                 .replace(" ", "_")
                 .trim();
     }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/inventory/InventoryUtils.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/inventory/InventoryUtils.java
index f1df7ec4..c0126aca 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/inventory/InventoryUtils.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/inventory/InventoryUtils.java
@@ -26,6 +26,7 @@
 import de.eintosti.buildsystem.api.player.settings.Settings;
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.display.Displayable.DisplayableType;
+import de.eintosti.buildsystem.config.Config.Settings.Navigator;
 import java.util.Arrays;
 import java.util.List;
 import java.util.OptionalInt;
@@ -222,7 +223,7 @@ private static void storeWorldInformation(@NotNull ItemStack itemStack, BuildWor
      * @return true if the item is a navigator, false otherwise
      */
     public static boolean isNavigator(Player player, ItemStack itemStack) {
-        if (itemStack == null || itemStack.getType() != PLUGIN.getConfigValues().getNavigatorItem().get()) {
+        if (itemStack == null || itemStack.getType() != Navigator.item.get()) {
             return false;
         }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/inventory/MaterialUtils.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/inventory/MaterialUtils.java
index d7b5a4a3..d51b4da8 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/inventory/MaterialUtils.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/inventory/MaterialUtils.java
@@ -19,9 +19,6 @@
 
 import com.cryptomorin.xseries.XMaterial;
 
-/**
- * @author Trichtern
- */
 public final class MaterialUtils {
 
     private MaterialUtils() {
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/BuildWorldImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/BuildWorldImpl.java
index 7396e6e0..6c42e994 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/BuildWorldImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/BuildWorldImpl.java
@@ -81,8 +81,7 @@ public BuildWorldImpl(
                 new WorldDataImpl(
                         name,
                         privateWorld,
-                        privateWorld ? XMaterial.PLAYER_HEAD : PLUGIN.getCustomizableIcons().getIcon(worldType),
-                        PLUGIN.getConfigValues()
+                        privateWorld ? XMaterial.PLAYER_HEAD : PLUGIN.getCustomizableIcons().getIcon(worldType)
                 ),
                 creator,
                 new ArrayList<>(),
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java
index 106344dd..5f91a0a8 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java
@@ -26,7 +26,7 @@
 import de.eintosti.buildsystem.api.world.creation.generator.Generator;
 import de.eintosti.buildsystem.api.world.data.BuildWorldType;
 import de.eintosti.buildsystem.api.world.display.Folder;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.storage.FolderStorageImpl;
 import de.eintosti.buildsystem.storage.WorldStorageImpl;
 import de.eintosti.buildsystem.storage.factory.FolderStorageFactory;
@@ -58,15 +58,11 @@ public class WorldServiceImpl implements WorldService {
     private static boolean importingAllWorlds = false;
 
     private final BuildSystemPlugin plugin;
-    private final ConfigValues configValues;
-
     private final WorldStorageImpl worldStorage;
     private final FolderStorageImpl folderStorage;
 
     public WorldServiceImpl(BuildSystemPlugin plugin) {
         this.plugin = plugin;
-        this.configValues = plugin.getConfigValues();
-
         this.worldStorage = new WorldStorageFactory(plugin).createStorage();
         this.folderStorage = new FolderStorageFactory(plugin).createStorage();
     }
@@ -186,7 +182,7 @@ public boolean importWorld(Player player, String worldName, Builder creator, Bui
 
     public void importWorlds(Player player, String[] worldList, Generator generator, @Nullable Builder creator) {
         int worlds = worldList.length;
-        int delay = configValues.getImportDelay();
+        int delay = Config.World.importAllDelay;
 
         Messages.sendMessage(player, "worlds_importall_started",
                 Map.entry("%amount%", String.valueOf(worlds))
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java
index d48671cc..6b9de21e 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java
@@ -26,7 +26,8 @@
 import de.eintosti.buildsystem.api.world.creation.generator.CustomGenerator;
 import de.eintosti.buildsystem.api.world.data.BuildWorldType;
 import de.eintosti.buildsystem.api.world.display.Folder;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.World.Default;
+import de.eintosti.buildsystem.config.Config.World.Default.Time;
 import de.eintosti.buildsystem.util.FileUtils;
 import de.eintosti.buildsystem.world.BuildWorldImpl;
 import de.eintosti.buildsystem.world.creation.generator.voidgenerator.ModernVoidGenerator;
@@ -42,6 +43,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
+import org.bukkit.GameRule;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
@@ -73,7 +75,7 @@ public BuildWorldCreatorImpl(BuildSystemPlugin plugin, @NotNull String name) {
         this.worldStorage = plugin.getWorldService().getWorldStorage();
 
         setName(name);
-        setDifficulty(plugin.getConfigValues().getWorldDifficulty());
+        setDifficulty(Default.difficulty);
     }
 
     @Override
@@ -307,12 +309,17 @@ private void configureVoidWorld(WorldCreator worldCreator) {
      * @param bukkitWorld The world to configure
      */
     private void applyDefaultWorldSettings(World bukkitWorld) {
-        ConfigValues config = plugin.getConfigValues();
         bukkitWorld.setDifficulty(this.difficulty);
-        bukkitWorld.setTime(config.getNoonTime());
-        bukkitWorld.getWorldBorder().setSize(config.getWorldBorderSize());
-        bukkitWorld.setKeepSpawnInMemory(config.isTeleportAfterCreation());
-        config.getDefaultGameRules().forEach(bukkitWorld::setGameRuleValue);
+        bukkitWorld.setTime(Time.noon);
+        bukkitWorld.getWorldBorder().setSize(Default.worldBoarderSize);
+        bukkitWorld.setKeepSpawnInMemory(true);
+        Default.gameRules.forEach((gameRule, value) -> applyGameRule(bukkitWorld, gameRule, value));
+    }
+
+    private <T> void applyGameRule(World world, GameRule<T> rule, Object value) {
+        @SuppressWarnings("unchecked")
+        T castedValue = (T) value;
+        world.setGameRule(rule, castedValue);
     }
 
     /**
@@ -323,18 +330,16 @@ private void applyDefaultWorldSettings(World bukkitWorld) {
      */
     private void applyPostGenerationSettings(World bukkitWorld, BuildWorldType worldType) {
         switch (worldType) {
-            case VOID:
-                if (plugin.getConfigValues().isVoidBlock()) {
-                    bukkitWorld.getBlockAt(0, VOID_BLOCK_Y, 0).setType(Material.GOLD_BLOCK);
-                }
+            case VOID -> {
+                bukkitWorld.getBlockAt(0, VOID_BLOCK_Y, 0).setType(Material.GOLD_BLOCK);
                 bukkitWorld.setSpawnLocation(0, VOID_BLOCK_Y + 1, 0);
-                break;
-            case FLAT:
+            }
+            case FLAT -> {
                 bukkitWorld.setSpawnLocation(0, -60, 0);
-                break;
-            default:
+            }
+            default -> {
                 // No special post-generation steps for other types
-                break;
+            }
         }
     }
 
@@ -390,10 +395,6 @@ private void updateWorldDataVersion() {
     }
 
     private void teleportAfterCreation(Player player) {
-        if (!plugin.getConfigValues().isTeleportAfterCreation()) {
-            return;
-        }
-
         BuildWorld buildWorld = worldStorage.getBuildWorld(worldName);
         if (buildWorld == null) {
             return;
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/data/WorldDataImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/data/WorldDataImpl.java
index ceb7ab2f..6158ffb8 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/data/WorldDataImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/data/WorldDataImpl.java
@@ -25,7 +25,11 @@
 import de.eintosti.buildsystem.api.world.data.BuildWorldStatus;
 import de.eintosti.buildsystem.api.world.data.WorldData;
 import de.eintosti.buildsystem.api.world.display.Folder;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config;
+import de.eintosti.buildsystem.config.Config.World.Default;
+import de.eintosti.buildsystem.config.Config.World.Default.Permission;
+import de.eintosti.buildsystem.config.Config.World.Default.Settings;
+import de.eintosti.buildsystem.config.Config.World.Default.Settings.BuildersEnabled;
 import java.util.HashMap;
 import java.util.Map;
 import org.bukkit.Bukkit;
@@ -37,8 +41,6 @@
 
 public class WorldDataImpl implements WorldData {
 
-    private final ConfigValues configValues;
-
     private final Map<String, Type<?>> data = new HashMap<>();
 
     private final Type<String> customSpawn = register("spawn");
@@ -64,27 +66,26 @@ public class WorldDataImpl implements WorldData {
 
     private String worldName;
 
-    public WorldDataImpl(String worldName, boolean privateWorld, XMaterial material, ConfigValues configValues) {
+    public WorldDataImpl(String worldName, boolean privateWorld, XMaterial material) {
         this(
                 worldName,
                 null,
-                configValues.getDefaultPermission(privateWorld).replace("%world%", worldName),
+                (privateWorld ? Permission.privatePermission : Permission.publicPermission).replace("%world%", worldName),
                 "-",
-                configValues.getWorldDifficulty(),
+                Default.difficulty,
                 material,
                 BuildWorldStatus.NOT_STARTED,
-                configValues.isWorldBlockBreaking(),
-                configValues.isWorldBlockInteractions(),
-                configValues.isWorldBlockPlacement(),
-                configValues.isWorldBuildersEnabled(privateWorld),
-                configValues.isWorldExplosions(),
-                configValues.isWorldMobAi(),
-                configValues.isWorldPhysics(),
+                Settings.blockBreaking,
+                Settings.blockInteractions,
+                Settings.blockPlacement,
+                (privateWorld ? BuildersEnabled.privateBuilders : BuildersEnabled.publicBuilders),
+                Settings.explosions,
+                Settings.mobAi,
+                Settings.physics,
                 privateWorld,
                 -1L,
                 -1L,
-                -1L,
-                configValues
+                -1L
         );
     }
 
@@ -106,8 +107,7 @@ public WorldDataImpl(
             boolean privateWorld,
             long lastLoaded,
             long lastUnloaded,
-            long lastEdited,
-            ConfigValues configValues
+            long lastEdited
     ) {
         this.customSpawn.set(customSpawn);
         this.permission.set(permission);
@@ -131,7 +131,6 @@ public WorldDataImpl(
         this.lastUnloaded.set(lastUnloaded);
 
         this.worldName = worldName;
-        this.configValues = configValues;
     }
 
     public <T> Type<T> register(@NotNull String key) {
@@ -182,7 +181,7 @@ private Type<String> getOverrideValue(Function<Folder, String> valueProvider) {
 
     @Override
     public Type<String> permission() {
-        if (configValues.isFolderOverridePermissions()) {
+        if (Config.Folder.overridePermissions) {
             Type<String> assignedFolderPermission = getOverrideValue(Folder::getPermission);
             if (assignedFolderPermission != null) {
                 return assignedFolderPermission;
@@ -193,7 +192,7 @@ public Type<String> permission() {
 
     @Override
     public Type<String> project() {
-        if (configValues.isFolderOverrideProjects()) {
+        if (Config.Folder.overrideProjects) {
             Type<String> assignedFolderProject = getOverrideValue(Folder::getProject);
             if (assignedFolderProject != null) {
                 return assignedFolderProject;
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/modification/EditInventory.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/modification/EditInventory.java
index b3183af7..e772d905 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/modification/EditInventory.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/modification/EditInventory.java
@@ -29,7 +29,7 @@
 import de.eintosti.buildsystem.api.world.data.WorldData;
 import de.eintosti.buildsystem.command.subcommand.worlds.SetPermissionSubCommand;
 import de.eintosti.buildsystem.command.subcommand.worlds.SetProjectSubCommand;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.World.Default;
 import de.eintosti.buildsystem.player.PlayerServiceImpl;
 import de.eintosti.buildsystem.util.inventory.BuildSystemInventory;
 import de.eintosti.buildsystem.util.inventory.BuildWorldHolder;
@@ -69,12 +69,10 @@ public class EditInventory extends BuildSystemInventory {
     );
 
     private final BuildSystemPlugin plugin;
-    private final ConfigValues configValues;
     private final PlayerServiceImpl playerManager;
 
     public EditInventory(BuildSystemPlugin plugin) {
         this.plugin = plugin;
-        this.configValues = plugin.getConfigValues();
         this.playerManager = plugin.getPlayerService();
     }
 
@@ -170,26 +168,20 @@ private void addSettingsItem(Player player, Inventory inventory, int position, X
     }
 
     private void addTimeItem(Player player, Inventory inventory, BuildWorld buildWorld) {
-        World bukkitWorld = Bukkit.getWorld(buildWorld.getName());
-
         XMaterial xMaterial;
         String value;
-        switch (getWorldTime(bukkitWorld)) {
-            case SUNRISE -> {
-                xMaterial = XMaterial.ORANGE_STAINED_GLASS;
-                value = Messages.getString("worldeditor_time_lore_sunrise", player);
+        switch (getWorldTime(buildWorld)) {
+            case NIGHT -> {
+                xMaterial = XMaterial.BLUE_STAINED_GLASS;
+                value = Messages.getString("worldeditor_time_lore_night", player);
             }
             case NOON -> {
                 xMaterial = XMaterial.YELLOW_STAINED_GLASS;
                 value = Messages.getString("worldeditor_time_lore_noon", player);
             }
-            case NIGHT -> {
-                xMaterial = XMaterial.BLUE_STAINED_GLASS;
-                value = Messages.getString("worldeditor_time_lore_night", player);
-            }
             default -> {
-                xMaterial = XMaterial.WHITE_STAINED_GLASS;
-                value = Messages.getString("worldeditor_time_lore_unknown", player);
+                xMaterial = XMaterial.ORANGE_STAINED_GLASS;
+                value = Messages.getString("worldeditor_time_lore_sunrise", player);
             }
         }
 
@@ -198,13 +190,9 @@ private void addTimeItem(Player player, Inventory inventory, BuildWorld buildWor
         ));
     }
 
-    public Time getWorldTime(World bukkitWorld) {
-        if (bukkitWorld == null) {
-            return Time.UNKNOWN;
-        }
-
-        int worldTime = (int) bukkitWorld.getTime();
-        int noonTime = plugin.getConfigValues().getNoonTime();
+    public Time getWorldTime(BuildWorld buildWorld) {
+        int worldTime = (int) buildWorld.getWorld().getTime();
+        int noonTime = Default.Time.noon;
 
         if (worldTime >= 0 && worldTime < noonTime) {
             return Time.SUNRISE;
@@ -416,18 +404,12 @@ private boolean hasPermission(Player player, String permission) {
     }
 
     private void changeTime(Player player, BuildWorld buildWorld) {
-        World bukkitWorld = Bukkit.getWorld(buildWorld.getName());
-        if (bukkitWorld == null) {
-            return;
-        }
-
-        int time = switch (getWorldTime(bukkitWorld)) {
-            case UNKNOWN, SUNRISE -> configValues.getNoonTime();
-            case NOON -> configValues.getNightTime();
-            case NIGHT -> configValues.getSunriseTime();
+        int time = switch (getWorldTime(buildWorld)) {
+            case SUNRISE -> Default.Time.noon;
+            case NOON -> Default.Time.night;
+            case NIGHT -> Default.Time.sunrise;
         };
-
-        bukkitWorld.setTime(time);
+        buildWorld.getWorld().setTime(time);
         openInventory(player, buildWorld);
     }
 
@@ -450,7 +432,7 @@ private void removeEntities(Player player, BuildWorld buildWorld) {
     }
 
     public enum Time {
-        SUNRISE, NOON, NIGHT, UNKNOWN
+        SUNRISE, NOON, NIGHT
     }
 
     private static class EditInventoryHolder extends BuildWorldHolder {
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldTeleporterImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldTeleporterImpl.java
index 2c81dc5b..6f218ddb 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldTeleporterImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldTeleporterImpl.java
@@ -22,6 +22,7 @@
 import de.eintosti.buildsystem.Messages;
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.util.WorldTeleporter;
+import de.eintosti.buildsystem.config.Config.World.Unload;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -50,7 +51,7 @@ public static WorldTeleporterImpl of(@Nullable BuildWorld buildWorld) {
     @Override
     public void teleport(Player player) {
         boolean hadToLoad = false;
-        if (plugin.getConfigValues().isUnloadWorlds() && !buildWorld.isLoaded()) {
+        if (Unload.enabled && !buildWorld.isLoaded()) {
             buildWorld.getLoader().loadForPlayer(player);
             hadToLoad = true;
         }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java
index c5919bd4..941cfe5e 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java
@@ -22,7 +22,7 @@
 import de.eintosti.buildsystem.api.event.world.BuildWorldUnloadEvent;
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.util.WorldUnloader;
-import de.eintosti.buildsystem.config.ConfigValues;
+import de.eintosti.buildsystem.config.Config.World.Unload;
 import de.eintosti.buildsystem.world.SpawnManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
@@ -33,7 +33,6 @@
 public class WorldUnloaderImpl implements WorldUnloader {
 
     private final BuildSystemPlugin plugin;
-    private final ConfigValues configValues;
     private final BuildWorld buildWorld;
 
     private final long secondsUntilUnload;
@@ -41,10 +40,17 @@ public class WorldUnloaderImpl implements WorldUnloader {
 
     private WorldUnloaderImpl(BuildWorld buildWorld) {
         this.plugin = JavaPlugin.getPlugin(BuildSystemPlugin.class);
-        this.configValues = plugin.getConfigValues();
         this.buildWorld = buildWorld;
 
-        this.secondsUntilUnload = configValues.getTimeUntilUnload();
+        this.secondsUntilUnload = calculateSecondsUntilUnload(Unload.timeUntilUnload);
+    }
+
+    private long calculateSecondsUntilUnload(String timeString) {
+        String[] timeArray = timeString.split(":");
+        int hours = Integer.parseInt(timeArray[0]);
+        int minutes = Integer.parseInt(timeArray[1]);
+        int seconds = Integer.parseInt(timeArray[2]);
+        return hours * 3600L + minutes * 60L + seconds;
     }
 
     public static WorldUnloaderImpl of(BuildWorld buildWorld) {
@@ -53,7 +59,7 @@ public static WorldUnloaderImpl of(BuildWorld buildWorld) {
 
     @Override
     public void manageUnload() {
-        if (!configValues.isUnloadWorlds()) {
+        if (!Unload.enabled) {
             buildWorld.setLoaded(true);
             return;
         }
@@ -64,7 +70,7 @@ public void manageUnload() {
 
     @Override
     public void startUnloadTask() {
-        if (!configValues.isUnloadWorlds()) {
+        if (!Unload.enabled) {
             return;
         }
 
@@ -92,7 +98,7 @@ public void unload() {
             return;
         }
 
-        if (configValues.getBlackListedWorldsToUnload().contains(buildWorld.getName()) || isSpawnWorld(bukkitWorld)) {
+        if (Unload.blacklistedWorlds.contains(buildWorld.getName()) || isSpawnWorld(bukkitWorld)) {
             return;
         }
 
diff --git a/buildsystem-core/src/main/resources/config.yml b/buildsystem-core/src/main/resources/config.yml
index 145cac7a..92f8b294 100644
--- a/buildsystem-core/src/main/resources/config.yml
+++ b/buildsystem-core/src/main/resources/config.yml
@@ -5,11 +5,10 @@ messages:
 settings:
   update-checker: true
   scoreboard: true
-  archive-vanish: true
-  archive-should-change-gamemode: true
-  # Possible values are: "SURVIVAL", "CREATIVE", "ADVENTURE", "SPECTATOR"
-  archive-world-game-mode: "ADVENTURE"
-  teleport-after-creation: true
+  archive:
+    vanish: true
+    change-gamemode: true
+    world-game-mode: "ADVENTURE" # Possible values are: "SURVIVAL", "CREATIVE", "ADVENTURE", "SPECTATOR"
   save-from-death:
     enable: true
     teleport-to-map-spawn: true
@@ -61,7 +60,10 @@ world:
       - world
       - world_nether
       - worth_the_end
-  void-block: true
+  backup:
+    enabled: true
+    backup-interval: 900
+    max-backups-per-world: 9
 folder:
   override-permissions: true
   override-projects: false
\ No newline at end of file
diff --git a/buildsystem-core/src/main/resources/plugin.yml b/buildsystem-core/src/main/resources/plugin.yml
deleted file mode 100644
index 82bb1b51..00000000
--- a/buildsystem-core/src/main/resources/plugin.yml
+++ /dev/null
@@ -1,123 +0,0 @@
-name: BuildSystem
-version: ${version}
-api-version: "1.13"
-author: einTosti
-main: de.eintosti.buildsystem.BuildSystemPlugin
-description: Powerful, easy to use system for builders
-website: https://buildsystem.eintosti.de
-softdepend: [ LuckPerms, PlaceholderAPI, WorldEdit, AxiomPaper ]
-
-commands:
-  back:
-    description: Teleports you to your previous location.
-    usage: /<command>
-  blocks:
-    description: Opens a menu with secret blocks.
-    usage: /<command>
-  build:
-    description: Puts you into "Build Mode".
-    usage: /<command> [player]
-  buildsystem:
-    description: Overview of all plugin commands.
-    usage: /<command>
-  config:
-    description: Reload the config.
-    usage: /<command> reload
-  explosions:
-    description: Toggle explosions.
-    usage: /<command> reload
-  gamemode:
-    aliases: [ gm ]
-    description: Change your gamemode
-    usage: /<command> <mode> [player]
-  day:
-    description: Set a world's time to daytime.
-    usage: /<command> [world]
-  night:
-    description: Set a world's time to nighttime.
-    usage: /<command> [world]
-  noai:
-    description: Disable all the entity AIs in a world.
-    usage: /<command> [world]
-  physics:
-    description: Toggle block physics.
-    usage: /<command> [world]
-  settings:
-    description: Manage user settings.
-    usage: /<command>
-  setup:
-    description: Change the default items in GUIs.
-    usage: /<command>
-  skull:
-    description: Receive a player's skull.
-    usage: /<command> [name]
-  spawn:
-    description: Teleport to the spawn.
-    usage: /<command>
-  speed:
-    aliases: [ s ]
-    description: Change your flying/walking speed.
-    usage: /<command> [1-5]
-  top:
-    description: Teleports you to the highest location.
-    usage: /<command>
-  worlds:
-    aliases: [ w ]
-    description: Open the world menu.
-    usage: /<command>
-
-permissions:
-  buildsystem.help:
-    children:
-      - buildsystem.help.buildsystem
-      - buildsystem.help.worlds
-    default: true
-    description: Permission for help commands.
-  buildsystem.navigator:
-    description: Open the worlds navigator.
-    default: true
-  buildsystem.navigator.item:
-    description: Receive and use the navigator.
-    default: true
-  buildsystem.create:
-    children:
-      - buildsystem.create.private
-      - buildsystem.create.type.normal
-      - buildsystem.create.type.flat
-      - buildsystem.create.type.nether
-      - buildsystem.create.type.end
-      - buildsystem.create.type.void
-    default: true
-    description: Permission for creating world types
-  buildsystem.setstatus:
-    children:
-      - buildsystem.setstatus.hidden
-      - buildsystem.setstatus.archive
-      - buildsystem.setstatus.finished
-      - buildsystem.setstatus.almostfinished
-      - buildsystem.setstatus.inprogress
-      - buildsystem.setstatus.notstarted
-    default: op
-    description: Permission for specific status states
-  buildsystem.gamemode:
-    children:
-      - buildsystem.gamemode.survival
-      - buildsystem.gamemode.creative
-      - buildsystem.gamemode.adventure
-      - buildsystem.gamemode.spectator
-    default: op
-    description: Permission for changing own gamemode
-  buildsystem.gamemode.other:
-    children:
-      - buildsystem.gamemode.survival.other
-      - buildsystem.gamemode.creative.other
-      - buildsystem.gamemode.adventure.other
-      - buildsystem.gamemode.spectator.other
-    default: op
-    description: Permission for changing other player's gamemode
-  buildsystem.physics.message:
-    description: Receive the message that physics are disabled in a world.
-    default: true
-  buildsystem.updates:
-    description: Receive update messages.
-    default: op
\ No newline at end of file

From b9c6cf77f822530e894523353680b7361aaafda9 Mon Sep 17 00:00:00 2001
From: Thomas Meaney <thomas.meaney@icloud.com>
Date: Thu, 26 Jun 2025 19:00:54 +0200
Subject: [PATCH 02/11] Implement world backups

---
 .../buildsystem/api/world/backup/Backup.java  |  19 +-
 .../api/world/backup/BackupProfile.java       |  43 ++++
 .../api/world/backup/BackupStorage.java       |  38 ++++
 .../api/world/creation/BuildWorldCreator.java |  17 +-
 .../api/world/data/BuildWorldType.java        |  20 +-
 .../buildsystem/api/world/data/WorldData.java |   8 +
 buildsystem-core/build.gradle.kts             |   4 +-
 .../buildsystem/BuildSystemPlugin.java        |   7 +
 .../de/eintosti/buildsystem/Messages.java     |  31 +++
 .../buildsystem/command/WorldsCommand.java    |   2 +
 .../subcommand/worlds/BackupsSubCommand.java  |  85 ++++++++
 .../subcommand/worlds/UnimportSubCommand.java |   2 +-
 .../eintosti/buildsystem/config/Config.java   |  41 +++-
 .../buildsystem/storage/WorldStorageImpl.java |   2 +-
 .../storage/yaml/YamlWorldStorage.java        |   4 +-
 .../tabcomplete/WorldsTabComplete.java        |   8 +
 .../eintosti/buildsystem/util/FileUtils.java  |  66 ++++++-
 .../buildsystem/util/NumberUtils.java         |   2 +-
 .../buildsystem/util/StringCleaner.java       |   2 +-
 .../StringUtils.java}                         |  36 ++--
 .../buildsystem/world/WorldServiceImpl.java   |  63 +++---
 .../buildsystem/world/backup/BackupImpl.java  |  25 +++
 .../world/backup/BackupProfileImpl.java       | 140 +++++++++++++
 .../world/backup/BackupService.java           | 126 ++++++++++++
 .../world/backup/BackupsInventory.java        | 187 ++++++++++++++++++
 .../backup/storage/LocalBackupStorage.java    | 114 +++++++++++
 .../world/backup/storage/S3BackupStorage.java | 168 ++++++++++++++++
 .../world/creation/BuildWorldCreatorImpl.java | 120 ++++++-----
 ...nVoidGenerator.java => VoidGenerator.java} |  24 ++-
 .../buildsystem/world/data/WorldDataImpl.java |  11 ++
 .../world/util/WorldLoaderImpl.java           |  22 +--
 .../world/util/WorldUnloaderImpl.java         |  29 +--
 .../src/main/resources/config.yml             |  12 +-
 gradle/libs.versions.toml                     |  17 +-
 34 files changed, 1319 insertions(+), 176 deletions(-)
 rename buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/voidgenerator/VoidGenerator.java => buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/Backup.java (66%)
 create mode 100644 buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupProfile.java
 create mode 100644 buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/BackupsSubCommand.java
 rename buildsystem-core/src/main/java/de/eintosti/buildsystem/{world/creation/generator/voidgenerator/DeprecatedVoidGenerator.java => util/StringUtils.java} (52%)
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupImpl.java
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
 rename buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/{voidgenerator/ModernVoidGenerator.java => VoidGenerator.java} (73%)

diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/voidgenerator/VoidGenerator.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/Backup.java
similarity index 66%
rename from buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/voidgenerator/VoidGenerator.java
rename to buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/Backup.java
index b7c67eb0..262686f5 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/voidgenerator/VoidGenerator.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/Backup.java
@@ -15,20 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package de.eintosti.buildsystem.world.creation.generator.voidgenerator;
+package de.eintosti.buildsystem.api.world.backup;
 
-import org.bukkit.block.Biome;
-import org.bukkit.generator.ChunkGenerator;
+public interface Backup {
 
-public abstract class VoidGenerator extends ChunkGenerator {
+    BackupProfile owner();
 
-    private final Biome biome;
+    long creationTime();
 
-    public VoidGenerator(Biome biome) {
-        this.biome = biome;
-    }
-
-    public Biome getBiome() {
-        return biome;
-    }
-}
\ No newline at end of file
+    String key();
+}
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupProfile.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupProfile.java
new file mode 100644
index 00000000..84f88806
--- /dev/null
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupProfile.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023-2025, Thomas Meaney
+ * All rights reserved.
+ *
+ * Unauthorized copying of this file, via any medium is strictly prohibited
+ * Proprietary and confidential
+ */
+package de.eintosti.buildsystem.api.world.backup;
+
+import de.eintosti.buildsystem.api.world.BuildWorld;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import org.bukkit.entity.Player;
+
+public interface BackupProfile {
+
+    /**
+     * Asynchronously populates a list of available {@link Backup}s under this profile.
+     *
+     * @return Future that will be completed with available backups
+     */
+    CompletableFuture<List<Backup>> listBackups();
+
+    /**
+     * Creates a backup of the {@link BuildWorld}. If the profile is at the maximum backup capacity, the oldest backup will be deleted.
+     *
+     * @return Future that completes with the created backup.
+     */
+    CompletableFuture<Backup> createBackup();
+
+    /**
+     * Restores a {@link Backup}.
+     *
+     * @param backup Backup to restore
+     * @param player The player restoring the backup
+     */
+    void restoreBackup(Backup backup, Player player);
+
+    /**
+     * Removes all {@link Backup}s stored for this profile.
+     */
+    void destroy();
+}
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
new file mode 100644
index 00000000..a55d7022
--- /dev/null
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.eintosti.buildsystem.api.world.backup;
+
+import de.eintosti.buildsystem.api.world.BuildWorld;
+import java.io.File;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public interface BackupStorage {
+
+    List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld);
+
+    void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableFuture<Backup> future);
+
+    File downloadBackup(Backup backup);
+
+    void deleteBackup(Backup backup);
+
+    default String getBackupName(BuildWorld buildWorld, long timestamp) {
+        return buildWorld.getUniqueId() + "-" + timestamp + ".zip";
+    }
+}
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/creation/BuildWorldCreator.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/creation/BuildWorldCreator.java
index 9f474446..85565ca5 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/creation/BuildWorldCreator.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/creation/BuildWorldCreator.java
@@ -127,25 +127,26 @@ public interface BuildWorldCreator {
     void importWorld(Player player, boolean teleport);
 
     /**
-     * Generates the underlying Bukkit {@link World} and applies post-generation settings.
+     * Generates the underlying Bukkit {@link World} and applies post-generation settings. Only generates the world if the world was not created in a newer Minecraft version that
+     * the server is running.
      * <p>
-     * Only generates the world if the world was not created in a newer Minecraft version that the server is running.
+     * Important: This method should only be called after the world has been created and registered with the plugin.
      *
-     * @param buildWorld The build world to generate
      * @return The generated {@link World}, or {@code null} if generation failed
      */
     @Nullable
-    default World generateBukkitWorld(BuildWorld buildWorld) {
-        return generateBukkitWorld(buildWorld, true);
+    default World generateBukkitWorld() {
+        return generateBukkitWorld(true);
     }
 
     /**
      * Generates the underlying Bukkit {@link World} and applies post-generation settings.
+     * <p>
+     * Important: This method should only be called after the world has been created and registered with the plugin.
      *
-     * @param buildWorld   The build world to generate
      * @param checkVersion If true, verify that the world's data version is compatible
-     * @return The generated {@link World}, or {@code null} if generation failed.
+     * @return The generated {@link World}, or {@code null} if generation failed
      */
     @Nullable
-    World generateBukkitWorld(BuildWorld buildWorld, boolean checkVersion);
+    World generateBukkitWorld(boolean checkVersion);
 }
\ No newline at end of file
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/data/BuildWorldType.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/data/BuildWorldType.java
index 9362f4e6..46b16d9f 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/data/BuildWorldType.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/data/BuildWorldType.java
@@ -32,50 +32,50 @@ public enum BuildWorldType {
     /**
      * A standard world type, equivalent to a default Minecraft overworld with {@link Environment#NORMAL}.
      */
-    NORMAL(),
+    NORMAL,
 
     /**
      * A super-flat world, ideal for creative building without terrain obstacles.
      */
-    FLAT(),
+    FLAT,
 
     /**
      * A world type representing the Nether dimension, with {@link Environment#NETHER}.
      */
-    NETHER(),
+    NETHER,
 
     /**
      * A world type representing the End dimension, with {@link Environment#THE_END}.
      */
-    END(),
+    END,
 
     /**
      * An empty world, containing no blocks except for a single platform at spawn.
      */
-    VOID(),
+    VOID,
 
     /**
      * A world created as an identical copy of an existing template world.
      */
-    TEMPLATE(),
+    TEMPLATE,
 
     /**
      * A world that, by default, can only be modified by its creator.
      */
-    PRIVATE(),
+    PRIVATE,
 
     /**
      * A world that was not originally created by the BuildSystem plugin but has been imported for management.
      */
-    IMPORTED(),
+    IMPORTED,
 
     /**
      * A world generated using a custom {@link ChunkGenerator}.
      */
-    CUSTOM(),
+    CUSTOM,
 
     /**
      * A world whose type could not be determined or is not recognized by the BuildSystem.
      */
-    UNKNOWN()
+    UNKNOWN
 }
\ No newline at end of file
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/data/WorldData.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/data/WorldData.java
index 7b007cd3..f788b6b9 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/data/WorldData.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/data/WorldData.java
@@ -19,6 +19,7 @@
 
 import com.cryptomorin.xseries.XMaterial;
 import de.eintosti.buildsystem.api.world.BuildWorld;
+import de.eintosti.buildsystem.api.world.backup.Backup;
 import java.util.Map;
 import org.bukkit.Difficulty;
 import org.bukkit.Location;
@@ -139,6 +140,13 @@ public interface WorldData {
      */
     Type<Boolean> privateWorld();
 
+    /**
+     * Gets the number of seconds that have passed since that last {@link Backup} of the {@link BuildWorld} was created.
+     *
+     * @return The number of seconds since the last backup
+     */
+    Type<Integer> timeSinceBackup();
+
     /**
      * Retrieves a {@link Type} object representing the timestamp (in milliseconds since epoch) of the last time the {@link BuildWorld} was edited.
      *
diff --git a/buildsystem-core/build.gradle.kts b/buildsystem-core/build.gradle.kts
index e9224dd8..f04835a1 100644
--- a/buildsystem-core/build.gradle.kts
+++ b/buildsystem-core/build.gradle.kts
@@ -51,8 +51,10 @@ dependencies {
     implementation(libs.fastboard)
     implementation(libs.nbt) { isTransitive = false }
     implementation(libs.bstats)
+    implementation(libs.aws.core) // Unable to find the dependency at runtime, so we add it here
 
-    library("net.lingala.zip4j", "zip4j", "2.11.5")
+    library(libs.bundles.aws)
+    library(libs.zip4j)
 }
 
 tasks.named("assemble") {
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
index 9d22152c..c8df9bbe 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
@@ -91,6 +91,7 @@
 import de.eintosti.buildsystem.util.UpdateChecker;
 import de.eintosti.buildsystem.world.SpawnManager;
 import de.eintosti.buildsystem.world.WorldServiceImpl;
+import de.eintosti.buildsystem.world.backup.BackupService;
 import de.eintosti.buildsystem.world.display.CustomizableIcons;
 import java.io.File;
 import java.util.HashMap;
@@ -120,6 +121,7 @@ public class BuildSystemPlugin extends JavaPlugin {
     private SettingsManager settingsManager;
     private SpawnManager spawnManager;
     private WorldServiceImpl worldService;
+    private BackupService backupService;
     private CustomizableIcons customizableIcons;
 
     private LuckPermsExpansion luckPermsExpansion;
@@ -201,6 +203,7 @@ private void initClasses() {
         this.playerService = new PlayerServiceImpl(this);
         this.noClipManager = new NoClipManager(this);
         (this.worldService = new WorldServiceImpl(this)).init();
+        this.backupService = new BackupService(this);
         this.settingsManager = new SettingsManager(this);
         this.spawnManager = new SpawnManager(this);
     }
@@ -419,6 +422,10 @@ public WorldServiceImpl getWorldService() {
         return worldService;
     }
 
+    public BackupService getBackupService() {
+        return backupService;
+    }
+
     public CustomizableIcons getCustomizableIcons() {
         return customizableIcons;
     }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java
index 90b3150d..05748ee3 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java
@@ -237,6 +237,14 @@ public static void createMessageFile() {
         setMessage(sb, "worlds_addbuilder_already_added", "%prefix% &cThis player is already a builder.");
         setMessage(sb, "worlds_addbuilder_added", "%prefix% &b%builder% &7was &aadded &7as a builder.");
         addSpacer(sb, "");
+        setMessage(sb, "worlds_backup_usage", "%prefix% &7Usage: &b/worlds backup [create]");
+        setMessage(sb, "worlds_backup_unknown_world", "%prefix% &cUnknown world.");
+        setMessage(sb, "worlds_backup_world_not_imported", "%prefix% &cWorld must be imported: /worlds import <world>");
+        setMessage(sb, "worlds_backup_created", "%prefix% &7Successfully &acreated &7a backup of &b%world%&7.");
+        setMessage(sb, "worlds_backup_failed", "%prefix% &cUnable to create a backup of %world%.");
+        setMessage(sb, "worlds_backup_restoration_in_progress", "%prefix% &7&oThe world you are in is being restored...");
+        setMessage(sb, "worlds_backup_restoration_successful", "%prefix% &7The world has been successfully reset to the state from &a%timestamp%&7.");
+        addSpacer(sb, "");
         setMessage(sb, "worlds_builders_usage", "%prefix% &7Usage: &b/worlds builders <world>");
         setMessage(sb, "worlds_builders_unknown_world", "%prefix% &cUnknown world.");
         addSpacer(sb, "");
@@ -508,6 +516,29 @@ public static void createMessageFile() {
         setMessage(sb, "private_no_worlds", "&c&nNo worlds available");
         setMessage(sb, "private_create_world", "&bCreate a Private World");
         addSpacer(sb, "");
+        addSpacer(sb, "# World Backups");
+        setMessage(sb, "backups_title", "&3» &8World Backups");
+        setMessage(sb, "backups_information_name", "&aInformation");
+        setMessage(sb, "backups_information_lore", Arrays.asList(
+                "",
+                "&7A backup is automatically created",
+                "&7every &a%interval% minutes &7in which a",
+                "&7builder is present in the world.",
+                "",
+                "&7Next backup in: &a%remaining%"
+        ));
+        setMessage(sb, "backups_backup_name", "&a%timestamp%");
+        setMessage(sb, "restore_backup_title", "&3» &8Restore Backup");
+        setMessage(sb, "restore_backup_confirm_name", "&aConfirm");
+        setMessage(sb, "restore_backup_confirm_lore", Arrays.asList(
+                "",
+                "&7Are you sure you to &arestore &7to the",
+                "&7backup from &f%timestamp%&7?",
+                "",
+                "&c&nWarning&c: &7This action &cCANNOT &7be undone."
+        ));
+        setMessage(sb, "restore_backup_cancel_name", "&cCancel");
+        addSpacer(sb, "");
         addSpacer(sb, "# Setup");
         setMessage(sb, "setup_title", "&3» &8Setup");
         setMessage(sb, "setup_default_item_name", "&bDefault Item");
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/WorldsCommand.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/WorldsCommand.java
index 4fe77fff..36277294 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/WorldsCommand.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/WorldsCommand.java
@@ -22,6 +22,7 @@
 import de.eintosti.buildsystem.Messages;
 import de.eintosti.buildsystem.command.subcommand.SubCommand;
 import de.eintosti.buildsystem.command.subcommand.worlds.AddBuilderSubCommand;
+import de.eintosti.buildsystem.command.subcommand.worlds.BackupsSubCommand;
 import de.eintosti.buildsystem.command.subcommand.worlds.BuildersSubCommand;
 import de.eintosti.buildsystem.command.subcommand.worlds.DeleteSubCommand;
 import de.eintosti.buildsystem.command.subcommand.worlds.EditSubCommand;
@@ -89,6 +90,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
 
         SubCommand subCommand = switch (argument) {
             case ADD_BUILDER -> new AddBuilderSubCommand(plugin, player.getWorld().getName());
+            case BACKUP -> new BackupsSubCommand(plugin);
             case BUILDERS -> new BuildersSubCommand(plugin, worldName);
             case DELETE -> new DeleteSubCommand(plugin, worldName);
             case EDIT -> new EditSubCommand(plugin, worldName);
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/BackupsSubCommand.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/BackupsSubCommand.java
new file mode 100644
index 00000000..c91f11f2
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/BackupsSubCommand.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.eintosti.buildsystem.command.subcommand.worlds;
+
+import com.cryptomorin.xseries.XSound;
+import de.eintosti.buildsystem.BuildSystemPlugin;
+import de.eintosti.buildsystem.Messages;
+import de.eintosti.buildsystem.api.world.BuildWorld;
+import de.eintosti.buildsystem.command.subcommand.Argument;
+import de.eintosti.buildsystem.command.subcommand.SubCommand;
+import de.eintosti.buildsystem.tabcomplete.WorldsTabComplete;
+import de.eintosti.buildsystem.world.backup.BackupsInventory;
+import de.eintosti.buildsystem.world.util.WorldPermissionsImpl;
+import java.util.Map;
+import java.util.Map.Entry;
+import org.bukkit.entity.Player;
+
+public class BackupsSubCommand implements SubCommand {
+
+    private final BuildSystemPlugin plugin;
+
+    public BackupsSubCommand(BuildSystemPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void execute(Player player, String[] args) {
+        BuildWorld buildWorld = plugin.getWorldService().getWorldStorage().getBuildWorld(player.getWorld().getName());
+        if (!WorldPermissionsImpl.of(buildWorld).canPerformCommand(player, getArgument().getPermission())) {
+            Messages.sendPermissionError(player);
+            return;
+        }
+
+        if (buildWorld == null) {
+            Messages.sendMessage(player, "worlds_backup_world_not_imported");
+            return;
+        }
+
+        switch (args.length) {
+            case 1 -> {
+                XSound.BLOCK_CHEST_OPEN.play(player);
+                new BackupsInventory(plugin).openBackupsInventory(player, buildWorld);
+            }
+            case 2 -> {
+                if (args[1].equalsIgnoreCase("create")) {
+                    if (!player.hasPermission(getArgument().getPermission() + ".create")) {
+                        Messages.sendPermissionError(player);
+                        return;
+                    }
+
+                    Entry<String, Object> worldNamePlaceholder = Map.entry("%world%", buildWorld.getName());
+                    plugin.getBackupService().backup(buildWorld,
+                            () -> Messages.sendMessage(player, "worlds_backup_created", worldNamePlaceholder),
+                            () -> Messages.sendMessage(player, "worlds_backup_failed", worldNamePlaceholder)
+                    );
+                } else {
+                    Messages.sendMessage(player, "worlds_backup_usage");
+                }
+            }
+            default -> {
+                Messages.sendMessage(player, "worlds_backup_usage");
+            }
+        }
+    }
+
+    @Override
+    public Argument getArgument() {
+        return WorldsTabComplete.WorldsArgument.BACKUP;
+    }
+}
\ No newline at end of file
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/UnimportSubCommand.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/UnimportSubCommand.java
index 8961c410..ca44fc53 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/UnimportSubCommand.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/UnimportSubCommand.java
@@ -54,7 +54,7 @@ public void execute(Player player, String[] args) {
             return;
         }
 
-        plugin.getWorldService().unimportWorld(player, buildWorld, true);
+        plugin.getWorldService().unimportWorld(buildWorld, true);
         Messages.sendMessage(player, "worlds_unimport_finished",
                 Map.entry("%world%", buildWorld.getName())
         );
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
index 36c557c0..85d222d9 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
@@ -18,6 +18,8 @@
 package de.eintosti.buildsystem.config;
 
 import com.cryptomorin.xseries.XMaterial;
+import de.eintosti.buildsystem.BuildSystemPlugin;
+import de.eintosti.buildsystem.api.world.backup.BackupStorage;
 import de.eintosti.buildsystem.config.Config.Settings.Archive;
 import de.eintosti.buildsystem.config.Config.Settings.BuildMode;
 import de.eintosti.buildsystem.config.Config.Settings.Builder;
@@ -30,6 +32,8 @@
 import de.eintosti.buildsystem.config.Config.World.Default.Time;
 import de.eintosti.buildsystem.config.Config.World.Limits;
 import de.eintosti.buildsystem.config.Config.World.Unload;
+import de.eintosti.buildsystem.world.backup.storage.LocalBackupStorage;
+import de.eintosti.buildsystem.world.backup.storage.S3BackupStorage;
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -42,6 +46,7 @@
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
 import org.bukkit.GameRule;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -335,7 +340,9 @@ public static class Backup {
             /**
              * The maximum number of backups to keep per world.
              */
-            public static int maxBackupsPerWorld = 9;
+            public static int maxBackupsPerWorld = 5;
+
+            public static BackupStorage storage;
         }
     }
 
@@ -357,9 +364,9 @@ public static class Folder {
     /**
      * Loads the configuration values from the plugin's config.yml into the static fields.
      *
-     * @param plugin The JavaPlugin instance.
+     * @param plugin The plugin instance.
      */
-    public static void load(final JavaPlugin plugin) {
+    public static void load(final BuildSystemPlugin plugin) {
         FileConfiguration config = plugin.getConfig();
 
         // Messages
@@ -431,7 +438,8 @@ public static void load(final JavaPlugin plugin) {
         // World - Backup
         Backup.enabled = config.getBoolean("world.backup.enabled", true);
         Backup.backupInterval = config.getInt("world.backup.backup-interval", 900);
-        Backup.maxBackupsPerWorld = config.getInt("world.backup.max-backups-per-world", 9);
+        Backup.maxBackupsPerWorld = config.getInt("world.backup.max-backups-per-world", 5);
+        Backup.storage = createBackupStorage(plugin);
 
         // Folder
         Folder.overridePermissions = config.getBoolean("folder.override-permissions", true);
@@ -493,4 +501,29 @@ private static XMaterial parseWorldEditWand(JavaPlugin plugin) {
 
         return XMaterial.matchXMaterial(wand).orElse(defaultWand);
     }
+
+    private static BackupStorage createBackupStorage(BuildSystemPlugin plugin) {
+        FileConfiguration config = plugin.getConfig();
+        String type = config.getString("world.backup.storage.type", "local").toLowerCase();
+
+        switch (type) {
+            case "s3" -> {
+                ConfigurationSection s3 = config.getConfigurationSection("world.backup.storage.s3");
+                return new S3BackupStorage(
+                        plugin,
+                        s3.getString("access-key"),
+                        s3.getString("secret-key"),
+                        s3.getString("region"),
+                        s3.getString("bucket"),
+                        s3.getString("path")
+                );
+            }
+            default -> {
+                if (!type.equals("local")) {
+                    plugin.getLogger().warning("Unknown backup storage type '" + type + "', defaulting to local storage.");
+                }
+                return new LocalBackupStorage(plugin);
+            }
+        }
+    }
 }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/WorldStorageImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/WorldStorageImpl.java
index ece234e3..93ae94f8 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/WorldStorageImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/WorldStorageImpl.java
@@ -189,7 +189,7 @@ private LoadResult loadWorld(BuildWorld buildWorld, boolean alwaysLoad) {
             return LoadResult.NOT_BLACKLISTED;
         }
 
-        World world = new BuildWorldCreatorImpl(plugin, worldName).generateBukkitWorld(buildWorld);
+        World world = new BuildWorldCreatorImpl(plugin, buildWorld).generateBukkitWorld();
         if (world == null) {
             return LoadResult.FAILED;
         }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlWorldStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlWorldStorage.java
index e6ec8159..94f5ee36 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlWorldStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlWorldStorage.java
@@ -199,6 +199,8 @@ private WorldDataImpl parseWorldData(String worldName) {
         boolean physics = config.getBoolean(path + ".physics");
         boolean privateWorld = config.getBoolean(path + ".private");
 
+        int timeSinceBackup = config.getInt(path + ".time-since-backup", 0);
+
         long lastLoaded = config.getLong(path + ".last-loaded");
         long lastUnloaded = config.getLong(path + ".last-unloaded");
         long lastEdited = config.getLong(path + ".last-edited");
@@ -206,7 +208,7 @@ private WorldDataImpl parseWorldData(String worldName) {
         return new WorldDataImpl(
                 worldName, customSpawn, permission, project, difficulty, material, worldStatus, blockBreaking,
                 blockInteractions, blockPlacement, buildersEnabled, explosions, mobAi, physics, privateWorld,
-                lastLoaded, lastUnloaded, lastEdited
+                timeSinceBackup, lastLoaded, lastUnloaded, lastEdited
         );
     }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/tabcomplete/WorldsTabComplete.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/tabcomplete/WorldsTabComplete.java
index 1e4235e6..1c181190 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/tabcomplete/WorldsTabComplete.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/tabcomplete/WorldsTabComplete.java
@@ -101,6 +101,13 @@ public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Comman
                         break;
                     }
 
+                    case "backup": {
+                        if (player.hasPermission(WorldsArgument.BACKUP.getPermission() + ".create")) {
+                            addArgument(args[1], "create", arrayList);
+                        }
+                        break;
+                    }
+
                     case "delete": {
                         worldStorage.getBuildWorlds().stream()
                                 .filter(world -> world.getPermissions().canPerformCommand(player, "buildsystem." + args[0].toLowerCase(Locale.ROOT)))
@@ -240,6 +247,7 @@ public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Comman
 
     public enum WorldsArgument implements Argument {
         ADD_BUILDER("addBuilder", "buildsystem.addbuilder"),
+        BACKUP("backup", "buildsystem.backup"),
         BUILDERS("builders", "buildsystem.builders"),
         DELETE("delete", "buildsystem.delete"),
         EDIT("edit", "buildsystem.edit"),
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java
index 205e348e..789010d2 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java
@@ -18,7 +18,9 @@
 package de.eintosti.buildsystem.util;
 
 import com.google.common.collect.Sets;
+import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.api.world.BuildWorld;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,21 +31,43 @@
 import java.nio.file.attribute.FileTime;
 import java.util.Comparator;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.stream.Stream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.model.ExcludeFileFilter;
 import net.lingala.zip4j.model.ZipParameters;
 import org.bukkit.Bukkit;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public final class FileUtils {
 
+    private static final Logger LOGGER = JavaPlugin.getPlugin(BuildSystemPlugin.class).getLogger();
     private static final Set<String> IGNORE_FILES = Sets.newHashSet("uid.dat", "session.lock");
 
     private FileUtils() {
     }
 
+    public static Path resolve(Path parent, final String child) {
+        Path path = parent;
+        try {
+            if (!Files.exists(parent)) {
+                Files.createDirectory(parent);
+            }
+            path = parent.resolve(child);
+            if (!Files.exists(path)) {
+                Files.createDirectory(path);
+            }
+        } catch (final Exception e) {
+            LOGGER.log(Level.SEVERE, "Failed to create backup directory for " + child, e);
+        }
+        return path;
+    }
+
     /**
      * Copies a file or directory from the source location to the target location.
      *
@@ -63,7 +87,7 @@ public static void copy(@NotNull File source, @NotNull File target) {
                 copyFile(source, target);
             }
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            LOGGER.log(Level.SEVERE, "Failed to copy " + source.getAbsolutePath() + " to " + target.getAbsolutePath(), e);
         }
     }
 
@@ -76,7 +100,8 @@ public static void copy(@NotNull File source, @NotNull File target) {
      */
     private static void copyDirectory(@NotNull File source, @NotNull File target) throws IOException {
         if (!target.exists() && !target.mkdirs()) {
-            throw new IOException("Couldn't create directory: " + target.getName());
+            LOGGER.log(Level.SEVERE, "Failed to create target directory: " + target.getAbsolutePath());
+            return;
         }
 
         for (String fileName : source.list()) {
@@ -98,8 +123,10 @@ private static void copyDirectory(@NotNull File source, @NotNull File target) th
      * @throws IOException If an I/O error occurs while copying the file
      */
     private static void copyFile(@NotNull File source, @NotNull File target) throws IOException {
-        try (InputStream inputStream = Files.newInputStream(source.toPath());
-                OutputStream outputStream = Files.newOutputStream(target.toPath())) {
+        try (
+                InputStream inputStream = Files.newInputStream(source.toPath());
+                OutputStream outputStream = Files.newOutputStream(target.toPath())
+        ) {
             byte[] buffer = new byte[1024];
             int length;
             while ((length = inputStream.read(buffer)) > 0) {
@@ -119,7 +146,7 @@ public static void deleteDirectory(File directory) {
                     .map(Path::toFile)
                     .forEach(File::delete);
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.log(Level.SEVERE, "Failed to delete directory " + directory.getAbsolutePath(), e);
         }
     }
 
@@ -136,14 +163,14 @@ public static long getDirectoryCreation(File file) {
             FileTime time = attrs.creationTime();
             creation = time.toMillis();
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.log(Level.SEVERE, "Failed to read attributes from " + file.getAbsolutePath(), e);
         }
         return creation;
     }
 
     @Nullable
     public static File zipWorld(File storage, BuildWorld buildWorld) {
-        try (ZipFile zipFile = new ZipFile(storage.getAbsolutePath() + ".zip")) {
+        try (ZipFile zipFile = new ZipFile(storage.getAbsolutePath())) {
             File worldContainer = new File(Bukkit.getWorldContainer(), buildWorld.getName());
 
             ExcludeFileFilter excludeFileFilter = Sets.newHashSet(
@@ -156,8 +183,31 @@ public static File zipWorld(File storage, BuildWorld buildWorld) {
             zipFile.addFolder(worldContainer, zipParameters);
             return zipFile.getFile();
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.log(Level.SEVERE, "Failed to zip world " + storage.getAbsolutePath(), e);
         }
         return null;
     }
+
+    public static byte[] zipWorldToMemory(BuildWorld buildWorld) throws IOException {
+        Path worldPath = Path.of(new File(Bukkit.getWorldContainer(), buildWorld.getName()).getPath());
+        ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+
+        try (
+                ZipOutputStream zipOut = new ZipOutputStream(byteOut);
+                Stream<Path> walk = Files.walk(worldPath)
+        ) {
+            walk.filter(Files::isRegularFile).forEach(file -> {
+                try {
+                    Path relativePath = worldPath.relativize(file);
+                    zipOut.putNextEntry(new ZipEntry(relativePath.toString().replace("\\", "/")));
+                    Files.copy(file, zipOut);
+                    zipOut.closeEntry();
+                } catch (IOException e) {
+                    LOGGER.log(Level.SEVERE, "Failed to zip world " + worldPath + " to memory", e);
+                }
+            });
+        }
+
+        return byteOut.toByteArray();
+    }
 }
\ No newline at end of file
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/NumberUtils.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/NumberUtils.java
index 47067af1..494c7421 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/NumberUtils.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/NumberUtils.java
@@ -22,7 +22,7 @@
  *
  * @since 2.0
  */
-public class NumberUtils {
+public final class NumberUtils {
 
     private NumberUtils() {
     }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/StringCleaner.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/StringCleaner.java
index 8d512b2f..078cd864 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/StringCleaner.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/StringCleaner.java
@@ -21,7 +21,7 @@
 import java.util.Arrays;
 import org.jetbrains.annotations.Nullable;
 
-public class StringCleaner {
+public final class StringCleaner {
 
     public static final String INVALID_NAME_CHARACTERS = "[^A-Za-z\\d/_-]";
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/voidgenerator/DeprecatedVoidGenerator.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/StringUtils.java
similarity index 52%
rename from buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/voidgenerator/DeprecatedVoidGenerator.java
rename to buildsystem-core/src/main/java/de/eintosti/buildsystem/util/StringUtils.java
index 1c7008a5..a5127ff7 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/voidgenerator/DeprecatedVoidGenerator.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/StringUtils.java
@@ -15,27 +15,27 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package de.eintosti.buildsystem.world.creation.generator.voidgenerator;
+package de.eintosti.buildsystem.util;
 
-import java.util.Random;
-import javax.annotation.Nonnull;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
+import de.eintosti.buildsystem.config.Config.Messages;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
-/**
- * The {@link VoidGenerator} that is used for servers which run on Spigot 1.13-1.16.
- */
-@SuppressWarnings("deprecation")
-public class DeprecatedVoidGenerator extends VoidGenerator {
+public final class StringUtils {
 
-    public DeprecatedVoidGenerator() {
-        super(Biome.PLAINS);
+    private StringUtils() {
     }
 
-    @Nonnull
-    @Override
-    public ChunkData generateChunkData(@Nonnull World world, @Nonnull Random random, int x, int z, @Nonnull BiomeGrid biome) {
-        biome.setBiome(x, z, super.getBiome());
-        return createChunkData(world);
+    /**
+     * Formats a given time in milliseconds to a human-readable string.
+     *
+     * @param millis The time in milliseconds to format
+     * @return A formatted string representing the date and time
+     */
+    public static String formatTime(long millis) {
+        Date date = new Date(millis);
+        DateFormat formatter = new SimpleDateFormat(Messages.dateFormat + " HH:mm:ss");
+        return formatter.format(date);
     }
-}
\ No newline at end of file
+}
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java
index 5f91a0a8..b07a5f3d 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java
@@ -235,19 +235,18 @@ public boolean isImportingAllWorlds() {
     /**
      * Unimport an existing {@link BuildWorld}. In comparison to {@link #deleteWorld(Player, BuildWorld)}, unimporting a world does not delete the world's directory.
      *
-     * @param player     The player unloading the world
      * @param buildWorld The build world object
      * @param save       Whether to save the world before unloading
      */
-    public void unimportWorld(Player player, BuildWorld buildWorld, boolean save) {
+    public void unimportWorld(BuildWorld buildWorld, boolean save) {
         buildWorld.getUnloader().forceUnload(save);
         this.worldStorage.removeBuildWorld(buildWorld);
-        removePlayersFromWorld(buildWorld.getName(), Messages.getString("worlds_unimport_players_world", player));
+        removePlayersFromWorld(buildWorld.getName(), "worlds_unimport_players_world");
         Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> this.worldStorage.delete(buildWorld));
     }
 
     /**
-     * Delete an existing {@link BuildWorld}. In comparison to {@link #unimportWorld(Player, BuildWorld, boolean)}, deleting a world deletes the world's directory.
+     * Delete an existing {@link BuildWorld}. In comparison to {@link #unimportWorld(BuildWorld, boolean)}, deleting a world deletes the world's directory.
      *
      * @param player     The player who issued the deletion
      * @param buildWorld The world to be deleted
@@ -271,9 +270,9 @@ public void deleteWorld(Player player, BuildWorld buildWorld) {
         }
 
         Messages.sendMessage(player, "worlds_delete_started", Map.entry("%world%", worldName));
-        removePlayersFromWorld(worldName, Messages.getString("worlds_delete_players_world", player));
+        removePlayersFromWorld(worldName, "worlds_delete_players_world");
         Bukkit.getScheduler().runTaskLater(plugin, () -> {
-            unimportWorld(player, buildWorld, false);
+            unimportWorld(buildWorld, false);
             FileUtils.deleteDirectory(deleteFolder);
             Messages.sendMessage(player, "worlds_delete_finished");
         }, 20L);
@@ -319,7 +318,7 @@ public void renameWorld(Player player, BuildWorld buildWorld, String newName) {
             return;
         }
 
-        List<Player> removedPlayers = removePlayersFromWorld(oldName, Messages.getString("worlds_rename_players_world", player));
+        List<Player> removedPlayers = removePlayersFromWorld(oldName, "worlds_rename_players_world");
         for (Chunk chunk : oldWorld.getLoadedChunks()) {
             chunk.unload(true);
         }
@@ -337,7 +336,7 @@ public void renameWorld(Player player, BuildWorld buildWorld, String newName) {
         this.worldStorage.addBuildWorld(buildWorld);
         Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> this.worldStorage.save(buildWorld));
 
-        World newWorld = new BuildWorldCreatorImpl(plugin, sanitizedNewName).generateBukkitWorld(buildWorld, false);
+        World newWorld = new BuildWorldCreatorImpl(plugin, buildWorld).generateBukkitWorld(false);
         Location spawnLocation = oldWorld.getSpawnLocation();
         spawnLocation.setWorld(newWorld);
 
@@ -365,41 +364,49 @@ public void renameWorld(Player player, BuildWorld buildWorld, String newName) {
         );
     }
 
-    private List<Player> removePlayersFromWorld(String worldName, String message) {
-        List<Player> players = new ArrayList<>();
+    public List<Player> removePlayersFromWorld(String worldName, String messageKey) {
+        List<Player> affectedPlayers = new ArrayList<>();
 
-        World bukkitWorld = Bukkit.getWorld(worldName);
-        if (bukkitWorld == null) {
-            return players;
+        World worldToRemove = Bukkit.getWorld(worldName);
+        if (worldToRemove == null) {
+            plugin.getLogger().warning("Cannot remove players from world '" + worldName + "' because the world does not exist.");
+            return affectedPlayers;
         }
 
-        World defaultWorld = Bukkit.getWorlds().getFirst();
-        Location spawnLocation = defaultWorld.getHighestBlockAt(defaultWorld.getSpawnLocation()).getLocation().add(0.5, 1, 0.5);
+        World fallbackWorld = Bukkit.getWorlds().getFirst();
+        Location fallbackSpawn = fallbackWorld.getHighestBlockAt(fallbackWorld.getSpawnLocation()).getLocation().add(0.5, 1, 0.5);
 
         SpawnManager spawnManager = plugin.getSpawnManager();
 
         Bukkit.getOnlinePlayers().forEach(player -> {
-            World playerWorld = player.getWorld();
-            if (!playerWorld.equals(bukkitWorld)) {
+            if (!player.getWorld().equals(worldToRemove)) {
                 return;
             }
 
+            boolean teleported = false;
+
             if (spawnManager.spawnExists()) {
-                if (!spawnManager.getSpawnWorld().equals(playerWorld)) {
-                    spawnManager.teleport(player);
-                } else {
-                    PaperLib.teleportAsync(player, spawnLocation);
-                    spawnManager.remove();
-                }
-            } else {
-                PaperLib.teleportAsync(player, spawnLocation);
+                // Spawn exists -> always teleport to it
+                spawnManager.teleport(player);
+                teleported = true;
+            } else if (!fallbackWorld.equals(worldToRemove)) {
+                // Spawn doesn't exist, the fallback world is usable -> teleport
+                PaperLib.teleportAsync(player, fallbackSpawn);
+                teleported = true;
+            }
+
+            if (!teleported) {
+                // No valid spawn and fallback world is the one being deleted -> kick
+                spawnManager.remove();
+                player.kickPlayer(Messages.getString(messageKey, player));
+                return;
             }
 
-            player.sendMessage(message);
-            players.add(player);
+            Messages.sendMessage(player, messageKey);
+            affectedPlayers.add(player);
         });
 
-        return players;
+        return affectedPlayers;
     }
 
     public void save() {
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupImpl.java
new file mode 100644
index 00000000..9e7376f1
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupImpl.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.eintosti.buildsystem.world.backup;
+
+import de.eintosti.buildsystem.api.world.backup.Backup;
+import de.eintosti.buildsystem.api.world.backup.BackupProfile;
+
+public record BackupImpl(BackupProfile owner, long creationTime, String key) implements Backup {
+
+}
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
new file mode 100644
index 00000000..38983c61
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2023-2025, Thomas Meaney
+ * All rights reserved.
+ *
+ * Unauthorized copying of this file, via any medium is strictly prohibited
+ * Proprietary and confidential
+ */
+package de.eintosti.buildsystem.world.backup;
+
+import de.eintosti.buildsystem.BuildSystemPlugin;
+import de.eintosti.buildsystem.Messages;
+import de.eintosti.buildsystem.api.world.BuildWorld;
+import de.eintosti.buildsystem.api.world.backup.Backup;
+import de.eintosti.buildsystem.api.world.backup.BackupProfile;
+import de.eintosti.buildsystem.api.world.backup.BackupStorage;
+import de.eintosti.buildsystem.api.world.util.WorldTeleporter;
+import de.eintosti.buildsystem.config.Config;
+import de.eintosti.buildsystem.util.FileUtils;
+import de.eintosti.buildsystem.util.StringUtils;
+import de.eintosti.buildsystem.world.SpawnManager;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
+import net.lingala.zip4j.ZipFile;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+public class BackupProfileImpl implements BackupProfile {
+
+    private final BuildSystemPlugin plugin;
+    private final BackupStorage storage;
+    private final BuildWorld buildWorld;
+    protected final Object backupLock;
+
+    public BackupProfileImpl(BuildSystemPlugin plugin, BackupStorage storage, BuildWorld buildWorld) {
+        this.plugin = plugin;
+        this.storage = storage;
+        this.buildWorld = buildWorld;
+        this.backupLock = new Object();
+    }
+
+    @Override
+    public CompletableFuture<List<Backup>> listBackups() {
+        synchronized (this.backupLock) {
+            return CompletableFuture.supplyAsync(() -> this.storage.listBackups(this, this.buildWorld));
+        }
+    }
+
+    @Override
+    public CompletableFuture<Backup> createBackup() {
+        World world = this.buildWorld.getWorld();
+        if (world != null) {
+            world.save();
+        }
+
+        CompletableFuture<Backup> future = new CompletableFuture<>();
+        this.listBackups().thenAcceptAsync(backups -> {
+            synchronized (this.backupLock) {
+                if (backups.size() >= Config.World.Backup.maxBackupsPerWorld) {
+                    storage.deleteBackup(backups.getLast());
+                }
+
+                this.storage.storeBackup(this, this.buildWorld, future);
+            }
+        });
+        return future;
+    }
+
+    @Override
+    public void restoreBackup(Backup backup, Player player) {
+        File backupFile = this.storage.downloadBackup(backup);
+        if (backupFile == null || !Files.exists(backupFile.toPath())) {
+            throw new IllegalArgumentException("The specific backup does not exist");
+        }
+
+        String worldName = this.buildWorld.getName();
+        World world = this.buildWorld.getWorld();
+        if (world == null && !this.buildWorld.isLoaded()) {
+            this.buildWorld.getLoader().load();
+        }
+
+        if (world == null) {
+            Messages.sendMessage(player, "worlds_backup_unknown_world");
+            return;
+        }
+
+        SpawnManager spawnManager = plugin.getSpawnManager();
+        Location spawn = spawnManager.getSpawn();
+        boolean isSpawn = spawnManager.spawnExists() && spawnManager.getSpawnWorld().equals(world);
+
+        List<Player> removedPlayers = plugin.getWorldService().removePlayersFromWorld(worldName, "worlds_backup_restoration_in_progress");
+
+        Bukkit.getScheduler().runTaskLater(plugin, () -> {
+            this.buildWorld.getUnloader().forceUnload(false);
+        }, 20L);
+
+        Bukkit.getScheduler().runTaskLater(plugin, () -> {
+            FileUtils.deleteDirectory(new File(Bukkit.getWorldContainer(), worldName));
+
+            try (ZipFile zip = new ZipFile(backupFile)) {
+                zip.extractAll(Bukkit.getWorldContainer().getAbsolutePath());
+            } catch (IOException e) {
+                plugin.getLogger().warning("Failed to restore backup at: " + backupFile.getAbsolutePath());
+                return;
+            }
+
+            this.buildWorld.getLoader().load();
+
+            WorldTeleporter worldTeleporter = this.buildWorld.getTeleporter();
+            removedPlayers.stream().filter(Objects::nonNull).forEach(worldTeleporter::teleport);
+
+            if (isSpawn) {
+                spawn.setWorld(Bukkit.getWorld(worldName));
+                spawnManager.set(spawn, worldName);
+            }
+
+            Messages.sendMessage(player, "worlds_backup_restoration_successful",
+                    Map.entry("%timestamp%", StringUtils.formatTime(backup.creationTime()))
+            );
+        }, 60L);
+    }
+
+    @Override
+    public void destroy() {
+        this.listBackups().whenCompleteAsync((backups, error) -> {
+            if (error != null) {
+                plugin.getLogger().log(Level.SEVERE, "Failed to destroy backup", error);
+                return;
+            }
+            backups.forEach(this.storage::deleteBackup);
+        });
+    }
+}
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
new file mode 100644
index 00000000..7bf17eb1
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2023-2025, Thomas Meaney
+ * All rights reserved.
+ *
+ * Unauthorized copying of this file, via any medium is strictly prohibited
+ * Proprietary and confidential
+ */
+package de.eintosti.buildsystem.world.backup;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import de.eintosti.buildsystem.BuildSystemPlugin;
+import de.eintosti.buildsystem.api.storage.WorldStorage;
+import de.eintosti.buildsystem.api.world.BuildWorld;
+import de.eintosti.buildsystem.api.world.backup.BackupProfile;
+import de.eintosti.buildsystem.api.world.backup.BackupStorage;
+import de.eintosti.buildsystem.api.world.data.WorldData.Type;
+import de.eintosti.buildsystem.config.Config.World;
+import de.eintosti.buildsystem.config.Config.World.Backup;
+import java.time.Duration;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class BackupService {
+
+    private static final long UPDATE_INTERVAL = Duration.ofSeconds(5).getSeconds();
+
+    private final BuildSystemPlugin plugin;
+    private final BackupStorage backupStorage;
+    private final WorldStorage worldStorage;
+
+    private final Cache<BuildWorldCacheKey, BackupProfile> backupProfileCache = CacheBuilder.newBuilder().expireAfterAccess(3, TimeUnit.MINUTES).build();
+
+    public BackupService(BuildSystemPlugin plugin) {
+        this.plugin = plugin;
+        this.backupStorage = Backup.storage;
+        this.worldStorage = plugin.getWorldService().getWorldStorage();
+
+        Bukkit.getScheduler().runTaskTimer(plugin, this::incrementTimeSinceBackup, UPDATE_INTERVAL * 20, UPDATE_INTERVAL * 20);
+    }
+
+    /**
+     * Increments the time since a {@link BuildWorld} was backed-up by {@link #UPDATE_INTERVAL} seconds. If the time has surpassed {@link World.Backup#backupInterval}, a backup
+     * will be created.
+     */
+    private void incrementTimeSinceBackup() {
+        Set<BuildWorld> worlds = new HashSet<>();
+
+        for (Player pl : Bukkit.getOnlinePlayers()) {
+            BuildWorld buildWorld = worldStorage.getBuildWorld(pl.getWorld().getName());
+            if (buildWorld != null && buildWorld.getPermissions().canModify(pl, () -> true)) {
+                worlds.add(buildWorld);
+            }
+        }
+
+        worlds.forEach(buildWorld -> {
+            Type<Integer> timeSinceBackup = buildWorld.getData().timeSinceBackup();
+            timeSinceBackup.set((int) (timeSinceBackup.get() + UPDATE_INTERVAL));
+
+            if (timeSinceBackup.get() > World.Backup.backupInterval) {
+                getProfile(buildWorld).createBackup();
+                timeSinceBackup.set(0);
+            }
+        });
+    }
+
+    /**
+     * Performs a backup of the {@link BuildWorld}.
+     *
+     * @param buildWorld The world to create a backup of
+     * @param onSuccess  Action to run if backup was successful
+     * @param onFailure  Action to run if backup failed
+     */
+    public void backup(BuildWorld buildWorld, Runnable onSuccess, Runnable onFailure) {
+        getProfile(buildWorld).createBackup().whenComplete((backup, throwable) -> {
+            if (throwable != null) {
+                plugin.getLogger().log(Level.SEVERE, "Backup failed", throwable);
+                Bukkit.getScheduler().runTask(plugin, onFailure);
+            } else {
+                Bukkit.getScheduler().runTask(plugin, onSuccess);
+            }
+        });
+    }
+
+    /**
+     * Gets the backup profile for a {@link BuildWorld}.
+     *
+     * @param buildWorld The world to get the backup profile for
+     * @return The backup profile
+     */
+    public BackupProfile getProfile(BuildWorld buildWorld) {
+        try {
+            return this.backupProfileCache.get(
+                    new BuildWorldCacheKey(buildWorld),
+                    () -> new BackupProfileImpl(this.plugin, this.backupStorage, buildWorld)
+            );
+        } catch (ExecutionException e) {
+            BackupProfileImpl profile = new BackupProfileImpl(this.plugin, this.backupStorage, buildWorld);
+            this.backupProfileCache.put(new BuildWorldCacheKey(buildWorld), profile);
+            return profile;
+        }
+    }
+
+    private record BuildWorldCacheKey(BuildWorld buildWorld) {
+
+        @Override
+        public boolean equals(Object other) {
+            if (this == other) {
+                return true;
+            }
+
+            if (other == null || getClass() != other.getClass()) {
+                return false;
+            }
+
+            BuildWorldCacheKey that = (BuildWorldCacheKey) other;
+            return Objects.equals(buildWorld.getUniqueId(), that.buildWorld.getUniqueId());
+        }
+    }
+}
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java
new file mode 100644
index 00000000..1ed86043
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2023-2025, Thomas Meaney
+ * All rights reserved.
+ *
+ * Unauthorized copying of this file, via any medium is strictly prohibited
+ * Proprietary and confidential
+ */
+package de.eintosti.buildsystem.world.backup;
+
+import com.cryptomorin.xseries.XMaterial;
+import de.eintosti.buildsystem.BuildSystemPlugin;
+import de.eintosti.buildsystem.Messages;
+import de.eintosti.buildsystem.api.world.BuildWorld;
+import de.eintosti.buildsystem.api.world.backup.Backup;
+import de.eintosti.buildsystem.config.Config.World;
+import de.eintosti.buildsystem.util.StringUtils;
+import de.eintosti.buildsystem.util.inventory.BuildSystemHolder;
+import de.eintosti.buildsystem.util.inventory.BuildSystemInventory;
+import de.eintosti.buildsystem.util.inventory.BuildWorldHolder;
+import de.eintosti.buildsystem.util.inventory.InventoryUtils;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
+
+public class BackupsInventory extends BuildSystemInventory {
+
+    private static final int FIRST_BACKUP_SLOT = 9;
+
+    private final BackupService backupService;
+
+    public BackupsInventory(BuildSystemPlugin plugin) {
+        this.backupService = plugin.getBackupService();
+    }
+
+    public void openBackupsInventory(Player player, BuildWorld buildWorld) {
+        player.openInventory(getBackupsInventory(player, buildWorld));
+    }
+
+    private Inventory getBackupsInventory(Player player, BuildWorld buildWorld) {
+        List<Backup> backups = backupService.getProfile(buildWorld).listBackups().join();
+        Inventory inventory = new BackupsHolder(this, buildWorld, player, backups).getInventory();
+
+        for (int i = 0; i <= 8; i++) {
+            InventoryUtils.addGlassPane(player, inventory, i);
+        }
+
+        inventory.setItem(4, InventoryUtils.createItem(XMaterial.OAK_HANGING_SIGN,
+                Messages.getString("backups_information_name", player),
+                Messages.getStringList("backups_information_lore", player,
+                        Map.entry("%interval%", World.Backup.backupInterval / 60),
+                        Map.entry("%remaining%", getDurationUntilBackup(buildWorld))
+                )
+        ));
+
+        for (int i = 0; i < backups.size(); i++) {
+            inventory.setItem(FIRST_BACKUP_SLOT + i, InventoryUtils.createItem(XMaterial.GRASS_BLOCK,
+                    Messages.getString("backups_backup_name", player,
+                            Map.entry("%timestamp%", StringUtils.formatTime(backups.get(i).creationTime()))
+                    )
+            ));
+        }
+
+        for (int i = 18; i <= 26; i++) {
+            InventoryUtils.addGlassPane(player, inventory, i);
+        }
+
+        return inventory;
+    }
+
+    private String getDurationUntilBackup(BuildWorld buildWorld) {
+        int timeUntilBackup = World.Backup.backupInterval;
+        int timeSinceBackup = buildWorld.getData().timeSinceBackup().get();
+
+        Date date = new Date((timeUntilBackup - timeSinceBackup) * 1000L);
+        DateFormat formatter = new SimpleDateFormat("mm:ss");
+        return formatter.format(date);
+    }
+
+    public void openConfirmationInventory(Player player, Backup backup) {
+        player.openInventory(getConfirmationInventory(player, backup));
+    }
+
+    private Inventory getConfirmationInventory(Player player, Backup backup) {
+        Inventory inventory = new ConfirmationHolder(this, backup, player).getInventory();
+
+        for (int slot : new int[]{0, 1, 2, 3, 9, 10, 12, 18, 19, 20, 21}) {
+            inventory.setItem(slot, InventoryUtils.createItem(XMaterial.LIME_STAINED_GLASS_PANE, "§a"));
+        }
+        for (int slot : new int[]{4, 13, 22}) {
+            inventory.setItem(slot, InventoryUtils.createItem(XMaterial.BLACK_STAINED_GLASS_PANE, "§0"));
+        }
+        for (int slot : new int[]{5, 6, 7, 8, 14, 16, 17, 23, 24, 25, 26}) {
+            inventory.setItem(slot, InventoryUtils.createItem(XMaterial.RED_STAINED_GLASS_PANE, "§c"));
+        }
+
+        inventory.setItem(11, InventoryUtils.createItem(XMaterial.LIME_DYE,
+                Messages.getString("restore_backup_confirm_name", player),
+                Messages.getStringList("restore_backup_confirm_lore", player,
+                        Map.entry("%timestamp%", StringUtils.formatTime(backup.creationTime()))
+                )
+        ));
+        inventory.setItem(15, InventoryUtils.createItem(XMaterial.RED_DYE,
+                Messages.getString("restore_backup_cancel_name", player)
+        ));
+        return inventory;
+    }
+
+    @Override
+    public void onClick(InventoryClickEvent event) {
+        ItemStack itemStack = event.getCurrentItem();
+        if (itemStack == null || itemStack.getType() == Material.AIR || !itemStack.hasItemMeta()) {
+            return;
+        }
+
+        Player player = (Player) event.getWhoClicked();
+        Inventory inventory = event.getInventory();
+        InventoryHolder holder = inventory.getHolder();
+        if (holder instanceof BackupsHolder backupsHolder) {
+            event.setCancelled(true);
+
+            int slot = event.getSlot();
+            if (slot >= FIRST_BACKUP_SLOT && slot <= 17) {
+                Backup backup = backupsHolder.getBackups().get(slot - FIRST_BACKUP_SLOT);
+                if (backup == null) {
+                    return;
+                }
+
+                player.closeInventory();
+                openConfirmationInventory(player, backup);
+            }
+        }
+
+        if (holder instanceof ConfirmationHolder confirmationHolder) {
+            event.setCancelled(true);
+
+            switch (event.getSlot()) {
+                case 11 -> {
+                    player.closeInventory();
+                    player.playSound(player, Sound.ENTITY_PLAYER_LEVELUP, 1f, 1f);
+                    Backup backup = confirmationHolder.getBackup();
+                    backup.owner().restoreBackup(backup, player);
+                }
+                case 15 -> {
+                    player.closeInventory();
+                    player.playSound(player, Sound.ENTITY_ZOMBIE_BREAK_WOODEN_DOOR, 1f, 1f);
+                }
+            }
+        }
+    }
+
+    private static class BackupsHolder extends BuildWorldHolder {
+
+        private final List<Backup> backups;
+
+        public BackupsHolder(BuildSystemInventory inventory, BuildWorld buildWorld, Player player, List<Backup> backups) {
+            super(inventory, buildWorld, 27, Messages.getString("backups_title", player));
+            this.backups = backups;
+        }
+
+        public List<Backup> getBackups() {
+            return backups;
+        }
+    }
+
+    private static class ConfirmationHolder extends BuildSystemHolder {
+
+        private final Backup backup;
+
+        public ConfirmationHolder(BuildSystemInventory inventory, Backup backup, Player player) {
+            super(inventory, 27, Messages.getString("restore_backup_title", player));
+            this.backup = backup;
+        }
+
+        public Backup getBackup() {
+            return backup;
+        }
+    }
+}
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
new file mode 100644
index 00000000..9261527c
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.eintosti.buildsystem.world.backup.storage;
+
+import de.eintosti.buildsystem.BuildSystemPlugin;
+import de.eintosti.buildsystem.api.world.BuildWorld;
+import de.eintosti.buildsystem.api.world.backup.Backup;
+import de.eintosti.buildsystem.api.world.backup.BackupProfile;
+import de.eintosti.buildsystem.api.world.backup.BackupStorage;
+import de.eintosti.buildsystem.config.Config;
+import de.eintosti.buildsystem.util.FileUtils;
+import de.eintosti.buildsystem.world.backup.BackupImpl;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
+import java.util.stream.Stream;
+
+public class LocalBackupStorage implements BackupStorage {
+
+    private final BuildSystemPlugin plugin;
+    private final Path backupPath;
+
+    public LocalBackupStorage(BuildSystemPlugin plugin) {
+        this.plugin = plugin;
+
+        this.backupPath = plugin.getDataFolder().toPath().resolve("backups");
+        if (!Files.exists(backupPath)) {
+            try {
+                Files.createDirectory(backupPath);
+            } catch (IOException e) {
+                plugin.getLogger().log(Level.SEVERE, "Unable to create backup folder", e);
+            }
+        }
+    }
+
+    @Override
+    public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
+        List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
+
+        try (Stream<Path> walk = Files.walk(getBackupDirectory(buildWorld))) {
+            walk.filter(LocalBackupStorage::isValidFile).forEach(path -> backups.add(
+                    new BackupImpl(owner, FileUtils.getDirectoryCreation(path.toFile()), path.toAbsolutePath().toString())
+            ));
+        } catch (IOException e) {
+            plugin.getLogger().log(Level.SEVERE, "Error while listing backups", e);
+            return Collections.emptyList();
+        }
+
+        backups.sort(Comparator.comparingLong(Backup::creationTime).reversed());
+        return backups;
+    }
+
+    @Override
+    public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableFuture<Backup> future) {
+        long currentTime = System.currentTimeMillis();
+        File storage = new File(getBackupDirectory(buildWorld).toFile(), getBackupName(buildWorld, currentTime));
+        File zip = FileUtils.zipWorld(storage, buildWorld);
+        if (zip == null) {
+            future.completeExceptionally(new RuntimeException("Failed to complete the backup for " + buildWorld.getName()));
+            return;
+        }
+        future.complete(new BackupImpl(owner, currentTime, zip.getAbsolutePath()));
+    }
+
+    @Override
+    public File downloadBackup(Backup backup) {
+        return new File(backup.key());
+    }
+
+    @Override
+    public void deleteBackup(Backup backup) {
+        File file = new File(backup.key());
+        try {
+            Files.deleteIfExists(file.toPath());
+        } catch (IOException e) {
+            plugin.getLogger().log(Level.SEVERE, "Unable to delete backup " + backup.key(), e);
+        }
+    }
+
+    /**
+     * Gets the directory containing the backups for this profile. This directory may not exist.
+     *
+     * @return Folder that contains the backups for this profile
+     */
+    public Path getBackupDirectory(BuildWorld buildWorld) {
+        return FileUtils.resolve(this.backupPath, buildWorld.getUniqueId().toString());
+    }
+
+    private static boolean isValidFile(Path path) {
+        return path.getFileName().toString().endsWith(".zip");
+    }
+}
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
new file mode 100644
index 00000000..a58d2425
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.eintosti.buildsystem.world.backup.storage;
+
+import de.eintosti.buildsystem.BuildSystemPlugin;
+import de.eintosti.buildsystem.api.world.BuildWorld;
+import de.eintosti.buildsystem.api.world.backup.Backup;
+import de.eintosti.buildsystem.api.world.backup.BackupProfile;
+import de.eintosti.buildsystem.api.world.backup.BackupStorage;
+import de.eintosti.buildsystem.config.Config;
+import de.eintosti.buildsystem.util.FileUtils;
+import de.eintosti.buildsystem.world.backup.BackupImpl;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+
+public class S3BackupStorage implements BackupStorage {
+
+    private final BuildSystemPlugin plugin;
+    private final S3Client s3Client;
+    private final String bucket;
+    private final String pathPrefix;
+
+    public S3BackupStorage(BuildSystemPlugin plugin, String accessKey, String secretKey, String region, String bucket, String pathPrefix) {
+        this.plugin = plugin;
+        this.bucket = bucket;
+        this.pathPrefix = pathPrefix;
+        this.s3Client = S3Client.builder()
+                .region(Region.of(region))
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)))
+                .build();
+    }
+
+    private boolean isValidS3Key(String key) {
+        return key.endsWith(".zip");
+    }
+
+    private String getBackupDirectory(BuildWorld buildWorld) {
+        return this.pathPrefix + "/" + buildWorld.getUniqueId() + "/";
+    }
+
+    private Path getTmpDownloadDirectory() {
+        return FileUtils.resolve(plugin.getDataFolder().toPath(), "backups");
+    }
+
+    @Override
+    public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
+        List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
+
+        try {
+            ListObjectsV2Response response = this.s3Client.listObjectsV2(ListObjectsV2Request.builder()
+                    .bucket(this.bucket)
+                    .prefix(getBackupDirectory(buildWorld))
+                    .build());
+
+            backups.addAll(
+                    response.contents().stream()
+                            .filter(object -> isValidS3Key(object.key()))
+                            .map(object -> new BackupImpl(owner, extractCreationTime(object.key()).toEpochMilli(), object.key()))
+                            .toList()
+            );
+        } catch (S3Exception e) {
+            plugin.getLogger().log(Level.SEVERE, "Error while listing backups", e);
+            return Collections.emptyList();
+        }
+
+        backups.sort(Comparator.comparingLong(Backup::creationTime).reversed());
+        return backups;
+    }
+
+    @Override
+    public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableFuture<Backup> future) {
+        byte[] zipBytes;
+        try {
+            zipBytes = FileUtils.zipWorldToMemory(buildWorld);
+        } catch (IOException e) {
+            future.completeExceptionally(new RuntimeException("Failed to complete the backup for " + buildWorld.getName()));
+            return;
+        }
+
+        long currentTime = System.currentTimeMillis();
+        String key = getBackupDirectory(buildWorld) + getBackupName(buildWorld, currentTime);
+
+        this.s3Client.putObject(
+                PutObjectRequest.builder()
+                        .bucket(this.bucket)
+                        .key(key)
+                        .build(),
+                RequestBody.fromBytes(zipBytes)
+        );
+
+        future.complete(new BackupImpl(owner, currentTime, key));
+    }
+
+    private Instant extractCreationTime(String key) {
+        // TODO: Is this the correct format for the key?
+        // Example: key = "backups/worlds/world1/2024-06-25T18-30-00.zip"
+        String filename = Paths.get(key).getFileName().toString().replace(".zip", "");
+        try {
+            return LocalDateTime.parse(filename, DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss"))
+                    .atZone(ZoneOffset.UTC)
+                    .toInstant();
+        } catch (DateTimeParseException e) {
+            return Instant.EPOCH;
+        }
+    }
+
+    @Override
+    public File downloadBackup(Backup backup) {
+        Path targetPath = getTmpDownloadDirectory().resolve(Paths.get(backup.key()).getFileName().toString());
+
+        this.s3Client.getObject(
+                GetObjectRequest.builder()
+                        .bucket(this.bucket)
+                        .key(backup.key())
+                        .build(),
+                targetPath
+        );
+
+        return targetPath.toFile();
+    }
+
+    @Override
+    public void deleteBackup(Backup backup) {
+        this.s3Client.deleteObject(DeleteObjectRequest.builder()
+                .bucket(this.bucket)
+                .key(backup.key())
+                .build());
+    }
+}
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java
index 6b9de21e..2662ae1f 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java
@@ -17,6 +17,7 @@
  */
 package de.eintosti.buildsystem.world.creation;
 
+import com.cryptomorin.xseries.XMaterial;
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.Messages;
 import de.eintosti.buildsystem.api.storage.WorldStorage;
@@ -30,7 +31,7 @@
 import de.eintosti.buildsystem.config.Config.World.Default.Time;
 import de.eintosti.buildsystem.util.FileUtils;
 import de.eintosti.buildsystem.world.BuildWorldImpl;
-import de.eintosti.buildsystem.world.creation.generator.voidgenerator.ModernVoidGenerator;
+import de.eintosti.buildsystem.world.creation.generator.VoidGenerator;
 import dev.dewy.nbt.Nbt;
 import dev.dewy.nbt.io.CompressionType;
 import dev.dewy.nbt.tags.collection.CompoundTag;
@@ -44,9 +45,9 @@
 import org.bukkit.ChatColor;
 import org.bukkit.Difficulty;
 import org.bukkit.GameRule;
-import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
+import org.bukkit.WorldType;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -55,7 +56,6 @@ public class BuildWorldCreatorImpl implements BuildWorldCreator {
 
     private static final String LEVEL_DAT_FILE_NAME = "level.dat";
     private static final String TEMPLATES_DIRECTORY = "templates";
-    private static final int VOID_BLOCK_Y = 64;
 
     private final BuildSystemPlugin plugin;
     private final WorldStorage worldStorage;
@@ -67,15 +67,32 @@ public class BuildWorldCreatorImpl implements BuildWorldCreator {
     private CustomGenerator customGenerator = null;
     private long creationDate = System.currentTimeMillis();
     private String template = null;
-    private Difficulty difficulty;
     private Folder folder;
 
+    private Difficulty difficulty;
+    private Integer time;
+    private Integer worldBoarderSize;
+
+    private BuildWorld buildWorld;
+
     public BuildWorldCreatorImpl(BuildSystemPlugin plugin, @NotNull String name) {
         this.plugin = plugin;
         this.worldStorage = plugin.getWorldService().getWorldStorage();
 
-        setName(name);
-        setDifficulty(Default.difficulty);
+        this.worldName = name;
+        this.difficulty = Default.difficulty;
+        this.time = Time.noon;
+        this.worldBoarderSize = Default.worldBoarderSize;
+    }
+
+    public BuildWorldCreatorImpl(BuildSystemPlugin plugin, @NotNull BuildWorld buildWorld) {
+        this.plugin = plugin;
+        this.worldStorage = plugin.getWorldService().getWorldStorage();
+
+        this.buildWorld = buildWorld;
+        this.worldName = buildWorld.getName();
+        this.worldType = buildWorld.getType();
+        this.customGenerator = buildWorld.getCustomGenerator();
     }
 
     @Override
@@ -134,12 +151,12 @@ public BuildWorldCreatorImpl setCreationDate(long creationDate) {
 
     @Override
     public void createWorld(Player player) {
-        if (worldStorage.worldAndFolderExist(worldName)) {
+        if (this.worldStorage.worldAndFolderExist(this.worldName)) {
             Messages.sendMessage(player, "worlds_world_exists");
             return;
         }
 
-        boolean success = (worldType == BuildWorldType.TEMPLATE)
+        boolean success = (this.worldType == BuildWorldType.TEMPLATE)
                 ? createWorldFromTemplate(player)
                 : createWorldFromGenerator(player);
 
@@ -151,8 +168,8 @@ public void createWorld(Player player) {
 
     @Override
     public void importWorld(Player player, boolean teleport) {
-        BuildWorld buildWorld = createAndRegisterBuildWorld(player);
-        generateBukkitWorld(buildWorld, true);
+        this.buildWorld = createAndRegisterBuildWorld(player);
+        generateBukkitWorld(true);
         if (teleport) {
             teleportAfterCreation(player);
         }
@@ -166,12 +183,12 @@ public void importWorld(Player player, boolean teleport) {
      */
     private boolean createWorldFromGenerator(Player player) {
         Messages.sendMessage(player, "worlds_world_creation_started",
-                Map.entry("%world%", worldName),
-                Map.entry("%type%", Messages.getString(Messages.getMessageKey(worldType), player))
+                Map.entry("%world%", this.worldName),
+                Map.entry("%type%", Messages.getString(Messages.getMessageKey(this.worldType), player))
         );
 
-        BuildWorld buildWorld = createAndRegisterBuildWorld(player);
-        generateBukkitWorld(buildWorld, false); // Version check is not needed for new worlds.
+        this.buildWorld = createAndRegisterBuildWorld(player);
+        generateBukkitWorld(false); // Version check is not needed for new worlds.
         return true;
     }
 
@@ -182,22 +199,22 @@ private boolean createWorldFromGenerator(Player player) {
      * @return {@code true} if the creation was successful, {@code false} otherwise
      */
     private boolean createWorldFromTemplate(Player player) {
-        File templateFile = new File(plugin.getDataFolder(), TEMPLATES_DIRECTORY + File.separator + template);
+        File templateFile = new File(this.plugin.getDataFolder(), TEMPLATES_DIRECTORY + File.separator + template);
         if (!templateFile.exists()) {
             Messages.sendMessage(player, "worlds_template_does_not_exist");
             return false;
         }
 
         Messages.sendMessage(player, "worlds_template_creation_started",
-                Map.entry("%world%", worldName),
-                Map.entry("%template%", template)
+                Map.entry("%world%", this.worldName),
+                Map.entry("%template%", this.template)
         );
 
-        File worldFile = new File(Bukkit.getWorldContainer(), worldName);
+        File worldFile = new File(Bukkit.getWorldContainer(), this.worldName);
         FileUtils.copy(templateFile, worldFile);
 
-        BuildWorld buildWorld = createAndRegisterBuildWorld(player);
-        generateBukkitWorld(buildWorld, true); // Version check is important for templates.
+        this.buildWorld = createAndRegisterBuildWorld(player);
+        generateBukkitWorld(true);
         return true;
     }
 
@@ -209,18 +226,18 @@ private boolean createWorldFromTemplate(Player player) {
      */
     private BuildWorld createAndRegisterBuildWorld(Player player) {
         BuildWorldImpl buildWorld = new BuildWorldImpl(
-                worldName,
-                creator == null ? Builder.of(player) : creator,
-                worldType,
-                creationDate,
-                isPrivate,
-                customGenerator
+                this.worldName,
+                this.creator == null ? Builder.of(player) : this.creator,
+                this.worldType,
+                this.creationDate,
+                this.isPrivate,
+                this.customGenerator
         );
 
         buildWorld.getData().lastLoaded().set(System.currentTimeMillis());
-        worldStorage.addBuildWorld(buildWorld);
-        if (folder != null) {
-            folder.addWorld(buildWorld);
+        this.worldStorage.addBuildWorld(buildWorld);
+        if (this.folder != null) {
+            this.folder.addWorld(buildWorld);
         }
 
         return buildWorld;
@@ -238,7 +255,11 @@ private int getServerDataVersion() {
 
     @Override
     @Nullable
-    public World generateBukkitWorld(BuildWorld buildWorld, boolean checkVersion) {
+    public World generateBukkitWorld(boolean checkVersion) {
+        if (this.buildWorld == null) {
+            throw new IllegalStateException("BuildWorld must be set before generating the Bukkit world.");
+        }
+
         if (checkVersion && isDataVersionTooHigh()) {
             plugin.getLogger().warning(String.format(Locale.ROOT,
                     "\"%s\" was created in a newer version of Minecraft (%s > %s). Skipping...",
@@ -252,7 +273,7 @@ worldName, parseDataVersion(), getServerDataVersion()
 
         if (bukkitWorld != null) {
             applyDefaultWorldSettings(bukkitWorld);
-            applyPostGenerationSettings(bukkitWorld, buildWorld.getType());
+            applyPostGenerationSettings(bukkitWorld, this.buildWorld.getType());
             updateWorldDataVersion();
         }
 
@@ -269,12 +290,14 @@ private WorldCreator createBukkitWorldCreator() {
 
         switch (worldType) {
             case VOID:
-                configureVoidWorld(worldCreator);
+                worldCreator.type(WorldType.FLAT);
+                worldCreator.generateStructures(false);
+                worldCreator.generator(new VoidGenerator());
                 break;
             case FLAT:
             case PRIVATE:
+                worldCreator.type(WorldType.FLAT);
                 worldCreator.generateStructures(false);
-                worldCreator.type(org.bukkit.WorldType.FLAT);
                 break;
             case NETHER:
                 worldCreator.generateStructures(true);
@@ -290,17 +313,13 @@ private WorldCreator createBukkitWorldCreator() {
                 }
                 // Fall-through to NORMAL for default settings
             default: // NORMAL
+                worldCreator.type(WorldType.NORMAL);
                 worldCreator.generateStructures(true);
                 worldCreator.environment(World.Environment.NORMAL);
                 break;
         }
-        return worldCreator;
-    }
 
-    private void configureVoidWorld(WorldCreator worldCreator) {
-        worldCreator.generateStructures(false);
-        worldCreator.type(org.bukkit.WorldType.FLAT);
-        worldCreator.generator(new ModernVoidGenerator());
+        return worldCreator;
     }
 
     /**
@@ -309,9 +328,15 @@ private void configureVoidWorld(WorldCreator worldCreator) {
      * @param bukkitWorld The world to configure
      */
     private void applyDefaultWorldSettings(World bukkitWorld) {
-        bukkitWorld.setDifficulty(this.difficulty);
-        bukkitWorld.setTime(Time.noon);
-        bukkitWorld.getWorldBorder().setSize(Default.worldBoarderSize);
+        if (this.difficulty != null) {
+            bukkitWorld.setDifficulty(this.difficulty);
+        }
+        if (this.time != null) {
+            bukkitWorld.setTime(this.time);
+        }
+        if (this.worldBoarderSize != null) {
+            bukkitWorld.getWorldBorder().setSize(Default.worldBoarderSize);
+        }
         bukkitWorld.setKeepSpawnInMemory(true);
         Default.gameRules.forEach((gameRule, value) -> applyGameRule(bukkitWorld, gameRule, value));
     }
@@ -331,8 +356,9 @@ private <T> void applyGameRule(World world, GameRule<T> rule, Object value) {
     private void applyPostGenerationSettings(World bukkitWorld, BuildWorldType worldType) {
         switch (worldType) {
             case VOID -> {
-                bukkitWorld.getBlockAt(0, VOID_BLOCK_Y, 0).setType(Material.GOLD_BLOCK);
-                bukkitWorld.setSpawnLocation(0, VOID_BLOCK_Y + 1, 0);
+                int voidBlockY = 64;
+                bukkitWorld.getBlockAt(0, voidBlockY, 0).setType(XMaterial.GOLD_BLOCK.get());
+                bukkitWorld.setSpawnLocation(0, voidBlockY + 1, 0);
             }
             case FLAT -> {
                 bukkitWorld.setSpawnLocation(0, -60, 0);
@@ -352,7 +378,7 @@ public boolean isDataVersionTooHigh() {
     }
 
     private int parseDataVersion() {
-        File levelFile = new File(new File(Bukkit.getWorldContainer(), worldName), LEVEL_DAT_FILE_NAME);
+        File levelFile = new File(new File(Bukkit.getWorldContainer(), this.worldName), LEVEL_DAT_FILE_NAME);
         if (!levelFile.exists()) {
             return -1;
         }
@@ -363,13 +389,13 @@ private int parseDataVersion() {
             IntTag dataVersion = data.getInt("DataVersion");
             return dataVersion != null ? dataVersion.getValue() : -1;
         } catch (IOException e) {
-            plugin.getLogger().log(Level.WARNING, "Failed to parse level.dat for world " + worldName, e);
+            plugin.getLogger().log(Level.WARNING, "Failed to parse level.dat for world " + this.worldName, e);
             return -1;
         }
     }
 
     private void updateWorldDataVersion() {
-        File levelFile = new File(new File(Bukkit.getWorldContainer(), worldName), LEVEL_DAT_FILE_NAME);
+        File levelFile = new File(new File(Bukkit.getWorldContainer(), this.worldName), LEVEL_DAT_FILE_NAME);
         if (!levelFile.exists()) {
             return;
         }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/voidgenerator/ModernVoidGenerator.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/VoidGenerator.java
similarity index 73%
rename from buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/voidgenerator/ModernVoidGenerator.java
rename to buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/VoidGenerator.java
index c6105534..cff0f369 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/voidgenerator/ModernVoidGenerator.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/generator/VoidGenerator.java
@@ -15,32 +15,40 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package de.eintosti.buildsystem.world.creation.generator.voidgenerator;
+package de.eintosti.buildsystem.world.creation.generator;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BiomeProvider;
+import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.generator.WorldInfo;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * The {@link VoidGenerator} that is used for servers which run on Spigot 1.17+
- */
-public class ModernVoidGenerator extends VoidGenerator {
+public class VoidGenerator extends ChunkGenerator {
+
+    private final Biome biome;
+
+    public VoidGenerator() {
+        this.biome = Biome.PLAINS;
+    }
 
-    public ModernVoidGenerator() {
-        super(Biome.PLAINS);
+    @Override
+    public void generateNoise(@NotNull WorldInfo worldInfo, @NotNull Random random, int chunkX, int chunkZ, @NotNull ChunkData chunkData) {
     }
 
     @Override
     public void generateSurface(@NotNull WorldInfo worldInfo, @NotNull Random random, int x, int z, @NotNull ChunkData chunkData) {
     }
 
+    @Override
+    public void generateCaves(@NotNull WorldInfo worldInfo, @NotNull Random random, int chunkX, int chunkZ, @NotNull ChunkData chunkData) {
+    }
+
     @Override
     public BiomeProvider getDefaultBiomeProvider(@NotNull WorldInfo worldInfo) {
-        return new SingleBiomeProvider(super.getBiome());
+        return new SingleBiomeProvider(this.biome);
     }
 
     public static class SingleBiomeProvider extends BiomeProvider {
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/data/WorldDataImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/data/WorldDataImpl.java
index 6158ffb8..6ba0082a 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/data/WorldDataImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/data/WorldDataImpl.java
@@ -60,6 +60,8 @@ public class WorldDataImpl implements WorldData {
     private final Type<Boolean> physics = register("physics");
     private final Type<Boolean> privateWorld = register("private");
 
+    private final Type<Integer> timeSinceBackup = register("time-since-backup");
+
     private final Type<Long> lastEdited = register("last-edited");
     private final Type<Long> lastLoaded = register("last-loaded");
     private final Type<Long> lastUnloaded = register("last-unloaded");
@@ -83,6 +85,7 @@ public WorldDataImpl(String worldName, boolean privateWorld, XMaterial material)
                 Settings.mobAi,
                 Settings.physics,
                 privateWorld,
+                0,
                 -1L,
                 -1L,
                 -1L
@@ -105,6 +108,7 @@ public WorldDataImpl(
             boolean mobAi,
             boolean physics,
             boolean privateWorld,
+            int timeSinceBackup,
             long lastLoaded,
             long lastUnloaded,
             long lastEdited
@@ -126,6 +130,8 @@ public WorldDataImpl(
         this.physics.set(physics);
         this.privateWorld.set(privateWorld);
 
+        this.timeSinceBackup.set(timeSinceBackup);
+
         this.lastEdited.set(lastEdited);
         this.lastLoaded.set(lastLoaded);
         this.lastUnloaded.set(lastUnloaded);
@@ -256,6 +262,11 @@ public Type<Boolean> privateWorld() {
         return privateWorld;
     }
 
+    @Override
+    public Type<Integer> timeSinceBackup() {
+        return timeSinceBackup;
+    }
+
     @Override
     public Type<Long> lastEdited() {
         return lastEdited;
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldLoaderImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldLoaderImpl.java
index 573588db..31fda939 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldLoaderImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldLoaderImpl.java
@@ -46,39 +46,39 @@ public static WorldLoaderImpl of(BuildWorld buildWorld) {
 
     @Override
     public void loadForPlayer(Player player) {
-        if (buildWorld.isLoaded()) {
+        if (this.buildWorld.isLoaded()) {
             return;
         }
 
         player.closeInventory();
-        player.sendTitle(" ", Messages.getString("loading_world", player, Map.entry("%world%", buildWorld.getName())), 5, 70, 20);
+        player.sendTitle(" ", Messages.getString("loading_world", player, Map.entry("%world%", this.buildWorld.getName())), 5, 70, 20);
 
         load();
     }
 
     @Override
     public void load() {
-        if (buildWorld.isLoaded()) {
+        if (this.buildWorld.isLoaded()) {
             return;
         }
 
-        BuildWorldLoadEvent loadEvent = new BuildWorldLoadEvent(buildWorld);
+        BuildWorldLoadEvent loadEvent = new BuildWorldLoadEvent(this.buildWorld);
         Bukkit.getServer().getPluginManager().callEvent(loadEvent);
         if (loadEvent.isCancelled()) {
             return;
         }
 
-        String worldName = buildWorld.getName();
-        plugin.getLogger().info("*** Loading world \"" + worldName + "\" ***");
-        World world = new BuildWorldCreatorImpl(plugin, worldName).generateBukkitWorld(buildWorld);
+        String worldName = this.buildWorld.getName();
+        this.plugin.getLogger().info("*** Loading world \"" + worldName + "\" ***");
+        World world = new BuildWorldCreatorImpl(this.plugin, this.buildWorld).generateBukkitWorld();
         if (world == null) {
             return;
         }
 
-        buildWorld.getData().lastLoaded().set(System.currentTimeMillis());
-        buildWorld.setLoaded(true);
+        this.buildWorld.getData().lastLoaded().set(System.currentTimeMillis());
+        this.buildWorld.setLoaded(true);
 
-        Bukkit.getServer().getPluginManager().callEvent(new BuildWorldPostLoadEvent(buildWorld));
-        buildWorld.getUnloader().resetUnloadTask();
+        Bukkit.getServer().getPluginManager().callEvent(new BuildWorldPostLoadEvent(this.buildWorld));
+        this.buildWorld.getUnloader().resetUnloadTask();
     }
 } 
\ No newline at end of file
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java
index 941cfe5e..08912e7f 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java
@@ -107,17 +107,21 @@ public void unload() {
 
     @Override
     public void forceUnload(boolean save) {
-        World bukkitWorld = buildWorld.getWorld();
-        if (bukkitWorld == null) {
-            return;
-        }
-
         BuildWorldUnloadEvent unloadEvent = new BuildWorldUnloadEvent(buildWorld);
         Bukkit.getServer().getPluginManager().callEvent(unloadEvent);
         if (unloadEvent.isCancelled()) {
             return;
         }
 
+        this.buildWorld.getData().lastUnloaded().set(System.currentTimeMillis());
+        this.buildWorld.setLoaded(false);
+        this.unloadTask = null;
+
+        World bukkitWorld = this.buildWorld.getWorld();
+        if (bukkitWorld == null) {
+            return;
+        }
+
         if (save) {
             bukkitWorld.save();
         }
@@ -125,15 +129,16 @@ public void forceUnload(boolean save) {
         for (Chunk chunk : bukkitWorld.getLoadedChunks()) {
             chunk.unload(save);
         }
-        Bukkit.unloadWorld(bukkitWorld, save);
-        Bukkit.getWorlds().remove(bukkitWorld);
 
-        buildWorld.getData().lastUnloaded().set(System.currentTimeMillis());
-        buildWorld.setLoaded(false);
-        this.unloadTask = null;
+        if (!Bukkit.unloadWorld(bukkitWorld, save)) {
+            plugin.getLogger().warning("Failed to unload world \"" + this.buildWorld.getName() + "\". It may still be loaded in memory.");
+            return;
+        }
+
+        Bukkit.getWorlds().remove(bukkitWorld);
 
-        Bukkit.getServer().getPluginManager().callEvent(new BuildWorldPostUnloadEvent(buildWorld));
-        plugin.getLogger().info("*** Unloaded world \"" + buildWorld.getName() + "\" ***");
+        Bukkit.getServer().getPluginManager().callEvent(new BuildWorldPostUnloadEvent(this.buildWorld));
+        plugin.getLogger().info("*** Unloaded world \"" + this.buildWorld.getName() + "\" ***");
     }
 
     private boolean isSpawnWorld(World bukkitWorld) {
diff --git a/buildsystem-core/src/main/resources/config.yml b/buildsystem-core/src/main/resources/config.yml
index 92f8b294..cab9fe89 100644
--- a/buildsystem-core/src/main/resources/config.yml
+++ b/buildsystem-core/src/main/resources/config.yml
@@ -8,7 +8,7 @@ settings:
   archive:
     vanish: true
     change-gamemode: true
-    world-game-mode: "ADVENTURE" # Possible values are: "SURVIVAL", "CREATIVE", "ADVENTURE", "SPECTATOR"
+    world-game-mode: "ADVENTURE" # Options: "SURVIVAL", "CREATIVE", "ADVENTURE", "SPECTATOR"
   save-from-death:
     enable: true
     teleport-to-map-spawn: true
@@ -63,7 +63,15 @@ world:
   backup:
     enabled: true
     backup-interval: 900
-    max-backups-per-world: 9
+    max-backups-per-world: 5
+    storage:
+      type: local # Options: local, s3
+      s3:
+        access-key: YOUR_AWS_ACCESS_KEY
+        secret-key: YOUR_AWS_SECRET_KEY
+        region: eu-central-1
+        bucket: buildsystem-backups
+        path: backups/worlds/
 folder:
   override-permissions: true
   override-projects: false
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 78c16a18..fdd681e7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,6 +15,8 @@ bstats = "3.1.0"
 fastboard = "2.1.5"
 nbt = "1.5.1"
 xseries = "13.3.1"
+aws-sdk = "2.31.70"
+zip4j = "2.11.5"
 
 [libraries]
 # Platform expectations
@@ -30,7 +32,20 @@ axiompaper = { group = "maven.modrinth.workaround", name = "axiom-paper-plugin",
 # Third Party
 annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
 authlib = { group = "com.mojang", name = "authlib", version.ref = "authlib" }
+aws-auth = { module = "software.amazon.awssdk:auth", version.ref = "aws-sdk" }
+aws-core = { module = "software.amazon.awssdk:core", version.ref = "aws-sdk" }
+aws-regions = { module = "software.amazon.awssdk:regions", version.ref = "aws-sdk" }
+aws-s3 = { module = "software.amazon.awssdk:s3", version.ref = "aws-sdk" }
 bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
 fastboard = { group = "fr.mrmicky", name = "fastboard", version.ref = "fastboard" }
 nbt = { group = "dev.dewy", name = "nbt", version.ref = "nbt" }
-xseries = { group = "com.github.cryptomorin", name = "XSeries", version.ref = "xseries" }
\ No newline at end of file
+zip4j = { group = "net.lingala.zip4j", name = "zip4j", version.ref = "zip4j" }
+xseries = { group = "com.github.cryptomorin", name = "XSeries", version.ref = "xseries" }
+
+[bundles]
+aws = [
+    "aws-s3",
+    "aws-auth",
+    "aws-regions",
+    # "aws-core", Unable to find the dependency at runtime
+]
\ No newline at end of file

From 3903826a872460a7b2e6595808ed5f78a88039de Mon Sep 17 00:00:00 2001
From: Thomas Meaney <thomas.meaney@icloud.com>
Date: Thu, 26 Jun 2025 19:46:03 +0200
Subject: [PATCH 03/11] Create migrator for automatically updating config to
 the newest version

---
 .../buildsystem/BuildSystemPlugin.java        |   7 +-
 .../eintosti/buildsystem/config/Config.java   | 143 +++++++++++-------
 .../migration/ConfigMigrationManager.java     |  81 ++++++++++
 .../config/migration/Migration.java           |  35 +++++
 .../config/migration/MigrationV1ToV2.java     |  51 +++++++
 .../yaml/AbstractYamlStorage.java}            |   6 +-
 .../yaml/YamlSetupStorage.java}               |   6 +-
 .../yaml/YamlSpawnStorage.java}               |   6 +-
 .../buildsystem/world/SpawnManager.java       |  10 +-
 .../world/display/CustomizableIcons.java      |  18 +--
 .../src/main/resources/config.yml             |   6 +-
 11 files changed, 285 insertions(+), 84 deletions(-)
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/ConfigMigrationManager.java
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/Migration.java
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/MigrationV1ToV2.java
 rename buildsystem-core/src/main/java/de/eintosti/buildsystem/{config/ConfigurationFile.java => storage/yaml/AbstractYamlStorage.java} (91%)
 rename buildsystem-core/src/main/java/de/eintosti/buildsystem/{config/SetupConfig.java => storage/yaml/YamlSetupStorage.java} (94%)
 rename buildsystem-core/src/main/java/de/eintosti/buildsystem/{config/SpawnConfig.java => storage/yaml/YamlSpawnStorage.java} (88%)

diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
index c8df9bbe..481c6f83 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
@@ -45,6 +45,7 @@
 import de.eintosti.buildsystem.config.Config.Settings.Builder;
 import de.eintosti.buildsystem.config.Config.World;
 import de.eintosti.buildsystem.config.Config.World.Unload;
+import de.eintosti.buildsystem.config.migration.ConfigMigrationManager;
 import de.eintosti.buildsystem.expansion.luckperms.LuckPermsExpansion;
 import de.eintosti.buildsystem.expansion.placeholderapi.PlaceholderApiExpansion;
 import de.eintosti.buildsystem.listener.AsyncPlayerChatListener;
@@ -131,9 +132,11 @@ public class BuildSystemPlugin extends JavaPlugin {
 
     @Override
     public void onLoad() {
+        new ConfigMigrationManager(this).migrate();
         this.getConfig().options().copyDefaults(true);
         this.saveConfig();
-        Config.load(this);
+        Config.load();
+
         Messages.createMessageFile();
         createTemplateFolder();
     }
@@ -381,7 +384,7 @@ public void reloadConfigData(boolean init) {
         }
 
         reloadConfig();
-        Config.load(this);
+        Config.load();
 
         if (init) {
             worldService.getWorldStorage().getBuildWorlds().forEach(buildWorld -> buildWorld.getUnloader().manageUnload());
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
index 85d222d9..d2d8f915 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
@@ -32,11 +32,13 @@
 import de.eintosti.buildsystem.config.Config.World.Default.Time;
 import de.eintosti.buildsystem.config.Config.World.Limits;
 import de.eintosti.buildsystem.config.Config.World.Unload;
+import de.eintosti.buildsystem.config.migration.ConfigMigrationManager;
 import de.eintosti.buildsystem.world.backup.storage.LocalBackupStorage;
 import de.eintosti.buildsystem.world.backup.storage.S3BackupStorage;
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
@@ -56,6 +58,39 @@
  */
 public class Config {
 
+    private static final BuildSystemPlugin PLUGIN = JavaPlugin.getPlugin(BuildSystemPlugin.class);
+    private static final FileConfiguration CONFIG = PLUGIN.getConfig();
+
+    /**
+     * Gets the plugin's configuration.
+     *
+     * @return The plugin's configuration
+     */
+    public static FileConfiguration getConfig() {
+        return CONFIG;
+    }
+
+    /**
+     * Gets the current version of the plugin's configuration.
+     *
+     * @return The version number of the configuration
+     * @see ConfigMigrationManager#LATEST_VERSION
+     */
+    public static int getVersion() {
+        return CONFIG.getInt("version", 1);
+    }
+
+    /**
+     * Sets the version of the plugin's configuration.
+     *
+     * @param version The version number to set
+     */
+    public static void setVersion(int version) {
+        CONFIG.set("version", version);
+        CONFIG.setComments("version", List.of("Internal, do not change manually!"));
+        PLUGIN.saveConfig();
+    }
+
     /**
      * Stores messages related configurations.
      */
@@ -363,45 +398,41 @@ public static class Folder {
 
     /**
      * Loads the configuration values from the plugin's config.yml into the static fields.
-     *
-     * @param plugin The plugin instance.
      */
-    public static void load(final BuildSystemPlugin plugin) {
-        FileConfiguration config = plugin.getConfig();
-
+    public static void load() {
         // Messages
-        Messages.spawnTeleportMessage = config.getBoolean("messages.spawn-teleport-message", false);
-        Messages.joinQuitMessages = config.getBoolean("messages.join-quit-messages", true);
-        Messages.dateFormat = config.getString("messages.date-format", "dd/MM/yyyy");
+        Messages.spawnTeleportMessage = CONFIG.getBoolean("messages.spawn-teleport-message", false);
+        Messages.joinQuitMessages = CONFIG.getBoolean("messages.join-quit-messages", true);
+        Messages.dateFormat = CONFIG.getString("messages.date-format", "dd/MM/yyyy");
 
         // Settings
-        Settings.updateChecker = config.getBoolean("settings.update-checker", true);
-        Settings.scoreboard = config.getBoolean("settings.scoreboard", true);
+        Settings.updateChecker = CONFIG.getBoolean("settings.update-checker", true);
+        Settings.scoreboard = CONFIG.getBoolean("settings.scoreboard", true);
         // Settings - Archive
-        Archive.vanish = config.getBoolean("settings.archive.vanish", true);
-        Archive.changeGamemode = config.getBoolean("settings.archive.change-gamemode", true);
-        Archive.worldGameMode = parseGameMode(config.getString("settings.archive.world-game-mode"));
+        Archive.vanish = CONFIG.getBoolean("settings.archive.vanish", true);
+        Archive.changeGamemode = CONFIG.getBoolean("settings.archive.change-gamemode", true);
+        Archive.worldGameMode = parseGameMode(CONFIG.getString("settings.archive.world-gamemode"));
         // Settings - Save from death
-        SaveFromDeath.enabled = config.getBoolean("settings.save-from-death.enable", true);
-        SaveFromDeath.teleportToMapSpawn = config.getBoolean("settings.save-from-death.teleport-to-map-spawn", true);
+        SaveFromDeath.enabled = CONFIG.getBoolean("settings.save-from-death.enable", true);
+        SaveFromDeath.teleportToMapSpawn = CONFIG.getBoolean("settings.save-from-death.teleport-to-map-spawn", true);
         // Settings - Build mode
-        BuildMode.dropItems = config.getBoolean("settings.build-mode.drop-items", true);
-        BuildMode.moveItems = config.getBoolean("settings.build-mode.move-items", true);
+        BuildMode.dropItems = CONFIG.getBoolean("settings.build-mode.drop-items", true);
+        BuildMode.moveItems = CONFIG.getBoolean("settings.build-mode.move-items", true);
         // Settings - Builder
-        Builder.blockWorldEditNonBuilder = config.getBoolean("settings.builder.block-worldedit-non-builder", true);
-        Builder.worldEditWand = parseWorldEditWand(plugin);
+        Builder.blockWorldEditNonBuilder = CONFIG.getBoolean("settings.builder.block-worldedit-non-builder", true);
+        Builder.worldEditWand = parseWorldEditWand();
         // Settings - Navigator
-        Navigator.item = XMaterial.valueOf(config.getString("settings.navigator.item", "CLOCK"));
-        Navigator.giveItemOnJoin = config.getBoolean("settings.navigator.give-item-on-join", true);
+        Navigator.item = XMaterial.valueOf(CONFIG.getString("settings.navigator.item", "CLOCK"));
+        Navigator.giveItemOnJoin = CONFIG.getBoolean("settings.navigator.give-item-on-join", true);
 
         // World
-        World.lockWeather = config.getBoolean("world.lock-weather", true);
-        World.invalidCharacters = config.getString("world.invalid-characters", "^\b$");
-        World.importAllDelay = config.getInt("world.import-all.delay", 30);
+        World.lockWeather = CONFIG.getBoolean("world.lock-weather", true);
+        World.invalidCharacters = CONFIG.getString("world.invalid-characters", "^\b$");
+        World.importAllDelay = CONFIG.getInt("world.import-all.delay", 30);
         // World - Default
-        Default.worldBoarderSize = config.getInt("world.default.worldborder.size", 6000000);
-        Default.difficulty = Difficulty.valueOf(config.getString("world.default.difficulty", "PEACEFUL").toUpperCase(Locale.ROOT));
-        Default.gameRules = config.getConfigurationSection("world.default.gamerules")
+        Default.worldBoarderSize = CONFIG.getInt("world.default.worldborder.size", 6000000);
+        Default.difficulty = Difficulty.valueOf(CONFIG.getString("world.default.difficulty", "PEACEFUL").toUpperCase(Locale.ROOT));
+        Default.gameRules = CONFIG.getConfigurationSection("world.default.gamerules")
                 .getValues(true)
                 .entrySet()
                 .stream()
@@ -412,38 +443,38 @@ public static void load(final BuildSystemPlugin plugin) {
                 .filter(Objects::nonNull)
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         // World - Default - Permission
-        Permission.publicPermission = config.getString("world.default.permission.public", "-");
-        Permission.privatePermission = config.getString("world.default.permission.private", "-");
+        Permission.publicPermission = CONFIG.getString("world.default.permission.public", "-");
+        Permission.privatePermission = CONFIG.getString("world.default.permission.private", "-");
         // World - Default - Time
-        Time.sunrise = config.getInt("world.default.time.sunrise", 0);
-        Time.noon = config.getInt("world.default.time.noon", 6000);
-        Time.night = config.getInt("world.default.time.night", 18000);
+        Time.sunrise = CONFIG.getInt("world.default.time.sunrise", 0);
+        Time.noon = CONFIG.getInt("world.default.time.noon", 6000);
+        Time.night = CONFIG.getInt("world.default.time.night", 18000);
         // World - Default - Settings
-        Default.Settings.physics = config.getBoolean("world.default.settings.physics", true);
-        Default.Settings.explosions = config.getBoolean("world.default.settings.explosions", true);
-        Default.Settings.mobAi = config.getBoolean("world.default.settings.mob-ai", true);
-        Default.Settings.blockBreaking = config.getBoolean("world.default.settings.block-breaking", true);
-        Default.Settings.blockPlacement = config.getBoolean("world.default.settings.block-placement", true);
-        Default.Settings.blockInteractions = config.getBoolean("world.default.settings.block-interactions", true);
+        Default.Settings.physics = CONFIG.getBoolean("world.default.settings.physics", true);
+        Default.Settings.explosions = CONFIG.getBoolean("world.default.settings.explosions", true);
+        Default.Settings.mobAi = CONFIG.getBoolean("world.default.settings.mob-ai", true);
+        Default.Settings.blockBreaking = CONFIG.getBoolean("world.default.settings.block-breaking", true);
+        Default.Settings.blockPlacement = CONFIG.getBoolean("world.default.settings.block-placement", true);
+        Default.Settings.blockInteractions = CONFIG.getBoolean("world.default.settings.block-interactions", true);
         // World - Default - Settings - Builders Enabled
-        BuildersEnabled.publicBuilders = config.getBoolean("world.default.settings.builders-enabled.public", false);
-        BuildersEnabled.privateBuilders = config.getBoolean("world.default.settings.builders-enabled.private", true);
+        BuildersEnabled.publicBuilders = CONFIG.getBoolean("world.default.settings.builders-enabled.public", false);
+        BuildersEnabled.privateBuilders = CONFIG.getBoolean("world.default.settings.builders-enabled.private", true);
         // World - Limits
-        Limits.publicWorlds = config.getInt("world.default.settings.public-worlds", -1);
-        Limits.privateWorlds = config.getInt("world.default.settings.private-worlds", -1);
+        Limits.publicWorlds = CONFIG.getInt("world.default.settings.public-worlds", -1);
+        Limits.privateWorlds = CONFIG.getInt("world.default.settings.private-worlds", -1);
         // World - Unload
-        Unload.enabled = config.getBoolean("world.unload.enabled", false);
-        Unload.timeUntilUnload = config.getString("world.unload.time-until-unload", "01:00:00");
-        Unload.blacklistedWorlds = new HashSet<>(config.getStringList("world.unload.blacklisted-worlds"));
+        Unload.enabled = CONFIG.getBoolean("world.unload.enabled", false);
+        Unload.timeUntilUnload = CONFIG.getString("world.unload.time-until-unload", "01:00:00");
+        Unload.blacklistedWorlds = new HashSet<>(CONFIG.getStringList("world.unload.blacklisted-worlds"));
         // World - Backup
-        Backup.enabled = config.getBoolean("world.backup.enabled", true);
-        Backup.backupInterval = config.getInt("world.backup.backup-interval", 900);
-        Backup.maxBackupsPerWorld = config.getInt("world.backup.max-backups-per-world", 5);
-        Backup.storage = createBackupStorage(plugin);
+        Backup.enabled = CONFIG.getBoolean("world.backup.enabled", true);
+        Backup.backupInterval = CONFIG.getInt("world.backup.backup-interval", 900);
+        Backup.maxBackupsPerWorld = CONFIG.getInt("world.backup.max-backups-per-world", 5);
+        Backup.storage = createBackupStorage(PLUGIN);
 
         // Folder
-        Folder.overridePermissions = config.getBoolean("folder.override-permissions", true);
-        Folder.overrideProjects = config.getBoolean("folder.override-projects", false);
+        Folder.overridePermissions = CONFIG.getBoolean("folder.override-permissions", true);
+        Folder.overrideProjects = CONFIG.getBoolean("folder.override-projects", false);
     }
 
     /**
@@ -466,11 +497,10 @@ private static GameMode parseGameMode(@Nullable String gameModeName) {
     /**
      * Parses the WorldEdit wand from the plugin's configuration.
      *
-     * @param plugin The JavaPlugin instance.
      * @return The parsed {@link XMaterial} for the WorldEdit wand.
      */
-    private static XMaterial parseWorldEditWand(JavaPlugin plugin) {
-        File pluginDir = plugin.getDataFolder().getParentFile();
+    private static XMaterial parseWorldEditWand() {
+        File pluginDir = PLUGIN.getDataFolder().getParentFile();
         File configFile = null;
 
         File weConfig = new File(pluginDir + File.separator + "WorldEdit", "config.yml");
@@ -503,12 +533,11 @@ private static XMaterial parseWorldEditWand(JavaPlugin plugin) {
     }
 
     private static BackupStorage createBackupStorage(BuildSystemPlugin plugin) {
-        FileConfiguration config = plugin.getConfig();
-        String type = config.getString("world.backup.storage.type", "local").toLowerCase();
+        String type = CONFIG.getString("world.backup.storage.type", "local").toLowerCase();
 
         switch (type) {
             case "s3" -> {
-                ConfigurationSection s3 = config.getConfigurationSection("world.backup.storage.s3");
+                ConfigurationSection s3 = CONFIG.getConfigurationSection("world.backup.storage.s3");
                 return new S3BackupStorage(
                         plugin,
                         s3.getString("access-key"),
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/ConfigMigrationManager.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/ConfigMigrationManager.java
new file mode 100644
index 00000000..c2712c2c
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/ConfigMigrationManager.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.eintosti.buildsystem.config.migration;
+
+
+import de.eintosti.buildsystem.BuildSystemPlugin;
+import de.eintosti.buildsystem.config.Config;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+
+/**
+ * Manages the migration of configurations. It holds a registry of available migration steps and applies them sequentially.
+ */
+public class ConfigMigrationManager {
+
+    public static final int LATEST_VERSION = 2;
+
+    private final BuildSystemPlugin plugin;
+    private final Map<Integer, Migration> migrations;
+
+    /**
+     * Constructs a new {@link ConfigMigrationManager} instance.
+     *
+     * @param plugin The BuildSystemPlugin instance
+     */
+    public ConfigMigrationManager(BuildSystemPlugin plugin) {
+        this.plugin = plugin;
+        this.migrations = new HashMap<>();
+
+        registerMigration(1, new MigrationV1ToV2());
+    }
+
+    /**
+     * Registers a {@link Migration} step.
+     *
+     * @param fromVersion The version from which this migration applies. For example, {@link MigrationV1ToV2} is registered with {@code fromVersion = 1}
+     * @param migration   The migration instance
+     */
+    public void registerMigration(int fromVersion, Migration migration) {
+        this.migrations.put(fromVersion, migration);
+    }
+
+    /**
+     * Migrates the given configuration to the latest version.
+     *
+     * @throws IllegalStateException If a required migration step is missing.
+     */
+    public void migrate() {
+        Logger logger = plugin.getLogger();
+
+        while (Config.getVersion() < LATEST_VERSION) {
+            int currentVersion = Config.getVersion();
+            Migration migration = migrations.get(currentVersion);
+            if (migration == null) {
+                throw new IllegalStateException("Missing migration from version " + currentVersion + " to " + (currentVersion + 1));
+            }
+
+            logger.info("Migrating from version " + currentVersion + " to " + (currentVersion + 1) + "...");
+            migration.migrate(Config.getConfig());
+            Config.setVersion(currentVersion + 1);
+        }
+
+        logger.info("Config is at the latest version: " + Config.getVersion());
+    }
+}
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/Migration.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/Migration.java
new file mode 100644
index 00000000..92fe4e93
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/Migration.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.eintosti.buildsystem.config.migration;
+
+import org.bukkit.configuration.file.FileConfiguration;
+
+/**
+ * Interface for a single configuration migration step. Each implementation should know how to migrate a configuration from a specific source version to the next version.
+ */
+public interface Migration {
+
+    /**
+     * Applies the migration logic to the given configuration.
+     * <p>
+     * The implementation is responsible for modifying the config's internal data and potentially its version, though the manager will handle version incrementing.
+     *
+     * @param config The configuration to migrate
+     */
+    void migrate(FileConfiguration config);
+}
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/MigrationV1ToV2.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/MigrationV1ToV2.java
new file mode 100644
index 00000000..ca7de793
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/migration/MigrationV1ToV2.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.eintosti.buildsystem.config.migration;
+
+import java.util.List;
+import org.bukkit.configuration.file.FileConfiguration;
+
+public class MigrationV1ToV2 implements Migration {
+
+    @Override
+    public void migrate(FileConfiguration config) {
+        if (config.contains("settings.archive-vanish")) {
+            config.set("settings.archive.vanish", config.getBoolean("settings.archive-vanish"));
+            config.set("settings.archive-vanish", null);
+        }
+
+        if (config.contains("settings.archive-should-change-gamemode")) {
+            config.set("settings.archive.change-gamemode", config.getBoolean("settings.archive-should-change-gamemode"));
+            config.set("settings.archive-should-change-gamemode", null);
+        }
+
+        if (config.contains("settings.archive-world-game-mode")) {
+            config.set("settings.archive.world-gamemode", config.getString("settings.archive-world-game-mode"));
+            config.setComments("settings.archive.world-gamemode", List.of("Options: SURVIVAL, CREATIVE, ADVENTURE, SPECTATOR"));
+            config.set("settings.archive-world-game-mode", null);
+        }
+
+        if (config.contains("settings.teleport-after-creation")) {
+            config.set("settings.teleport-after-creation", null);
+        }
+
+        if (config.contains("world.void-block")) {
+            config.set("world.void-block", null);
+        }
+    }
+}
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/ConfigurationFile.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/AbstractYamlStorage.java
similarity index 91%
rename from buildsystem-core/src/main/java/de/eintosti/buildsystem/config/ConfigurationFile.java
rename to buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/AbstractYamlStorage.java
index 92c7875a..b30998c6 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/ConfigurationFile.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/AbstractYamlStorage.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package de.eintosti.buildsystem.config;
+package de.eintosti.buildsystem.storage.yaml;
 
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import java.io.File;
@@ -24,12 +24,12 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
-public abstract class ConfigurationFile {
+public abstract class AbstractYamlStorage {
 
     private final File file;
     private final FileConfiguration configuration;
 
-    public ConfigurationFile(BuildSystemPlugin plugin, String fileName) {
+    public AbstractYamlStorage(BuildSystemPlugin plugin, String fileName) {
         this.file = new File(plugin.getDataFolder(), fileName);
         this.configuration = YamlConfiguration.loadConfiguration(file);
         loadFile();
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/SetupConfig.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlSetupStorage.java
similarity index 94%
rename from buildsystem-core/src/main/java/de/eintosti/buildsystem/config/SetupConfig.java
rename to buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlSetupStorage.java
index 362059a6..1d1971e2 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/SetupConfig.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlSetupStorage.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package de.eintosti.buildsystem.config;
+package de.eintosti.buildsystem.storage.yaml;
 
 import com.cryptomorin.xseries.XMaterial;
 import de.eintosti.buildsystem.BuildSystemPlugin;
@@ -29,9 +29,9 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import org.jetbrains.annotations.Nullable;
 
-public class SetupConfig extends ConfigurationFile {
+public class YamlSetupStorage extends AbstractYamlStorage {
 
-    public SetupConfig(BuildSystemPlugin plugin) {
+    public YamlSetupStorage(BuildSystemPlugin plugin) {
         super(plugin, "setup.yml");
     }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/SpawnConfig.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlSpawnStorage.java
similarity index 88%
rename from buildsystem-core/src/main/java/de/eintosti/buildsystem/config/SpawnConfig.java
rename to buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlSpawnStorage.java
index ae4a44a2..0aea4b17 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/SpawnConfig.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/YamlSpawnStorage.java
@@ -15,14 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package de.eintosti.buildsystem.config;
+package de.eintosti.buildsystem.storage.yaml;
 
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import org.bukkit.Location;
 
-public class SpawnConfig extends ConfigurationFile {
+public class YamlSpawnStorage extends AbstractYamlStorage {
 
-    public SpawnConfig(BuildSystemPlugin plugin) {
+    public YamlSpawnStorage(BuildSystemPlugin plugin) {
         super(plugin, "spawn.yml");
     }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/SpawnManager.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/SpawnManager.java
index 61dba6a7..77a7aa44 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/SpawnManager.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/SpawnManager.java
@@ -21,7 +21,7 @@
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.api.storage.WorldStorage;
 import de.eintosti.buildsystem.api.world.BuildWorld;
-import de.eintosti.buildsystem.config.SpawnConfig;
+import de.eintosti.buildsystem.storage.yaml.YamlSpawnStorage;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -33,7 +33,7 @@ public class SpawnManager {
 
     private final BuildSystemPlugin plugin;
     private final WorldStorage worldStorage;
-    private final SpawnConfig spawnConfig;
+    private final YamlSpawnStorage spawnStorage;
 
     private String spawnName;
     private Location spawn;
@@ -41,7 +41,7 @@ public class SpawnManager {
     public SpawnManager(BuildSystemPlugin plugin) {
         this.plugin = plugin;
         this.worldStorage = plugin.getWorldService().getWorldStorage();
-        this.spawnConfig = new SpawnConfig(plugin);
+        this.spawnStorage = new YamlSpawnStorage(plugin);
         load();
     }
 
@@ -91,11 +91,11 @@ public void remove() {
     }
 
     public void save() {
-        spawnConfig.saveSpawn(spawn);
+        spawnStorage.saveSpawn(spawn);
     }
 
     private void load() {
-        FileConfiguration configuration = spawnConfig.getFile();
+        FileConfiguration configuration = spawnStorage.getFile();
         String string = configuration.getString("spawn");
         if (string == null || string.trim().isEmpty()) {
             return;
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/display/CustomizableIcons.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/display/CustomizableIcons.java
index f249aec7..46d040fc 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/display/CustomizableIcons.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/display/CustomizableIcons.java
@@ -21,7 +21,7 @@
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.api.world.data.BuildWorldStatus;
 import de.eintosti.buildsystem.api.world.data.BuildWorldType;
-import de.eintosti.buildsystem.config.SetupConfig;
+import de.eintosti.buildsystem.storage.yaml.YamlSetupStorage;
 import java.util.EnumMap;
 import java.util.Locale;
 import java.util.Map;
@@ -31,13 +31,13 @@
  */
 public class CustomizableIcons {
 
-    private final SetupConfig setupConfig;
+    private final YamlSetupStorage setupStorage;
 
     private final Map<BuildWorldType, XMaterial> typeIcons;
     private final Map<BuildWorldStatus, XMaterial> statusIcons;
 
     public CustomizableIcons(BuildSystemPlugin plugin) {
-        this.setupConfig = new SetupConfig(plugin);
+        this.setupStorage = new YamlSetupStorage(plugin);
 
         this.typeIcons = loadTypeIcons();
         this.statusIcons = loadStatusIcons();
@@ -55,12 +55,12 @@ private Map<BuildWorldType, XMaterial> loadTypeIcons() {
                 Map.entry(BuildWorldType.IMPORTED, XMaterial.FURNACE)
         ));
 
-        Map<BuildWorldType, XMaterial> loadedIcons = this.setupConfig.loadIcons(IconType.TYPE, type -> BuildWorldType.valueOf(type.toUpperCase(Locale.ROOT)));
+        Map<BuildWorldType, XMaterial> loadedIcons = this.setupStorage.loadIcons(IconType.TYPE, type -> BuildWorldType.valueOf(type.toUpperCase(Locale.ROOT)));
         if (loadedIcons != null) {
             typeIcons.putAll(loadedIcons);
         }
 
-        setupConfig.saveIcons(IconType.TYPE, typeIcons);
+        setupStorage.saveIcons(IconType.TYPE, typeIcons);
         return typeIcons;
     }
 
@@ -74,12 +74,12 @@ private Map<BuildWorldStatus, XMaterial> loadStatusIcons() {
                 Map.entry(BuildWorldStatus.HIDDEN, XMaterial.BONE_MEAL)
         ));
 
-        Map<BuildWorldStatus, XMaterial> loadedIcons = this.setupConfig.loadIcons(IconType.STATUS, type -> BuildWorldStatus.valueOf(type.toUpperCase(Locale.ROOT)));
+        Map<BuildWorldStatus, XMaterial> loadedIcons = this.setupStorage.loadIcons(IconType.STATUS, type -> BuildWorldStatus.valueOf(type.toUpperCase(Locale.ROOT)));
         if (loadedIcons != null) {
             statusIcon.putAll(loadedIcons);
         }
 
-        setupConfig.saveIcons(IconType.STATUS, statusIcon);
+        setupStorage.saveIcons(IconType.STATUS, statusIcon);
         return statusIcon;
     }
 
@@ -111,7 +111,7 @@ public XMaterial getIcon(BuildWorldStatus status) {
      */
     public void setIcon(BuildWorldType type, XMaterial material) {
         this.typeIcons.put(type, material);
-        this.setupConfig.saveIcon(IconType.TYPE, type, material);
+        this.setupStorage.saveIcon(IconType.TYPE, type, material);
     }
 
     /**
@@ -122,7 +122,7 @@ public void setIcon(BuildWorldType type, XMaterial material) {
      */
     public void setIcon(BuildWorldStatus status, XMaterial material) {
         this.statusIcons.put(status, material);
-        this.setupConfig.saveIcon(IconType.STATUS, status, material);
+        this.setupStorage.saveIcon(IconType.STATUS, status, material);
     }
 
     public enum IconType {
diff --git a/buildsystem-core/src/main/resources/config.yml b/buildsystem-core/src/main/resources/config.yml
index cab9fe89..bfb25090 100644
--- a/buildsystem-core/src/main/resources/config.yml
+++ b/buildsystem-core/src/main/resources/config.yml
@@ -8,7 +8,8 @@ settings:
   archive:
     vanish: true
     change-gamemode: true
-    world-game-mode: "ADVENTURE" # Options: "SURVIVAL", "CREATIVE", "ADVENTURE", "SPECTATOR"
+    # Options: "SURVIVAL", "CREATIVE", "ADVENTURE", "SPECTATOR"
+    world-gamemode: "ADVENTURE"
   save-from-death:
     enable: true
     teleport-to-map-spawn: true
@@ -65,7 +66,8 @@ world:
     backup-interval: 900
     max-backups-per-world: 5
     storage:
-      type: local # Options: local, s3
+      # Options: local, s3
+      type: local
       s3:
         access-key: YOUR_AWS_ACCESS_KEY
         secret-key: YOUR_AWS_SECRET_KEY

From 4dbd404ea6191e58ed5a09d6fb0e34665d6310d0 Mon Sep 17 00:00:00 2001
From: Thomas Meaney <thomas.meaney@icloud.com>
Date: Thu, 26 Jun 2025 20:27:07 +0200
Subject: [PATCH 04/11] Improve world backup when using S3

---
 .../api/world/backup/BackupStorage.java       |  4 +-
 .../eintosti/buildsystem/config/Config.java   |  2 +-
 .../backup/storage/LocalBackupStorage.java    |  2 +-
 .../world/backup/storage/S3BackupStorage.java | 80 +++++++++----------
 .../src/main/resources/config.yml             |  6 +-
 5 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
index a55d7022..35c05cbb 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
@@ -32,7 +32,7 @@ public interface BackupStorage {
 
     void deleteBackup(Backup backup);
 
-    default String getBackupName(BuildWorld buildWorld, long timestamp) {
-        return buildWorld.getUniqueId() + "-" + timestamp + ".zip";
+    default String getBackupName(long timestamp) {
+        return timestamp + ".zip";
     }
 }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
index d2d8f915..a08c58dd 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
@@ -469,7 +469,7 @@ public static void load() {
         // World - Backup
         Backup.enabled = CONFIG.getBoolean("world.backup.enabled", true);
         Backup.backupInterval = CONFIG.getInt("world.backup.backup-interval", 900);
-        Backup.maxBackupsPerWorld = CONFIG.getInt("world.backup.max-backups-per-world", 5);
+        Backup.maxBackupsPerWorld = Math.min(CONFIG.getInt("world.backup.max-backups-per-world", 5), 9);
         Backup.storage = createBackupStorage(PLUGIN);
 
         // Folder
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
index 9261527c..3bd3ab24 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
@@ -75,7 +75,7 @@ public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
     @Override
     public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableFuture<Backup> future) {
         long currentTime = System.currentTimeMillis();
-        File storage = new File(getBackupDirectory(buildWorld).toFile(), getBackupName(buildWorld, currentTime));
+        File storage = new File(getBackupDirectory(buildWorld).toFile(), getBackupName(currentTime));
         File zip = FileUtils.zipWorld(storage, buildWorld);
         if (zip == null) {
             future.completeExceptionally(new RuntimeException("Failed to complete the backup for " + buildWorld.getName()));
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
index a58d2425..9efcdc41 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
@@ -29,19 +29,16 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Level;
+import org.bukkit.Bukkit;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
@@ -62,7 +59,7 @@ public class S3BackupStorage implements BackupStorage {
     public S3BackupStorage(BuildSystemPlugin plugin, String accessKey, String secretKey, String region, String bucket, String pathPrefix) {
         this.plugin = plugin;
         this.bucket = bucket;
-        this.pathPrefix = pathPrefix;
+        this.pathPrefix = pathPrefix.endsWith("/") ? pathPrefix : pathPrefix + "/";
         this.s3Client = S3Client.builder()
                 .region(Region.of(region))
                 .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)))
@@ -74,7 +71,7 @@ private boolean isValidS3Key(String key) {
     }
 
     private String getBackupDirectory(BuildWorld buildWorld) {
-        return this.pathPrefix + "/" + buildWorld.getUniqueId() + "/";
+        return this.pathPrefix + buildWorld.getUniqueId() + "/";
     }
 
     private Path getTmpDownloadDirectory() {
@@ -94,10 +91,10 @@ public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
             backups.addAll(
                     response.contents().stream()
                             .filter(object -> isValidS3Key(object.key()))
-                            .map(object -> new BackupImpl(owner, extractCreationTime(object.key()).toEpochMilli(), object.key()))
+                            .map(object -> new BackupImpl(owner, object.lastModified().toEpochMilli(), object.key()))
                             .toList()
             );
-        } catch (S3Exception e) {
+        } catch (S3Exception | SdkClientException e) {
             plugin.getLogger().log(Level.SEVERE, "Error while listing backups", e);
             return Collections.emptyList();
         }
@@ -117,29 +114,19 @@ public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableF
         }
 
         long currentTime = System.currentTimeMillis();
-        String key = getBackupDirectory(buildWorld) + getBackupName(buildWorld, currentTime);
+        String key = getBackupDirectory(buildWorld) + getBackupName(currentTime);
 
-        this.s3Client.putObject(
-                PutObjectRequest.builder()
-                        .bucket(this.bucket)
-                        .key(key)
-                        .build(),
-                RequestBody.fromBytes(zipBytes)
-        );
-
-        future.complete(new BackupImpl(owner, currentTime, key));
-    }
-
-    private Instant extractCreationTime(String key) {
-        // TODO: Is this the correct format for the key?
-        // Example: key = "backups/worlds/world1/2024-06-25T18-30-00.zip"
-        String filename = Paths.get(key).getFileName().toString().replace(".zip", "");
         try {
-            return LocalDateTime.parse(filename, DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss"))
-                    .atZone(ZoneOffset.UTC)
-                    .toInstant();
-        } catch (DateTimeParseException e) {
-            return Instant.EPOCH;
+            this.s3Client.putObject(
+                    PutObjectRequest.builder()
+                            .bucket(this.bucket)
+                            .key(key)
+                            .build(),
+                    RequestBody.fromBytes(zipBytes)
+            );
+            future.complete(new BackupImpl(owner, currentTime, key));
+        } catch (S3Exception | SdkClientException e) {
+            future.completeExceptionally(new RuntimeException("Failed to upload backup for " + buildWorld.getName(), e));
         }
     }
 
@@ -147,22 +134,33 @@ private Instant extractCreationTime(String key) {
     public File downloadBackup(Backup backup) {
         Path targetPath = getTmpDownloadDirectory().resolve(Paths.get(backup.key()).getFileName().toString());
 
-        this.s3Client.getObject(
-                GetObjectRequest.builder()
-                        .bucket(this.bucket)
-                        .key(backup.key())
-                        .build(),
-                targetPath
-        );
+        try {
+            this.s3Client.getObject(
+                    GetObjectRequest.builder()
+                            .bucket(this.bucket)
+                            .key(backup.key())
+                            .build(),
+                    targetPath
+            );
+        } catch (S3Exception | SdkClientException e) {
+            plugin.getLogger().log(Level.SEVERE, "Error while downloading backup: " + backup.key(), e);
+            return null;
+        }
 
         return targetPath.toFile();
     }
 
     @Override
     public void deleteBackup(Backup backup) {
-        this.s3Client.deleteObject(DeleteObjectRequest.builder()
-                .bucket(this.bucket)
-                .key(backup.key())
-                .build());
+        try {
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+                this.s3Client.deleteObject(DeleteObjectRequest.builder()
+                        .bucket(this.bucket)
+                        .key(backup.key())
+                        .build());
+            });
+        } catch (S3Exception | SdkClientException e) {
+            plugin.getLogger().log(Level.SEVERE, "Unable to delete backup " + backup.key(), e);
+        }
     }
 }
diff --git a/buildsystem-core/src/main/resources/config.yml b/buildsystem-core/src/main/resources/config.yml
index bfb25090..70538ca2 100644
--- a/buildsystem-core/src/main/resources/config.yml
+++ b/buildsystem-core/src/main/resources/config.yml
@@ -50,7 +50,7 @@ world:
   lock-weather: true
   invalid-characters: ^\b$
   import-all:
-    delay: 30
+    delay: 30 # In seconds
   max-amount:
     public: -1
     private: -1
@@ -63,8 +63,8 @@ world:
       - worth_the_end
   backup:
     enabled: true
-    backup-interval: 900
-    max-backups-per-world: 5
+    backup-interval: 900 # In seconds
+    max-backups-per-world: 5 # Maximum: 9
     storage:
       # Options: local, s3
       type: local

From 4982d0a86903a771938be89be5ff8fb6b2e0271e Mon Sep 17 00:00:00 2001
From: Thomas Meaney <thomas.meaney@icloud.com>
Date: Thu, 26 Jun 2025 21:50:37 +0200
Subject: [PATCH 05/11] Rename `backup.enabled` config option to `auto-backup`
 and use it

---
 .../main/java/de/eintosti/buildsystem/config/Config.java    | 4 ++--
 .../de/eintosti/buildsystem/world/backup/BackupService.java | 6 ++++--
 buildsystem-core/src/main/resources/config.yml              | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
index a08c58dd..7d32ec8c 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
@@ -367,7 +367,7 @@ public static class Backup {
             /**
              * Whether world backups are enabled.
              */
-            public static boolean enabled = true;
+            public static boolean autoBackup = true;
             /**
              * The interval in seconds between automatic backups.
              */
@@ -467,7 +467,7 @@ public static void load() {
         Unload.timeUntilUnload = CONFIG.getString("world.unload.time-until-unload", "01:00:00");
         Unload.blacklistedWorlds = new HashSet<>(CONFIG.getStringList("world.unload.blacklisted-worlds"));
         // World - Backup
-        Backup.enabled = CONFIG.getBoolean("world.backup.enabled", true);
+        Backup.autoBackup = CONFIG.getBoolean("world.auto-backup", true);
         Backup.backupInterval = CONFIG.getInt("world.backup.backup-interval", 900);
         Backup.maxBackupsPerWorld = Math.min(CONFIG.getInt("world.backup.max-backups-per-world", 5), 9);
         Backup.storage = createBackupStorage(PLUGIN);
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
index 7bf17eb1..bc0dd887 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
@@ -42,12 +42,14 @@ public BackupService(BuildSystemPlugin plugin) {
         this.backupStorage = Backup.storage;
         this.worldStorage = plugin.getWorldService().getWorldStorage();
 
-        Bukkit.getScheduler().runTaskTimer(plugin, this::incrementTimeSinceBackup, UPDATE_INTERVAL * 20, UPDATE_INTERVAL * 20);
+        if (Backup.autoBackup) {
+            Bukkit.getScheduler().runTaskTimer(plugin, this::incrementTimeSinceBackup, UPDATE_INTERVAL * 20, UPDATE_INTERVAL * 20);
+        }
     }
 
     /**
      * Increments the time since a {@link BuildWorld} was backed-up by {@link #UPDATE_INTERVAL} seconds. If the time has surpassed {@link World.Backup#backupInterval}, a backup
-     * will be created.
+     * will automatically be created.
      */
     private void incrementTimeSinceBackup() {
         Set<BuildWorld> worlds = new HashSet<>();
diff --git a/buildsystem-core/src/main/resources/config.yml b/buildsystem-core/src/main/resources/config.yml
index 70538ca2..b03c15df 100644
--- a/buildsystem-core/src/main/resources/config.yml
+++ b/buildsystem-core/src/main/resources/config.yml
@@ -62,7 +62,7 @@ world:
       - world_nether
       - worth_the_end
   backup:
-    enabled: true
+    auto-backup: true
     backup-interval: 900 # In seconds
     max-backups-per-world: 5 # Maximum: 9
     storage:

From 12c9c82868d003d6871c68ee8460b5a320245698 Mon Sep 17 00:00:00 2001
From: Thomas Meaney <thomas.meaney@icloud.com>
Date: Fri, 27 Jun 2025 09:59:46 +0200
Subject: [PATCH 06/11] Add support for using SFTP & other S3 storages (that
 allow for AWS auth)

---
 .../api/world/backup/BackupStorage.java       |   8 +-
 buildsystem-core/build.gradle.kts             |   1 +
 .../buildsystem/BuildSystemPlugin.java        |   2 +
 .../eintosti/buildsystem/config/Config.java   |  19 +-
 .../world/backup/BackupService.java           |   4 +
 .../backup/storage/LocalBackupStorage.java    |   5 +
 .../world/backup/storage/S3BackupStorage.java |  51 +++-
 .../backup/storage/SftpBackupStorage.java     | 272 ++++++++++++++++++
 .../src/main/resources/config.yml             |  13 +-
 gradle/libs.versions.toml                     |   4 +-
 10 files changed, 356 insertions(+), 23 deletions(-)
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java

diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
index 35c05cbb..e4ac5969 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
@@ -24,6 +24,10 @@
 
 public interface BackupStorage {
 
+    default String getBackupName(long timestamp) {
+        return timestamp + ".zip";
+    }
+
     List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld);
 
     void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableFuture<Backup> future);
@@ -32,7 +36,5 @@ public interface BackupStorage {
 
     void deleteBackup(Backup backup);
 
-    default String getBackupName(long timestamp) {
-        return timestamp + ".zip";
-    }
+    void close();
 }
diff --git a/buildsystem-core/build.gradle.kts b/buildsystem-core/build.gradle.kts
index f04835a1..d823b51b 100644
--- a/buildsystem-core/build.gradle.kts
+++ b/buildsystem-core/build.gradle.kts
@@ -54,6 +54,7 @@ dependencies {
     implementation(libs.aws.core) // Unable to find the dependency at runtime, so we add it here
 
     library(libs.bundles.aws)
+    library(libs.sftp)
     library(libs.zip4j)
 }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
index 481c6f83..1c3ed0f8 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java
@@ -185,6 +185,8 @@ public void onDisable() {
             playerService.closeNavigator(pl);
         });
 
+        this.backupService.getStorage().close();
+
         reloadConfigData(false);
         saveConfig();
         saveBuildConfig();
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
index 7d32ec8c..76c6dde6 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
@@ -35,6 +35,7 @@
 import de.eintosti.buildsystem.config.migration.ConfigMigrationManager;
 import de.eintosti.buildsystem.world.backup.storage.LocalBackupStorage;
 import de.eintosti.buildsystem.world.backup.storage.S3BackupStorage;
+import de.eintosti.buildsystem.world.backup.storage.SftpBackupStorage;
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -44,7 +45,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
 import org.bukkit.GameRule;
@@ -52,6 +52,7 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Manages the plugin's configuration, loading and providing access to various settings.
@@ -364,6 +365,8 @@ public static class Unload {
          */
         public static class Backup {
 
+            @Nullable
+            public static String url = null;
             /**
              * Whether world backups are enabled.
              */
@@ -467,7 +470,8 @@ public static void load() {
         Unload.timeUntilUnload = CONFIG.getString("world.unload.time-until-unload", "01:00:00");
         Unload.blacklistedWorlds = new HashSet<>(CONFIG.getStringList("world.unload.blacklisted-worlds"));
         // World - Backup
-        Backup.autoBackup = CONFIG.getBoolean("world.auto-backup", true);
+        Backup.url = CONFIG.getString("world.backup.url");
+        Backup.autoBackup = CONFIG.getBoolean("world.backup.auto-backup", true);
         Backup.backupInterval = CONFIG.getInt("world.backup.backup-interval", 900);
         Backup.maxBackupsPerWorld = Math.min(CONFIG.getInt("world.backup.max-backups-per-world", 5), 9);
         Backup.storage = createBackupStorage(PLUGIN);
@@ -547,6 +551,17 @@ private static BackupStorage createBackupStorage(BuildSystemPlugin plugin) {
                         s3.getString("path")
                 );
             }
+            case "sftp" -> {
+                ConfigurationSection sftp = CONFIG.getConfigurationSection("world.backup.storage.s3");
+                return new SftpBackupStorage(
+                        plugin,
+                        sftp.getString("host"),
+                        sftp.getInt("port"),
+                        sftp.getString("username"),
+                        sftp.getString("password"),
+                        sftp.getString("path")
+                );
+            }
             default -> {
                 if (!type.equals("local")) {
                     plugin.getLogger().warning("Unknown backup storage type '" + type + "', defaulting to local storage.");
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
index bc0dd887..33ad128a 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
@@ -47,6 +47,10 @@ public BackupService(BuildSystemPlugin plugin) {
         }
     }
 
+    public BackupStorage getStorage() {
+        return this.backupStorage;
+    }
+
     /**
      * Increments the time since a {@link BuildWorld} was backed-up by {@link #UPDATE_INTERVAL} seconds. If the time has surpassed {@link World.Backup#backupInterval}, a backup
      * will automatically be created.
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
index 3bd3ab24..a9326997 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
@@ -99,6 +99,11 @@ public void deleteBackup(Backup backup) {
         }
     }
 
+    @Override
+    public void close() {
+        // Nothing to do for local storage
+    }
+
     /**
      * Gets the directory containing the backups for this profile. This directory may not exist.
      *
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
index 9efcdc41..452b7964 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
@@ -23,16 +23,18 @@
 import de.eintosti.buildsystem.api.world.backup.BackupProfile;
 import de.eintosti.buildsystem.api.world.backup.BackupStorage;
 import de.eintosti.buildsystem.config.Config;
+import de.eintosti.buildsystem.config.Config.World;
 import de.eintosti.buildsystem.util.FileUtils;
 import de.eintosti.buildsystem.world.backup.BackupImpl;
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Level;
 import org.bukkit.Bukkit;
@@ -42,6 +44,7 @@
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3ClientBuilder;
 import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
@@ -60,24 +63,27 @@ public S3BackupStorage(BuildSystemPlugin plugin, String accessKey, String secret
         this.plugin = plugin;
         this.bucket = bucket;
         this.pathPrefix = pathPrefix.endsWith("/") ? pathPrefix : pathPrefix + "/";
-        this.s3Client = S3Client.builder()
-                .region(Region.of(region))
-                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)))
-                .build();
-    }
 
-    private boolean isValidS3Key(String key) {
-        return key.endsWith(".zip");
+        S3ClientBuilder builder = S3Client.builder()
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)));
+
+        if (World.Backup.url == null || World.Backup.url.isEmpty()) {
+            builder = builder
+                    .region(Region.of(region));
+        } else {
+            builder = builder
+                    .region(Region.EU_CENTRAL_1) // Dummy value
+                    .endpointOverride(URI.create(World.Backup.url))
+                    .forcePathStyle(true);
+        }
+
+        this.s3Client = builder.build();
     }
 
     private String getBackupDirectory(BuildWorld buildWorld) {
         return this.pathPrefix + buildWorld.getUniqueId() + "/";
     }
 
-    private Path getTmpDownloadDirectory() {
-        return FileUtils.resolve(plugin.getDataFolder().toPath(), "backups");
-    }
-
     @Override
     public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
         List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
@@ -90,7 +96,7 @@ public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
 
             backups.addAll(
                     response.contents().stream()
-                            .filter(object -> isValidS3Key(object.key()))
+                            .filter(object -> object.key().endsWith(".zip"))
                             .map(object -> new BackupImpl(owner, object.lastModified().toEpochMilli(), object.key()))
                             .toList()
             );
@@ -132,7 +138,7 @@ public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableF
 
     @Override
     public File downloadBackup(Backup backup) {
-        Path targetPath = getTmpDownloadDirectory().resolve(Paths.get(backup.key()).getFileName().toString());
+        Path targetPath = FileUtils.resolve(getTmpDownloadDirectory(), UUID.randomUUID() + ".zip");
 
         try {
             this.s3Client.getObject(
@@ -150,6 +156,10 @@ public File downloadBackup(Backup backup) {
         return targetPath.toFile();
     }
 
+    private Path getTmpDownloadDirectory() {
+        return FileUtils.resolve(plugin.getDataFolder().toPath(), ".tmp_backup_downloads");
+    }
+
     @Override
     public void deleteBackup(Backup backup) {
         try {
@@ -163,4 +173,17 @@ public void deleteBackup(Backup backup) {
             plugin.getLogger().log(Level.SEVERE, "Unable to delete backup " + backup.key(), e);
         }
     }
+
+    @Override
+    public void close() {
+        if (this.s3Client != null) {
+            try {
+                this.s3Client.close();
+            } catch (Exception e) {
+                plugin.getLogger().log(Level.SEVERE, "Error while closing S3 client", e);
+            }
+        }
+
+        FileUtils.deleteDirectory(getTmpDownloadDirectory().toFile());
+    }
 }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
new file mode 100644
index 00000000..1e0e2f0c
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.eintosti.buildsystem.world.backup.storage;
+
+import de.eintosti.buildsystem.BuildSystemPlugin;
+import de.eintosti.buildsystem.api.world.BuildWorld;
+import de.eintosti.buildsystem.api.world.backup.Backup;
+import de.eintosti.buildsystem.api.world.backup.BackupProfile;
+import de.eintosti.buildsystem.api.world.backup.BackupStorage;
+import de.eintosti.buildsystem.config.Config;
+import de.eintosti.buildsystem.util.FileUtils;
+import de.eintosti.buildsystem.world.backup.BackupImpl;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
+import org.apache.sshd.client.SshClient;
+import org.apache.sshd.client.session.ClientSession;
+import org.apache.sshd.sftp.client.SftpClient;
+import org.apache.sshd.sftp.client.SftpClient.DirEntry;
+import org.apache.sshd.sftp.client.SftpClientFactory;
+import org.bukkit.Bukkit;
+
+public class SftpBackupStorage implements BackupStorage {
+
+    private static final Duration CONNECTION_TIMEOUT = Duration.ofSeconds(10);
+    private static final Duration AUTH_TIMEOUT = Duration.ofSeconds(5);
+    private static final int BUFFER_SIZE = 8192;
+
+    private final BuildSystemPlugin plugin;
+    private final String host;
+    private final int port;
+    private final String username;
+    private final String password;
+    private final String remoteBasePath;
+    private final Path tmpDownloadPath;
+
+    private volatile SshClient sshClient;
+
+    public SftpBackupStorage(BuildSystemPlugin plugin, String host, int port, String username, String password, String remoteBasePath) {
+        this.plugin = plugin;
+        this.host = host;
+        this.port = validatePort(port);
+        this.username = username;
+        this.password = password;
+        this.remoteBasePath = normalizeBasePath(remoteBasePath);
+        this.tmpDownloadPath = FileUtils.resolve(plugin.getDataFolder().toPath(), ".tmp_backup_downloads");
+
+        initializeSshClient();
+    }
+
+    private static int validatePort(int port) {
+        if (port <= 0 || port > 65535) {
+            throw new IllegalArgumentException("Port must be between 1 and 65535, got: " + port);
+        }
+        return port;
+    }
+
+    private static String normalizeBasePath(String basePath) {
+        if (basePath == null || basePath.trim().isEmpty()) {
+            return "/";
+        }
+        String normalized = basePath.trim();
+        return normalized.endsWith("/") ? normalized : normalized + "/";
+    }
+
+    private void initializeSshClient() {
+        this.sshClient = SshClient.setUpDefaultClient();
+        this.sshClient.start();
+    }
+
+    private SftpClient connect() throws IOException {
+        if (this.sshClient == null || this.sshClient.isClosed()) {
+            initializeSshClient();
+        }
+
+        try {
+            ClientSession session = this.sshClient.connect(this.username, this.host, this.port)
+                    .verify(CONNECTION_TIMEOUT.toMillis())
+                    .getSession();
+
+            session.addPasswordIdentity(this.password);
+            session.auth().verify(AUTH_TIMEOUT.toMillis());
+
+            return SftpClientFactory.instance().createSftpClient(session);
+        } catch (Exception e) {
+            throw new IOException("Failed to establish SFTP connection to " + this.host + ":" + this.port, e);
+        }
+    }
+
+    private String getBackupDirectory(BuildWorld buildWorld) {
+        return remoteBasePath + buildWorld.getUniqueId() + "/";
+    }
+
+    @Override
+    public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
+        List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
+        String backupDirectory = getBackupDirectory(buildWorld);
+
+        try (SftpClient sftp = connect()) {
+            if (!directoryExists(sftp, backupDirectory)) {
+                plugin.getLogger().warning("SFTP backup directory does not exist: " + backupDirectory);
+                return backups;
+            }
+
+            Iterable<DirEntry> files = sftp.readDir(backupDirectory);
+            for (SftpClient.DirEntry file : files) {
+                if (file.getFilename().endsWith(".zip")) {
+                    long creationTime = file.getAttributes().getCreateTime().toMillis();
+                    String fullPath = backupDirectory + file.getFilename();
+                    backups.add(new BackupImpl(owner, creationTime, fullPath));
+                }
+            }
+        } catch (IOException e) {
+            plugin.getLogger().log(Level.SEVERE, "Failed to list SFTP backups", e);
+        }
+
+        backups.sort(Comparator.comparingLong(Backup::creationTime).reversed());
+        return backups;
+    }
+
+    @Override
+    public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableFuture<Backup> future) {
+        byte[] zipBytes;
+        try {
+            zipBytes = FileUtils.zipWorldToMemory(buildWorld);
+        } catch (IOException e) {
+            future.completeExceptionally(new RuntimeException("Failed to zip world: " + buildWorld.getName()));
+            return;
+        }
+
+        long timestamp = System.currentTimeMillis();
+        String backupName = getBackupName(timestamp);
+        String backupDir = getBackupDirectory(buildWorld);
+        String remotePath = backupDir + backupName;
+
+        try (SftpClient sftp = connect()) {
+            createDirectoryIfNotExists(sftp, backupDir);
+
+            try (
+                    OutputStream out = sftp.write(remotePath);
+                    BufferedOutputStream bufferedOut = new BufferedOutputStream(out, BUFFER_SIZE)
+            ) {
+                bufferedOut.write(zipBytes);
+                bufferedOut.flush();
+            }
+            future.complete(new BackupImpl(owner, timestamp, remotePath));
+        } catch (IOException e) {
+            future.completeExceptionally(new RuntimeException("Failed to upload SFTP backup", e));
+        }
+    }
+
+    private void createDirectoryIfNotExists(SftpClient sftp, String path) throws IOException {
+        try {
+            if (!directoryExists(sftp, path)) {
+                createDirectoriesRecursively(sftp, path);
+            }
+        } catch (IOException e) {
+            throw new IOException("Failed to create backup directory: " + path, e);
+        }
+    }
+
+    private void createDirectoriesRecursively(SftpClient sftp, String path) throws IOException {
+        if (path == null || path.isEmpty() || path.equals("/")) {
+            return;
+        }
+
+        String normalizedPath = path.replace("\\", "/");
+        if (normalizedPath.endsWith("/")) {
+            normalizedPath = normalizedPath.substring(0, normalizedPath.length() - 1);
+        }
+
+        if (directoryExists(sftp, normalizedPath)) {
+            return;
+        }
+
+        int lastSeparator = normalizedPath.lastIndexOf('/');
+        if (lastSeparator > 0) {
+            String parentPath = normalizedPath.substring(0, lastSeparator);
+            createDirectoriesRecursively(sftp, parentPath);
+        }
+
+        sftp.mkdir(normalizedPath);
+    }
+
+    private boolean directoryExists(SftpClient sftp, String path) {
+        try {
+            return sftp.stat(path).isDirectory();
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    @Override
+    public File downloadBackup(Backup backup) {
+        Path target = tmpDownloadPath.resolve(UUID.randomUUID() + ".zip");
+
+        try (
+                SftpClient sftp = connect();
+                InputStream in = sftp.read(backup.key());
+                BufferedInputStream bufferedIn = new BufferedInputStream(in, BUFFER_SIZE);
+                OutputStream out = Files.newOutputStream(target);
+                BufferedOutputStream bufferedOut = new BufferedOutputStream(out, BUFFER_SIZE)
+        ) {
+            bufferedIn.transferTo(bufferedOut);
+            return target.toFile();
+        } catch (IOException e) {
+            plugin.getLogger().log(Level.SEVERE, "Failed to download SFTP backup: " + backup.key(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public void deleteBackup(Backup backup) {
+        try {
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+                try (SftpClient sftp = connect()) {
+                    sftp.remove(backup.key());
+                } catch (IOException e) {
+                    plugin.getLogger().warning("Backup file not found for deletion: " + backup.key());
+                }
+            });
+        } catch (Exception e) {
+            plugin.getLogger().log(Level.SEVERE, "Failed to delete SFTP backup: " + backup.key(), e);
+        }
+    }
+
+    @Override
+    public void close() {
+        try {
+            if (Files.exists(tmpDownloadPath)) {
+                FileUtils.deleteDirectory(tmpDownloadPath.toFile());
+            }
+        } catch (Exception e) {
+            plugin.getLogger().log(Level.WARNING, "Failed to clean up temporary download directory", e);
+        }
+
+        if (sshClient != null && !sshClient.isClosed()) {
+            try {
+                sshClient.stop();
+            } catch (Exception e) {
+                plugin.getLogger().log(Level.WARNING, "Failed to properly close SSH client", e);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/buildsystem-core/src/main/resources/config.yml b/buildsystem-core/src/main/resources/config.yml
index b03c15df..a6575885 100644
--- a/buildsystem-core/src/main/resources/config.yml
+++ b/buildsystem-core/src/main/resources/config.yml
@@ -66,14 +66,21 @@ world:
     backup-interval: 900 # In seconds
     max-backups-per-world: 5 # Maximum: 9
     storage:
-      # Options: local, s3
+      # Options: local, s3, sftp
       type: local
       s3:
-        access-key: YOUR_AWS_ACCESS_KEY
-        secret-key: YOUR_AWS_SECRET_KEY
+        url: null # Only required when not using AWS S3
+        access-key: YOUR_ACCESS_KEY
+        secret-key: YOUR_SECRET_KEY
         region: eu-central-1
         bucket: buildsystem-backups
         path: backups/worlds/
+      sftp:
+        host: YOUR_SFTP_HOST
+        port: 22
+        username: YOUR_SFTP_USERNAME
+        password: YOUR_SFTP_PASSWORD
+        path: backups/worlds/
 folder:
   override-permissions: true
   override-projects: false
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fdd681e7..c8bdc39e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,11 +11,12 @@ axiompaper = "4.0.1-1.21.1"
 # Third Party
 annotations = "26.0.2"
 authlib = "3.13.56"
+aws-sdk = "2.31.70"
 bstats = "3.1.0"
 fastboard = "2.1.5"
 nbt = "1.5.1"
 xseries = "13.3.1"
-aws-sdk = "2.31.70"
+sshd-sftp = "2.9.0"
 zip4j = "2.11.5"
 
 [libraries]
@@ -39,6 +40,7 @@ aws-s3 = { module = "software.amazon.awssdk:s3", version.ref = "aws-sdk" }
 bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
 fastboard = { group = "fr.mrmicky", name = "fastboard", version.ref = "fastboard" }
 nbt = { group = "dev.dewy", name = "nbt", version.ref = "nbt" }
+sftp = { group = "org.apache.sshd", name = "sshd-sftp", version.ref = "sshd-sftp" }
 zip4j = { group = "net.lingala.zip4j", name = "zip4j", version.ref = "zip4j" }
 xseries = { group = "com.github.cryptomorin", name = "XSeries", version.ref = "xseries" }
 

From e988bc91fab27fec2ecd5a8c74b0a676ed194935 Mon Sep 17 00:00:00 2001
From: Thomas Meaney <thomas.meaney@icloud.com>
Date: Fri, 27 Jun 2025 10:15:49 +0200
Subject: [PATCH 07/11] Load backups in `/worlds backup` asynchronously, fix
 tmp download file being a folder for S3 storages

---
 .../world/backup/BackupsInventory.java        | 48 ++++++++++++++-----
 .../world/backup/storage/S3BackupStorage.java | 14 +++---
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java
index 1ed86043..545bd4fa 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java
@@ -20,9 +20,11 @@
 import de.eintosti.buildsystem.util.inventory.InventoryUtils;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
@@ -35,9 +37,11 @@ public class BackupsInventory extends BuildSystemInventory {
 
     private static final int FIRST_BACKUP_SLOT = 9;
 
+    private final Logger logger;
     private final BackupService backupService;
 
     public BackupsInventory(BuildSystemPlugin plugin) {
+        this.logger = plugin.getLogger();
         this.backupService = plugin.getBackupService();
     }
 
@@ -46,8 +50,9 @@ public void openBackupsInventory(Player player, BuildWorld buildWorld) {
     }
 
     private Inventory getBackupsInventory(Player player, BuildWorld buildWorld) {
-        List<Backup> backups = backupService.getProfile(buildWorld).listBackups().join();
-        Inventory inventory = new BackupsHolder(this, buildWorld, player, backups).getInventory();
+        BackupsHolder backupsHolder = new BackupsHolder(this, buildWorld, player, new ArrayList<>());
+        Inventory inventory = backupsHolder.getInventory();
+        loadBackups(backupsHolder, buildWorld, player);
 
         for (int i = 0; i <= 8; i++) {
             InventoryUtils.addGlassPane(player, inventory, i);
@@ -61,14 +66,6 @@ private Inventory getBackupsInventory(Player player, BuildWorld buildWorld) {
                 )
         ));
 
-        for (int i = 0; i < backups.size(); i++) {
-            inventory.setItem(FIRST_BACKUP_SLOT + i, InventoryUtils.createItem(XMaterial.GRASS_BLOCK,
-                    Messages.getString("backups_backup_name", player,
-                            Map.entry("%timestamp%", StringUtils.formatTime(backups.get(i).creationTime()))
-                    )
-            ));
-        }
-
         for (int i = 18; i <= 26; i++) {
             InventoryUtils.addGlassPane(player, inventory, i);
         }
@@ -76,6 +73,34 @@ private Inventory getBackupsInventory(Player player, BuildWorld buildWorld) {
         return inventory;
     }
 
+    /**
+     * Loads the {@link Backup} for a given world and adds them to the inventory on completion.
+     *
+     * @param backupsHolder The holder to populate
+     * @param buildWorld    The world to load backups for
+     * @param player        The player to display the backups to
+     */
+    private void loadBackups(BackupsHolder backupsHolder, BuildWorld buildWorld, Player player) {
+        backupService.getProfile(buildWorld).listBackups().thenAcceptAsync(backups -> {
+            backupsHolder.getBackups().addAll(backups);
+
+            Inventory inventory = backupsHolder.getInventory();
+            for (int i = 0; i < backups.size(); i++) {
+                inventory.setItem(FIRST_BACKUP_SLOT + i, InventoryUtils.createItem(XMaterial.GRASS_BLOCK,
+                        Messages.getString("backups_backup_name", player,
+                                Map.entry("%timestamp%", StringUtils.formatTime(backups.get(i).creationTime()))
+                        )
+                ));
+            }
+        });
+    }
+
+    /**
+     * Gets the duration until the next backup is due as a string formatted in {@code mm:ss}.
+     *
+     * @param buildWorld The world to get the backup duration for
+     * @return A string representing the duration until the next backup
+     */
     private String getDurationUntilBackup(BuildWorld buildWorld) {
         int timeUntilBackup = World.Backup.backupInterval;
         int timeSinceBackup = buildWorld.getData().timeSinceBackup().get();
@@ -128,9 +153,10 @@ public void onClick(InventoryClickEvent event) {
             event.setCancelled(true);
 
             int slot = event.getSlot();
-            if (slot >= FIRST_BACKUP_SLOT && slot <= 17) {
+            if (slot >= FIRST_BACKUP_SLOT && slot < FIRST_BACKUP_SLOT + 9 && itemStack.getType() == XMaterial.GRASS_BLOCK.get()) {
                 Backup backup = backupsHolder.getBackups().get(slot - FIRST_BACKUP_SLOT);
                 if (backup == null) {
+                    logger.warning("Could not find backup for slot " + slot + " in backups inventory for player " + player.getName());
                     return;
                 }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
index 452b7964..bfb494d5 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
@@ -58,11 +58,13 @@ public class S3BackupStorage implements BackupStorage {
     private final S3Client s3Client;
     private final String bucket;
     private final String pathPrefix;
+    private final Path tmpDownloadDirectory;
 
     public S3BackupStorage(BuildSystemPlugin plugin, String accessKey, String secretKey, String region, String bucket, String pathPrefix) {
         this.plugin = plugin;
         this.bucket = bucket;
         this.pathPrefix = pathPrefix.endsWith("/") ? pathPrefix : pathPrefix + "/";
+        this.tmpDownloadDirectory = FileUtils.resolve(plugin.getDataFolder().toPath(), ".tmp_backup_downloads");
 
         S3ClientBuilder builder = S3Client.builder()
                 .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)));
@@ -138,7 +140,7 @@ public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableF
 
     @Override
     public File downloadBackup(Backup backup) {
-        Path targetPath = FileUtils.resolve(getTmpDownloadDirectory(), UUID.randomUUID() + ".zip");
+        Path target = this.tmpDownloadDirectory.resolve(UUID.randomUUID() + ".zip");
 
         try {
             this.s3Client.getObject(
@@ -146,18 +148,14 @@ public File downloadBackup(Backup backup) {
                             .bucket(this.bucket)
                             .key(backup.key())
                             .build(),
-                    targetPath
+                    target
             );
         } catch (S3Exception | SdkClientException e) {
             plugin.getLogger().log(Level.SEVERE, "Error while downloading backup: " + backup.key(), e);
             return null;
         }
 
-        return targetPath.toFile();
-    }
-
-    private Path getTmpDownloadDirectory() {
-        return FileUtils.resolve(plugin.getDataFolder().toPath(), ".tmp_backup_downloads");
+        return target.toFile();
     }
 
     @Override
@@ -184,6 +182,6 @@ public void close() {
             }
         }
 
-        FileUtils.deleteDirectory(getTmpDownloadDirectory().toFile());
+        FileUtils.deleteDirectory(this.tmpDownloadDirectory.toFile());
     }
 }

From 3022a089914e6c74093be32433928429686fde07 Mon Sep 17 00:00:00 2001
From: Thomas Meaney <thomas.meaney@icloud.com>
Date: Fri, 27 Jun 2025 20:14:29 +0200
Subject: [PATCH 08/11] Bug fixes & improvements

- Load backups in `/worlds backup` asynchronously
- Improvements to restoring backups
- Add ability to also backup not active worlds
- Store used generator type for imported worlds
---
 .../buildsystem/api/world/BuildWorld.java     |  4 +-
 .../subcommand/worlds/ImportSubCommand.java   |  4 +-
 .../eintosti/buildsystem/config/Config.java   | 55 ++++++++++-------
 .../eintosti/buildsystem/util/FileUtils.java  | 13 +++-
 .../buildsystem/world/BuildWorldImpl.java     |  4 +-
 .../buildsystem/world/WorldServiceImpl.java   |  2 +-
 .../world/backup/BackupProfileImpl.java       | 60 ++++++++-----------
 .../world/backup/BackupService.java           | 17 ++++--
 .../world/backup/BackupsInventory.java        | 12 ++--
 .../world/backup/storage/S3BackupStorage.java | 19 +++---
 .../backup/storage/SftpBackupStorage.java     | 14 ++---
 .../world/creation/BuildWorldCreatorImpl.java | 12 +++-
 .../world/util/WorldUnloaderImpl.java         |  6 +-
 .../src/main/resources/config.yml             |  8 ++-
 14 files changed, 122 insertions(+), 108 deletions(-)

diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/BuildWorld.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/BuildWorld.java
index ee03f364..e327c29d 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/BuildWorld.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/BuildWorld.java
@@ -88,8 +88,10 @@ public interface BuildWorld extends Displayable {
 
     /**
      * Gets the custom chunk generator used to generate the world.
+     * <p>
+     * Only set when the world type is {@link BuildWorldType#CUSTOM} or {@link BuildWorldType#IMPORTED}.
      *
-     * @return The custom chunk generator used to generate the world.
+     * @return The custom chunk generator used to generate the world, or {@code null} if not set
      */
     @Nullable
     CustomGenerator getCustomGenerator();
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/ImportSubCommand.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/ImportSubCommand.java
index 18373be5..bf32cf0c 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/ImportSubCommand.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/ImportSubCommand.java
@@ -82,7 +82,7 @@ public void execute(Player player, String[] args) {
 
         Builder creator = null;
         Generator generator = Generator.VOID;
-        String generatorName = null;
+        String generatorName = generator.name();
         BuildWorldType worldType = BuildWorldType.IMPORTED;
 
         if (args.length != 2) {
@@ -96,6 +96,7 @@ public void execute(Player player, String[] args) {
                 }
                 try {
                     generator = Generator.valueOf(generatorArg.toUpperCase(Locale.ROOT));
+                    generatorName = generator.name();
                 } catch (IllegalArgumentException ignored) {
                     generator = Generator.CUSTOM;
                     generatorName = generatorArg;
@@ -125,7 +126,6 @@ public void execute(Player player, String[] args) {
                 try {
                     worldType = BuildWorldType.valueOf(worldTypeArg.toUpperCase(Locale.ROOT));
                 } catch (IllegalArgumentException ignored) {
-
                 }
             }
         }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
index 76c6dde6..ce821f84 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/config/Config.java
@@ -26,6 +26,7 @@
 import de.eintosti.buildsystem.config.Config.Settings.Navigator;
 import de.eintosti.buildsystem.config.Config.Settings.SaveFromDeath;
 import de.eintosti.buildsystem.config.Config.World.Backup;
+import de.eintosti.buildsystem.config.Config.World.Backup.AutoBackup;
 import de.eintosti.buildsystem.config.Config.World.Default;
 import de.eintosti.buildsystem.config.Config.World.Default.Permission;
 import de.eintosti.buildsystem.config.Config.World.Default.Settings.BuildersEnabled;
@@ -365,22 +366,30 @@ public static class Unload {
          */
         public static class Backup {
 
-            @Nullable
-            public static String url = null;
-            /**
-             * Whether world backups are enabled.
-             */
-            public static boolean autoBackup = true;
-            /**
-             * The interval in seconds between automatic backups.
-             */
-            public static int backupInterval = 900;
             /**
              * The maximum number of backups to keep per world.
              */
             public static int maxBackupsPerWorld = 5;
-
+            /**
+             * The storage for backups.
+             */
             public static BackupStorage storage;
+
+            public static class AutoBackup {
+
+                /**
+                 * Whether automatic backups are enabled.
+                 */
+                public static boolean enabled = true;
+                /**
+                 * Whether only active worlds should be backed up.
+                 */
+                public static boolean onlyActiveWorlds;
+                /**
+                 * The interval in seconds between automatic backups.
+                 */
+                public static int interval = 900;
+            }
         }
     }
 
@@ -470,11 +479,12 @@ public static void load() {
         Unload.timeUntilUnload = CONFIG.getString("world.unload.time-until-unload", "01:00:00");
         Unload.blacklistedWorlds = new HashSet<>(CONFIG.getStringList("world.unload.blacklisted-worlds"));
         // World - Backup
-        Backup.url = CONFIG.getString("world.backup.url");
-        Backup.autoBackup = CONFIG.getBoolean("world.backup.auto-backup", true);
-        Backup.backupInterval = CONFIG.getInt("world.backup.backup-interval", 900);
-        Backup.maxBackupsPerWorld = Math.min(CONFIG.getInt("world.backup.max-backups-per-world", 5), 9);
-        Backup.storage = createBackupStorage(PLUGIN);
+        Backup.maxBackupsPerWorld = Math.min(CONFIG.getInt("world.backup.max-backups-per-world", 5), 18);
+        Backup.storage = createBackupStorage();
+        // World - Backup - AutoBackup
+        AutoBackup.enabled = CONFIG.getBoolean("world.backup.auto-backup.enabled", true);
+        AutoBackup.interval = CONFIG.getInt("world.backup.auto-backup.interval", 900);
+        AutoBackup.onlyActiveWorlds = CONFIG.getBoolean("world.backup.auto-backup.only-active-worlds", true);
 
         // Folder
         Folder.overridePermissions = CONFIG.getBoolean("folder.override-permissions", true);
@@ -536,14 +546,15 @@ private static XMaterial parseWorldEditWand() {
         return XMaterial.matchXMaterial(wand).orElse(defaultWand);
     }
 
-    private static BackupStorage createBackupStorage(BuildSystemPlugin plugin) {
+    private static BackupStorage createBackupStorage() {
         String type = CONFIG.getString("world.backup.storage.type", "local").toLowerCase();
 
         switch (type) {
             case "s3" -> {
                 ConfigurationSection s3 = CONFIG.getConfigurationSection("world.backup.storage.s3");
                 return new S3BackupStorage(
-                        plugin,
+                        PLUGIN,
+                        s3.getString("url"),
                         s3.getString("access-key"),
                         s3.getString("secret-key"),
                         s3.getString("region"),
@@ -552,9 +563,9 @@ private static BackupStorage createBackupStorage(BuildSystemPlugin plugin) {
                 );
             }
             case "sftp" -> {
-                ConfigurationSection sftp = CONFIG.getConfigurationSection("world.backup.storage.s3");
+                ConfigurationSection sftp = CONFIG.getConfigurationSection("world.backup.storage.sftp");
                 return new SftpBackupStorage(
-                        plugin,
+                        PLUGIN,
                         sftp.getString("host"),
                         sftp.getInt("port"),
                         sftp.getString("username"),
@@ -564,9 +575,9 @@ private static BackupStorage createBackupStorage(BuildSystemPlugin plugin) {
             }
             default -> {
                 if (!type.equals("local")) {
-                    plugin.getLogger().warning("Unknown backup storage type '" + type + "', defaulting to local storage.");
+                    PLUGIN.getLogger().warning("Unknown backup storage type '" + type + "', defaulting to local storage.");
                 }
-                return new LocalBackupStorage(plugin);
+                return new LocalBackupStorage(PLUGIN);
             }
         }
     }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java
index 789010d2..d0833efd 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/util/FileUtils.java
@@ -141,12 +141,21 @@ private static void copyFile(@NotNull File source, @NotNull File target) throws
      * @param directory Directory to delete
      */
     public static void deleteDirectory(File directory) {
-        try (Stream<Path> walk = Files.walk(directory.toPath())) {
+        deleteDirectory(directory.toPath());
+    }
+
+    /**
+     * Deletes a directory recursively.
+     *
+     * @param directoryPath The path of the directory to delete
+     */
+    public static void deleteDirectory(Path directoryPath) {
+        try (Stream<Path> walk = Files.walk(directoryPath)) {
             walk.sorted(Comparator.reverseOrder())
                     .map(Path::toFile)
                     .forEach(File::delete);
         } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Failed to delete directory " + directory.getAbsolutePath(), e);
+            LOGGER.log(Level.SEVERE, "Failed to delete directory " + directoryPath.toAbsolutePath(), e);
         }
     }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/BuildWorldImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/BuildWorldImpl.java
index 6c42e994..fb0020bd 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/BuildWorldImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/BuildWorldImpl.java
@@ -72,7 +72,7 @@ public BuildWorldImpl(
             BuildWorldType worldType,
             long creation,
             boolean privateWorld,
-            CustomGenerator customGenerator
+            @Nullable CustomGenerator customGenerator
     ) {
         this(
                 UUID.randomUUID(),
@@ -98,7 +98,7 @@ public BuildWorldImpl(
             Builder creator,
             List<Builder> builders,
             long creation,
-            CustomGenerator customGenerator
+            @Nullable CustomGenerator customGenerator
     ) {
         this.uuid = uuid;
         this.name = name;
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java
index b07a5f3d..ae945557 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/WorldServiceImpl.java
@@ -391,7 +391,7 @@ public List<Player> removePlayersFromWorld(String worldName, String messageKey)
                 teleported = true;
             } else if (!fallbackWorld.equals(worldToRemove)) {
                 // Spawn doesn't exist, the fallback world is usable -> teleport
-                PaperLib.teleportAsync(player, fallbackSpawn);
+                player.teleport(fallbackSpawn);
                 teleported = true;
             }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
index 38983c61..4a6498fc 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
@@ -75,56 +75,46 @@ public CompletableFuture<Backup> createBackup() {
 
     @Override
     public void restoreBackup(Backup backup, Player player) {
-        File backupFile = this.storage.downloadBackup(backup);
-        if (backupFile == null || !Files.exists(backupFile.toPath())) {
-            throw new IllegalArgumentException("The specific backup does not exist");
-        }
-
         String worldName = this.buildWorld.getName();
         World world = this.buildWorld.getWorld();
-        if (world == null && !this.buildWorld.isLoaded()) {
-            this.buildWorld.getLoader().load();
-        }
-
         if (world == null) {
             Messages.sendMessage(player, "worlds_backup_unknown_world");
             return;
         }
 
-        SpawnManager spawnManager = plugin.getSpawnManager();
-        Location spawn = spawnManager.getSpawn();
-        boolean isSpawn = spawnManager.spawnExists() && spawnManager.getSpawnWorld().equals(world);
-
         List<Player> removedPlayers = plugin.getWorldService().removePlayersFromWorld(worldName, "worlds_backup_restoration_in_progress");
 
-        Bukkit.getScheduler().runTaskLater(plugin, () -> {
-            this.buildWorld.getUnloader().forceUnload(false);
-        }, 20L);
+        File backupFile = this.storage.downloadBackup(backup);
+        if (backupFile == null || !Files.exists(backupFile.toPath())) {
+            throw new IllegalArgumentException("The specific backup does not exist");
+        }
 
-        Bukkit.getScheduler().runTaskLater(plugin, () -> {
-            FileUtils.deleteDirectory(new File(Bukkit.getWorldContainer(), worldName));
+        SpawnManager spawnManager = plugin.getSpawnManager();
+        Location spawn = spawnManager.getSpawn();
+        boolean isSpawn = spawnManager.spawnExists() && spawnManager.getSpawnWorld().equals(world);
 
-            try (ZipFile zip = new ZipFile(backupFile)) {
-                zip.extractAll(Bukkit.getWorldContainer().getAbsolutePath());
-            } catch (IOException e) {
-                plugin.getLogger().warning("Failed to restore backup at: " + backupFile.getAbsolutePath());
-                return;
-            }
+        this.buildWorld.getUnloader().forceUnload(false);
+        FileUtils.deleteDirectory(new File(Bukkit.getWorldContainer(), worldName));
 
-            this.buildWorld.getLoader().load();
+        try (ZipFile zip = new ZipFile(backupFile)) {
+            zip.extractAll(FileUtils.resolve(Bukkit.getWorldContainer().toPath(), this.buildWorld.getName()).toString());
+        } catch (IOException e) {
+            plugin.getLogger().warning("Failed to restore backup at: " + backupFile.getAbsolutePath());
+            return;
+        }
 
-            WorldTeleporter worldTeleporter = this.buildWorld.getTeleporter();
-            removedPlayers.stream().filter(Objects::nonNull).forEach(worldTeleporter::teleport);
+        this.buildWorld.getLoader().load();
+        WorldTeleporter worldTeleporter = this.buildWorld.getTeleporter();
+        removedPlayers.stream().filter(Objects::nonNull).forEach(worldTeleporter::teleport);
 
-            if (isSpawn) {
-                spawn.setWorld(Bukkit.getWorld(worldName));
-                spawnManager.set(spawn, worldName);
-            }
+        if (isSpawn) {
+            spawn.setWorld(Bukkit.getWorld(worldName));
+            spawnManager.set(spawn, worldName);
+        }
 
-            Messages.sendMessage(player, "worlds_backup_restoration_successful",
-                    Map.entry("%timestamp%", StringUtils.formatTime(backup.creationTime()))
-            );
-        }, 60L);
+        Messages.sendMessage(player, "worlds_backup_restoration_successful",
+                Map.entry("%timestamp%", StringUtils.formatTime(backup.creationTime()))
+        );
     }
 
     @Override
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
index 33ad128a..ba9f02ab 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
@@ -17,6 +17,7 @@
 import de.eintosti.buildsystem.api.world.data.WorldData.Type;
 import de.eintosti.buildsystem.config.Config.World;
 import de.eintosti.buildsystem.config.Config.World.Backup;
+import de.eintosti.buildsystem.config.Config.World.Backup.AutoBackup;
 import java.time.Duration;
 import java.util.HashSet;
 import java.util.Objects;
@@ -42,7 +43,7 @@ public BackupService(BuildSystemPlugin plugin) {
         this.backupStorage = Backup.storage;
         this.worldStorage = plugin.getWorldService().getWorldStorage();
 
-        if (Backup.autoBackup) {
+        if (AutoBackup.enabled) {
             Bukkit.getScheduler().runTaskTimer(plugin, this::incrementTimeSinceBackup, UPDATE_INTERVAL * 20, UPDATE_INTERVAL * 20);
         }
     }
@@ -58,18 +59,22 @@ public BackupStorage getStorage() {
     private void incrementTimeSinceBackup() {
         Set<BuildWorld> worlds = new HashSet<>();
 
-        for (Player pl : Bukkit.getOnlinePlayers()) {
-            BuildWorld buildWorld = worldStorage.getBuildWorld(pl.getWorld().getName());
-            if (buildWorld != null && buildWorld.getPermissions().canModify(pl, () -> true)) {
-                worlds.add(buildWorld);
+        if (AutoBackup.onlyActiveWorlds) {
+            for (Player pl : Bukkit.getOnlinePlayers()) {
+                BuildWorld buildWorld = worldStorage.getBuildWorld(pl.getWorld().getName());
+                if (buildWorld != null && buildWorld.getPermissions().canModify(pl, () -> true)) {
+                    worlds.add(buildWorld);
+                }
             }
+        } else {
+            worlds.addAll(worldStorage.getBuildWorlds());
         }
 
         worlds.forEach(buildWorld -> {
             Type<Integer> timeSinceBackup = buildWorld.getData().timeSinceBackup();
             timeSinceBackup.set((int) (timeSinceBackup.get() + UPDATE_INTERVAL));
 
-            if (timeSinceBackup.get() > World.Backup.backupInterval) {
+            if (timeSinceBackup.get() > AutoBackup.interval) {
                 getProfile(buildWorld).createBackup();
                 timeSinceBackup.set(0);
             }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java
index 545bd4fa..3b1195a9 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupsInventory.java
@@ -12,7 +12,7 @@
 import de.eintosti.buildsystem.Messages;
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.backup.Backup;
-import de.eintosti.buildsystem.config.Config.World;
+import de.eintosti.buildsystem.config.Config.World.Backup.AutoBackup;
 import de.eintosti.buildsystem.util.StringUtils;
 import de.eintosti.buildsystem.util.inventory.BuildSystemHolder;
 import de.eintosti.buildsystem.util.inventory.BuildSystemInventory;
@@ -61,12 +61,12 @@ private Inventory getBackupsInventory(Player player, BuildWorld buildWorld) {
         inventory.setItem(4, InventoryUtils.createItem(XMaterial.OAK_HANGING_SIGN,
                 Messages.getString("backups_information_name", player),
                 Messages.getStringList("backups_information_lore", player,
-                        Map.entry("%interval%", World.Backup.backupInterval / 60),
+                        Map.entry("%interval%", AutoBackup.interval / 60),
                         Map.entry("%remaining%", getDurationUntilBackup(buildWorld))
                 )
         ));
 
-        for (int i = 18; i <= 26; i++) {
+        for (int i = 27; i <= 35; i++) {
             InventoryUtils.addGlassPane(player, inventory, i);
         }
 
@@ -102,7 +102,7 @@ private void loadBackups(BackupsHolder backupsHolder, BuildWorld buildWorld, Pla
      * @return A string representing the duration until the next backup
      */
     private String getDurationUntilBackup(BuildWorld buildWorld) {
-        int timeUntilBackup = World.Backup.backupInterval;
+        int timeUntilBackup = AutoBackup.interval;
         int timeSinceBackup = buildWorld.getData().timeSinceBackup().get();
 
         Date date = new Date((timeUntilBackup - timeSinceBackup) * 1000L);
@@ -153,7 +153,7 @@ public void onClick(InventoryClickEvent event) {
             event.setCancelled(true);
 
             int slot = event.getSlot();
-            if (slot >= FIRST_BACKUP_SLOT && slot < FIRST_BACKUP_SLOT + 9 && itemStack.getType() == XMaterial.GRASS_BLOCK.get()) {
+            if (slot >= FIRST_BACKUP_SLOT && slot < FIRST_BACKUP_SLOT + 18 && itemStack.getType() == XMaterial.GRASS_BLOCK.get()) {
                 Backup backup = backupsHolder.getBackups().get(slot - FIRST_BACKUP_SLOT);
                 if (backup == null) {
                     logger.warning("Could not find backup for slot " + slot + " in backups inventory for player " + player.getName());
@@ -188,7 +188,7 @@ private static class BackupsHolder extends BuildWorldHolder {
         private final List<Backup> backups;
 
         public BackupsHolder(BuildSystemInventory inventory, BuildWorld buildWorld, Player player, List<Backup> backups) {
-            super(inventory, buildWorld, 27, Messages.getString("backups_title", player));
+            super(inventory, buildWorld, 36, Messages.getString("backups_title", player));
             this.backups = backups;
         }
 
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
index bfb494d5..3f2d90f6 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
@@ -23,7 +23,6 @@
 import de.eintosti.buildsystem.api.world.backup.BackupProfile;
 import de.eintosti.buildsystem.api.world.backup.BackupStorage;
 import de.eintosti.buildsystem.config.Config;
-import de.eintosti.buildsystem.config.Config.World;
 import de.eintosti.buildsystem.util.FileUtils;
 import de.eintosti.buildsystem.world.backup.BackupImpl;
 import java.io.File;
@@ -38,6 +37,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Level;
 import org.bukkit.Bukkit;
+import org.jetbrains.annotations.Nullable;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.core.exception.SdkClientException;
@@ -60,23 +60,20 @@ public class S3BackupStorage implements BackupStorage {
     private final String pathPrefix;
     private final Path tmpDownloadDirectory;
 
-    public S3BackupStorage(BuildSystemPlugin plugin, String accessKey, String secretKey, String region, String bucket, String pathPrefix) {
+    public S3BackupStorage(BuildSystemPlugin plugin, @Nullable String url, String accessKey, String secretKey, String region, String bucket, String pathPrefix) {
         this.plugin = plugin;
         this.bucket = bucket;
         this.pathPrefix = pathPrefix.endsWith("/") ? pathPrefix : pathPrefix + "/";
         this.tmpDownloadDirectory = FileUtils.resolve(plugin.getDataFolder().toPath(), ".tmp_backup_downloads");
 
         S3ClientBuilder builder = S3Client.builder()
-                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)));
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)))
+                .region(Region.of(region));
 
-        if (World.Backup.url == null || World.Backup.url.isEmpty()) {
+        if (url != null && !url.isEmpty()) {
             builder = builder
-                    .region(Region.of(region));
-        } else {
-            builder = builder
-                    .region(Region.EU_CENTRAL_1) // Dummy value
-                    .endpointOverride(URI.create(World.Backup.url))
-                    .forcePathStyle(true);
+                    .region(Region.of(region))
+                    .endpointOverride(URI.create(url));
         }
 
         this.s3Client = builder.build();
@@ -182,6 +179,6 @@ public void close() {
             }
         }
 
-        FileUtils.deleteDirectory(this.tmpDownloadDirectory.toFile());
+        FileUtils.deleteDirectory(this.tmpDownloadDirectory);
     }
 }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
index 1e0e2f0c..f29ab629 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
@@ -253,20 +253,14 @@ public void deleteBackup(Backup backup) {
 
     @Override
     public void close() {
-        try {
-            if (Files.exists(tmpDownloadPath)) {
-                FileUtils.deleteDirectory(tmpDownloadPath.toFile());
-            }
-        } catch (Exception e) {
-            plugin.getLogger().log(Level.WARNING, "Failed to clean up temporary download directory", e);
-        }
-
-        if (sshClient != null && !sshClient.isClosed()) {
+        if (this.sshClient != null && !this.sshClient.isClosed()) {
             try {
-                sshClient.stop();
+                this.sshClient.stop();
             } catch (Exception e) {
                 plugin.getLogger().log(Level.WARNING, "Failed to properly close SSH client", e);
             }
         }
+
+        FileUtils.deleteDirectory(this.tmpDownloadPath);
     }
 }
\ No newline at end of file
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java
index 2662ae1f..c5be0184 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/creation/BuildWorldCreatorImpl.java
@@ -286,7 +286,13 @@ worldName, parseDataVersion(), getServerDataVersion()
      * @return A configured {@link WorldCreator}
      */
     private WorldCreator createBukkitWorldCreator() {
-        WorldCreator worldCreator = new WorldCreator(worldName);
+        WorldCreator worldCreator = new WorldCreator(this.worldName);
+        BuildWorldType worldType = this.worldType;
+
+        if (worldType == BuildWorldType.IMPORTED && this.customGenerator != null && this.customGenerator.name() != null) {
+            // For imported worlds we store the world type generator within the custom generator
+            worldType = BuildWorldType.valueOf(this.customGenerator.name().toUpperCase(Locale.ROOT));
+        }
 
         switch (worldType) {
             case VOID:
@@ -308,8 +314,8 @@ private WorldCreator createBukkitWorldCreator() {
                 worldCreator.environment(World.Environment.THE_END);
                 break;
             case CUSTOM:
-                if (customGenerator != null) {
-                    worldCreator.generator(customGenerator.chunkGenerator());
+                if (this.customGenerator != null) {
+                    worldCreator.generator(this.customGenerator.chunkGenerator());
                 }
                 // Fall-through to NORMAL for default settings
             default: // NORMAL
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java
index 08912e7f..27dfce5a 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldUnloaderImpl.java
@@ -24,6 +24,7 @@
 import de.eintosti.buildsystem.api.world.util.WorldUnloader;
 import de.eintosti.buildsystem.config.Config.World.Unload;
 import de.eintosti.buildsystem.world.SpawnManager;
+import java.util.Arrays;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;
@@ -123,13 +124,10 @@ public void forceUnload(boolean save) {
         }
 
         if (save) {
+            Arrays.stream(bukkitWorld.getLoadedChunks()).forEach(Chunk::unload);
             bukkitWorld.save();
         }
 
-        for (Chunk chunk : bukkitWorld.getLoadedChunks()) {
-            chunk.unload(save);
-        }
-
         if (!Bukkit.unloadWorld(bukkitWorld, save)) {
             plugin.getLogger().warning("Failed to unload world \"" + this.buildWorld.getName() + "\". It may still be loaded in memory.");
             return;
diff --git a/buildsystem-core/src/main/resources/config.yml b/buildsystem-core/src/main/resources/config.yml
index a6575885..03281957 100644
--- a/buildsystem-core/src/main/resources/config.yml
+++ b/buildsystem-core/src/main/resources/config.yml
@@ -62,9 +62,11 @@ world:
       - world_nether
       - worth_the_end
   backup:
-    auto-backup: true
-    backup-interval: 900 # In seconds
-    max-backups-per-world: 5 # Maximum: 9
+    max-backups-per-world: 5 # Maximum: 18
+    auto-backup:
+      enabled: true
+      interval: 900 # In seconds
+      only-active-worlds: true
     storage:
       # Options: local, s3, sftp
       type: local

From e962198817bda50dfdbe9440cc9dc834b6e230d7 Mon Sep 17 00:00:00 2001
From: Thomas Meaney <thomas.meaney@icloud.com>
Date: Fri, 27 Jun 2025 21:07:16 +0200
Subject: [PATCH 09/11] Add some javadocs to backup API

---
 .../buildsystem/api/world/backup/Backup.java  | 18 +++++++++
 .../api/world/backup/BackupProfile.java       |  3 ++
 .../api/world/backup/BackupStorage.java       | 39 ++++++++++++++++++-
 .../api/world/backup/package-info.java        | 22 +++++++++++
 .../api/world/builder/package-info.java       | 22 +++++++++++
 .../api/world/creation/package-info.java      | 22 +++++++++++
 .../api/world/display/package-info.java       | 22 +++++++++++
 .../api/world/util/package-info.java          | 22 +++++++++++
 .../de/eintosti/buildsystem/Messages.java     |  4 +-
 .../subcommand/worlds/InfoSubCommand.java     |  1 +
 .../world/backup/BackupProfileImpl.java       | 15 +++++--
 .../world/backup/BackupService.java           | 36 +++++------------
 .../backup/storage/LocalBackupStorage.java    | 23 +++++++----
 .../world/backup/storage/S3BackupStorage.java | 22 +++++++----
 .../backup/storage/SftpBackupStorage.java     | 22 ++++++-----
 .../world/builder/package-info.java           | 22 +++++++++++
 16 files changed, 256 insertions(+), 59 deletions(-)
 create mode 100644 buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/package-info.java
 create mode 100644 buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/builder/package-info.java
 create mode 100644 buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/creation/package-info.java
 create mode 100644 buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/display/package-info.java
 create mode 100644 buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/util/package-info.java
 create mode 100644 buildsystem-core/src/main/java/de/eintosti/buildsystem/world/builder/package-info.java

diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/Backup.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/Backup.java
index 262686f5..1aaab91d 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/Backup.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/Backup.java
@@ -17,11 +17,29 @@
  */
 package de.eintosti.buildsystem.api.world.backup;
 
+/**
+ * Represents a single backup of a {@link de.eintosti.buildsystem.api.world.BuildWorld}.
+ */
 public interface Backup {
 
+    /**
+     * Returns the {@link BackupProfile} that owns this backup.
+     *
+     * @return The owner of the backup.
+     */
     BackupProfile owner();
 
+    /**
+     * Returns the timestamp when this backup was created.
+     *
+     * @return The creation time in milliseconds since the Unix epoch.
+     */
     long creationTime();
 
+    /**
+     * Returns a unique key or identifier for this backup.
+     *
+     * @return The key of the backup.
+     */
     String key();
 }
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupProfile.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupProfile.java
index 84f88806..e06d0995 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupProfile.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupProfile.java
@@ -12,6 +12,9 @@
 import java.util.concurrent.CompletableFuture;
 import org.bukkit.entity.Player;
 
+/**
+ * Represents a profile for managing backups of a specific {@link BuildWorld}. This interface defines operations related to listing, creating, restoring, and destroying backups.
+ */
 public interface BackupProfile {
 
     /**
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
index e4ac5969..3f11871c 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
@@ -22,19 +22,54 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+/**
+ * Represents a storage mechanism for managing world backups.
+ */
 public interface BackupStorage {
 
+    /**
+     * Generates a unique backup name based on a given timestamp.
+     *
+     * @param timestamp The timestamp to use for the backup name.
+     * @return A string representing the backup name (e.g., "1678886400000.zip").
+     */
     default String getBackupName(long timestamp) {
         return timestamp + ".zip";
     }
 
-    List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld);
+    /**
+     * Lists all available {@link Backup}s for a specific {@link BuildWorld}.
+     *
+     * @param buildWorld The world for which to list backups.
+     * @return A list of backup objects associated with the specified world.
+     */
+    List<Backup> listBackups(BuildWorld buildWorld);
 
-    void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableFuture<Backup> future);
+    /**
+     * Stores a new {@link Backup} for a given {@link BuildWorld}. The result of the operation is communicated via the provided {@link CompletableFuture}.
+     *
+     * @param buildWorld The world to be backed up.
+     * @param future     A future that will be completed with the backup object upon successful storage, or exceptionally if an error occurs.
+     */
+    void storeBackup(BuildWorld buildWorld, CompletableFuture<Backup> future);
 
+    /**
+     * Downloads a specific {@link Backup} file.
+     *
+     * @param backup The backup object representing the backup to be downloaded
+     * @return A file object pointing to the downloaded backup
+     */
     File downloadBackup(Backup backup);
 
+    /**
+     * Deletes a specific {@link Backup}.
+     *
+     * @param backup The backup object representing the backup to be deleted
+     */
     void deleteBackup(Backup backup);
 
+    /**
+     * Closes the backup storage, releasing any resources.
+     */
     void close();
 }
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/package-info.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/package-info.java
new file mode 100644
index 00000000..cafd7c5f
--- /dev/null
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Provides interfaces and classes for managing world backups.
+ */
+package de.eintosti.buildsystem.api.world.backup; 
\ No newline at end of file
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/builder/package-info.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/builder/package-info.java
new file mode 100644
index 00000000..26c9a353
--- /dev/null
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/builder/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Provides interfaces and classes for managing world builders and their associated permissions.
+ */
+package de.eintosti.buildsystem.api.world.builder;
\ No newline at end of file
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/creation/package-info.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/creation/package-info.java
new file mode 100644
index 00000000..2fa2bf6a
--- /dev/null
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/creation/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Provides interfaces and classes for managing world creation and initialization.
+ */
+package de.eintosti.buildsystem.api.world.creation;
\ No newline at end of file
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/display/package-info.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/display/package-info.java
new file mode 100644
index 00000000..5d485e1d
--- /dev/null
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/display/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Provides interfaces and classes for managing world display and rendering.
+ */
+package de.eintosti.buildsystem.api.world.display;
\ No newline at end of file
diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/util/package-info.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/util/package-info.java
new file mode 100644
index 00000000..a8ed32d6
--- /dev/null
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/util/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Provides utility classes and interfaces for managing world-related operations.
+ */
+package de.eintosti.buildsystem.api.world.util;
\ No newline at end of file
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java
index 05748ee3..fa7baa89 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/Messages.java
@@ -344,6 +344,7 @@ public static void createMessageFile() {
                 "&7&m-------------------------------------",
                 "%prefix% &7&nWorld info:&b %world%",
                 " ",
+                " &8- &7UUID: &b%uuid%",
                 " &8- &7Creator: &b%creator%",
                 " &8- &7Type: &b%type%",
                 " &8- &7Private: &b%private%",
@@ -587,6 +588,7 @@ public static void createMessageFile() {
         setMessage(sb, "type_custom", "Custom");
         setMessage(sb, "type_template", "Template");
         setMessage(sb, "type_private", "Private");
+        setMessage(sb, "type_imported", "Imported");
         addSpacer(sb, "");
         addSpacer(sb, "# World Status");
         setMessage(sb, "status_title", "&8Status &7» &3%world%");
@@ -1060,7 +1062,7 @@ public static String getMessageKey(BuildWorldType type) {
             case VOID -> "type_void";
             case TEMPLATE -> "type_template";
             case PRIVATE -> "type_private";
-            case IMPORTED -> null; // No message key for imported worlds
+            case IMPORTED -> "type_imported";
             case CUSTOM -> "type_custom";
             case UNKNOWN -> null; // No message key for unknown worlds
         };
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/InfoSubCommand.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/InfoSubCommand.java
index 7e6eb34c..c8cff9da 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/InfoSubCommand.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/command/subcommand/worlds/InfoSubCommand.java
@@ -61,6 +61,7 @@ public void execute(Player player, String[] args) {
         WorldData worldData = buildWorld.getData();
         Messages.sendMessage(player, "world_info",
                 Map.entry("%world%", buildWorld.getName()),
+                Map.entry("%uuid%", buildWorld.getUniqueId().toString()),
                 Map.entry("%creator%", getCreator(builders)),
                 Map.entry("%item%", worldData.material().get().name()),
                 Map.entry("%type%", Messages.getString(Messages.getMessageKey(buildWorld.getType()), player)),
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
index 4a6498fc..41e0160c 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -49,7 +50,7 @@ public BackupProfileImpl(BuildSystemPlugin plugin, BackupStorage storage, BuildW
     @Override
     public CompletableFuture<List<Backup>> listBackups() {
         synchronized (this.backupLock) {
-            return CompletableFuture.supplyAsync(() -> this.storage.listBackups(this, this.buildWorld));
+            return CompletableFuture.supplyAsync(() -> this.storage.listBackups(this.buildWorld));
         }
     }
 
@@ -63,11 +64,17 @@ public CompletableFuture<Backup> createBackup() {
         CompletableFuture<Backup> future = new CompletableFuture<>();
         this.listBackups().thenAcceptAsync(backups -> {
             synchronized (this.backupLock) {
-                if (backups.size() >= Config.World.Backup.maxBackupsPerWorld) {
-                    storage.deleteBackup(backups.getLast());
+                int maxBackups = Config.World.Backup.maxBackupsPerWorld;
+                int excess = backups.size() - maxBackups + 1;
+
+                if (excess > 0) {
+                    backups.stream()
+                            .sorted(Comparator.comparingLong(Backup::creationTime))
+                            .limit(excess)
+                            .forEach(storage::deleteBackup);
                 }
 
-                this.storage.storeBackup(this, this.buildWorld, future);
+                this.storage.storeBackup(this.buildWorld, future);
             }
         });
         return future;
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
index ba9f02ab..f3814f79 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
@@ -15,13 +15,12 @@
 import de.eintosti.buildsystem.api.world.backup.BackupProfile;
 import de.eintosti.buildsystem.api.world.backup.BackupStorage;
 import de.eintosti.buildsystem.api.world.data.WorldData.Type;
-import de.eintosti.buildsystem.config.Config.World;
 import de.eintosti.buildsystem.config.Config.World.Backup;
 import de.eintosti.buildsystem.config.Config.World.Backup.AutoBackup;
 import java.time.Duration;
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -30,13 +29,13 @@
 
 public class BackupService {
 
-    private static final long UPDATE_INTERVAL = Duration.ofSeconds(5).getSeconds();
+    private static final long UPDATE_PERIOD = Duration.ofSeconds(5).getSeconds();
 
     private final BuildSystemPlugin plugin;
     private final BackupStorage backupStorage;
     private final WorldStorage worldStorage;
 
-    private final Cache<BuildWorldCacheKey, BackupProfile> backupProfileCache = CacheBuilder.newBuilder().expireAfterAccess(3, TimeUnit.MINUTES).build();
+    private final Cache<UUID, BackupProfile> backupProfileCache = CacheBuilder.newBuilder().expireAfterAccess(3, TimeUnit.MINUTES).build();
 
     public BackupService(BuildSystemPlugin plugin) {
         this.plugin = plugin;
@@ -44,7 +43,7 @@ public BackupService(BuildSystemPlugin plugin) {
         this.worldStorage = plugin.getWorldService().getWorldStorage();
 
         if (AutoBackup.enabled) {
-            Bukkit.getScheduler().runTaskTimer(plugin, this::incrementTimeSinceBackup, UPDATE_INTERVAL * 20, UPDATE_INTERVAL * 20);
+            Bukkit.getScheduler().runTaskTimer(plugin, this::incrementTimeSinceBackup, UPDATE_PERIOD * 20, UPDATE_PERIOD * 20);
         }
     }
 
@@ -53,8 +52,8 @@ public BackupStorage getStorage() {
     }
 
     /**
-     * Increments the time since a {@link BuildWorld} was backed-up by {@link #UPDATE_INTERVAL} seconds. If the time has surpassed {@link World.Backup#backupInterval}, a backup
-     * will automatically be created.
+     * Increments the time since a {@link BuildWorld} was backed-up by {@link #UPDATE_PERIOD} seconds. If the time has surpassed {@link AutoBackup#interval}, a backup will
+     * automatically be created.
      */
     private void incrementTimeSinceBackup() {
         Set<BuildWorld> worlds = new HashSet<>();
@@ -72,7 +71,7 @@ private void incrementTimeSinceBackup() {
 
         worlds.forEach(buildWorld -> {
             Type<Integer> timeSinceBackup = buildWorld.getData().timeSinceBackup();
-            timeSinceBackup.set((int) (timeSinceBackup.get() + UPDATE_INTERVAL));
+            timeSinceBackup.set((int) (timeSinceBackup.get() + UPDATE_PERIOD));
 
             if (timeSinceBackup.get() > AutoBackup.interval) {
                 getProfile(buildWorld).createBackup();
@@ -108,30 +107,13 @@ public void backup(BuildWorld buildWorld, Runnable onSuccess, Runnable onFailure
     public BackupProfile getProfile(BuildWorld buildWorld) {
         try {
             return this.backupProfileCache.get(
-                    new BuildWorldCacheKey(buildWorld),
+                    buildWorld.getUniqueId(),
                     () -> new BackupProfileImpl(this.plugin, this.backupStorage, buildWorld)
             );
         } catch (ExecutionException e) {
             BackupProfileImpl profile = new BackupProfileImpl(this.plugin, this.backupStorage, buildWorld);
-            this.backupProfileCache.put(new BuildWorldCacheKey(buildWorld), profile);
+            this.backupProfileCache.put(buildWorld.getUniqueId(), profile);
             return profile;
         }
     }
-
-    private record BuildWorldCacheKey(BuildWorld buildWorld) {
-
-        @Override
-        public boolean equals(Object other) {
-            if (this == other) {
-                return true;
-            }
-
-            if (other == null || getClass() != other.getClass()) {
-                return false;
-            }
-
-            BuildWorldCacheKey that = (BuildWorldCacheKey) other;
-            return Objects.equals(buildWorld.getUniqueId(), that.buildWorld.getUniqueId());
-        }
-    }
 }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
index a9326997..dbc86f4c 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
@@ -20,7 +20,6 @@
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.backup.Backup;
-import de.eintosti.buildsystem.api.world.backup.BackupProfile;
 import de.eintosti.buildsystem.api.world.backup.BackupStorage;
 import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.util.FileUtils;
@@ -56,12 +55,16 @@ public LocalBackupStorage(BuildSystemPlugin plugin) {
     }
 
     @Override
-    public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
+    public List<Backup> listBackups(BuildWorld buildWorld) {
         List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
 
         try (Stream<Path> walk = Files.walk(getBackupDirectory(buildWorld))) {
             walk.filter(LocalBackupStorage::isValidFile).forEach(path -> backups.add(
-                    new BackupImpl(owner, FileUtils.getDirectoryCreation(path.toFile()), path.toAbsolutePath().toString())
+                    new BackupImpl(
+                            plugin.getBackupService().getProfile(buildWorld),
+                            FileUtils.getDirectoryCreation(path.toFile()),
+                            path.toAbsolutePath().toString()
+                    )
             ));
         } catch (IOException e) {
             plugin.getLogger().log(Level.SEVERE, "Error while listing backups", e);
@@ -73,15 +76,21 @@ public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
     }
 
     @Override
-    public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableFuture<Backup> future) {
-        long currentTime = System.currentTimeMillis();
-        File storage = new File(getBackupDirectory(buildWorld).toFile(), getBackupName(currentTime));
+    public void storeBackup(BuildWorld buildWorld, CompletableFuture<Backup> future) {
+        long timestamp = System.currentTimeMillis();
+        File storage = new File(getBackupDirectory(buildWorld).toFile(), getBackupName(timestamp));
         File zip = FileUtils.zipWorld(storage, buildWorld);
         if (zip == null) {
             future.completeExceptionally(new RuntimeException("Failed to complete the backup for " + buildWorld.getName()));
             return;
         }
-        future.complete(new BackupImpl(owner, currentTime, zip.getAbsolutePath()));
+
+        future.complete(new BackupImpl(
+                plugin.getBackupService().getProfile(buildWorld),
+                timestamp,
+                zip.getAbsolutePath()
+        ));
+        plugin.getLogger().info(String.format("Backed up world '%s'. Took %sms", buildWorld.getName(), (System.currentTimeMillis() - timestamp)));
     }
 
     @Override
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
index 3f2d90f6..edce3010 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
@@ -20,7 +20,6 @@
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.backup.Backup;
-import de.eintosti.buildsystem.api.world.backup.BackupProfile;
 import de.eintosti.buildsystem.api.world.backup.BackupStorage;
 import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.util.FileUtils;
@@ -55,6 +54,7 @@
 public class S3BackupStorage implements BackupStorage {
 
     private final BuildSystemPlugin plugin;
+
     private final S3Client s3Client;
     private final String bucket;
     private final String pathPrefix;
@@ -62,6 +62,7 @@ public class S3BackupStorage implements BackupStorage {
 
     public S3BackupStorage(BuildSystemPlugin plugin, @Nullable String url, String accessKey, String secretKey, String region, String bucket, String pathPrefix) {
         this.plugin = plugin;
+
         this.bucket = bucket;
         this.pathPrefix = pathPrefix.endsWith("/") ? pathPrefix : pathPrefix + "/";
         this.tmpDownloadDirectory = FileUtils.resolve(plugin.getDataFolder().toPath(), ".tmp_backup_downloads");
@@ -84,7 +85,7 @@ private String getBackupDirectory(BuildWorld buildWorld) {
     }
 
     @Override
-    public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
+    public List<Backup> listBackups(BuildWorld buildWorld) {
         List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
 
         try {
@@ -96,7 +97,11 @@ public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
             backups.addAll(
                     response.contents().stream()
                             .filter(object -> object.key().endsWith(".zip"))
-                            .map(object -> new BackupImpl(owner, object.lastModified().toEpochMilli(), object.key()))
+                            .map(object -> new BackupImpl(
+                                    plugin.getBackupService().getProfile(buildWorld),
+                                    object.lastModified().toEpochMilli(),
+                                    object.key()
+                            ))
                             .toList()
             );
         } catch (S3Exception | SdkClientException e) {
@@ -109,7 +114,10 @@ public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
     }
 
     @Override
-    public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableFuture<Backup> future) {
+    public void storeBackup(BuildWorld buildWorld, CompletableFuture<Backup> future) {
+        long timestamp = System.currentTimeMillis();
+        String key = getBackupDirectory(buildWorld) + getBackupName(timestamp);
+
         byte[] zipBytes;
         try {
             zipBytes = FileUtils.zipWorldToMemory(buildWorld);
@@ -118,9 +126,6 @@ public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableF
             return;
         }
 
-        long currentTime = System.currentTimeMillis();
-        String key = getBackupDirectory(buildWorld) + getBackupName(currentTime);
-
         try {
             this.s3Client.putObject(
                     PutObjectRequest.builder()
@@ -129,7 +134,8 @@ public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableF
                             .build(),
                     RequestBody.fromBytes(zipBytes)
             );
-            future.complete(new BackupImpl(owner, currentTime, key));
+            future.complete(new BackupImpl(plugin.getBackupService().getProfile(buildWorld), timestamp, key));
+            plugin.getLogger().info(String.format("Backed up world '%s'. Took %sms", buildWorld.getName(), (System.currentTimeMillis() - timestamp)));
         } catch (S3Exception | SdkClientException e) {
             future.completeExceptionally(new RuntimeException("Failed to upload backup for " + buildWorld.getName(), e));
         }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
index f29ab629..df9d51de 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
@@ -20,7 +20,6 @@
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.api.world.BuildWorld;
 import de.eintosti.buildsystem.api.world.backup.Backup;
-import de.eintosti.buildsystem.api.world.backup.BackupProfile;
 import de.eintosti.buildsystem.api.world.backup.BackupStorage;
 import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.util.FileUtils;
@@ -54,6 +53,7 @@ public class SftpBackupStorage implements BackupStorage {
     private static final int BUFFER_SIZE = 8192;
 
     private final BuildSystemPlugin plugin;
+
     private final String host;
     private final int port;
     private final String username;
@@ -65,6 +65,7 @@ public class SftpBackupStorage implements BackupStorage {
 
     public SftpBackupStorage(BuildSystemPlugin plugin, String host, int port, String username, String password, String remoteBasePath) {
         this.plugin = plugin;
+
         this.host = host;
         this.port = validatePort(port);
         this.username = username;
@@ -119,7 +120,7 @@ private String getBackupDirectory(BuildWorld buildWorld) {
     }
 
     @Override
-    public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
+    public List<Backup> listBackups(BuildWorld buildWorld) {
         List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
         String backupDirectory = getBackupDirectory(buildWorld);
 
@@ -134,7 +135,7 @@ public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
                 if (file.getFilename().endsWith(".zip")) {
                     long creationTime = file.getAttributes().getCreateTime().toMillis();
                     String fullPath = backupDirectory + file.getFilename();
-                    backups.add(new BackupImpl(owner, creationTime, fullPath));
+                    backups.add(new BackupImpl(plugin.getBackupService().getProfile(buildWorld), creationTime, fullPath));
                 }
             }
         } catch (IOException e) {
@@ -146,7 +147,12 @@ public List<Backup> listBackups(BackupProfile owner, BuildWorld buildWorld) {
     }
 
     @Override
-    public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableFuture<Backup> future) {
+    public void storeBackup(BuildWorld buildWorld, CompletableFuture<Backup> future) {
+        long timestamp = System.currentTimeMillis();
+        String backupName = getBackupName(timestamp);
+        String backupDir = getBackupDirectory(buildWorld);
+        String remotePath = backupDir + backupName;
+
         byte[] zipBytes;
         try {
             zipBytes = FileUtils.zipWorldToMemory(buildWorld);
@@ -155,11 +161,6 @@ public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableF
             return;
         }
 
-        long timestamp = System.currentTimeMillis();
-        String backupName = getBackupName(timestamp);
-        String backupDir = getBackupDirectory(buildWorld);
-        String remotePath = backupDir + backupName;
-
         try (SftpClient sftp = connect()) {
             createDirectoryIfNotExists(sftp, backupDir);
 
@@ -170,7 +171,8 @@ public void storeBackup(BackupProfile owner, BuildWorld buildWorld, CompletableF
                 bufferedOut.write(zipBytes);
                 bufferedOut.flush();
             }
-            future.complete(new BackupImpl(owner, timestamp, remotePath));
+            future.complete(new BackupImpl(plugin.getBackupService().getProfile(buildWorld), timestamp, remotePath));
+            plugin.getLogger().info(String.format("Backed up world '%s'. Took %sms", buildWorld.getName(), (System.currentTimeMillis() - timestamp)));
         } catch (IOException e) {
             future.completeExceptionally(new RuntimeException("Failed to upload SFTP backup", e));
         }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/builder/package-info.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/builder/package-info.java
new file mode 100644
index 00000000..abe25f64
--- /dev/null
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/builder/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2018-2025, Thomas Meaney
+ * Copyright (c) contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Provides classes for managing world builders and their associated functionality.
+ */
+package de.eintosti.buildsystem.world.builder; 
\ No newline at end of file

From b0e03a3e9f4dcee58495a49830596e386839fb90 Mon Sep 17 00:00:00 2001
From: Thomas Meaney <thomas.meaney@icloud.com>
Date: Sat, 28 Jun 2025 11:56:36 +0200
Subject: [PATCH 10/11] Fix SFTP connection establishment

---
 .../api/world/backup/BackupStorage.java       |   5 +-
 buildsystem-core/build.gradle.kts             |   1 +
 .../backup/storage/SftpBackupStorage.java     | 125 +++++++++++++-----
 gradle/libs.versions.toml                     |   4 +-
 4 files changed, 98 insertions(+), 37 deletions(-)

diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
index 3f11871c..a815898e 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
@@ -46,7 +46,10 @@ default String getBackupName(long timestamp) {
     List<Backup> listBackups(BuildWorld buildWorld);
 
     /**
-     * Stores a new {@link Backup} for a given {@link BuildWorld}. The result of the operation is communicated via the provided {@link CompletableFuture}.
+     * Creates and stores a new {@link Backup} for a given {@link BuildWorld}. The result of the operation is communicated via the provided {@link CompletableFuture}.
+     * <p>
+     * In comparison to {@link BackupProfile#createBackup()}, a backup will always be created and no older backups will be deleted. This method is intended for immediate backup
+     * creation and storage, rather than profile management.
      *
      * @param buildWorld The world to be backed up.
      * @param future     A future that will be completed with the backup object upon successful storage, or exceptionally if an error occurs.
diff --git a/buildsystem-core/build.gradle.kts b/buildsystem-core/build.gradle.kts
index d823b51b..01c17a51 100644
--- a/buildsystem-core/build.gradle.kts
+++ b/buildsystem-core/build.gradle.kts
@@ -54,6 +54,7 @@ dependencies {
     implementation(libs.aws.core) // Unable to find the dependency at runtime, so we add it here
 
     library(libs.bundles.aws)
+    library(libs.bouncycastle)
     library(libs.sftp)
     library(libs.zip4j)
 }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
index df9d51de..3864ab64 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
@@ -26,24 +26,31 @@
 import de.eintosti.buildsystem.world.backup.BackupImpl;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
+import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.security.Security;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Level;
 import org.apache.sshd.client.SshClient;
 import org.apache.sshd.client.session.ClientSession;
+import org.apache.sshd.common.signature.BuiltinSignatures;
 import org.apache.sshd.sftp.client.SftpClient;
+import org.apache.sshd.sftp.client.SftpClient.Attributes;
 import org.apache.sshd.sftp.client.SftpClient.DirEntry;
 import org.apache.sshd.sftp.client.SftpClientFactory;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bukkit.Bukkit;
 
 public class SftpBackupStorage implements BackupStorage {
@@ -62,6 +69,8 @@ public class SftpBackupStorage implements BackupStorage {
     private final Path tmpDownloadPath;
 
     private volatile SshClient sshClient;
+    private volatile ClientSession clientSession;
+    private volatile SftpClient sftpClient;
 
     public SftpBackupStorage(BuildSystemPlugin plugin, String host, int port, String username, String password, String remoteBasePath) {
         this.plugin = plugin;
@@ -73,7 +82,8 @@ public SftpBackupStorage(BuildSystemPlugin plugin, String host, int port, String
         this.remoteBasePath = normalizeBasePath(remoteBasePath);
         this.tmpDownloadPath = FileUtils.resolve(plugin.getDataFolder().toPath(), ".tmp_backup_downloads");
 
-        initializeSshClient();
+        Security.addProvider(new BouncyCastleProvider());
+        establishConnection();
     }
 
     private static int validatePort(int port) {
@@ -91,32 +101,49 @@ private static String normalizeBasePath(String basePath) {
         return normalized.endsWith("/") ? normalized : normalized + "/";
     }
 
-    private void initializeSshClient() {
-        this.sshClient = SshClient.setUpDefaultClient();
-        this.sshClient.start();
-    }
-
-    private SftpClient connect() throws IOException {
+    private synchronized void establishConnection() {
         if (this.sshClient == null || this.sshClient.isClosed()) {
             initializeSshClient();
         }
 
         try {
-            ClientSession session = this.sshClient.connect(this.username, this.host, this.port)
+            this.clientSession = this.sshClient.connect(this.username, this.host, this.port)
                     .verify(CONNECTION_TIMEOUT.toMillis())
                     .getSession();
 
-            session.addPasswordIdentity(this.password);
-            session.auth().verify(AUTH_TIMEOUT.toMillis());
+            this.clientSession.addPasswordIdentity(this.password);
+            this.clientSession.auth().verify(AUTH_TIMEOUT.toMillis());
 
-            return SftpClientFactory.instance().createSftpClient(session);
+            this.sftpClient = SftpClientFactory.instance().createSftpClient(this.clientSession);
+            plugin.getLogger().info("SFTP connection established successfully.");
         } catch (Exception e) {
-            throw new IOException("Failed to establish SFTP connection to " + this.host + ":" + this.port, e);
+            disconnectAll();
+            plugin.getLogger().log(Level.SEVERE, "Failed to establish SFTP connection to " + this.host + ":" + this.port, e);
         }
     }
 
+    private void initializeSshClient() {
+        this.sshClient = SshClient.setUpDefaultClient();
+        this.sshClient.setSignatureFactories(Arrays.asList(
+                BuiltinSignatures.rsa,
+                BuiltinSignatures.ed25519
+        ));
+        this.sshClient.start();
+    }
+
+    private SftpClient getSftpClient() {
+        if (sftpClient == null || !sftpClient.isOpen()) {
+            synchronized (this) {
+                if (sftpClient == null || !sftpClient.isOpen()) {
+                    establishConnection();
+                }
+            }
+        }
+        return sftpClient;
+    }
+
     private String getBackupDirectory(BuildWorld buildWorld) {
-        return remoteBasePath + buildWorld.getUniqueId() + "/";
+        return this.remoteBasePath + buildWorld.getUniqueId() + "/";
     }
 
     @Override
@@ -124,22 +151,30 @@ public List<Backup> listBackups(BuildWorld buildWorld) {
         List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
         String backupDirectory = getBackupDirectory(buildWorld);
 
-        try (SftpClient sftp = connect()) {
-            if (!directoryExists(sftp, backupDirectory)) {
-                plugin.getLogger().warning("SFTP backup directory does not exist: " + backupDirectory);
-                return backups;
-            }
+        try {
+            SftpClient sftp = getSftpClient();
+            createDirectoryIfNotExists(sftp, backupDirectory);
 
             Iterable<DirEntry> files = sftp.readDir(backupDirectory);
             for (SftpClient.DirEntry file : files) {
-                if (file.getFilename().endsWith(".zip")) {
-                    long creationTime = file.getAttributes().getCreateTime().toMillis();
-                    String fullPath = backupDirectory + file.getFilename();
-                    backups.add(new BackupImpl(plugin.getBackupService().getProfile(buildWorld), creationTime, fullPath));
+                if (!file.getFilename().endsWith(".zip")) {
+                    continue;
                 }
+
+                Attributes attributes = file.getAttributes();
+                long timestamp = Optional.ofNullable(attributes.getCreateTime())
+                        .orElse(attributes.getModifyTime())
+                        .toMillis();
+
+                backups.add(new BackupImpl(
+                        plugin.getBackupService().getProfile(buildWorld),
+                        timestamp,
+                        backupDirectory + file.getFilename()
+                ));
             }
         } catch (IOException e) {
             plugin.getLogger().log(Level.SEVERE, "Failed to list SFTP backups", e);
+            disconnectAll();
         }
 
         backups.sort(Comparator.comparingLong(Backup::creationTime).reversed());
@@ -150,8 +185,8 @@ public List<Backup> listBackups(BuildWorld buildWorld) {
     public void storeBackup(BuildWorld buildWorld, CompletableFuture<Backup> future) {
         long timestamp = System.currentTimeMillis();
         String backupName = getBackupName(timestamp);
-        String backupDir = getBackupDirectory(buildWorld);
-        String remotePath = backupDir + backupName;
+        String backupDirectory = getBackupDirectory(buildWorld);
+        String remotePath = backupDirectory + backupName;
 
         byte[] zipBytes;
         try {
@@ -161,8 +196,9 @@ public void storeBackup(BuildWorld buildWorld, CompletableFuture<Backup> future)
             return;
         }
 
-        try (SftpClient sftp = connect()) {
-            createDirectoryIfNotExists(sftp, backupDir);
+        try {
+            SftpClient sftp = getSftpClient();
+            createDirectoryIfNotExists(sftp, backupDirectory);
 
             try (
                     OutputStream out = sftp.write(remotePath);
@@ -175,6 +211,7 @@ public void storeBackup(BuildWorld buildWorld, CompletableFuture<Backup> future)
             plugin.getLogger().info(String.format("Backed up world '%s'. Took %sms", buildWorld.getName(), (System.currentTimeMillis() - timestamp)));
         } catch (IOException e) {
             future.completeExceptionally(new RuntimeException("Failed to upload SFTP backup", e));
+            disconnectAll();
         }
     }
 
@@ -221,10 +258,10 @@ private boolean directoryExists(SftpClient sftp, String path) {
 
     @Override
     public File downloadBackup(Backup backup) {
+        SftpClient sftp = getSftpClient();
         Path target = tmpDownloadPath.resolve(UUID.randomUUID() + ".zip");
 
         try (
-                SftpClient sftp = connect();
                 InputStream in = sftp.read(backup.key());
                 BufferedInputStream bufferedIn = new BufferedInputStream(in, BUFFER_SIZE);
                 OutputStream out = Files.newOutputStream(target);
@@ -234,6 +271,7 @@ public File downloadBackup(Backup backup) {
             return target.toFile();
         } catch (IOException e) {
             plugin.getLogger().log(Level.SEVERE, "Failed to download SFTP backup: " + backup.key(), e);
+            disconnectAll();
             return null;
         }
     }
@@ -242,7 +280,8 @@ public File downloadBackup(Backup backup) {
     public void deleteBackup(Backup backup) {
         try {
             Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-                try (SftpClient sftp = connect()) {
+                try {
+                    SftpClient sftp = getSftpClient();
                     sftp.remove(backup.key());
                 } catch (IOException e) {
                     plugin.getLogger().warning("Backup file not found for deletion: " + backup.key());
@@ -255,14 +294,30 @@ public void deleteBackup(Backup backup) {
 
     @Override
     public void close() {
-        if (this.sshClient != null && !this.sshClient.isClosed()) {
-            try {
-                this.sshClient.stop();
-            } catch (Exception e) {
-                plugin.getLogger().log(Level.WARNING, "Failed to properly close SSH client", e);
-            }
+        disconnectAll();
+        FileUtils.deleteDirectory(this.tmpDownloadPath);
+    }
+
+    private void disconnectAll() {
+        close(this.sshClient);
+        this.sshClient = null;
+
+        close(this.sftpClient);
+        this.sshClient = null;
+
+        close(this.clientSession);
+        this.clientSession = null;
+    }
+
+    private void close(Closeable closeable) {
+        if (closeable == null) {
+            return;
         }
 
-        FileUtils.deleteDirectory(this.tmpDownloadPath);
+        try {
+            closeable.close();
+        } catch (IOException e) {
+            plugin.getLogger().log(Level.WARNING, "Failed to close resource", e);
+        }
     }
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c8bdc39e..9716d4ff 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,11 +12,12 @@ axiompaper = "4.0.1-1.21.1"
 annotations = "26.0.2"
 authlib = "3.13.56"
 aws-sdk = "2.31.70"
+bouncycastle = "1.81"
 bstats = "3.1.0"
 fastboard = "2.1.5"
 nbt = "1.5.1"
 xseries = "13.3.1"
-sshd-sftp = "2.9.0"
+sshd-sftp = "2.15.0"
 zip4j = "2.11.5"
 
 [libraries]
@@ -37,6 +38,7 @@ aws-auth = { module = "software.amazon.awssdk:auth", version.ref = "aws-sdk" }
 aws-core = { module = "software.amazon.awssdk:core", version.ref = "aws-sdk" }
 aws-regions = { module = "software.amazon.awssdk:regions", version.ref = "aws-sdk" }
 aws-s3 = { module = "software.amazon.awssdk:s3", version.ref = "aws-sdk" }
+bouncycastle = { group = "org.bouncycastle", name = "bcpkix-jdk18on", version.ref = "bouncycastle" }
 bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
 fastboard = { group = "fr.mrmicky", name = "fastboard", version.ref = "fastboard" }
 nbt = { group = "dev.dewy", name = "nbt", version.ref = "nbt" }

From 5dde6c410b5a411d32ddae9d20b8f41c5f69b30c Mon Sep 17 00:00:00 2001
From: Thomas Meaney <thomas.meaney@icloud.com>
Date: Sat, 28 Jun 2025 12:42:06 +0200
Subject: [PATCH 11/11] Make backup storage methods return completable futures

This allows the first backup deletion, then creation action to better be performed sequentially
---
 .../api/world/backup/BackupStorage.java       |  21 ++-
 .../world/backup/BackupProfileImpl.java       |  62 +++---
 .../world/backup/BackupService.java           |   3 +
 .../backup/storage/LocalBackupStorage.java    |  84 +++++----
 .../world/backup/storage/S3BackupStorage.java | 165 ++++++++--------
 .../backup/storage/SftpBackupStorage.java     | 177 +++++++++---------
 .../world/util/WorldTeleporterImpl.java       |  25 +--
 7 files changed, 286 insertions(+), 251 deletions(-)

diff --git a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
index a815898e..7116cfc3 100644
--- a/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
+++ b/buildsystem-api/src/main/java/de/eintosti/buildsystem/api/world/backup/BackupStorage.java
@@ -40,10 +40,10 @@ default String getBackupName(long timestamp) {
     /**
      * Lists all available {@link Backup}s for a specific {@link BuildWorld}.
      *
-     * @param buildWorld The world for which to list backups.
-     * @return A list of backup objects associated with the specified world.
+     * @param buildWorld The world for which to list backups
+     * @return A future with a list of backup objects associated with the specified world
      */
-    List<Backup> listBackups(BuildWorld buildWorld);
+    CompletableFuture<List<Backup>> listBackups(BuildWorld buildWorld);
 
     /**
      * Creates and stores a new {@link Backup} for a given {@link BuildWorld}. The result of the operation is communicated via the provided {@link CompletableFuture}.
@@ -51,25 +51,26 @@ default String getBackupName(long timestamp) {
      * In comparison to {@link BackupProfile#createBackup()}, a backup will always be created and no older backups will be deleted. This method is intended for immediate backup
      * creation and storage, rather than profile management.
      *
-     * @param buildWorld The world to be backed up.
-     * @param future     A future that will be completed with the backup object upon successful storage, or exceptionally if an error occurs.
+     * @param buildWorld The world to be backed up
+     * @return A future that will be completed with the backup object upon successful storage, or exceptionally if an error occurs
      */
-    void storeBackup(BuildWorld buildWorld, CompletableFuture<Backup> future);
+    CompletableFuture<Backup> storeBackup(BuildWorld buildWorld);
 
     /**
-     * Downloads a specific {@link Backup} file.
+     * Downloads a specific {@link Backup} file asynchronously.
      *
      * @param backup The backup object representing the backup to be downloaded
-     * @return A file object pointing to the downloaded backup
+     * @return A future that will complete with a {@link File} object pointing to the downloaded backup once the download operation is finished
      */
-    File downloadBackup(Backup backup);
+    CompletableFuture<File> downloadBackup(Backup backup);
 
     /**
      * Deletes a specific {@link Backup}.
      *
      * @param backup The backup object representing the backup to be deleted
+     * @return A future that will complete after the deletion
      */
-    void deleteBackup(Backup backup);
+    CompletableFuture<Void> deleteBackup(Backup backup);
 
     /**
      * Closes the backup storage, releasing any resources.
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
index 41e0160c..3861e91b 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupProfileImpl.java
@@ -20,12 +20,13 @@
 import de.eintosti.buildsystem.world.SpawnManager;
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
 import net.lingala.zip4j.ZipFile;
 import org.bukkit.Bukkit;
@@ -50,7 +51,7 @@ public BackupProfileImpl(BuildSystemPlugin plugin, BackupStorage storage, BuildW
     @Override
     public CompletableFuture<List<Backup>> listBackups() {
         synchronized (this.backupLock) {
-            return CompletableFuture.supplyAsync(() -> this.storage.listBackups(this.buildWorld));
+            return this.storage.listBackups(this.buildWorld);
         }
     }
 
@@ -61,23 +62,37 @@ public CompletableFuture<Backup> createBackup() {
             world.save();
         }
 
-        CompletableFuture<Backup> future = new CompletableFuture<>();
-        this.listBackups().thenAcceptAsync(backups -> {
-            synchronized (this.backupLock) {
-                int maxBackups = Config.World.Backup.maxBackupsPerWorld;
-                int excess = backups.size() - maxBackups + 1;
-
-                if (excess > 0) {
-                    backups.stream()
-                            .sorted(Comparator.comparingLong(Backup::creationTime))
-                            .limit(excess)
-                            .forEach(storage::deleteBackup);
-                }
-
-                this.storage.storeBackup(this.buildWorld, future);
-            }
-        });
-        return future;
+        CompletableFuture<Backup> resultFuture = new CompletableFuture<>();
+        this.listBackups()
+                .thenComposeAsync(backups -> {
+                    synchronized (this.backupLock) {
+                        int maxBackups = Config.World.Backup.maxBackupsPerWorld;
+                        int excess = backups.size() - maxBackups + 1;
+
+                        List<CompletableFuture<Void>> deleteFutures = Collections.emptyList();
+
+                        if (excess > 0) {
+                            deleteFutures = backups.stream()
+                                    .sorted(Comparator.comparingLong(Backup::creationTime))
+                                    .limit(excess)
+                                    .map(storage::deleteBackup)
+                                    .toList();
+                        }
+
+                        return CompletableFuture
+                                .allOf(deleteFutures.toArray(new CompletableFuture[0]))
+                                .thenCompose(v -> storage.storeBackup(this.buildWorld));
+                    }
+                })
+                .whenComplete((backup, throwable) -> {
+                    if (throwable != null) {
+                        resultFuture.completeExceptionally(throwable);
+                    } else {
+                        resultFuture.complete(backup);
+                    }
+                });
+
+        return resultFuture;
     }
 
     @Override
@@ -91,9 +106,12 @@ public void restoreBackup(Backup backup, Player player) {
 
         List<Player> removedPlayers = plugin.getWorldService().removePlayersFromWorld(worldName, "worlds_backup_restoration_in_progress");
 
-        File backupFile = this.storage.downloadBackup(backup);
-        if (backupFile == null || !Files.exists(backupFile.toPath())) {
-            throw new IllegalArgumentException("The specific backup does not exist");
+        File backupFile;
+        try {
+            backupFile = this.storage.downloadBackup(backup).get();
+        } catch (InterruptedException | ExecutionException e) {
+            plugin.getLogger().log(Level.SEVERE, "Error while downloading backup", e);
+            return;
         }
 
         SpawnManager spawnManager = plugin.getSpawnManager();
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
index f3814f79..5ab32f29 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/BackupService.java
@@ -22,6 +22,8 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import org.bukkit.Bukkit;
@@ -29,6 +31,7 @@
 
 public class BackupService {
 
+    public static final Executor BACKUP_EXECUTOR = Executors.newCachedThreadPool();
     private static final long UPDATE_PERIOD = Duration.ofSeconds(5).getSeconds();
 
     private final BuildSystemPlugin plugin;
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
index dbc86f4c..a2d3bf18 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/LocalBackupStorage.java
@@ -24,6 +24,7 @@
 import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.util.FileUtils;
 import de.eintosti.buildsystem.world.backup.BackupImpl;
+import de.eintosti.buildsystem.world.backup.BackupService;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -55,57 +56,62 @@ public LocalBackupStorage(BuildSystemPlugin plugin) {
     }
 
     @Override
-    public List<Backup> listBackups(BuildWorld buildWorld) {
-        List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
+    public CompletableFuture<List<Backup>> listBackups(BuildWorld buildWorld) {
+        return CompletableFuture.supplyAsync(() -> {
+            List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
 
-        try (Stream<Path> walk = Files.walk(getBackupDirectory(buildWorld))) {
-            walk.filter(LocalBackupStorage::isValidFile).forEach(path -> backups.add(
-                    new BackupImpl(
-                            plugin.getBackupService().getProfile(buildWorld),
-                            FileUtils.getDirectoryCreation(path.toFile()),
-                            path.toAbsolutePath().toString()
-                    )
-            ));
-        } catch (IOException e) {
-            plugin.getLogger().log(Level.SEVERE, "Error while listing backups", e);
-            return Collections.emptyList();
-        }
+            try (Stream<Path> walk = Files.walk(getBackupDirectory(buildWorld))) {
+                walk.filter(LocalBackupStorage::isValidFile).forEach(path -> backups.add(
+                        new BackupImpl(
+                                plugin.getBackupService().getProfile(buildWorld),
+                                FileUtils.getDirectoryCreation(path.toFile()),
+                                path.toAbsolutePath().toString()
+                        )
+                ));
+            } catch (IOException e) {
+                plugin.getLogger().log(Level.SEVERE, "Error while listing backups", e);
+                return Collections.emptyList();
+            }
 
-        backups.sort(Comparator.comparingLong(Backup::creationTime).reversed());
-        return backups;
+            backups.sort(Comparator.comparingLong(Backup::creationTime).reversed());
+            return backups;
+        }, BackupService.BACKUP_EXECUTOR);
     }
 
     @Override
-    public void storeBackup(BuildWorld buildWorld, CompletableFuture<Backup> future) {
-        long timestamp = System.currentTimeMillis();
-        File storage = new File(getBackupDirectory(buildWorld).toFile(), getBackupName(timestamp));
-        File zip = FileUtils.zipWorld(storage, buildWorld);
-        if (zip == null) {
-            future.completeExceptionally(new RuntimeException("Failed to complete the backup for " + buildWorld.getName()));
-            return;
-        }
+    public CompletableFuture<Backup> storeBackup(BuildWorld buildWorld) {
+        return CompletableFuture.supplyAsync(() -> {
+            long timestamp = System.currentTimeMillis();
+            File storage = new File(getBackupDirectory(buildWorld).toFile(), getBackupName(timestamp));
+            File zip = FileUtils.zipWorld(storage, buildWorld);
+            if (zip == null) {
+                throw new RuntimeException("Failed to complete the backup for " + buildWorld.getName());
+            }
 
-        future.complete(new BackupImpl(
-                plugin.getBackupService().getProfile(buildWorld),
-                timestamp,
-                zip.getAbsolutePath()
-        ));
-        plugin.getLogger().info(String.format("Backed up world '%s'. Took %sms", buildWorld.getName(), (System.currentTimeMillis() - timestamp)));
+            plugin.getLogger().info(String.format("Backed up world '%s'. Took %sms", buildWorld.getName(), (System.currentTimeMillis() - timestamp)));
+            return new BackupImpl(
+                    plugin.getBackupService().getProfile(buildWorld),
+                    timestamp,
+                    zip.getAbsolutePath()
+            );
+        }, BackupService.BACKUP_EXECUTOR);
     }
 
     @Override
-    public File downloadBackup(Backup backup) {
-        return new File(backup.key());
+    public CompletableFuture<File> downloadBackup(Backup backup) {
+        return CompletableFuture.completedFuture(new File(backup.key()));
     }
 
     @Override
-    public void deleteBackup(Backup backup) {
-        File file = new File(backup.key());
-        try {
-            Files.deleteIfExists(file.toPath());
-        } catch (IOException e) {
-            plugin.getLogger().log(Level.SEVERE, "Unable to delete backup " + backup.key(), e);
-        }
+    public CompletableFuture<Void> deleteBackup(Backup backup) {
+        return CompletableFuture.runAsync(() -> {
+            File file = new File(backup.key());
+            try {
+                Files.deleteIfExists(file.toPath());
+            } catch (IOException e) {
+                throw new RuntimeException("Unable to delete backup " + backup.key(), e);
+            }
+        }, BackupService.BACKUP_EXECUTOR);
     }
 
     @Override
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
index edce3010..9fb4cdd1 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/S3BackupStorage.java
@@ -24,18 +24,17 @@
 import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.util.FileUtils;
 import de.eintosti.buildsystem.world.backup.BackupImpl;
+import de.eintosti.buildsystem.world.backup.BackupService;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Level;
-import org.bukkit.Bukkit;
 import org.jetbrains.annotations.Nullable;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -85,106 +84,112 @@ private String getBackupDirectory(BuildWorld buildWorld) {
     }
 
     @Override
-    public List<Backup> listBackups(BuildWorld buildWorld) {
-        List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
+    public CompletableFuture<List<Backup>> listBackups(BuildWorld buildWorld) {
+        return CompletableFuture.supplyAsync(() -> {
+            List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
 
-        try {
-            ListObjectsV2Response response = this.s3Client.listObjectsV2(ListObjectsV2Request.builder()
-                    .bucket(this.bucket)
-                    .prefix(getBackupDirectory(buildWorld))
-                    .build());
-
-            backups.addAll(
-                    response.contents().stream()
-                            .filter(object -> object.key().endsWith(".zip"))
-                            .map(object -> new BackupImpl(
-                                    plugin.getBackupService().getProfile(buildWorld),
-                                    object.lastModified().toEpochMilli(),
-                                    object.key()
-                            ))
-                            .toList()
-            );
-        } catch (S3Exception | SdkClientException e) {
-            plugin.getLogger().log(Level.SEVERE, "Error while listing backups", e);
-            return Collections.emptyList();
-        }
+            try {
+                ListObjectsV2Response response = this.s3Client.listObjectsV2(ListObjectsV2Request.builder()
+                        .bucket(this.bucket)
+                        .prefix(getBackupDirectory(buildWorld))
+                        .build());
 
-        backups.sort(Comparator.comparingLong(Backup::creationTime).reversed());
-        return backups;
+                backups.addAll(
+                        response.contents().stream()
+                                .filter(object -> object.key().endsWith(".zip"))
+                                .map(object -> new BackupImpl(
+                                        plugin.getBackupService().getProfile(buildWorld),
+                                        object.lastModified().toEpochMilli(),
+                                        object.key()
+                                ))
+                                .toList()
+                );
+            } catch (S3Exception | SdkClientException e) {
+                throw new RuntimeException("Error while listing backups", e);
+            }
+
+            backups.sort(Comparator.comparingLong(Backup::creationTime).reversed());
+            return backups;
+        }, BackupService.BACKUP_EXECUTOR);
     }
 
     @Override
-    public void storeBackup(BuildWorld buildWorld, CompletableFuture<Backup> future) {
-        long timestamp = System.currentTimeMillis();
-        String key = getBackupDirectory(buildWorld) + getBackupName(timestamp);
+    public CompletableFuture<Backup> storeBackup(BuildWorld buildWorld) {
+        return CompletableFuture.supplyAsync(() -> {
+            long timestamp = System.currentTimeMillis();
+            String key = getBackupDirectory(buildWorld) + getBackupName(timestamp);
 
-        byte[] zipBytes;
-        try {
-            zipBytes = FileUtils.zipWorldToMemory(buildWorld);
-        } catch (IOException e) {
-            future.completeExceptionally(new RuntimeException("Failed to complete the backup for " + buildWorld.getName()));
-            return;
-        }
+            byte[] zipBytes;
+            try {
+                zipBytes = FileUtils.zipWorldToMemory(buildWorld);
+            } catch (IOException e) {
+                throw new RuntimeException("Failed to complete the backup for " + buildWorld.getName());
+            }
 
-        try {
-            this.s3Client.putObject(
-                    PutObjectRequest.builder()
-                            .bucket(this.bucket)
-                            .key(key)
-                            .build(),
-                    RequestBody.fromBytes(zipBytes)
-            );
-            future.complete(new BackupImpl(plugin.getBackupService().getProfile(buildWorld), timestamp, key));
-            plugin.getLogger().info(String.format("Backed up world '%s'. Took %sms", buildWorld.getName(), (System.currentTimeMillis() - timestamp)));
-        } catch (S3Exception | SdkClientException e) {
-            future.completeExceptionally(new RuntimeException("Failed to upload backup for " + buildWorld.getName(), e));
-        }
+            try {
+                this.s3Client.putObject(
+                        PutObjectRequest.builder()
+                                .bucket(this.bucket)
+                                .key(key)
+                                .build(),
+                        RequestBody.fromBytes(zipBytes)
+                );
+                plugin.getLogger().info(String.format("Backed up world '%s'. Took %sms", buildWorld.getName(), (System.currentTimeMillis() - timestamp)));
+                return new BackupImpl(plugin.getBackupService().getProfile(buildWorld), timestamp, key);
+            } catch (S3Exception | SdkClientException e) {
+                throw new RuntimeException("Failed to upload backup for " + buildWorld.getName(), e);
+            }
+        }, BackupService.BACKUP_EXECUTOR);
     }
 
     @Override
-    public File downloadBackup(Backup backup) {
-        Path target = this.tmpDownloadDirectory.resolve(UUID.randomUUID() + ".zip");
-
-        try {
-            this.s3Client.getObject(
-                    GetObjectRequest.builder()
-                            .bucket(this.bucket)
-                            .key(backup.key())
-                            .build(),
-                    target
-            );
-        } catch (S3Exception | SdkClientException e) {
-            plugin.getLogger().log(Level.SEVERE, "Error while downloading backup: " + backup.key(), e);
-            return null;
-        }
-
-        return target.toFile();
+    public CompletableFuture<File> downloadBackup(Backup backup) {
+        return CompletableFuture.supplyAsync(() -> {
+            try {
+                Path target = this.tmpDownloadDirectory.resolve(UUID.randomUUID() + ".zip");
+                this.s3Client.getObject(
+                        GetObjectRequest.builder()
+                                .bucket(this.bucket)
+                                .key(backup.key())
+                                .build(),
+                        target
+                );
+                return target.toFile();
+            } catch (S3Exception | SdkClientException e) {
+                throw new RuntimeException("Failed to download S3 backup: " + backup.key(), e);
+            }
+        }, BackupService.BACKUP_EXECUTOR);
     }
 
     @Override
-    public void deleteBackup(Backup backup) {
-        try {
-            Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+    public CompletableFuture<Void> deleteBackup(Backup backup) {
+        return CompletableFuture.runAsync(() -> {
+            try {
                 this.s3Client.deleteObject(DeleteObjectRequest.builder()
                         .bucket(this.bucket)
                         .key(backup.key())
                         .build());
-            });
-        } catch (S3Exception | SdkClientException e) {
-            plugin.getLogger().log(Level.SEVERE, "Unable to delete backup " + backup.key(), e);
-        }
+            } catch (S3Exception | SdkClientException e) {
+                throw new RuntimeException("Unable to delete backup " + backup.key(), e);
+            }
+        }, BackupService.BACKUP_EXECUTOR);
     }
 
     @Override
     public void close() {
-        if (this.s3Client != null) {
-            try {
-                this.s3Client.close();
-            } catch (Exception e) {
-                plugin.getLogger().log(Level.SEVERE, "Error while closing S3 client", e);
-            }
+        disconnect();
+        FileUtils.deleteDirectory(this.tmpDownloadDirectory);
+    }
+
+    private void disconnect() {
+        if (this.s3Client == null) {
+            return;
         }
 
-        FileUtils.deleteDirectory(this.tmpDownloadDirectory);
+        try {
+            this.s3Client.close();
+        } catch (Exception e) {
+            plugin.getLogger().log(Level.SEVERE, "Error while closing S3 client", e);
+        }
     }
 }
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
index 3864ab64..22dee1d7 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/backup/storage/SftpBackupStorage.java
@@ -24,6 +24,7 @@
 import de.eintosti.buildsystem.config.Config;
 import de.eintosti.buildsystem.util.FileUtils;
 import de.eintosti.buildsystem.world.backup.BackupImpl;
+import de.eintosti.buildsystem.world.backup.BackupService;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.Closeable;
@@ -51,7 +52,6 @@
 import org.apache.sshd.sftp.client.SftpClient.DirEntry;
 import org.apache.sshd.sftp.client.SftpClientFactory;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bukkit.Bukkit;
 
 public class SftpBackupStorage implements BackupStorage {
 
@@ -147,72 +147,76 @@ private String getBackupDirectory(BuildWorld buildWorld) {
     }
 
     @Override
-    public List<Backup> listBackups(BuildWorld buildWorld) {
-        List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
-        String backupDirectory = getBackupDirectory(buildWorld);
-
-        try {
-            SftpClient sftp = getSftpClient();
-            createDirectoryIfNotExists(sftp, backupDirectory);
-
-            Iterable<DirEntry> files = sftp.readDir(backupDirectory);
-            for (SftpClient.DirEntry file : files) {
-                if (!file.getFilename().endsWith(".zip")) {
-                    continue;
+    public synchronized CompletableFuture<List<Backup>> listBackups(BuildWorld buildWorld) {
+        return CompletableFuture.supplyAsync(() -> {
+            List<Backup> backups = new ArrayList<>(Config.World.Backup.maxBackupsPerWorld);
+            String backupDirectory = getBackupDirectory(buildWorld);
+
+            try {
+                SftpClient sftp = getSftpClient();
+                createDirectoryIfNotExists(sftp, backupDirectory);
+
+                Iterable<DirEntry> files = sftp.readDir(backupDirectory);
+                for (SftpClient.DirEntry file : files) {
+                    if (!file.getFilename().endsWith(".zip")) {
+                        continue;
+                    }
+
+                    Attributes attributes = file.getAttributes();
+                    long timestamp = Optional.ofNullable(attributes.getCreateTime())
+                            .orElse(attributes.getModifyTime())
+                            .toMillis();
+
+                    backups.add(new BackupImpl(
+                            plugin.getBackupService().getProfile(buildWorld),
+                            timestamp,
+                            backupDirectory + file.getFilename()
+                    ));
                 }
-
-                Attributes attributes = file.getAttributes();
-                long timestamp = Optional.ofNullable(attributes.getCreateTime())
-                        .orElse(attributes.getModifyTime())
-                        .toMillis();
-
-                backups.add(new BackupImpl(
-                        plugin.getBackupService().getProfile(buildWorld),
-                        timestamp,
-                        backupDirectory + file.getFilename()
-                ));
+            } catch (IOException e) {
+                disconnectAll();
+                throw new RuntimeException("Failed to list SFTP backups", e);
             }
-        } catch (IOException e) {
-            plugin.getLogger().log(Level.SEVERE, "Failed to list SFTP backups", e);
-            disconnectAll();
-        }
 
-        backups.sort(Comparator.comparingLong(Backup::creationTime).reversed());
-        return backups;
+            backups.sort(Comparator.comparingLong(Backup::creationTime).reversed());
+            return backups;
+        }, BackupService.BACKUP_EXECUTOR);
     }
 
     @Override
-    public void storeBackup(BuildWorld buildWorld, CompletableFuture<Backup> future) {
-        long timestamp = System.currentTimeMillis();
-        String backupName = getBackupName(timestamp);
-        String backupDirectory = getBackupDirectory(buildWorld);
-        String remotePath = backupDirectory + backupName;
+    public synchronized CompletableFuture<Backup> storeBackup(BuildWorld buildWorld) {
+        return CompletableFuture.supplyAsync(() -> {
+            long timestamp = System.currentTimeMillis();
+            String backupName = getBackupName(timestamp);
+            String backupDirectory = getBackupDirectory(buildWorld);
+            String remotePath = backupDirectory + backupName;
+
+            byte[] zipBytes;
+            try {
+                zipBytes = FileUtils.zipWorldToMemory(buildWorld);
+            } catch (IOException e) {
+                throw new RuntimeException("Failed to zip world: " + buildWorld.getName());
+            }
 
-        byte[] zipBytes;
-        try {
-            zipBytes = FileUtils.zipWorldToMemory(buildWorld);
-        } catch (IOException e) {
-            future.completeExceptionally(new RuntimeException("Failed to zip world: " + buildWorld.getName()));
-            return;
-        }
+            try {
+                SftpClient sftp = getSftpClient();
+                createDirectoryIfNotExists(sftp, backupDirectory);
 
-        try {
-            SftpClient sftp = getSftpClient();
-            createDirectoryIfNotExists(sftp, backupDirectory);
+                try (
+                        OutputStream out = sftp.write(remotePath);
+                        BufferedOutputStream bufferedOut = new BufferedOutputStream(out, BUFFER_SIZE)
+                ) {
+                    bufferedOut.write(zipBytes);
+                    bufferedOut.flush();
+                }
 
-            try (
-                    OutputStream out = sftp.write(remotePath);
-                    BufferedOutputStream bufferedOut = new BufferedOutputStream(out, BUFFER_SIZE)
-            ) {
-                bufferedOut.write(zipBytes);
-                bufferedOut.flush();
+                plugin.getLogger().info(String.format("Backed up world '%s'. Took %sms", buildWorld.getName(), (System.currentTimeMillis() - timestamp)));
+                return new BackupImpl(plugin.getBackupService().getProfile(buildWorld), timestamp, remotePath);
+            } catch (IOException e) {
+                disconnectAll();
+                throw new RuntimeException("Failed to upload SFTP backup", e);
             }
-            future.complete(new BackupImpl(plugin.getBackupService().getProfile(buildWorld), timestamp, remotePath));
-            plugin.getLogger().info(String.format("Backed up world '%s'. Took %sms", buildWorld.getName(), (System.currentTimeMillis() - timestamp)));
-        } catch (IOException e) {
-            future.completeExceptionally(new RuntimeException("Failed to upload SFTP backup", e));
-            disconnectAll();
-        }
+        }, BackupService.BACKUP_EXECUTOR);
     }
 
     private void createDirectoryIfNotExists(SftpClient sftp, String path) throws IOException {
@@ -257,39 +261,36 @@ private boolean directoryExists(SftpClient sftp, String path) {
     }
 
     @Override
-    public File downloadBackup(Backup backup) {
-        SftpClient sftp = getSftpClient();
-        Path target = tmpDownloadPath.resolve(UUID.randomUUID() + ".zip");
-
-        try (
-                InputStream in = sftp.read(backup.key());
-                BufferedInputStream bufferedIn = new BufferedInputStream(in, BUFFER_SIZE);
-                OutputStream out = Files.newOutputStream(target);
-                BufferedOutputStream bufferedOut = new BufferedOutputStream(out, BUFFER_SIZE)
-        ) {
-            bufferedIn.transferTo(bufferedOut);
-            return target.toFile();
-        } catch (IOException e) {
-            plugin.getLogger().log(Level.SEVERE, "Failed to download SFTP backup: " + backup.key(), e);
-            disconnectAll();
-            return null;
-        }
+    public synchronized CompletableFuture<File> downloadBackup(Backup backup) {
+        return CompletableFuture.supplyAsync(() -> {
+            SftpClient sftp = getSftpClient();
+            Path target = tmpDownloadPath.resolve(UUID.randomUUID() + ".zip");
+
+            try (
+                    InputStream in = sftp.read(backup.key());
+                    BufferedInputStream bufferedIn = new BufferedInputStream(in, BUFFER_SIZE);
+                    OutputStream out = Files.newOutputStream(target);
+                    BufferedOutputStream bufferedOut = new BufferedOutputStream(out, BUFFER_SIZE)
+            ) {
+                bufferedIn.transferTo(bufferedOut);
+                return target.toFile();
+            } catch (IOException e) {
+                disconnectAll();
+                throw new RuntimeException("Failed to download SFTP backup: " + backup.key(), e);
+            }
+        }, BackupService.BACKUP_EXECUTOR);
     }
 
     @Override
-    public void deleteBackup(Backup backup) {
-        try {
-            Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-                try {
-                    SftpClient sftp = getSftpClient();
-                    sftp.remove(backup.key());
-                } catch (IOException e) {
-                    plugin.getLogger().warning("Backup file not found for deletion: " + backup.key());
-                }
-            });
-        } catch (Exception e) {
-            plugin.getLogger().log(Level.SEVERE, "Failed to delete SFTP backup: " + backup.key(), e);
-        }
+    public synchronized CompletableFuture<Void> deleteBackup(Backup backup) {
+        return CompletableFuture.runAsync(() -> {
+            try {
+                SftpClient sftp = getSftpClient();
+                sftp.remove(backup.key());
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to delete SFTP backup: " + backup.key(), e);
+            }
+        }, BackupService.BACKUP_EXECUTOR);
     }
 
     @Override
@@ -303,7 +304,7 @@ private void disconnectAll() {
         this.sshClient = null;
 
         close(this.sftpClient);
-        this.sshClient = null;
+        this.sftpClient = null;
 
         close(this.clientSession);
         this.clientSession = null;
diff --git a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldTeleporterImpl.java b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldTeleporterImpl.java
index 6f218ddb..b875ae24 100644
--- a/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldTeleporterImpl.java
+++ b/buildsystem-core/src/main/java/de/eintosti/buildsystem/world/util/WorldTeleporterImpl.java
@@ -93,20 +93,21 @@ public void teleport(Player player) {
         }
 
         Location finalLocation = location;
-        Bukkit.getScheduler().runTaskLater(plugin, () -> {
-            PaperLib.teleportAsync(player, finalLocation).whenComplete((completed, throwable) -> {
-                if (!completed) {
-                    return;
-                }
+        Bukkit.getScheduler().runTaskLater(plugin, () ->
+                PaperLib.teleportAsync(player, finalLocation)
+                        .whenComplete((completed, throwable) -> {
+                                    if (!completed) {
+                                        return;
+                                    }
 
-                player.resetTitle();
-                XSound.ENTITY_ENDERMAN_TELEPORT.play(player);
+                                    player.resetTitle();
+                                    XSound.ENTITY_ENDERMAN_TELEPORT.play(player);
 
-                if (!finalLocation.clone().add(0, -1, 0).getBlock().getType().isSolid()) {
-                    player.setFlying(player.getAllowFlight());
-                }
-            });
-        }, hadToLoad ? 20L : 0L);
+                                    if (!finalLocation.clone().add(0, -1, 0).getBlock().getType().isSolid()) {
+                                        player.setFlying(player.getAllowFlight());
+                                    }
+                                }
+                        ), hadToLoad ? 20L : 0L);
     }
 
     @Override