From 2d76a202e72e0c6f9a5e6cb995127515845fa283 Mon Sep 17 00:00:00 2001
From: ItzKatze <136186750+ItzKatze@users.noreply.github.com>
Date: Sun, 19 Oct 2025 11:30:48 +0200
Subject: [PATCH] updated to 1.21.8 added new gui system new settings gui

---
 README.md                                     |   2 +
 gradle/libs.versions.toml                     |   4 +-
 .../net/fameless/forcebattle/ForceBattle.java |  19 +-
 .../forcebattle/bossbar/BossbarManager.java   |  10 +-
 .../fameless/forcebattle/caption/Caption.java |   4 +-
 .../forcebattle/command/BackpackCommand.java  |   4 +-
 .../command/ConfigSettingsCommand.java        |  37 ++
 .../command/DisplayResultsCommand.java        |   4 +-
 .../forcebattle/command/ExcludeCommand.java   |   4 +-
 .../forcebattle/command/JokerCommand.java     |  10 +-
 .../forcebattle/command/LanguageCommand.java  |  12 +-
 .../forcebattle/command/PointsCommand.java    |   6 +-
 .../command/RandomTeamsCommand.java           |   6 +-
 .../forcebattle/command/ResetCommand.java     |   4 +-
 .../forcebattle/command/ResultCommand.java    |  28 +-
 .../forcebattle/command/SettingsCommand.java  |   9 +-
 .../forcebattle/command/SkipCommand.java      |  10 +-
 .../forcebattle/command/TeamCommand.java      |   6 +-
 .../forcebattle/command/TimerCommand.java     |   8 +-
 .../command/framework/Command.java            |   2 +
 .../configuration/SettingsManager.java        |  65 ++-
 .../forcebattle/game/GameListener.java        |  37 +-
 .../forcebattle/game/NametagManager.java      |   8 +-
 .../forcebattle/game/ObjectiveManager.java    |  43 +-
 .../net/fameless/forcebattle/game/Team.java   |   4 +-
 .../{Advancement.java => FBAdvancement.java}  |   4 +-
 .../data/{Structure.java => FBStructure.java} |   4 +-
 .../game/data/StructureSimplified.java        |  46 +-
 .../game/tasks/AdvancementTask.java           |  10 +-
 .../forcebattle/game/tasks/BiomeTask.java     |   7 +-
 .../forcebattle/game/tasks/CoordsTask.java    |   7 +-
 .../forcebattle/game/tasks/HeightTask.java    |   7 +-
 .../forcebattle/game/tasks/ItemTask.java      |   7 +-
 .../forcebattle/game/tasks/StructureTask.java |  37 +-
 .../forcebattle/gui/ForceBattleGUI.java       | 183 ++++++
 .../forcebattle/gui/GUIClickableItem.java     |  65 +++
 .../net/fameless/forcebattle/gui/GUIItem.java |  17 +
 .../fameless/forcebattle/gui/GUIListener.java |  42 ++
 .../fameless/forcebattle/gui/LanguageGUI.java | 117 ----
 .../fameless/forcebattle/gui/ResultGUI.java   | 531 ------------------
 .../fameless/forcebattle/gui/SettingsGUI.java | 182 ------
 .../gui/impl/ConfigSettingsGUI.java           | 119 ++++
 .../forcebattle/gui/impl/LanguageGUI.java     |  91 +++
 .../forcebattle/gui/impl/ResultGUI.java       | 290 ++++++++++
 .../forcebattle/gui/impl/SettingsGUI.java     | 147 +++++
 .../forcebattle/player/BattlePlayer.java      |  10 +-
 .../scoreboard/ScoreboardManager.java         |  91 +++
 .../forcebattle/tablist/TablistManager.java   |   4 +-
 .../fameless/forcebattle/util/BukkitUtil.java |   8 +-
 .../forcebattle/util/ItemStackCreator.java    | 186 ++++++
 .../fameless/forcebattle/util/ItemUtils.java  |  10 +-
 .../forcebattle/util/ResultUtils.java         |   7 +-
 .../fameless/forcebattle/util/StringUtil.java |  32 --
 .../util/{Format.java => StringUtility.java}  |  46 +-
 .../net/fameless/forcebattle/util/Toast.java  |   4 +-
 src/main/resources/config.yml                 | 106 ++--
 src/main/resources/languages/en_US.json       |  25 +-
 src/main/resources/plugin.yml                 |   1 +
 58 files changed, 1653 insertions(+), 1136 deletions(-)
 create mode 100644 src/main/java/net/fameless/forcebattle/command/ConfigSettingsCommand.java
 rename src/main/java/net/fameless/forcebattle/game/data/{Advancement.java => FBAdvancement.java} (99%)
 rename src/main/java/net/fameless/forcebattle/game/data/{Structure.java => FBStructure.java} (97%)
 create mode 100644 src/main/java/net/fameless/forcebattle/gui/ForceBattleGUI.java
 create mode 100644 src/main/java/net/fameless/forcebattle/gui/GUIClickableItem.java
 create mode 100644 src/main/java/net/fameless/forcebattle/gui/GUIItem.java
 create mode 100644 src/main/java/net/fameless/forcebattle/gui/GUIListener.java
 delete mode 100644 src/main/java/net/fameless/forcebattle/gui/LanguageGUI.java
 delete mode 100644 src/main/java/net/fameless/forcebattle/gui/ResultGUI.java
 delete mode 100644 src/main/java/net/fameless/forcebattle/gui/SettingsGUI.java
 create mode 100644 src/main/java/net/fameless/forcebattle/gui/impl/ConfigSettingsGUI.java
 create mode 100644 src/main/java/net/fameless/forcebattle/gui/impl/LanguageGUI.java
 create mode 100644 src/main/java/net/fameless/forcebattle/gui/impl/ResultGUI.java
 create mode 100644 src/main/java/net/fameless/forcebattle/gui/impl/SettingsGUI.java
 create mode 100644 src/main/java/net/fameless/forcebattle/scoreboard/ScoreboardManager.java
 create mode 100644 src/main/java/net/fameless/forcebattle/util/ItemStackCreator.java
 delete mode 100644 src/main/java/net/fameless/forcebattle/util/StringUtil.java
 rename src/main/java/net/fameless/forcebattle/util/{Format.java => StringUtility.java} (64%)

diff --git a/README.md b/README.md
index 92f3b56..998057e 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,8 @@
 **ForceBattle** is a multiplayer gamemode where players compete to complete randomized objectives and earn points.  
 The player with the most points after the timer ends wins the battle!
 
+Current supported Minecraft version: 1.21.8
+
 **Objective types include:**
 - 🔹 Collect an item
 - 🔹 Kill a mob
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d9fc320..2d974f8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
-spigot = "1.21.4-R0.1-SNAPSHOT"
+spigot = "1.21.8-R0.1-SNAPSHOT"
 gson = "2.11.0"
 guice = "7.0.0"
 annotations = "26.0.1"
 bstats = "3.0.2"
 adventureTextMinimessage = "4.17.0"
 adventureTextSerializerLegacy = "4.17.0"
-adventureBukkit = "4.3.4"
+adventureBukkit = "4.4.1"
 slf4j = "2.0.16"
 logback = "1.5.18"
 lombok = "1.18.32"
diff --git a/src/main/java/net/fameless/forcebattle/ForceBattle.java b/src/main/java/net/fameless/forcebattle/ForceBattle.java
index 9dc84ee..d47b5ed 100644
--- a/src/main/java/net/fameless/forcebattle/ForceBattle.java
+++ b/src/main/java/net/fameless/forcebattle/ForceBattle.java
@@ -13,9 +13,7 @@
 import net.fameless.forcebattle.game.NametagManager;
 import net.fameless.forcebattle.game.ObjectiveManager;
 import net.fameless.forcebattle.game.Timer;
-import net.fameless.forcebattle.gui.LanguageGUI;
-import net.fameless.forcebattle.gui.ResultGUI;
-import net.fameless.forcebattle.gui.SettingsGUI;
+import net.fameless.forcebattle.gui.GUIListener;
 import net.fameless.forcebattle.tablist.TablistManager;
 import net.fameless.forcebattle.util.BukkitUtil;
 import net.fameless.forcebattle.util.ResourceUtil;
@@ -39,12 +37,6 @@ public final class ForceBattle extends JavaPlugin {
     private static Timer timer;
     @Getter
     private static ObjectiveManager objectiveManager;
-    @Getter
-    private LanguageGUI languageGUI;
-    @Getter
-    private ResultGUI resultGUI;
-    @Getter
-    private SettingsGUI settingsGUI;
 
     public static ForceBattle get() {
         return instance;
@@ -59,18 +51,12 @@ public void onEnable() {
 
         Caption.setCurrentLanguage(Language.ofIdentifier(getConfig().getString("lang", "en")));
 
-        this.languageGUI = new LanguageGUI();
-        this.resultGUI = new ResultGUI();
-        this.settingsGUI = new SettingsGUI();
-
         initCore();
 
         NametagManager.runTask();
 
         Bukkit.getPluginManager().registerEvents(new GameListener(), this);
-        Bukkit.getPluginManager().registerEvents(languageGUI, this);
-        Bukkit.getPluginManager().registerEvents(resultGUI, this);
-        Bukkit.getPluginManager().registerEvents(settingsGUI, this);
+        Bukkit.getPluginManager().registerEvents(new GUIListener(), this);
 
         CommandHandler.registerAll(Command.COMMANDS);
         PermissionManager.registerPermissions();
@@ -107,6 +93,7 @@ private void initCore() {
         Command.createInstances();
         BossbarManager.runTask();
         TablistManager.startUpdating();
+        //ScoreboardManager.startUpdater();
         PluginUpdater.checkForUpdate();
     }
 
diff --git a/src/main/java/net/fameless/forcebattle/bossbar/BossbarManager.java b/src/main/java/net/fameless/forcebattle/bossbar/BossbarManager.java
index 492df64..6474157 100644
--- a/src/main/java/net/fameless/forcebattle/bossbar/BossbarManager.java
+++ b/src/main/java/net/fameless/forcebattle/bossbar/BossbarManager.java
@@ -6,7 +6,7 @@
 import net.fameless.forcebattle.game.Objective;
 import net.fameless.forcebattle.game.Team;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.Format;
+import net.fameless.forcebattle.util.StringUtility;
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
@@ -96,14 +96,14 @@ private static void hideBossBar(BattlePlayer battlePlayer, HashMap<BattlePlayer,
             return Caption.of(
                     "bossbar.format_hide_points",
                     TagResolver.resolver("battletype", Tag.inserting(Component.text(playerObjective.getBattleType().getPrefix()))),
-                    TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(playerObjective.getObjectiveString()))))
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(StringUtility.formatName(playerObjective.getObjectiveString()))))
             );
         }
 
         return Caption.of(
                 "bossbar.format",
                 TagResolver.resolver("battletype", Tag.inserting(Component.text(playerObjective.getBattleType().getPrefix()))),
-                TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(playerObjective.getObjectiveString())))),
+                TagResolver.resolver("objective", Tag.inserting(Component.text(StringUtility.formatName(playerObjective.getObjectiveString())))),
                 TagResolver.resolver("pointstype", Tag.inserting(Component.text(isPlayerInTeam ? "Team-Points" : "Points"))),
                 TagResolver.resolver("points", Tag.inserting(Component.text(points)))
         );
@@ -117,14 +117,14 @@ private static void hideBossBar(BattlePlayer battlePlayer, HashMap<BattlePlayer,
             return Caption.of(
                     "bossbar.team_format_hide_points",
                     TagResolver.resolver("battletype", Tag.inserting(Component.text(teamObjective.getBattleType().getPrefix()))),
-                    TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(teamObjective.getObjectiveString()))))
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(StringUtility.formatName(teamObjective.getObjectiveString()))))
             );
         }
 
         return Caption.of(
                 "bossbar.team_format",
                 TagResolver.resolver("battletype", Tag.inserting(Component.text(teamObjective.getBattleType().getPrefix()))),
-                TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(teamObjective.getObjectiveString())))),
+                TagResolver.resolver("objective", Tag.inserting(Component.text(StringUtility.formatName(teamObjective.getObjectiveString())))),
                 TagResolver.resolver("pointstype", Tag.inserting(Component.text("Team-Points"))),
                 TagResolver.resolver("points", Tag.inserting(Component.text(team.getPoints())))
         );
diff --git a/src/main/java/net/fameless/forcebattle/caption/Caption.java b/src/main/java/net/fameless/forcebattle/caption/Caption.java
index 34f00b3..bd68db4 100644
--- a/src/main/java/net/fameless/forcebattle/caption/Caption.java
+++ b/src/main/java/net/fameless/forcebattle/caption/Caption.java
@@ -4,7 +4,7 @@
 import lombok.Getter;
 import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.event.LanguageChangeEvent;
-import net.fameless.forcebattle.util.Format;
+import net.fameless.forcebattle.util.StringUtility;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.Tag;
@@ -45,7 +45,7 @@ private Caption() {
 
     private static @NotNull String replaceDefaults(String input) {
         input = input.replace("<prefix>", getString("prefix"))
-                .replace("<time>", Format.formatTime(ForceBattle.getTimer().getTime()))
+                .replace("<time>", StringUtility.formatTime(ForceBattle.getTimer().getTime()))
         ;
         return input;
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/BackpackCommand.java b/src/main/java/net/fameless/forcebattle/command/BackpackCommand.java
index 2e8532a..10692d6 100644
--- a/src/main/java/net/fameless/forcebattle/command/BackpackCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/BackpackCommand.java
@@ -6,7 +6,7 @@
 import net.fameless.forcebattle.command.framework.CommandCaller;
 import net.fameless.forcebattle.configuration.SettingsManager;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.StringUtil;
+import net.fameless.forcebattle.util.StringUtility;
 import net.fameless.forcebattle.util.TabCompletions;
 import org.jetbrains.annotations.NotNull;
 
@@ -54,7 +54,7 @@ public void executeCommand(CommandCaller caller, String[] args) {
     @Override
     public List<String> tabComplete(CommandCaller caller, String @NotNull [] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[0], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
         }
         return List.of();
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/ConfigSettingsCommand.java b/src/main/java/net/fameless/forcebattle/command/ConfigSettingsCommand.java
new file mode 100644
index 0000000..3060846
--- /dev/null
+++ b/src/main/java/net/fameless/forcebattle/command/ConfigSettingsCommand.java
@@ -0,0 +1,37 @@
+package net.fameless.forcebattle.command;
+
+import net.fameless.forcebattle.command.framework.CallerType;
+import net.fameless.forcebattle.command.framework.Command;
+import net.fameless.forcebattle.command.framework.CommandCaller;
+import net.fameless.forcebattle.gui.impl.SettingsGUI;
+import net.fameless.forcebattle.player.BattlePlayer;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class ConfigSettingsCommand extends Command {
+
+    public ConfigSettingsCommand() {
+        super(
+                "configsettings",
+                List.of("menu"),
+                CallerType.PLAYER,
+                "/configsettings",
+                "forcebattle.settings",
+                "Command to open the settings menu"
+        );
+    }
+
+    @Override
+    public void executeCommand(@NotNull CommandCaller caller, String[] args) {
+        if (caller instanceof BattlePlayer player) {
+            new SettingsGUI().open(player);
+        }
+    }
+
+    @Override
+    public List<String> tabComplete(CommandCaller caller, String[] args) {
+        return List.of();
+    }
+
+}
diff --git a/src/main/java/net/fameless/forcebattle/command/DisplayResultsCommand.java b/src/main/java/net/fameless/forcebattle/command/DisplayResultsCommand.java
index 5b894e1..3eabf20 100644
--- a/src/main/java/net/fameless/forcebattle/command/DisplayResultsCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/DisplayResultsCommand.java
@@ -7,7 +7,7 @@
 import net.fameless.forcebattle.command.framework.CommandCaller;
 import net.fameless.forcebattle.game.Team;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.StringUtil;
+import net.fameless.forcebattle.util.StringUtility;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.jetbrains.annotations.NotNull;
 
@@ -98,7 +98,7 @@ protected void executeCommand(CommandCaller caller, String[] args) {
     @Override
     public List<String> tabComplete(CommandCaller caller, String @NotNull [] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], List.of("player", "team"), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[0], List.of("player", "team"), new ArrayList<>());
         }
         return List.of();
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/ExcludeCommand.java b/src/main/java/net/fameless/forcebattle/command/ExcludeCommand.java
index aec7cec..98548fb 100644
--- a/src/main/java/net/fameless/forcebattle/command/ExcludeCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/ExcludeCommand.java
@@ -5,7 +5,7 @@
 import net.fameless.forcebattle.command.framework.Command;
 import net.fameless.forcebattle.command.framework.CommandCaller;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.StringUtil;
+import net.fameless.forcebattle.util.StringUtility;
 import net.fameless.forcebattle.util.TabCompletions;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,7 +44,7 @@ public void executeCommand(CommandCaller caller, String[] args) {
     @Override
     public List<String> tabComplete(CommandCaller caller, String @NotNull [] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[0], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
         }
         return List.of();
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/JokerCommand.java b/src/main/java/net/fameless/forcebattle/command/JokerCommand.java
index 061bed4..268e2e5 100644
--- a/src/main/java/net/fameless/forcebattle/command/JokerCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/JokerCommand.java
@@ -5,7 +5,7 @@
 import net.fameless.forcebattle.command.framework.Command;
 import net.fameless.forcebattle.command.framework.CommandCaller;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.StringUtil;
+import net.fameless.forcebattle.util.StringUtility;
 import net.fameless.forcebattle.util.TabCompletions;
 
 import java.util.ArrayList;
@@ -76,17 +76,17 @@ protected void executeCommand(final CommandCaller caller, final String[] args) {
     @Override
     protected List<String> tabComplete(final CommandCaller caller, final String[] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], List.of("add", "remove"), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[0], List.of("add", "remove"), new ArrayList<>());
         }
         if (args.length == 2) {
-            return StringUtil.copyPartialMatches(args[1], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[1], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
         }
         if (args.length == 3) {
-            return StringUtil.copyPartialMatches(args[2], List.of(JokerType.PLAYERSKIP.getIdentifier(), JokerType.SWAP.getIdentifier(),
+            return StringUtility.copyPartialMatches(args[2], List.of(JokerType.PLAYERSKIP.getIdentifier(), JokerType.SWAP.getIdentifier(),
                     JokerType.TEAMSKIP.getIdentifier()), new ArrayList<>());
         }
         if (args.length == 4) {
-            return StringUtil.copyPartialMatches(args[3], List.of("amount"), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[3], List.of("amount"), new ArrayList<>());
         }
         return List.of();
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/LanguageCommand.java b/src/main/java/net/fameless/forcebattle/command/LanguageCommand.java
index 6b0cf68..343b3fa 100644
--- a/src/main/java/net/fameless/forcebattle/command/LanguageCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/LanguageCommand.java
@@ -5,9 +5,9 @@
 import net.fameless.forcebattle.command.framework.CallerType;
 import net.fameless.forcebattle.command.framework.Command;
 import net.fameless.forcebattle.command.framework.CommandCaller;
-import net.fameless.forcebattle.gui.LanguageGUI;
+import net.fameless.forcebattle.gui.impl.LanguageGUI;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.StringUtil;
+import net.fameless.forcebattle.util.StringUtility;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.jetbrains.annotations.NotNull;
 
@@ -16,8 +16,6 @@
 
 public class LanguageCommand extends Command {
 
-    private final LanguageGUI languageGUI;
-
     public LanguageCommand() {
         super(
                 "language",
@@ -27,8 +25,6 @@ public LanguageCommand() {
                 "forcebattle.lang",
                 "Command to change the language of the plugin"
         );
-
-        this.languageGUI = ForceBattle.get().getLanguageGUI();
     }
 
     @Override
@@ -38,7 +34,7 @@ public void executeCommand(@NotNull CommandCaller caller, String @NotNull [] arg
                 caller.sendMessage(Caption.of(CallerType.CONSOLE.getErrorMessageKey()));
                 return;
             }
-            battlePlayer.openInventory(languageGUI.getLanguageGUI());
+            new LanguageGUI().open(battlePlayer);
         } else {
             net.fameless.forcebattle.caption.Language newLanguage = net.fameless.forcebattle.caption.Language.ofIdentifier(args[0]);
             if (newLanguage != null && !newLanguage.equals(Caption.getCurrentLanguage())) {
@@ -51,7 +47,7 @@ public void executeCommand(@NotNull CommandCaller caller, String @NotNull [] arg
     @Override
     public List<String> tabComplete(CommandCaller caller, String @NotNull [] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], List.of("en", "zh_cn", "zh_tw", "de"), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[0], List.of("en", "zh_cn", "zh_tw", "de"), new ArrayList<>());
         }
         return List.of();
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/PointsCommand.java b/src/main/java/net/fameless/forcebattle/command/PointsCommand.java
index 88a5e62..e889f47 100644
--- a/src/main/java/net/fameless/forcebattle/command/PointsCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/PointsCommand.java
@@ -5,7 +5,7 @@
 import net.fameless.forcebattle.command.framework.Command;
 import net.fameless.forcebattle.command.framework.CommandCaller;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.StringUtil;
+import net.fameless.forcebattle.util.StringUtility;
 import net.fameless.forcebattle.util.TabCompletions;
 
 import java.util.ArrayList;
@@ -63,9 +63,9 @@ protected void executeCommand(final CommandCaller caller, final String[] args) {
     @Override
     protected List<String> tabComplete(final CommandCaller caller, final String[] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], List.of("add", "set", "remove"), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[0], List.of("add", "set", "remove"), new ArrayList<>());
         } else if (args.length == 2) {
-            return StringUtil.copyPartialMatches(args[1], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[1], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
         } else if (args.length == 3 && args[2].isEmpty()) {
             return List.of("<amount>");
         }
diff --git a/src/main/java/net/fameless/forcebattle/command/RandomTeamsCommand.java b/src/main/java/net/fameless/forcebattle/command/RandomTeamsCommand.java
index 5d5e43f..947d442 100644
--- a/src/main/java/net/fameless/forcebattle/command/RandomTeamsCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/RandomTeamsCommand.java
@@ -46,10 +46,8 @@ protected void executeCommand(final CommandCaller caller, final String[] args) {
                 return;
             }
 
-            System.out.println("Size: " + size);
-            List<BattlePlayer> players = new ArrayList<>(BattlePlayer.BATTLE_PLAYERS);
+            List<BattlePlayer> players = new ArrayList<>(BattlePlayer.getOnlinePlayers());
             int playerAmount = players.size();
-            System.out.println("PlayerAmount: " + playerAmount);
 
             if (playerAmount % size != 0) {
                 caller.sendMessage(Caption.of("error.no_equal_teams"));
@@ -58,7 +56,6 @@ protected void executeCommand(final CommandCaller caller, final String[] args) {
 
             Random random = new Random();
             int amountOfTeams = playerAmount / size;
-            System.out.println("AmountOfTeams: " + amountOfTeams);
 
             for (int i = 0; i < amountOfTeams; i++) {
                 BattlePlayer player = players.get(random.nextInt(players.size()));
@@ -81,7 +78,6 @@ protected void executeCommand(final CommandCaller caller, final String[] args) {
                 for (BattlePlayer player : team.getPlayers()) {
                     names.add(player.getName() + ", ");
                 }
-                System.out.println("Team " + team.getId() + ": " + names);
             }
         }
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/ResetCommand.java b/src/main/java/net/fameless/forcebattle/command/ResetCommand.java
index 962fb73..2279e13 100644
--- a/src/main/java/net/fameless/forcebattle/command/ResetCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/ResetCommand.java
@@ -6,7 +6,7 @@
 import net.fameless.forcebattle.command.framework.Command;
 import net.fameless.forcebattle.command.framework.CommandCaller;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.StringUtil;
+import net.fameless.forcebattle.util.StringUtility;
 import net.fameless.forcebattle.util.TabCompletions;
 import org.jetbrains.annotations.NotNull;
 
@@ -46,7 +46,7 @@ public void executeCommand(CommandCaller caller, String @NotNull [] args) {
     @Override
     public List<String> tabComplete(CommandCaller caller, String @NotNull [] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[0], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
         }
         return List.of();
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/ResultCommand.java b/src/main/java/net/fameless/forcebattle/command/ResultCommand.java
index 0fb74d1..8bd6a64 100644
--- a/src/main/java/net/fameless/forcebattle/command/ResultCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/ResultCommand.java
@@ -6,9 +6,9 @@
 import net.fameless.forcebattle.command.framework.Command;
 import net.fameless.forcebattle.command.framework.CommandCaller;
 import net.fameless.forcebattle.game.Team;
-import net.fameless.forcebattle.gui.ResultGUI;
+import net.fameless.forcebattle.gui.impl.ResultGUI;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.StringUtil;
+import net.fameless.forcebattle.util.StringUtility;
 import net.fameless.forcebattle.util.TabCompletions;
 import org.jetbrains.annotations.NotNull;
 
@@ -18,8 +18,6 @@
 
 public class ResultCommand extends Command {
 
-    private final ResultGUI resultGUI;
-
     public ResultCommand() {
         super(
                 "result",
@@ -29,8 +27,6 @@ public ResultCommand() {
                 "forcebattle.result",
                 "Command to display the results of a battle"
         );
-
-        resultGUI = ForceBattle.get().getResultGUI();
     }
 
     @Override
@@ -45,7 +41,7 @@ public void executeCommand(@NotNull CommandCaller caller, String[] args) {
         }
         BattlePlayer whoOpens = whoOpensOpt.get();
         if (args.length == 0) {
-            whoOpens.openInventory(resultGUI.getResultGUI(whoOpens, 1));
+            new ResultGUI().open(whoOpens);
             return;
         }
         if (args.length < 2 && !args[0].equals("animated")) {
@@ -56,7 +52,7 @@ public void executeCommand(@NotNull CommandCaller caller, String[] args) {
             case "player" -> {
                 @NotNull Optional<BattlePlayer> targetOpt = BattlePlayer.adapt(args[1]);
                 targetOpt.ifPresentOrElse(
-                        target -> whoOpens.openInventory(resultGUI.getResultGUI(whoOpens, target, 1)),
+                        target -> new ResultGUI(target, false).open(whoOpens),
                         () -> caller.sendMessage(Caption.of("command.no_such_player"))
                 );
             }
@@ -70,7 +66,7 @@ public void executeCommand(@NotNull CommandCaller caller, String[] args) {
                 }
                 Optional<Team> targetTeamOpt = Team.ofId(teamId);
                 targetTeamOpt.ifPresentOrElse(
-                        team -> whoOpens.openInventory(resultGUI.getResultGUI(whoOpens, team, 1)),
+                        team -> new ResultGUI(team, false).open(whoOpens),
                         () -> caller.sendMessage(Caption.of("command.no_such_team"))
                 );
             }
@@ -86,7 +82,7 @@ public void executeCommand(@NotNull CommandCaller caller, String[] args) {
                 }
                 BattlePlayer battlePlayer = BattlePlayer.getPlaces().get(place);
                 for (BattlePlayer player : BattlePlayer.getOnlinePlayers()) {
-                    player.openInventory(resultGUI.getAnimatedPlayerGUI(player, battlePlayer));
+                    new ResultGUI(battlePlayer, true).open(player);
                 }
             }
             case "teamanimated" -> {
@@ -101,7 +97,7 @@ public void executeCommand(@NotNull CommandCaller caller, String[] args) {
                 }
                 Team team = Team.getPlaces().get(place);
                 for (BattlePlayer player : BattlePlayer.getOnlinePlayers()) {
-                    player.openInventory(resultGUI.getAnimatedTeamGUI(player, team));
+                    new ResultGUI(team, true).open(player);
                 }
             }
         }
@@ -110,13 +106,13 @@ public void executeCommand(@NotNull CommandCaller caller, String[] args) {
     @Override
     public List<String> tabComplete(CommandCaller caller, String @NotNull [] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], List.of("player", "team", "playeranimated", "teamanimated"), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[0], List.of("player", "team", "playeranimated", "teamanimated"), new ArrayList<>());
         } else if (args.length == 2) {
             return switch (args[0]) {
-                case "player" -> StringUtil.copyPartialMatches(args[1], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
-                case "team" -> StringUtil.copyPartialMatches(args[1], TabCompletions.getTeamIdTabCompletions(), new ArrayList<>());
-                case "playeranimated" -> StringUtil.copyPartialMatches(args[1], TabCompletions.getPlayerPlaces(), new ArrayList<>());
-                case "teamanimated" -> StringUtil.copyPartialMatches(args[1], TabCompletions.getTeamPlaces(), new ArrayList<>());
+                case "player" -> StringUtility.copyPartialMatches(args[1], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
+                case "team" -> StringUtility.copyPartialMatches(args[1], TabCompletions.getTeamIdTabCompletions(), new ArrayList<>());
+                case "playeranimated" -> StringUtility.copyPartialMatches(args[1], TabCompletions.getPlayerPlaces(), new ArrayList<>());
+                case "teamanimated" -> StringUtility.copyPartialMatches(args[1], TabCompletions.getTeamPlaces(), new ArrayList<>());
                 default -> List.of();
             };
         }
diff --git a/src/main/java/net/fameless/forcebattle/command/SettingsCommand.java b/src/main/java/net/fameless/forcebattle/command/SettingsCommand.java
index f218f3a..c0c8ec6 100644
--- a/src/main/java/net/fameless/forcebattle/command/SettingsCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/SettingsCommand.java
@@ -1,10 +1,9 @@
 package net.fameless.forcebattle.command;
 
-import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.command.framework.CallerType;
 import net.fameless.forcebattle.command.framework.Command;
 import net.fameless.forcebattle.command.framework.CommandCaller;
-import net.fameless.forcebattle.gui.SettingsGUI;
+import net.fameless.forcebattle.gui.impl.SettingsGUI;
 import net.fameless.forcebattle.player.BattlePlayer;
 import org.jetbrains.annotations.NotNull;
 
@@ -12,8 +11,6 @@
 
 public class SettingsCommand extends Command {
 
-    private final SettingsGUI settingsGUI;
-
     public SettingsCommand() {
         super(
                 "settings",
@@ -23,14 +20,12 @@ public SettingsCommand() {
                 "forcebattle.settings",
                 "Command to open the settings menu"
         );
-
-        settingsGUI = ForceBattle.get().getSettingsGUI();
     }
 
     @Override
     public void executeCommand(@NotNull CommandCaller caller, String[] args) {
         if (caller instanceof BattlePlayer player) {
-            player.openInventory(settingsGUI.getSettingsGUI());
+            new SettingsGUI().open(player);
         }
     }
 
diff --git a/src/main/java/net/fameless/forcebattle/command/SkipCommand.java b/src/main/java/net/fameless/forcebattle/command/SkipCommand.java
index 27aeaa0..de276a2 100644
--- a/src/main/java/net/fameless/forcebattle/command/SkipCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/SkipCommand.java
@@ -6,7 +6,7 @@
 import net.fameless.forcebattle.command.framework.CommandCaller;
 import net.fameless.forcebattle.game.Team;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.StringUtil;
+import net.fameless.forcebattle.util.StringUtility;
 import net.fameless.forcebattle.util.TabCompletions;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
@@ -52,7 +52,7 @@ public void executeCommand(CommandCaller caller, String[] args) {
                 }
                 case "team" -> {
                     try {
-                        @NotNull Optional<Team> teamOpt = Team.ofId(Integer.parseInt(args[3]));
+                        @NotNull Optional<Team> teamOpt = Team.ofId(Integer.parseInt(args[1]));
                         teamOpt.ifPresentOrElse(
                                 team -> {
                                     team.updateObjective(null, false, false);
@@ -76,11 +76,11 @@ public void executeCommand(CommandCaller caller, String[] args) {
     @Override
     public List<String> tabComplete(CommandCaller caller, String @NotNull [] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], List.of("player", "team"), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[0], List.of("player", "team"), new ArrayList<>());
         } else if (args.length == 2) {
             return switch (args[0]) {
-                case "player" -> StringUtil.copyPartialMatches(args[1], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
-                case "team" -> StringUtil.copyPartialMatches(args[1], TabCompletions.getTeamIdTabCompletions(), new ArrayList<>());
+                case "player" -> StringUtility.copyPartialMatches(args[1], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
+                case "team" -> StringUtility.copyPartialMatches(args[1], TabCompletions.getTeamIdTabCompletions(), new ArrayList<>());
                 default -> List.of();
             };
         }
diff --git a/src/main/java/net/fameless/forcebattle/command/TeamCommand.java b/src/main/java/net/fameless/forcebattle/command/TeamCommand.java
index fb6aa6e..ed50699 100644
--- a/src/main/java/net/fameless/forcebattle/command/TeamCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/TeamCommand.java
@@ -6,7 +6,7 @@
 import net.fameless.forcebattle.command.framework.Command;
 import net.fameless.forcebattle.command.framework.CommandCaller;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.StringUtil;
+import net.fameless.forcebattle.util.StringUtility;
 import net.fameless.forcebattle.util.TabCompletions;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
@@ -137,10 +137,10 @@ public void executeCommand(CommandCaller caller, String[] args) {
     @Override
     public List<String> tabComplete(CommandCaller caller, String @NotNull [] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], List.of("create", "list", "join", "leave", "accept", "reject"), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[0], List.of("create", "list", "join", "leave", "accept", "reject"), new ArrayList<>());
         }
         if (args.length == 2 && args[0].equalsIgnoreCase("join")) {
-            return StringUtil.copyPartialMatches(args[1], TabCompletions.getTeamIdTabCompletions(), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[1], TabCompletions.getTeamIdTabCompletions(), new ArrayList<>());
         }
         return List.of();
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/TimerCommand.java b/src/main/java/net/fameless/forcebattle/command/TimerCommand.java
index 906d86b..e4332b4 100644
--- a/src/main/java/net/fameless/forcebattle/command/TimerCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/TimerCommand.java
@@ -7,8 +7,8 @@
 import net.fameless.forcebattle.command.framework.CommandCaller;
 import net.fameless.forcebattle.configuration.SettingsManager;
 import net.fameless.forcebattle.game.Timer;
-import net.fameless.forcebattle.util.Format;
-import net.fameless.forcebattle.util.StringUtil;
+import net.fameless.forcebattle.util.StringUtility;
+import net.fameless.forcebattle.util.StringUtility;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -63,7 +63,7 @@ public void executeCommand(CommandCaller caller, String[] args) {
                     return;
                 }
                 timer.setTime(newTime);
-                caller.sendMessage(Caption.of("command.timer_set", TagResolver.resolver("time", Tag.inserting(Component.text(Format.formatTime(newTime))))));
+                caller.sendMessage(Caption.of("command.timer_set", TagResolver.resolver("time", Tag.inserting(Component.text(StringUtility.formatTime(newTime))))));
                 return;
             }
             case "duration" -> {
@@ -96,7 +96,7 @@ public void executeCommand(CommandCaller caller, String[] args) {
     @Override
     public List<String> tabComplete(CommandCaller caller, String @NotNull [] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], List.of("toggle", "set", "duration"), new ArrayList<>());
+            return StringUtility.copyPartialMatches(args[0], List.of("toggle", "set", "duration"), new ArrayList<>());
         }
         return List.of();
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/framework/Command.java b/src/main/java/net/fameless/forcebattle/command/framework/Command.java
index 2fc3641..76118b0 100644
--- a/src/main/java/net/fameless/forcebattle/command/framework/Command.java
+++ b/src/main/java/net/fameless/forcebattle/command/framework/Command.java
@@ -3,6 +3,7 @@
 import lombok.Getter;
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.command.BackpackCommand;
+import net.fameless.forcebattle.command.ConfigSettingsCommand;
 import net.fameless.forcebattle.command.DisplayResultsCommand;
 import net.fameless.forcebattle.command.ExcludeCommand;
 import net.fameless.forcebattle.command.HelpCommand;
@@ -93,6 +94,7 @@ public static void createInstances() {
         new ResetCommand();
         new ResultCommand();
         new SettingsCommand();
+        new ConfigSettingsCommand();
         new SkipCommand();
         new TeamCommand();
         new TimerCommand();
diff --git a/src/main/java/net/fameless/forcebattle/configuration/SettingsManager.java b/src/main/java/net/fameless/forcebattle/configuration/SettingsManager.java
index f4a839f..7de0d77 100644
--- a/src/main/java/net/fameless/forcebattle/configuration/SettingsManager.java
+++ b/src/main/java/net/fameless/forcebattle/configuration/SettingsManager.java
@@ -1,6 +1,7 @@
 package net.fameless.forcebattle.configuration;
 
 import net.fameless.forcebattle.ForceBattle;
+import net.fameless.forcebattle.gui.impl.SettingsGUI;
 import net.fameless.forcebattle.player.BattlePlayer;
 import net.fameless.forcebattle.util.BattleType;
 import org.bukkit.ChatColor;
@@ -61,21 +62,14 @@ private static void updateSetting(Setting setting) {
         BattlePlayer.BATTLE_PLAYERS.forEach(player -> player.updateObjective(false, false));
     }
 
-    public static void setForceItemEnabled(boolean enabled) { setState(Setting.FORCE_ITEM, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setForceMobEnabled(boolean enabled) { setState(Setting.FORCE_MOB, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setForceBiomeEnabled(boolean enabled) { setState(Setting.FORCE_BIOME, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setForceAdvancementEnabled(boolean enabled) { setState(Setting.FORCE_ADVANCEMENT, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setForceHeightEnabled(boolean enabled) { setState(Setting.FORCE_HEIGHT, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setForceCoordsEnabled(boolean enabled) { setState(Setting.FORCE_COORDS, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setForceStructureEnabled(boolean enabled) { setState(Setting.FORCE_STRUCTURE, enabled ? SettingState.PLAYER : SettingState.OFF); }
-
-    public static void setChainModeEnabled(boolean enabled) { setState(Setting.CHAIN_MODE, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setBackpackEnabled(boolean enabled) { setState(Setting.BACKPACK, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setHidePointsEnabled(boolean enabled) { setState(Setting.HIDE_POINTS, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setHideObjectivesEnabled(boolean enabled) { setState(Setting.HIDE_OBJECTIVES, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setNoDuplicateObjectivesEnabled(boolean enabled) { setState(Setting.NO_DUPLICATE_OBJECTIVES, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setSimplifiedObjectivesEnabled(boolean enabled) { setState(Setting.SIMPLIFIED_OBJECTIVES, enabled ? SettingState.PLAYER : SettingState.OFF); }
-    public static void setExtraTeamObjectivesEnabled(boolean enabled) { setState(Setting.EXTRA_TEAM_OBJECTIVE, enabled ? SettingState.TEAM : SettingState.OFF); }
+    public static boolean isMultiState(Setting setting) {
+        for (SettingsGUI.SettingButton button : SettingsGUI.SettingButton.values()) {
+            if (button.getSetting() == setting) {
+                return button.isMultiState();
+            }
+        }
+        return false;
+    }
 
     public enum Setting {
         FORCE_ITEM,
@@ -85,37 +79,56 @@ public enum Setting {
         FORCE_HEIGHT,
         FORCE_COORDS,
         FORCE_STRUCTURE,
+
         BACKPACK,
         CHAIN_MODE,
         HIDE_POINTS,
         HIDE_OBJECTIVES,
         NO_DUPLICATE_OBJECTIVES,
         SIMPLIFIED_OBJECTIVES,
-        EXTRA_TEAM_OBJECTIVE
+        EXTRA_TEAM_OBJECTIVE,
+
+        EXCLUDE_MUSIC_DISCS,
+        EXCLUDE_BANNER_PATTERNS,
+        EXCLUDE_ARMOR_TEMPLATES,
+        EXCLUDE_POTTERY_SHERDS,
+        EXCLUDE_ORES,
+        EXCLUDE_END_ITEMS,
+        EXCLUDE_TRIAL_ITEMS,
     }
 
+
     public enum SettingState {
         OFF(ChatColor.RED + "Off"),
         PLAYER(ChatColor.GREEN + "Player"),
         TEAM(ChatColor.AQUA + "Team"),
         BOTH(ChatColor.GOLD + "Both");
 
-        private final String displayName;
+        private final String defaultName;
 
-        SettingState(String displayName) {
-            this.displayName = displayName;
+        SettingState(String defaultName) {
+            this.defaultName = defaultName;
         }
 
-        public String getDisplayName() {
-            return displayName;
+        public SettingState next(boolean multiState) {
+            if (multiState) {
+                return switch (this) {
+                    case OFF -> PLAYER;
+                    case PLAYER -> TEAM;
+                    case TEAM -> BOTH;
+                    case BOTH -> OFF;
+                };
+            } else {
+                return this == OFF ? PLAYER : OFF;
+            }
         }
 
-        public SettingState next() {
+        public String getDisplayName(boolean multiState) {
+            if (multiState) return defaultName;
+
             return switch (this) {
-                case OFF -> PLAYER;
-                case PLAYER -> TEAM;
-                case TEAM -> BOTH;
-                case BOTH -> OFF;
+                case OFF -> ChatColor.RED + "Off";
+                default -> ChatColor.GREEN + "On";
             };
         }
     }
diff --git a/src/main/java/net/fameless/forcebattle/game/GameListener.java b/src/main/java/net/fameless/forcebattle/game/GameListener.java
index e972b69..7e1b91a 100644
--- a/src/main/java/net/fameless/forcebattle/game/GameListener.java
+++ b/src/main/java/net/fameless/forcebattle/game/GameListener.java
@@ -16,7 +16,7 @@
 import net.fameless.forcebattle.player.BattlePlayer;
 import net.fameless.forcebattle.util.BattleType;
 import net.fameless.forcebattle.util.BukkitUtil;
-import net.fameless.forcebattle.util.Format;
+import net.fameless.forcebattle.util.StringUtility;
 import net.fameless.forcebattle.util.ItemUtils;
 import net.fameless.forcebattle.util.StructureUtil;
 import net.fameless.forcebattle.util.Toast;
@@ -39,6 +39,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -76,6 +77,9 @@ public GameListener() {
 
     //TODO better tablist
     //TODO scoreboard which shows teammate obj
+    //TODO click im chat fixen
+    //TODO evtl /item => zeigt rezept an => wenn gui system done is
+    //TODO commands von cords ausführen
 
     @EventHandler
     public void onPlayerLogin(AsyncPlayerPreLoginEvent event) {
@@ -104,7 +108,7 @@ public void onPlayerLogin(AsyncPlayerPreLoginEvent event) {
                     }
                 }
 
-                String formattedTime = Format.formatTime(ForceBattle.getTimer().getTime());
+                String formattedTime = StringUtility.formatTime(ForceBattle.getTimer().getTime());
 
                 final String kickMessage = "§c§l✖ A game is currently running! ✖\n\n" +
                         "§7⏳ Time remaining: §6" + formattedTime + "\n\n" +
@@ -148,6 +152,9 @@ public void onGameStart(TimerStartEvent event) throws IOException {
         World world = Bukkit.getWorld("world");
         ForceBattle.broadcast(Caption.of("notification.battle_started"));
         world.setTime(0);
+        world.setStorm(false);
+        world.setThundering(false);
+        world.setWeatherDuration(0);
 
         Bukkit.getStructureManager().deleteStructure(new NamespacedKey("forcebattle", "spawn"), true);
 
@@ -163,6 +170,8 @@ public void onGameStart(TimerStartEvent event) throws IOException {
         }
 
         for (BattlePlayer player : BattlePlayer.getOnlinePlayers()) {
+            if (player.getPlayer() == null) return;
+
             if (player.getObjective() == null) {
                 player.updateObjective(false, false);
             }
@@ -180,7 +189,7 @@ public void onGameStart(TimerStartEvent event) throws IOException {
             player.getPlayer().getInventory().addItem(ItemUtils.SpecialItems.getPlayerSkipItem(ForceBattle.get().getConfig().getInt("playerSkips", 3)));
             player.getPlayer().getInventory().addItem(ItemUtils.SpecialItems.getSwapItem(ForceBattle.get().getConfig().getInt("swaps", 1)));
 
-            if (SettingsManager.isEnabled(SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE)) {
+            if (SettingsManager.isEnabled(SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE) && player.isInTeam()) {
                 player.getPlayer().getInventory().addItem(ItemUtils.SpecialItems.getTeamSkipItem(ForceBattle.get().getConfig().getInt("teamSkips", 1)));
             }
 
@@ -193,12 +202,26 @@ public void onGameEnd(TimerEndEvent event) {
         ForceBattle.broadcast(Caption.of("notification.battle_over"));
 
         for (BattlePlayer player : BattlePlayer.getOnlinePlayers()) {
+            if (player.getPlayer() == null) return;
+
             player.getPlayer().teleport(Bukkit.getWorld("world").getSpawnLocation());
             player.getPlayer().setHealth(20);
             player.getPlayer().setSaturation(20);
         }
     }
 
+    @EventHandler
+    public void onHungerChange(FoodLevelChangeEvent event) {
+        if (!(event.getEntity() instanceof Player player)) return;
+
+        if (!ForceBattle.getTimer().isRunning()) {
+            event.setCancelled(true);
+
+            player.setFoodLevel(20);
+            player.setSaturation(20);
+        }
+    }
+
     @EventHandler
     public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
         if (!ForceBattle.getTimer().isRunning() && event.getEntity() instanceof Player) {
@@ -248,7 +271,7 @@ private boolean isTargetMatch(LivingEntity target, String objectiveString) {
     }
 
     private void completeObjective(BattlePlayer player, String objective) {
-        String formattedObjective = Format.formatName(objective);
+        String formattedObjective = StringUtility.formatName(objective);
         Material toastIcon = Material.DIAMOND_SWORD;
         ForceBattle plugin = ForceBattle.get();
 
@@ -299,7 +322,7 @@ public void onPlayerSkip(@NotNull PlayerInteractEvent event) {
 
         battlePlayer.sendMessage(Caption.of(
                 "notification.objective_skipped",
-                TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(oldObjective.getObjectiveString()))))
+                TagResolver.resolver("objective", Tag.inserting(Component.text(StringUtility.formatName(oldObjective.getObjectiveString()))))
         ));
         battlePlayer.updateObjective(true, true);
 
@@ -342,14 +365,14 @@ public void onTeamSkip(@NotNull PlayerInteractEvent event) {
                 player.sendMessage(Caption.of(
                         "notification.objective_skipped_by_teammate",
                         TagResolver.resolver("player", Tag.inserting(Component.text(player.getName()))),
-                        TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(oldObjective.getObjectiveString()))))
+                        TagResolver.resolver("objective", Tag.inserting(Component.text(StringUtility.formatName(oldObjective.getObjectiveString()))))
                 ));
             }
         });
 
         battlePlayer.sendMessage(Caption.of(
                 "notification.objective_skipped",
-                TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(oldObjective.getObjectiveString()))))
+                TagResolver.resolver("objective", Tag.inserting(Component.text(StringUtility.formatName(oldObjective.getObjectiveString()))))
         ));
 
         team.updateObjective(battlePlayer, true, true);
diff --git a/src/main/java/net/fameless/forcebattle/game/NametagManager.java b/src/main/java/net/fameless/forcebattle/game/NametagManager.java
index 8b9419b..c83139c 100644
--- a/src/main/java/net/fameless/forcebattle/game/NametagManager.java
+++ b/src/main/java/net/fameless/forcebattle/game/NametagManager.java
@@ -3,11 +3,11 @@
 import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
+import net.fameless.forcebattle.game.data.FBAdvancement;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.game.data.Advancement;
 import net.fameless.forcebattle.util.BattleType;
 import net.fameless.forcebattle.util.BukkitUtil;
-import net.fameless.forcebattle.util.Format;
+import net.fameless.forcebattle.util.StringUtility;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -69,10 +69,10 @@ private static void updateNametag(@NotNull BattlePlayer battlePlayer) {
 
         String objectiveString;
         Objective objective = battlePlayer.getObjective();
-        if (BukkitUtil.convertObjective(BattleType.FORCE_ADVANCEMENT, objective.getObjectiveString()) instanceof Advancement advancement) {
+        if (BukkitUtil.convertObjective(BattleType.FORCE_ADVANCEMENT, objective.getObjectiveString()) instanceof FBAdvancement advancement) {
             objectiveString = advancement.name;
         } else {
-            objectiveString = Format.formatName(objective.getObjectiveString());
+            objectiveString = StringUtility.formatName(objective.getObjectiveString());
         }
 
         if (!SettingsManager.isEnabled(SettingsManager.Setting.HIDE_OBJECTIVES)) {
diff --git a/src/main/java/net/fameless/forcebattle/game/ObjectiveManager.java b/src/main/java/net/fameless/forcebattle/game/ObjectiveManager.java
index 7ba2846..ba91d6b 100644
--- a/src/main/java/net/fameless/forcebattle/game/ObjectiveManager.java
+++ b/src/main/java/net/fameless/forcebattle/game/ObjectiveManager.java
@@ -3,13 +3,13 @@
 import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
+import net.fameless.forcebattle.game.data.FBAdvancement;
 import net.fameless.forcebattle.game.data.BiomeSimplified;
+import net.fameless.forcebattle.game.data.FBStructure;
 import net.fameless.forcebattle.game.data.StructureSimplified;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.game.data.Advancement;
 import net.fameless.forcebattle.util.BattleType;
 import net.fameless.forcebattle.util.BukkitUtil;
-import net.fameless.forcebattle.game.data.Structure;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -145,24 +145,23 @@ public List<Material> getAvailableItems() {
         List<Material> availableItems = new ArrayList<>();
 
         List<String> itemsToExclude = ForceBattle.get().getConfig().getStringList("exclude.items");
-        boolean excludeSpawnEggs = ForceBattle.get().getConfig().getBoolean("exclude.exclude_spawn_eggs", true);
-        boolean excludeMusicDiscs = ForceBattle.get().getConfig().getBoolean("exclude.exclude_music_discs", false);
-        boolean excludeBannerPatterns = ForceBattle.get().getConfig().getBoolean("exclude.exclude_banner_patterns", true);
-        boolean excludeBanners = ForceBattle.get().getConfig().getBoolean("exclude.exclude_banners", true);
-        boolean excludeArmorTemplates = ForceBattle.get().getConfig().getBoolean("exclude.exclude_armor_templates", false);
-        boolean excludePotteryShreds = ForceBattle.get().getConfig().getBoolean("exclude.exclude_pottery_sherds", false);
-        boolean excludeOres = ForceBattle.get().getConfig().getBoolean("exclude.exclude_ores", false);
+        boolean excludeMusicDiscs = SettingsManager.isEnabled(SettingsManager.Setting.EXCLUDE_MUSIC_DISCS);
+        boolean excludeBannerPatterns = SettingsManager.isEnabled(SettingsManager.Setting.EXCLUDE_BANNER_PATTERNS);
+        boolean excludeArmorTemplates = SettingsManager.isEnabled(SettingsManager.Setting.EXCLUDE_ARMOR_TEMPLATES);
+        boolean excludePotteryShreds = SettingsManager.isEnabled(SettingsManager.Setting.EXCLUDE_POTTERY_SHERDS);
+        boolean excludeOres = SettingsManager.isEnabled(SettingsManager.Setting.EXCLUDE_ORES);
+        boolean excludeEndItems = SettingsManager.isEnabled(SettingsManager.Setting.EXCLUDE_END_ITEMS);
 
         for (Material material : Material.values()) {
             if (!material.isItem()) continue;
             if (itemsToExclude.contains(material.name())) continue;
-            if (excludeSpawnEggs && material.name().endsWith("SPAWN_EGG")) continue;
             if (excludeMusicDiscs && material.name().contains("DISC")) continue;
             if (excludeBannerPatterns && material.name().endsWith("BANNER_PATTERN")) continue;
-            if (excludeBanners && material.name().endsWith("BANNER")) continue;
             if (excludeArmorTemplates && material.name().endsWith("TEMPLATE")) continue;
             if (excludePotteryShreds && material.name().endsWith("POTTERY_SHERD")) continue;
             if (excludeOres && material.name().endsWith("ORE")) continue;
+            if (excludeEndItems && ENDITEMS.contains(material)) continue;
+            if (material.name().endsWith("SPAWN_EGG")) continue;
             if (material.name().endsWith("CANDLE_CAKE")) continue;
             if (material.name().startsWith("POTTED")) continue;
             if (material.name().contains("PETRIFIED")) continue;
@@ -215,12 +214,12 @@ public List<BiomeSimplified> getAvailableBiomesSimplified() {
         return list;
     }
 
-    public List<Advancement> getAvailableAdvancements() {
-        List<Advancement> availableAdvancements = new ArrayList<>();
+    public List<FBAdvancement> getAvailableAdvancements() {
+        List<FBAdvancement> availableAdvancements = new ArrayList<>();
 
         List<String> advancementsToExclude = ForceBattle.get().getConfig().getStringList("exclude.advancements");
 
-        for (Advancement advancement : Advancement.values()) {
+        for (FBAdvancement advancement : FBAdvancement.values()) {
             if (advancementsToExclude.contains(advancement.name())) {
                 continue;
             }
@@ -262,12 +261,12 @@ public Location getRandomLocation(BattlePlayer battlePlayer) {
         return new Location(player.getWorld(), x, y, z);
     }
 
-    public List<Structure> getAvailableStructures() {
-        List<Structure> availableStructures = new ArrayList<>();
+    public List<FBStructure> getAvailableStructures() {
+        List<FBStructure> availableStructures = new ArrayList<>();
 
         List<String> structuresToExclude = ForceBattle.get().getConfig().getStringList("exclude.structures");
 
-        for (Structure structure : Structure.values()) {
+        for (FBStructure structure : FBStructure.values()) {
             if (structuresToExclude.contains(structure.getKey())) {
                 continue;
             }
@@ -324,4 +323,14 @@ public void updateChainList() {
         Collections.shuffle(chainList);
     }
 
+    private final List<Material> ENDITEMS = List.of(
+            Material.END_STONE, Material.END_STONE_BRICK_SLAB, Material.END_STONE_BRICKS, Material.END_STONE_BRICK_STAIRS, Material.END_STONE_BRICK_WALL,
+            Material.END_PORTAL_FRAME, Material.END_PORTAL, Material.END_GATEWAY, Material.END_ROD, Material.ELYTRA, Material.PURPUR_BLOCK, Material.PURPUR_PILLAR,
+            Material.PURPUR_SLAB, Material.PURPUR_STAIRS, Material.CHORUS_FLOWER, Material.CHORUS_FRUIT, Material.CHORUS_PLANT, Material.POPPED_CHORUS_FRUIT,
+            Material.DRAGON_BREATH, Material.DRAGON_EGG, Material.DRAGON_HEAD, Material.DRAGON_WALL_HEAD, Material.SHULKER_SHELL, Material.SHULKER_BOX,
+            Material.BLUE_SHULKER_BOX, Material.BLACK_SHULKER_BOX, Material.CYAN_SHULKER_BOX, Material.BROWN_SHULKER_BOX, Material.GRAY_SHULKER_BOX,
+            Material.GREEN_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX, Material.LIGHT_GRAY_SHULKER_BOX, Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX,
+            Material.ORANGE_SHULKER_BOX, Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX, Material.RED_SHULKER_BOX, Material.WHITE_SHULKER_BOX,
+            Material.YELLOW_SHULKER_BOX, Material.SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE
+    );
 }
diff --git a/src/main/java/net/fameless/forcebattle/game/Team.java b/src/main/java/net/fameless/forcebattle/game/Team.java
index 50722b6..4aa17a4 100644
--- a/src/main/java/net/fameless/forcebattle/game/Team.java
+++ b/src/main/java/net/fameless/forcebattle/game/Team.java
@@ -8,7 +8,7 @@
 import net.fameless.forcebattle.event.PlayerTeamJoinEvent;
 import net.fameless.forcebattle.event.PlayerTeamLeaveEvent;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.Format;
+import net.fameless.forcebattle.util.StringUtility;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -218,7 +218,7 @@ public void updateObjective(BattlePlayer finisher, boolean finishLast, boolean h
             for (BattlePlayer member : players) {
                 member.sendMessage(Caption.of(
                         "notification.next_objective",
-                        TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(newObjective.getObjectiveString())))),
+                        TagResolver.resolver("objective", Tag.inserting(Component.text(StringUtility.formatName(newObjective.getObjectiveString())))),
                         TagResolver.resolver("objective_type", Tag.inserting(Component.text(newObjective.getBattleType().getPrefix())))
                 ));
             }
diff --git a/src/main/java/net/fameless/forcebattle/game/data/Advancement.java b/src/main/java/net/fameless/forcebattle/game/data/FBAdvancement.java
similarity index 99%
rename from src/main/java/net/fameless/forcebattle/game/data/Advancement.java
rename to src/main/java/net/fameless/forcebattle/game/data/FBAdvancement.java
index 52cf2d7..1ed072a 100644
--- a/src/main/java/net/fameless/forcebattle/game/data/Advancement.java
+++ b/src/main/java/net/fameless/forcebattle/game/data/FBAdvancement.java
@@ -4,7 +4,7 @@
 import org.bukkit.NamespacedKey;
 
 @Getter
-public enum Advancement {
+public enum FBAdvancement {
     STONE_AGE(NamespacedKey.minecraft("story/mine_stone"), "Stone Age", "Mine Stone with your new Pickaxe"),
     GETTING_AN_UPGRADE(NamespacedKey.minecraft("story/upgrade_tools"), "Getting an Upgrade", "Construct a better Pickaxe"),
     ACQUIRE_HARDWARE(NamespacedKey.minecraft("story/smelt_iron"), "Acquire Hardware", "Smelt an Iron Ingot"),
@@ -154,7 +154,7 @@ public enum Advancement {
     public final String name;
     public final String description;
 
-    Advancement(NamespacedKey key, String name, String description) {
+    FBAdvancement(NamespacedKey key, String name, String description) {
         this.key = key;
         this.name = name;
         this.description = description;
diff --git a/src/main/java/net/fameless/forcebattle/game/data/Structure.java b/src/main/java/net/fameless/forcebattle/game/data/FBStructure.java
similarity index 97%
rename from src/main/java/net/fameless/forcebattle/game/data/Structure.java
rename to src/main/java/net/fameless/forcebattle/game/data/FBStructure.java
index 7ad54eb..815d5d4 100644
--- a/src/main/java/net/fameless/forcebattle/game/data/Structure.java
+++ b/src/main/java/net/fameless/forcebattle/game/data/FBStructure.java
@@ -4,7 +4,7 @@
 import org.bukkit.NamespacedKey;
 
 @Getter
-public enum Structure {
+public enum FBStructure {
     VILLAGE_PLAINS(NamespacedKey.minecraft("village_plains"), "Village Plains"),
     VILLAGE_SAVANNA(NamespacedKey.minecraft("village_savanna"), "Village Savanna"),
     VILLAGE_SNOWY(NamespacedKey.minecraft("village_snowy"), "Village Snowy"),
@@ -41,7 +41,7 @@ public enum Structure {
     public final NamespacedKey key;
     public final String name;
 
-    Structure(NamespacedKey key, String name) {
+    FBStructure(NamespacedKey key, String name) {
         this.key = key;
         this.name = name;
     }
diff --git a/src/main/java/net/fameless/forcebattle/game/data/StructureSimplified.java b/src/main/java/net/fameless/forcebattle/game/data/StructureSimplified.java
index 51e6a3e..5055979 100644
--- a/src/main/java/net/fameless/forcebattle/game/data/StructureSimplified.java
+++ b/src/main/java/net/fameless/forcebattle/game/data/StructureSimplified.java
@@ -1,35 +1,37 @@
 package net.fameless.forcebattle.game.data;
 
 import lombok.Getter;
+
 import java.util.List;
 
 @Getter
 public enum StructureSimplified {
-    VILLAGE("Village", List.of(Structure.VILLAGE_PLAINS, Structure.VILLAGE_SAVANNA, Structure.VILLAGE_SNOWY, Structure.VILLAGE_TAIGA, Structure.VILLAGE_DESERT)),
-    PILLAGER_OUTPOST("Pillager Outpost", List.of(Structure.PILLAGER_OUTPOST)),
-    RUINED_PORTAL("Ruined Portal", List.of(Structure.RUINED_PORTAL_MOUNTAIN, Structure.RUINED_PORTAL_DESERT, Structure.RUINED_PORTAL_JUNGLE,
-            Structure.RUINED_PORTAL_OCEAN, Structure.RUINED_PORTAL_SWAMP, Structure.RUINED_PORTAL_NETHER)),
-    OCEAN_RUIN("Ocean Ruin", List.of(Structure.OCEAN_RUIN_COLD, Structure.OCEAN_RUIN_WARM)),
-    TRIAL_CHAMBERS("Trial Chambers", List.of(Structure.TRIAL_CHAMBERS)),
-    SHIPWRECK("Shipwreck", List.of(Structure.SHIPWRECK, Structure.SHIPWRECK_BEACHED)),
-    TRAIL_RUINS("Trail Ruins", List.of(Structure.TRAIL_RUINS)),
-    MANSION("Mansion", List.of(Structure.MANSION)),
-    JUNGLE_PYRAMID("Jungle Pyramid", List.of(Structure.JUNGLE_PYRAMID)),
-    MINESHAFT("Mineshaft", List.of(Structure.MINESHAFT, Structure.MINESHAFT_MESA)),
-    SWAMP_HUT("Swamp Hut", List.of(Structure.SWAMP_HUT)),
-    END_CITY("End City", List.of(Structure.END_CITY)),
-    ANCIENT_CITY("Ancient City", List.of(Structure.ANCIENT_CITY)),
-    DESERT_PYRAMID("Desert Pyramid", List.of(Structure.DESERT_PYRAMID)),
-    MONUMENT("Monument", List.of(Structure.MONUMENT)),
-    IGLOO("Igloo", List.of(Structure.IGLOO)),
-    BASTION_REMNANT("Bastion Remnant", List.of(Structure.BASTION_REMNANT)),
-    FORTRESS("Fortress", List.of(Structure.FORTRESS)),
-    STRONGHOLD("Stronghold", List.of(Structure.STRONGHOLD));
+    VILLAGE("Village", List.of(FBStructure.VILLAGE_PLAINS, FBStructure.VILLAGE_SAVANNA, FBStructure.VILLAGE_SNOWY, FBStructure.VILLAGE_TAIGA, FBStructure.VILLAGE_DESERT)),
+    PILLAGER_OUTPOST("Pillager Outpost", List.of(FBStructure.PILLAGER_OUTPOST)),
+    RUINED_PORTAL("Ruined Portal", List.of(
+            FBStructure.RUINED_PORTAL_MOUNTAIN, FBStructure.RUINED_PORTAL_DESERT, FBStructure.RUINED_PORTAL_JUNGLE,
+            FBStructure.RUINED_PORTAL_OCEAN, FBStructure.RUINED_PORTAL_SWAMP, FBStructure.RUINED_PORTAL_NETHER)),
+    OCEAN_RUIN("Ocean Ruin", List.of(FBStructure.OCEAN_RUIN_COLD, FBStructure.OCEAN_RUIN_WARM)),
+    TRIAL_CHAMBERS("Trial Chambers", List.of(FBStructure.TRIAL_CHAMBERS)),
+    SHIPWRECK("Shipwreck", List.of(FBStructure.SHIPWRECK, FBStructure.SHIPWRECK_BEACHED)),
+    TRAIL_RUINS("Trail Ruins", List.of(FBStructure.TRAIL_RUINS)),
+    MANSION("Mansion", List.of(FBStructure.MANSION)),
+    JUNGLE_PYRAMID("Jungle Pyramid", List.of(FBStructure.JUNGLE_PYRAMID)),
+    MINESHAFT("Mineshaft", List.of(FBStructure.MINESHAFT, FBStructure.MINESHAFT_MESA)),
+    SWAMP_HUT("Swamp Hut", List.of(FBStructure.SWAMP_HUT)),
+    END_CITY("End City", List.of(FBStructure.END_CITY)),
+    ANCIENT_CITY("Ancient City", List.of(FBStructure.ANCIENT_CITY)),
+    DESERT_PYRAMID("Desert Pyramid", List.of(FBStructure.DESERT_PYRAMID)),
+    MONUMENT("Monument", List.of(FBStructure.MONUMENT)),
+    IGLOO("Igloo", List.of(FBStructure.IGLOO)),
+    BASTION_REMNANT("Bastion Remnant", List.of(FBStructure.BASTION_REMNANT)),
+    FORTRESS("Fortress", List.of(FBStructure.FORTRESS)),
+    STRONGHOLD("Stronghold", List.of(FBStructure.STRONGHOLD));
 
     private final String name;
-    private final List<Structure> structures;
+    private final List<FBStructure> structures;
 
-    StructureSimplified(String name, List<Structure> structures) {
+    StructureSimplified(String name, List<FBStructure> structures) {
         this.name = name;
         this.structures = structures;
     }
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/AdvancementTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/AdvancementTask.java
index 3bd65c4..2034d7f 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/AdvancementTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/AdvancementTask.java
@@ -3,8 +3,12 @@
 import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
+import net.fameless.forcebattle.game.data.FBAdvancement;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.*;
+import net.fameless.forcebattle.util.BattleType;
+import net.fameless.forcebattle.util.BukkitUtil;
+import net.fameless.forcebattle.util.StringUtility;
+import net.fameless.forcebattle.util.Toast;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -66,7 +70,7 @@ private void checkTeamObjective(BattlePlayer battlePlayer, Player player) {
 
     private boolean hasCompletedAdvancement(Player player, String objectiveString) {
         Object obj = BukkitUtil.convertObjective(BattleType.FORCE_ADVANCEMENT, objectiveString);
-        if (!(obj instanceof net.fameless.forcebattle.game.data.Advancement adv)) return false;
+        if (!(obj instanceof FBAdvancement adv)) return false;
 
         Optional<Advancement> advancementOpt = getAdvancement(adv.getKey());
         if (advancementOpt.isEmpty()) return false;
@@ -76,7 +80,7 @@ private boolean hasCompletedAdvancement(Player player, String objectiveString) {
     }
 
     private void completeObjective(BattlePlayer player, String objective) {
-        String formattedObjective = Format.formatName(objective);
+        String formattedObjective = StringUtility.formatName(objective);
         Material toastIcon = Material.BREWING_STAND;
         ForceBattle plugin = ForceBattle.get();
 
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/BiomeTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/BiomeTask.java
index 371e14c..2a8f8d9 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/BiomeTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/BiomeTask.java
@@ -5,7 +5,10 @@
 import net.fameless.forcebattle.configuration.SettingsManager;
 import net.fameless.forcebattle.game.data.BiomeSimplified;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.*;
+import net.fameless.forcebattle.util.BattleType;
+import net.fameless.forcebattle.util.BukkitUtil;
+import net.fameless.forcebattle.util.StringUtility;
+import net.fameless.forcebattle.util.Toast;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -69,7 +72,7 @@ private boolean isBiomeMatch(String objectiveString, Biome currentBiome) {
     }
 
     private void completeObjective(BattlePlayer player, String objective) {
-        String formattedObjective = Format.formatName(objective);
+        String formattedObjective = StringUtility.formatName(objective);
         Material toastIcon = Material.GRASS_BLOCK;
         ForceBattle plugin = ForceBattle.get();
 
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/CoordsTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/CoordsTask.java
index cd3a213..416f949 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/CoordsTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/CoordsTask.java
@@ -4,7 +4,10 @@
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.*;
+import net.fameless.forcebattle.util.BattleType;
+import net.fameless.forcebattle.util.BukkitUtil;
+import net.fameless.forcebattle.util.StringUtility;
+import net.fameless.forcebattle.util.Toast;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -72,7 +75,7 @@ private void completeObjective(BattlePlayer player, String objective) {
         if (obj instanceof Location loc) {
             coordsDisplay = String.format("%.0f, %.0f", loc.getX(), loc.getZ());
         } else {
-            coordsDisplay = Format.formatName(objective);
+            coordsDisplay = StringUtility.formatName(objective);
         }
 
         Material toastIcon = Material.COMPASS;
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/HeightTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/HeightTask.java
index a65bb4a..d4f7478 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/HeightTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/HeightTask.java
@@ -4,7 +4,10 @@
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.*;
+import net.fameless.forcebattle.util.BattleType;
+import net.fameless.forcebattle.util.BukkitUtil;
+import net.fameless.forcebattle.util.StringUtility;
+import net.fameless.forcebattle.util.Toast;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -60,7 +63,7 @@ private boolean isAtTargetHeight(Player player, String objectiveString) {
 
     private void completeObjective(BattlePlayer player, String objective) {
         Object obj = BukkitUtil.convertObjective(BattleType.FORCE_HEIGHT, objective);
-        String heightDisplay = obj instanceof Integer height ? String.valueOf(height) : Format.formatName(objective);
+        String heightDisplay = obj instanceof Integer height ? String.valueOf(height) : StringUtility.formatName(objective);
 
         Material toastIcon = Material.SCAFFOLDING;
         ForceBattle plugin = ForceBattle.get();
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/ItemTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/ItemTask.java
index 4cb25ab..b1735bc 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/ItemTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/ItemTask.java
@@ -4,7 +4,10 @@
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.*;
+import net.fameless.forcebattle.util.BattleType;
+import net.fameless.forcebattle.util.BukkitUtil;
+import net.fameless.forcebattle.util.StringUtility;
+import net.fameless.forcebattle.util.Toast;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -58,7 +61,7 @@ private boolean hasRequiredItem(Player player, String objectiveString) {
     }
 
     private void completeObjective(BattlePlayer player, String objective) {
-        String formattedObjective = Format.formatName(objective);
+        String formattedObjective = StringUtility.formatName(objective);
         Object obj = BukkitUtil.convertObjective(BattleType.FORCE_ITEM, objective);
         Material toastIcon = obj instanceof Material mat ? mat : Material.BOOK;
         ForceBattle plugin = ForceBattle.get();
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/StructureTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/StructureTask.java
index 0925977..8c84638 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/StructureTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/StructureTask.java
@@ -3,23 +3,32 @@
 import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
-import net.fameless.forcebattle.game.data.Structure;
+import net.fameless.forcebattle.game.data.FBStructure;
 import net.fameless.forcebattle.game.data.StructureSimplified;
 import net.fameless.forcebattle.player.BattlePlayer;
 import net.fameless.forcebattle.util.BattleType;
 import net.fameless.forcebattle.util.BukkitUtil;
-import net.fameless.forcebattle.util.Format;
+import net.fameless.forcebattle.util.StringUtility;
 import net.fameless.forcebattle.util.Toast;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Registry;
+import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.generator.structure.GeneratedStructure;
+import org.bukkit.generator.structure.Structure;
 import org.bukkit.generator.structure.StructurePiece;
 import org.bukkit.util.BoundingBox;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class StructureTask implements ForceTask {
@@ -31,7 +40,7 @@ public void runTick() {
         if (!SettingsManager.isEnabled(SettingsManager.Setting.FORCE_STRUCTURE)) return;
         if (!ForceBattle.getTimer().isRunning()) return;
 
-        Registry<org.bukkit.generator.structure.Structure> registry = Bukkit.getRegistry(org.bukkit.generator.structure.Structure.class);
+        Registry<Structure> registry = Bukkit.getRegistry(Structure.class);
         if (registry == null) return;
 
         for (Player player : Bukkit.getOnlinePlayers()) {
@@ -43,7 +52,7 @@ public void runTick() {
         }
     }
 
-    private void checkPlayerObjective(BattlePlayer battlePlayer, Player player, Registry<org.bukkit.generator.structure.Structure> registry) {
+    private void checkPlayerObjective(BattlePlayer battlePlayer, Player player, Registry<Structure> registry) {
         if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_STRUCTURE) return;
 
         String objectiveString = battlePlayer.getObjective().getObjectiveString();
@@ -53,7 +62,7 @@ private void checkPlayerObjective(BattlePlayer battlePlayer, Player player, Regi
         }
     }
 
-    private void checkTeamObjective(BattlePlayer battlePlayer, Player player, Registry<org.bukkit.generator.structure.Structure> registry) {
+    private void checkTeamObjective(BattlePlayer battlePlayer, Player player, Registry<Structure> registry) {
         if (!battlePlayer.isInTeam()) return;
         if (battlePlayer.getTeam().getObjective() == null) return;
         if (battlePlayer.getTeam().getObjective().getBattleType() != BattleType.FORCE_STRUCTURE) return;
@@ -65,12 +74,12 @@ private void checkTeamObjective(BattlePlayer battlePlayer, Player player, Regist
         }
     }
 
-    private boolean isInsideStructure(Player player, String objectiveString, Registry<org.bukkit.generator.structure.Structure> registry) {
+    private boolean isInsideStructure(Player player, String objectiveString, Registry<Structure> registry) {
         Object parsed = BukkitUtil.convertObjective(BattleType.FORCE_STRUCTURE, objectiveString);
 
         if (parsed instanceof StructureSimplified simplified) {
-            for (Structure structure : simplified.getStructures()) {
-                org.bukkit.generator.structure.Structure bukkitStruct = registry.get(structure.getKey());
+            for (FBStructure structure : simplified.getStructures()) {
+                Structure bukkitStruct = registry.get(structure.getKey());
                 if (bukkitStruct != null && checkPlayerLocationInStructure(player, bukkitStruct)) {
                     return true;
                 }
@@ -78,15 +87,15 @@ private boolean isInsideStructure(Player player, String objectiveString, Registr
             return false;
         }
 
-        if (parsed instanceof Structure structure) {
-            org.bukkit.generator.structure.Structure bukkitStruct = registry.get(structure.getKey());
+        if (parsed instanceof FBStructure structure) {
+            Structure bukkitStruct = registry.get(structure.getKey());
             return bukkitStruct != null && checkPlayerLocationInStructure(player, bukkitStruct);
         }
 
         return false;
     }
 
-    private boolean checkPlayerLocationInStructure(Player player, org.bukkit.generator.structure.Structure bukkitStruct) {
+    private boolean checkPlayerLocationInStructure(Player player, Structure bukkitStruct) {
         String worldName = player.getWorld().getName();
         String cacheKey = worldName + ":" + bukkitStruct.getKey().getKey();
         Set<BoundingBox> cachedBoxes = STRUCTURE_CACHE.get(cacheKey);
@@ -137,7 +146,7 @@ private boolean isInsideBoundingBox(Location loc, BoundingBox box) {
     }
 
     private void completeObjective(BattlePlayer player, String objective) {
-        String formattedObjective = Format.formatName(objective);
+        String formattedObjective = StringUtility.formatName(objective);
         Material toastIcon = Material.STRUCTURE_BLOCK;
         ForceBattle plugin = ForceBattle.get();
 
diff --git a/src/main/java/net/fameless/forcebattle/gui/ForceBattleGUI.java b/src/main/java/net/fameless/forcebattle/gui/ForceBattleGUI.java
new file mode 100644
index 0000000..721ff52
--- /dev/null
+++ b/src/main/java/net/fameless/forcebattle/gui/ForceBattleGUI.java
@@ -0,0 +1,183 @@
+package net.fameless.forcebattle.gui;
+
+import lombok.Getter;
+import net.fameless.forcebattle.player.BattlePlayer;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Getter
+public abstract class ForceBattleGUI implements Listener, InventoryHolder {
+    public static final Map<UUID, ForceBattleGUI> GUI_MAP = new ConcurrentHashMap<>();
+
+    protected String title;
+    protected int size;
+    protected final List<GUIItem> items;
+
+    private Inventory inventory;
+    private BattlePlayer player;
+    private boolean hasFinishedLoading = false;
+
+    public ForceBattleGUI(String title, int size) {
+        this.title = title;
+        this.size = size;
+        this.items = Collections.synchronizedList(new ArrayList<>());
+    }
+
+    @Override
+    public @NotNull Inventory getInventory() {
+        if (inventory == null) {
+            inventory = Bukkit.createInventory(this, size, title);
+        }
+        return inventory;
+    }
+
+    public void set(GUIItem item) {
+        synchronized (items) {
+            items.removeIf(i -> i.slot == item.slot);
+            items.add(item);
+        }
+    }
+
+    public GUIItem get(int slot) {
+        synchronized (items) {
+            return items.stream().filter(i -> i.slot == slot).findFirst().orElse(null);
+        }
+    }
+
+    public int firstEmpty() {
+        for (int i = 0; i < size; i++) {
+            int finalI = i;
+            long found = items.stream().filter(it -> it.slot == finalI).count();
+            if (found == 0) return i;
+        }
+        return -1;
+    }
+
+    public void fill(ItemStack item, int from, int to, boolean overwrite) {
+        for (int slot = from; slot <= to; slot++) {
+            if (!overwrite && get(slot) != null) continue;
+            set(new GUIItem(slot) {
+                @Override
+                public ItemStack getItem(BattlePlayer player) {
+                    return item;
+                }
+            });
+        }
+    }
+
+    public void fill(ItemStack item) {
+        fill(item, 0, size - 1, true);
+    }
+
+    public void border(ItemStack item) {
+        border(item, 0, size - 1, true);
+    }
+
+    public void border(ItemStack item, int corner1, int corner2, boolean overwrite) {
+        int width = 9;
+        int topLeft = Math.min(corner1, corner2);
+        int bottomRight = Math.max(corner1, corner2);
+        for (int slot = topLeft; slot <= bottomRight; slot++) {
+            int row = slot / width;
+            int col = slot % width;
+
+            int topRow = topLeft / width;
+            int bottomRow = bottomRight / width;
+            int leftCol = topLeft % width;
+            int rightCol = bottomRight % width;
+
+            boolean border =
+                    row == topRow || row == bottomRow ||
+                            col == leftCol || col == rightCol;
+
+            if (border) {
+                if (!overwrite && get(slot) != null) continue;
+                set(new GUIItem(slot) {
+                    @Override
+                    public ItemStack getItem(BattlePlayer player) {
+                        return item;
+                    }
+                });
+            }
+        }
+    }
+
+    public void open(BattlePlayer player) {
+        this.player = player;
+        Player p = player.getPlayer();
+        ForceBattleGUI previous = GUI_MAP.get(p.getUniqueId());
+
+        if (previous != null) {
+            previous.onClose(new InventoryCloseEvent(p.getOpenInventory()), CloseReason.SERVER_EXITED);
+            GUI_MAP.remove(p.getUniqueId());
+        }
+
+        this.inventory = Bukkit.createInventory(this, size, title);
+        GUI_MAP.put(p.getUniqueId(), this);
+
+        try {
+            setItems(player);
+            updateInventory(player);
+            hasFinishedLoading = true;
+        } catch (Exception e) {
+            p.sendMessage("§cAn error occurred while opening the GUI.");
+            e.printStackTrace();
+            return;
+        }
+
+        p.openInventory(inventory);
+        afterOpen(player);
+    }
+
+    public void close(BattlePlayer player, CloseReason reason) {
+        player.getPlayer().closeInventory();
+        onClose(new InventoryCloseEvent(player.getPlayer().getOpenInventory()), reason);
+        GUI_MAP.remove(player.getPlayer().getUniqueId());
+    }
+
+
+    public void updateInventory(BattlePlayer player) {
+        synchronized (items) {
+            Inventory inv = getInventory();
+            for (GUIItem item : items) {
+                inv.setItem(item.slot, item.getItem(player));
+            }
+        }
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+        if (inventory != null) {
+            inventory = Bukkit.createInventory(this, size, title);
+            updateInventory(player);
+        }
+    }
+
+    public abstract void setItems(BattlePlayer player);
+
+    public abstract boolean allowHotkeying();
+
+    public void onOpen(BattlePlayer player) {
+    }
+
+    public void afterOpen(BattlePlayer player) {
+    }
+
+    public void onClose(InventoryCloseEvent e, CloseReason reason) {
+    }
+
+    public enum CloseReason {
+        PLAYER_EXITED,
+        SERVER_EXITED,
+        SIGN_OPENED
+    }
+}
diff --git a/src/main/java/net/fameless/forcebattle/gui/GUIClickableItem.java b/src/main/java/net/fameless/forcebattle/gui/GUIClickableItem.java
new file mode 100644
index 0000000..bcc8ac1
--- /dev/null
+++ b/src/main/java/net/fameless/forcebattle/gui/GUIClickableItem.java
@@ -0,0 +1,65 @@
+package net.fameless.forcebattle.gui;
+
+import net.fameless.forcebattle.player.BattlePlayer;
+import net.fameless.forcebattle.util.ItemStackCreator;
+import net.fameless.forcebattle.util.Skull;
+import org.bukkit.Material;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.ItemStack;
+
+public abstract class GUIClickableItem extends GUIItem {
+
+    public GUIClickableItem(final int slot) {
+        super(slot);
+    }
+
+    public abstract void run(InventoryClickEvent event, BattlePlayer player);
+
+    public static GUIClickableItem getCloseItem(int slot) {
+        return new GUIClickableItem(slot) {
+            @Override
+            public void run(InventoryClickEvent e, BattlePlayer player) {
+                player.getPlayer().closeInventory();
+            }
+
+            @Override
+            public ItemStack getItem(BattlePlayer player) {
+                return ItemStackCreator.createNamedItemStack(Material.BARRIER, "§cClose");
+            }
+        };
+    }
+
+    public static GUIClickableItem getGoBackItem(int slot, ForceBattleGUI gui) {
+        return new GUIClickableItem(slot) {
+            @Override
+            public void run(InventoryClickEvent e, BattlePlayer player) {
+                gui.open(player);
+            }
+
+            @Override
+            public ItemStack getItem(BattlePlayer player) {
+                return ItemStackCreator.getSkull(Skull.ARROW_LEFT, "§aGo Back", 1, "§7To " + gui.getTitle());
+            }
+        };
+    }
+
+    public static GUIClickableItem getGoForthItem(int slot, ForceBattleGUI gui) {
+        return new GUIClickableItem(slot) {
+            @Override
+            public void run(InventoryClickEvent e, BattlePlayer player) {
+                gui.open(player);
+            }
+
+            @Override
+            public ItemStack getItem(BattlePlayer player) {
+                return ItemStackCreator.getSkull(Skull.ARROW_RIGHT, "§aGo Forth", 1, "§7To " + gui.getTitle());
+            }
+        };
+    }
+
+    @Override
+    public void onClick(InventoryClickEvent event, BattlePlayer player) {
+        run(event, player);
+    }
+
+}
diff --git a/src/main/java/net/fameless/forcebattle/gui/GUIItem.java b/src/main/java/net/fameless/forcebattle/gui/GUIItem.java
new file mode 100644
index 0000000..4619a2a
--- /dev/null
+++ b/src/main/java/net/fameless/forcebattle/gui/GUIItem.java
@@ -0,0 +1,17 @@
+package net.fameless.forcebattle.gui;
+
+import net.fameless.forcebattle.player.BattlePlayer;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.ItemStack;
+
+public abstract class GUIItem {
+    public final int slot;
+    public abstract ItemStack getItem(BattlePlayer player);
+
+    public GUIItem(int slot) {
+        this.slot = slot;
+    }
+
+    public void onClick(InventoryClickEvent event, BattlePlayer player) {
+    }
+}
diff --git a/src/main/java/net/fameless/forcebattle/gui/GUIListener.java b/src/main/java/net/fameless/forcebattle/gui/GUIListener.java
new file mode 100644
index 0000000..525af2b
--- /dev/null
+++ b/src/main/java/net/fameless/forcebattle/gui/GUIListener.java
@@ -0,0 +1,42 @@
+package net.fameless.forcebattle.gui;
+
+import net.fameless.forcebattle.player.BattlePlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryDragEvent;
+
+public class GUIListener implements Listener {
+
+    @EventHandler
+    public void onClick(InventoryClickEvent event) {
+        if (!(event.getInventory().getHolder() instanceof ForceBattleGUI gui)) return;
+        event.setCancelled(!gui.allowHotkeying());
+
+        BattlePlayer player = BattlePlayer.adapt((Player) event.getWhoClicked());
+
+        if (event.getRawSlot() < 0) return;
+        if (event.getRawSlot() >= gui.getSize()) return;
+
+        GUIItem item = gui.get(event.getRawSlot());
+        if (item == null) return;
+        item.onClick(event, player);
+    }
+
+    @EventHandler
+    public void onDrag(InventoryDragEvent event) {
+        if (event.getInventory().getHolder() instanceof ForceBattleGUI) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler
+    public void onClose(InventoryCloseEvent event) {
+        if (event.getInventory().getHolder() instanceof ForceBattleGUI gui) {
+            gui.onClose(event, ForceBattleGUI.CloseReason.PLAYER_EXITED);
+            ForceBattleGUI.GUI_MAP.remove(event.getPlayer().getUniqueId());
+        }
+    }
+}
diff --git a/src/main/java/net/fameless/forcebattle/gui/LanguageGUI.java b/src/main/java/net/fameless/forcebattle/gui/LanguageGUI.java
deleted file mode 100644
index e764ded..0000000
--- a/src/main/java/net/fameless/forcebattle/gui/LanguageGUI.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package net.fameless.forcebattle.gui;
-
-import lombok.Getter;
-import net.fameless.forcebattle.ForceBattle;
-import net.fameless.forcebattle.caption.Caption;
-import net.fameless.forcebattle.caption.Language;
-import net.fameless.forcebattle.util.ItemUtils;
-import net.fameless.forcebattle.util.Skull;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-public class LanguageGUI implements Listener, InventoryHolder {
-
-    @Getter
-    private enum LanguageButton {
-        ENGLISH(0, Language.ENGLISH, Skull.FLAG_UK, "English",
-                List.of("Click to set the language to english"), "Language is already set to english!"),
-
-        GERMAN(1, Language.GERMAN, Skull.FLAG_GERMANY, "Deutsch",
-                List.of("Klicke, um die Sprache auf deutsch zu stellen"), "Die Sprache ist bereits auf Deutsch eingestellt."),
-
-        CHINESE_SIMPLIFIED(2, Language.CHINESE_SIMPLIFIED, Skull.FLAG_CHINA, "简体中文",
-                List.of("点击将语言设置为简体中文"), "成功设置为简体中文!"),
-
-        CHINESE_TRADITIONAL(3, Language.CHINESE_TRADITIONAL, Skull.FLAG_CHINA, "繁体中文",
-                List.of("点击将语言设置为繁体中文"), "成功設寘爲緐體中文!");
-
-        private final int slot;
-        private final Language language;
-        private final Skull skull;
-        private final String name;
-        private final List<String> lore;
-        private final String alreadyMessage;
-
-        LanguageButton(int slot, Language language, Skull skull, String name, List<String> lore, String alreadyMessage) {
-            this.slot = slot;
-            this.language = language;
-            this.skull = skull;
-            this.name = name;
-            this.lore = lore;
-            this.alreadyMessage = alreadyMessage;
-        }
-
-        public ItemStack buildItem() {
-            List<String> coloredLore = lore.stream()
-                    .map(line -> ChatColor.GRAY + line)
-                    .toList();
-
-            return ItemUtils.buildItem(
-                    skull.asItemStack(),
-                    ChatColor.GOLD + name,
-                    coloredLore,
-                    null,
-                    null
-            );
-        }
-
-        public static LanguageButton fromSlot(int slot) {
-            for (LanguageButton button : values()) {
-                if (button.slot == slot) return button;
-            }
-            return null;
-        }
-
-        public void handleClick(Player player) {
-            if (Caption.getCurrentLanguage() == language) {
-                player.sendMessage(ChatColor.RED + alreadyMessage);
-                return;
-            }
-            Caption.setCurrentLanguage(language);
-            ForceBattle.broadcast(MiniMessage.miniMessage().deserialize(
-                    Caption.getCurrentLanguage().getUpdateMessage(),
-                    Caption.prefixTagResolver()
-            ));
-        }
-    }
-
-    @NotNull public Inventory getLanguageGUI() {
-        Inventory gui = Bukkit.createInventory(this, 9, Caption.getAsLegacy("gui.language_title"));
-        for (LanguageButton button : LanguageButton.values()) {
-            gui.setItem(button.getSlot(), button.buildItem());
-        }
-        return gui;
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    public void onInventoryClick(@NotNull InventoryClickEvent event) {
-        if (!(event.getInventory().getHolder() instanceof LanguageGUI)) return;
-        event.setCancelled(true);
-
-        if (!(event.getWhoClicked() instanceof Player player)) return;
-
-        LanguageButton button = LanguageButton.fromSlot(event.getSlot());
-        if (button != null) {
-            button.handleClick(player);
-        }
-
-        player.openInventory(getLanguageGUI());
-    }
-
-    @Override
-    public @NotNull Inventory getInventory() {
-        return getLanguageGUI();
-    }
-
-}
diff --git a/src/main/java/net/fameless/forcebattle/gui/ResultGUI.java b/src/main/java/net/fameless/forcebattle/gui/ResultGUI.java
deleted file mode 100644
index 32f7d40..0000000
--- a/src/main/java/net/fameless/forcebattle/gui/ResultGUI.java
+++ /dev/null
@@ -1,531 +0,0 @@
-package net.fameless.forcebattle.gui;
-
-import lombok.Getter;
-import net.fameless.forcebattle.ForceBattle;
-import net.fameless.forcebattle.caption.Caption;
-import net.fameless.forcebattle.game.Objective;
-import net.fameless.forcebattle.game.Team;
-import net.fameless.forcebattle.game.data.BiomeSimplified;
-import net.fameless.forcebattle.game.data.StructureSimplified;
-import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.game.data.Advancement;
-import net.fameless.forcebattle.util.BukkitUtil;
-import net.fameless.forcebattle.util.Format;
-import net.fameless.forcebattle.util.InventoryUtils;
-import net.fameless.forcebattle.util.ItemData;
-import net.fameless.forcebattle.util.ItemUtils;
-import net.fameless.forcebattle.util.ResultUtils;
-import net.fameless.forcebattle.game.data.Structure;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.block.Biome;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.persistence.PersistentDataType;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-import static net.fameless.forcebattle.gui.ResultGUI.ResultCommandUtils.combineTeamObjectives;
-import static net.fameless.forcebattle.gui.ResultGUI.ResultCommandUtils.getGUITypeFromItemStack;
-import static net.fameless.forcebattle.gui.ResultGUI.ResultCommandUtils.getInvTemplate;
-import static net.fameless.forcebattle.gui.ResultGUI.ResultCommandUtils.getPageItems;
-import static net.fameless.forcebattle.gui.ResultGUI.ResultCommandUtils.getPageLeftItemStack;
-import static net.fameless.forcebattle.gui.ResultGUI.ResultCommandUtils.getPageRightItemStack;
-import static net.fameless.forcebattle.gui.ResultGUI.ResultCommandUtils.isPageLeftItemStack;
-import static net.fameless.forcebattle.gui.ResultGUI.ResultCommandUtils.isPageRightItemStack;
-
-public class ResultGUI implements Listener, InventoryHolder {
-
-    public static ResultGUI holderInstance;
-
-    private final int SPACES_ON_PAGE = 45;
-    private boolean animatedGUIFinished = false;
-    private final HashMap<BattlePlayer, Integer> playerPageCache = new HashMap<>();
-    private final NamespacedKey DATA_KEY = new NamespacedKey(ForceBattle.get(), "resultData");
-
-    public ResultGUI() {
-        holderInstance = this;
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    public void handleInteraction(@NotNull InventoryClickEvent event) {
-        if (!(event.getInventory().getHolder() instanceof ResultGUI)) {
-            return;
-        }
-        if (event.getCurrentItem() == null) {
-            return;
-        }
-        if (!(event.getWhoClicked() instanceof Player player)) {
-            return;
-        }
-        event.setCancelled(true);
-        if (!isPageLeftItemStack(event.getCurrentItem()) && !isPageRightItemStack(event.getCurrentItem())) {
-            return;
-        }
-
-        boolean pageLeft = isPageLeftItemStack(event.getCurrentItem());
-
-        BattlePlayer whoClicked = BattlePlayer.adapt(player);
-        ResultType type = getGUITypeFromItemStack(event.getInventory().getItem(0));
-        if (type == null) {
-            event.getWhoClicked().closeInventory();
-        }
-        int page = playerPageCache.getOrDefault(whoClicked, 1);
-
-        switch (type) {
-            case ALL -> {
-                if (pageLeft) {
-                    event.getWhoClicked().openInventory(getResultGUI(whoClicked, page - 1));
-                } else {
-                    event.getWhoClicked().openInventory(getResultGUI(whoClicked, page + 1));
-                }
-            }
-            case TEAM -> {
-                Integer teamId = ItemUtils.getData(event.getInventory().getItem(0), DATA_KEY, PersistentDataType.INTEGER);
-                if (teamId == null) {
-                    event.getWhoClicked().closeInventory();
-                    return;
-                }
-                Optional<Team> targetTeamOpt = Team.ofId(teamId);
-                targetTeamOpt.ifPresentOrElse(
-                        targetTeam -> {
-                            if (pageLeft) {
-                                event.getWhoClicked().openInventory(getResultGUI(whoClicked, targetTeam, page - 1));
-                            } else {
-                                event.getWhoClicked().openInventory(getResultGUI(whoClicked, targetTeam, page + 1));
-                            }
-                        }, () -> event.getWhoClicked().closeInventory()
-                );
-
-            }
-            case PLAYER -> {
-                String playerIdString = ItemUtils.getData(event.getInventory().getItem(0), DATA_KEY, PersistentDataType.STRING);
-                if (playerIdString == null) {
-                    event.getWhoClicked().closeInventory();
-                    return;
-                }
-                UUID playerId;
-                try {
-                    playerId = UUID.fromString(playerIdString);
-                } catch (IllegalArgumentException e) {
-                    event.getWhoClicked().closeInventory();
-                    return;
-                }
-                @NotNull Optional<BattlePlayer> targetOptional = BattlePlayer.adapt(playerId);
-                targetOptional.ifPresentOrElse(
-                        target -> {
-                            if (pageLeft) {
-                                event.getWhoClicked().openInventory(getResultGUI(whoClicked, target, page - 1));
-                            } else {
-                                event.getWhoClicked().openInventory(getResultGUI(whoClicked, target, page + 1));
-                            }
-                        }, () -> event.getWhoClicked().closeInventory()
-                );
-            }
-        }
-    }
-
-    public @NotNull Inventory getResultGUI(BattlePlayer whoOpens, @NotNull Team team, int page) {
-        playerPageCache.put(whoOpens, page);
-        Inventory inventory = getInvTemplate(Caption.getAsLegacy(
-                ResultType.TEAM.getTitleKey(),
-                TagResolver.resolver("team-id", Tag.inserting(Component.text(team.getId())))
-        ));
-
-        List<Objective> objectives = combineTeamObjectives(team);
-        if (InventoryUtils.isPageValid(objectives, page - 1, SPACES_ON_PAGE)) {
-            inventory.setItem(0, getPageLeftItemStack());
-        }
-        if (InventoryUtils.isPageValid(objectives, page + 1, SPACES_ON_PAGE)) {
-            inventory.setItem(8, getPageRightItemStack());
-        }
-
-        ItemUtils.addData(
-                inventory.getItem(0),
-                new ItemData<>(DATA_KEY, PersistentDataType.INTEGER, team.getId()),
-                new ItemData<>(ResultType.TEAM.getKey(), PersistentDataType.INTEGER, 1)
-        );
-
-        getPageItems(objectives, page, SPACES_ON_PAGE, true).forEach(inventory::addItem);
-        return inventory;
-    }
-
-    public @NotNull Inventory getResultGUI(BattlePlayer whoOpens, @NotNull BattlePlayer target, int page) {
-        playerPageCache.put(whoOpens, page);
-        Inventory inventory = getInvTemplate(Caption.getAsLegacy(
-                ResultType.PLAYER.getTitleKey(),
-                TagResolver.resolver("player-name", Tag.inserting(Component.text(target.getName())))
-        ));
-
-        List<Objective> objectives = new ArrayList<>(Objective.finishedBy(target));
-        if (InventoryUtils.isPageValid(objectives, page - 1, SPACES_ON_PAGE)) {
-            inventory.setItem(0, getPageLeftItemStack());
-        }
-        if (InventoryUtils.isPageValid(objectives, page + 1, SPACES_ON_PAGE)) {
-            inventory.setItem(8, getPageRightItemStack());
-        }
-
-        ItemUtils.addData(
-                inventory.getItem(0),
-                new ItemData<>(DATA_KEY, PersistentDataType.STRING, target.getUuid().toString()),
-                new ItemData<>(ResultType.PLAYER.key, PersistentDataType.STRING, "1")
-        );
-
-        getPageItems(objectives, page, SPACES_ON_PAGE, true).forEach(inventory::addItem);
-        return inventory;
-    }
-
-    public @NotNull Inventory getResultGUI(BattlePlayer whoOpens, int page) {
-        playerPageCache.put(whoOpens, page);
-        Inventory inventory = getInvTemplate(Caption.getAsLegacy(ResultType.ALL.getTitleKey()));
-
-        List<Objective> objectives = new ArrayList<>(Objective.finished());
-        if (InventoryUtils.isPageValid(objectives, page - 1, SPACES_ON_PAGE)) {
-            inventory.setItem(0, getPageLeftItemStack());
-        }
-        if (InventoryUtils.isPageValid(objectives, page + 1, SPACES_ON_PAGE)) {
-            inventory.setItem(8, getPageRightItemStack());
-        }
-
-        ItemUtils.addData(
-                inventory.getItem(0),
-                new ItemData<>(ResultType.ALL.key, PersistentDataType.INTEGER, 1)
-        );
-
-        getPageItems(objectives, page, SPACES_ON_PAGE, true).forEach(inventory::addItem);
-        return inventory;
-    }
-
-    public @NotNull Inventory getAnimatedPlayerGUI(final BattlePlayer whoOpens, @NotNull final BattlePlayer player) {
-        List<Objective> objectives = new ArrayList<>(Objective.finishedBy(player));
-        return getAnimatedGUI(
-                whoOpens,
-                player,
-                null,
-                objectives,
-                ResultType.PLAYER,
-                DATA_KEY,
-                PersistentDataType.STRING,
-                player.getUuid().toString()
-        );
-    }
-
-    public @NotNull Inventory getAnimatedTeamGUI(final BattlePlayer whoOpens, @NotNull final Team team) {
-        List<Objective> objectives = ResultCommandUtils.combineTeamObjectives(team);
-        return getAnimatedGUI(
-                whoOpens,
-                null,
-                team,
-                objectives,
-                ResultType.TEAM,
-                DATA_KEY,
-                PersistentDataType.INTEGER,
-                team.getId()
-        );
-    }
-
-    private <P, C> @NotNull Inventory getAnimatedGUI(
-            final BattlePlayer whoOpens,
-            final BattlePlayer player,
-            final Team team,
-            final List<Objective> objectives,
-            final ResultType resultType,
-            final NamespacedKey dataKey,
-            final PersistentDataType<P, C> type,
-            final C value
-    ) {
-        playerPageCache.put(whoOpens, 1);
-        Inventory inventory = getInvTemplate("Results");
-
-        ItemUtils.addData(
-                inventory.getItem(0),
-                new ItemData<>(dataKey, type, value),
-                new ItemData<>(resultType.getKey(), PersistentDataType.INTEGER, 1)
-        );
-
-        if (objectives.isEmpty()) return inventory;
-
-        final int[] index = {0};
-
-        final long delayTicks = 10L;
-        animatedGUIFinished = false;
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                if (index[0] >= objectives.size()) {
-                    int finalPage = (index[0] > 0) ? ((index[0] - 1) / SPACES_ON_PAGE) + 1 : 1;
-                    updateNavButtons(inventory, objectives, finalPage, dataKey, type, value, resultType);
-
-                    if (whoOpens instanceof BattlePlayer bp) {
-                        animatedGUIFinished = true;
-                        bp.getPlayer().closeInventory();
-                    }
-                    switch (resultType) {
-                        case PLAYER -> Bukkit.getScheduler().runTask(
-                                ForceBattle.get(), () -> {
-                            Component message = ResultUtils.buildPlayerResultMessage(player);
-                            whoOpens.sendMessage(message);
-                            whoOpens.getPlayer().sendTitle(
-                                    "§6" + player.getName(),
-                                    "§8[§a" + player.getPoints() + "§8]",
-                                    10, 70, 20
-                            );
-                        });
-                        case TEAM -> Bukkit.getScheduler().runTask(
-                                ForceBattle.get(), () -> {
-                            Component message = ResultUtils.buildTeamResultMessage(team);
-                            whoOpens.sendMessage(message);
-                            whoOpens.getPlayer().sendTitle(
-                                    "§6Team " + team.getId(),
-                                    "§8[§a" + team.getPoints() + "§8]",
-                                    10, 70, 20
-                            );
-                        });
-                        default -> {}
-                    }
-
-                    this.cancel();
-                    return;
-                }
-
-                int page = (index[0] / SPACES_ON_PAGE) + 1;
-                playerPageCache.put(whoOpens, page);
-
-                if ((index[0] % SPACES_ON_PAGE) == 0) {
-                    for (int s = 9; s < 54; s++) inventory.setItem(s, null);
-                }
-
-                List<ItemStack> pageItems = ResultCommandUtils.getPageItems(objectives, page, SPACES_ON_PAGE, false);
-                int localIndex = index[0] % SPACES_ON_PAGE;
-                if (localIndex < pageItems.size()) {
-                    inventory.setItem(9 + localIndex, pageItems.get(localIndex));
-                }
-
-                updateNavButtons(inventory, objectives, page, dataKey, type, value, resultType);
-                index[0]++;
-            }
-        }.runTaskTimer(ForceBattle.get(), 0L, delayTicks);
-
-        return inventory;
-    }
-
-    /**
-     * Updates the left/right nav buttons with proper metadata.
-     */
-    private <P, C> void updateNavButtons(
-            Inventory inventory,
-            List<Objective> objectives,
-            int page,
-            NamespacedKey dataKey,
-            PersistentDataType<P, C> type,
-            C value,
-            ResultType resultType
-    ) {
-        // Left button
-        if (InventoryUtils.isPageValid(objectives, page - 1, SPACES_ON_PAGE)) {
-            ItemStack left = ResultCommandUtils.getPageLeftItemStack();
-            ItemUtils.addData(left,
-                    new ItemData<>(dataKey, type, value),
-                    new ItemData<>(resultType.getKey(), PersistentDataType.INTEGER, 1)
-            );
-            inventory.setItem(0, left);
-        } else {
-            inventory.setItem(0, ItemUtils.SpecialItems.getFillerItem());
-        }
-
-        // Right button
-        if (InventoryUtils.isPageValid(objectives, page + 1, SPACES_ON_PAGE)) {
-            ItemStack right = ResultCommandUtils.getPageRightItemStack();
-            ItemUtils.addData(right,
-                    new ItemData<>(dataKey, type, value),
-                    new ItemData<>(resultType.getKey(), PersistentDataType.INTEGER, 1)
-            );
-            inventory.setItem(8, right);
-        } else {
-            inventory.setItem(8, ItemUtils.SpecialItems.getFillerItem());
-        }
-    }
-
-    @Override
-    public @NotNull Inventory getInventory() {
-        return getResultGUI(null, 1);
-    }
-
-    @EventHandler
-    private void onInventoryClose(InventoryCloseEvent event) {
-        Player player = (Player) event.getPlayer();
-
-        if (event.getView().getTitle().equals("Results") && !animatedGUIFinished) {
-            Bukkit.getScheduler().runTask(ForceBattle.get(), () -> {
-                if (player.isOnline()) {
-                    player.openInventory(event.getInventory());
-                }
-            });
-        }
-
-    }
-
-    @Getter
-    public enum ResultType {
-
-        ALL(new NamespacedKey(ForceBattle.get(), "resultAll"), "gui.result_title_all"),
-        TEAM(new NamespacedKey(ForceBattle.get(), "resultTeam"), "gui.result_title_team"),
-        PLAYER(new NamespacedKey(ForceBattle.get(), "resultPlayer"), "gui.result_title_player");
-
-        private final NamespacedKey key;
-        private final String titleKey;
-
-        ResultType(NamespacedKey key, String titleKey) {
-            this.key = key;
-            this.titleKey = titleKey;
-        }
-
-    }
-
-    public static class ResultCommandUtils {
-
-        public static final NamespacedKey PAGE_RIGHT_KEY = new NamespacedKey(ForceBattle.get(), "pageRight");
-        public static final NamespacedKey PAGE_LEFT_KEY = new NamespacedKey(ForceBattle.get(), "pageLeft");
-
-        public static boolean isPageLeftItemStack(@NotNull ItemStack stack) {
-            return ItemUtils.hasData(stack, PAGE_LEFT_KEY);
-        }
-
-        public static @NotNull ItemStack getPageLeftItemStack() {
-            return ItemUtils.addData(
-                    new ItemUtils.ItemBuilder()
-                            .type(Material.LIME_STAINED_GLASS_PANE)
-                            .name(ChatColor.GREEN + "Go Left")
-                            .build(),
-                    new ItemData<>(PAGE_LEFT_KEY, PersistentDataType.INTEGER, 1)
-            );
-        }
-
-        public static boolean isPageRightItemStack(@NotNull ItemStack stack) {
-            return ItemUtils.hasData(stack, PAGE_RIGHT_KEY);
-        }
-
-        public static @NotNull ItemStack getPageRightItemStack() {
-            return ItemUtils.addData(
-                    new ItemUtils.ItemBuilder()
-                            .type(Material.LIME_STAINED_GLASS_PANE)
-                            .name(ChatColor.GREEN + "Go Right")
-                            .build(),
-                    new ItemData<>(PAGE_RIGHT_KEY, PersistentDataType.INTEGER, 1)
-            );
-        }
-
-        public static @Nullable ResultType getGUITypeFromItemStack(ItemStack stack) {
-            for (ResultType type : ResultType.values()) {
-                if (ItemUtils.hasData(stack, type.getKey())) {
-                    return type;
-                }
-            }
-            return null;
-        }
-
-        public static @NotNull Inventory getInvTemplate(@NotNull String name) {
-            Inventory inventory = Bukkit.createInventory(holderInstance, 54, name);
-            for (int i = 0; i < 9; i++) {
-                inventory.setItem(i, ItemUtils.SpecialItems.getFillerItem());
-            }
-            return inventory;
-        }
-
-        public static @NotNull List<Objective> combineTeamObjectives(@NotNull Team team) {
-            List<Objective> objectives = new ArrayList<>();
-            team.getPlayers().forEach(teamPlayer -> objectives.addAll(Objective.finishedBy(teamPlayer)));
-            return objectives;
-        }
-
-        public static List<ItemStack> getPageItems(@NotNull List<Objective> objectives, int page, int spaces, boolean displayNames) {
-            objectives.sort(Comparator.comparingLong(Objective::getTime).reversed());
-
-            int startIndex = (page - 1) * spaces;
-            int endIndex = Math.min(startIndex + spaces, objectives.size());
-
-            List<ItemStack> pageItems = new ArrayList<>();
-            for (int i = startIndex; i < endIndex; i++) {
-                if (i < 0 || i >= objectives.size()) {
-                    return pageItems;
-                }
-                Objective objective = objectives.get(i);
-                Object convertedObjective = BukkitUtil.convertObjective(objective.getBattleType(), objective.getObjectiveString());
-
-                Material itemType = getTypeFromObjective(objective);
-                String itemName = ChatColor.GRAY + objective.getBattleType().getPrefix() + ": " + ChatColor.BLUE +
-                        (convertedObjective instanceof Advancement advancement ? advancement.name : Format.formatName(objective.getObjectiveString()));
-
-                ItemUtils.ItemBuilder builder = new ItemUtils.ItemBuilder();
-
-                builder.type(itemType)
-                        .name(itemName)
-                        .addLore("")
-                        .addLore(ChatColor.GRAY + "Time: " + ChatColor.BLUE + Format.formatTime(objective.getTime()));
-
-                if (displayNames) {
-                    builder.addLore(ChatColor.GRAY + "Player: " + ChatColor.BLUE + objective.getWhoFinished().getName());
-                }
-
-                builder.addLore("");
-
-                if (objective.hasBeenSkipped()) {
-                    builder.addLore(ChatColor.RED + "SKIPPED");
-                    builder.addLore("");
-                }
-
-                pageItems.add(builder.build());
-            }
-            return pageItems;
-        }
-
-        public static Material getTypeFromObjective(@NotNull Objective objective) {
-            Object objectiveObject = BukkitUtil.convertObjective(objective.getBattleType(), objective.getObjectiveString());
-            if (objectiveObject instanceof Material material) {
-                return material;
-            }
-            if (objectiveObject instanceof EntityType) {
-                return Material.SPIDER_SPAWN_EGG;
-            }
-            if (objectiveObject instanceof Biome || objectiveObject instanceof BiomeSimplified) {
-                return Material.GRASS_BLOCK;
-            }
-            if (objectiveObject instanceof Advancement) {
-                return Material.BREWING_STAND;
-            }
-            if (objectiveObject instanceof Integer) {
-                return Material.SCAFFOLDING;
-            }
-            if (objectiveObject instanceof Location) {
-                return Material.DIAMOND_BOOTS;
-            }
-            if (objectiveObject instanceof Structure || objectiveObject instanceof StructureSimplified) {
-                return Material.STRUCTURE_BLOCK;
-            }
-            throw new RuntimeException("Corrupt/Invalid objective type: " + objective.getObjectiveString() + ". battleType: " + objective.getBattleType());
-        }
-
-    }
-
-}
diff --git a/src/main/java/net/fameless/forcebattle/gui/SettingsGUI.java b/src/main/java/net/fameless/forcebattle/gui/SettingsGUI.java
deleted file mode 100644
index 731e232..0000000
--- a/src/main/java/net/fameless/forcebattle/gui/SettingsGUI.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package net.fameless.forcebattle.gui;
-
-import lombok.Getter;
-import net.fameless.forcebattle.ForceBattle;
-import net.fameless.forcebattle.caption.Caption;
-import net.fameless.forcebattle.configuration.SettingsManager;
-import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.Format;
-import net.fameless.forcebattle.util.ItemUtils;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-
-public class SettingsGUI implements Listener, InventoryHolder {
-
-    private static SettingsGUI holderInstance;
-
-    public SettingsGUI() {
-        holderInstance = this;
-    }
-
-    private static final EnumSet<SettingsManager.Setting> MULTI_STATE_SETTINGS = EnumSet.of(
-            SettingsManager.Setting.FORCE_ITEM,
-            SettingsManager.Setting.FORCE_MOB,
-            SettingsManager.Setting.FORCE_BIOME,
-            SettingsManager.Setting.FORCE_ADVANCEMENT,
-            SettingsManager.Setting.FORCE_HEIGHT,
-            SettingsManager.Setting.FORCE_COORDS,
-            SettingsManager.Setting.FORCE_STRUCTURE
-    );
-
-    @Getter
-    private enum SettingButton {
-        FORCE_ITEM(0, Material.ITEM_FRAME, SettingsManager.Setting.FORCE_ITEM, "gui.force_item_name",
-                "gui.force_item_lore", "notification.force_item_changed"),
-        FORCE_MOB(1, Material.DIAMOND_SWORD, SettingsManager.Setting.FORCE_MOB, "gui.force_mob_name",
-                "gui.force_mob_lore", "notification.force_mob_changed"),
-        FORCE_BIOME(2, Material.GRASS_BLOCK, SettingsManager.Setting.FORCE_BIOME, "gui.force_biome_name",
-                "gui.force_biome_lore", "notification.force_biome_changed"),
-        FORCE_ADVANCEMENT(3, Material.BREWING_STAND, SettingsManager.Setting.FORCE_ADVANCEMENT, "gui.force_advancement_name",
-                "gui.force_advancement_lore", "notification.force_advancement_changed"),
-        FORCE_HEIGHT(4, Material.SCAFFOLDING, SettingsManager.Setting.FORCE_HEIGHT, "gui.force_height_name",
-                "gui.force_height_lore", "notification.force_height_changed"),
-        FORCE_COORDS(5, Material.FILLED_MAP, SettingsManager.Setting.FORCE_COORDS, "gui.force_coords_name",
-                "gui.force_coords_lore", "notification.force_coords_changed"),
-        FORCE_STRUCTURE(6, Material.STRUCTURE_BLOCK, SettingsManager.Setting.FORCE_STRUCTURE, "gui.force_structure_name",
-                "gui.force_structure_lore", "notification.force_structure_changed"),
-
-        CHAIN_MODE(27, Material.CHAIN, SettingsManager.Setting.CHAIN_MODE, "gui.chain_mode_name",
-                "gui.chain_mode_lore", "notification.chain_mode_changed"),
-        BACKPACK(28, Material.CHEST, SettingsManager.Setting.BACKPACK, ChatColor.BLUE + "Backpacks",
-                "gui.backpack_lore", "notification.backpack_changed"),
-        HIDE_POINTS(29, Material.IRON_TRAPDOOR, SettingsManager.Setting.HIDE_POINTS, "gui.hide_points_name",
-                "gui.hide_points_lore", "notification.hide_points_changed"),
-        HIDE_OBJECTIVES(30, Material.DARK_OAK_DOOR, SettingsManager.Setting.HIDE_OBJECTIVES, "gui.hide_objectives_name",
-                "gui.hide_objectives_lore", "notification.hide_objectives_changed"),
-        NO_DUPLICATE_OBJECTIVES(31, Material.NAME_TAG, SettingsManager.Setting.NO_DUPLICATE_OBJECTIVES, "gui.no_duplicate_objectives_name",
-                "gui.no_duplicate_objectives_lore", "notification.no_duplicate_objectives_changed"),
-        SIMPLIFIED_OBJECTIVES(32, Material.DIRT, SettingsManager.Setting.SIMPLIFIED_OBJECTIVES, "gui.simplified_objectives_name",
-                "gui.simplified_objectives_lore", "notification.simplified_objectives_changed"),
-        EXTRA_TEAM_OBJECTIVE(33, Material.ALLAY_SPAWN_EGG, SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE, "gui.extra_team_objective_name",
-                "gui.extra_team_objective_lore", "notification.extra_team_objective_changed"),
-
-        RESET(8, Material.BARRIER, null, ChatColor.RED + "RESET", null, null);
-
-        private final int slot;
-        private final Material material;
-        private final SettingsManager.Setting setting;
-        private final String name;
-        private final String lore;
-        private final String changedMsg;
-
-        SettingButton(int slot, Material material, SettingsManager.Setting setting, String name, String lore, String changedMsg) {
-            this.slot = slot;
-            this.material = material;
-            this.setting = setting;
-            this.name = name;
-            this.lore = lore;
-            this.changedMsg = changedMsg;
-        }
-
-
-        public static SettingButton fromSlot(int slot) {
-            for (SettingButton button : values()) {
-                if (button.slot == slot) return button;
-            }
-            return null;
-        }
-
-        public ItemStack toItem() {
-            ItemUtils.ItemBuilder builder = new ItemUtils.ItemBuilder().type(material);
-
-            if (name.startsWith("gui.")) {
-                builder.name(Caption.getAsLegacy(name));
-            } else {
-                builder.name(name);
-            }
-
-            List<String> loreLines = lore != null ? new ArrayList<>(Format.formatLineBreaks(
-                    LegacyComponentSerializer.legacySection().serialize(
-                            Caption.of(lore, TagResolver.resolver("state", Tag.inserting(Component.text(SettingsManager.getState(setting).getDisplayName()))))
-                    )
-            )) : new ArrayList<>();
-
-            if (!loreLines.isEmpty()) builder.lore(loreLines);
-
-            return builder.build();
-        }
-
-        public void handleClick(BattlePlayer whoClicked) {
-            if (this == RESET) {
-                ForceBattle.getTimer().setRunning(false);
-                ForceBattle.getTimer().setTime(ForceBattle.getTimer().getStartTime());
-                BattlePlayer.BATTLE_PLAYERS.forEach(p -> {
-                    if (!p.isOffline()) p.reset(true);
-                });
-                return;
-            }
-
-            if (setting == null) return;
-
-            SettingsManager.SettingState current = SettingsManager.getState(setting);
-            SettingsManager.SettingState next;
-
-            if (MULTI_STATE_SETTINGS.contains(setting)) {
-                next = current.next();
-            } else {
-                next = (current == SettingsManager.SettingState.OFF) ? SettingsManager.SettingState.PLAYER : SettingsManager.SettingState.OFF;
-            }
-
-            SettingsManager.setState(setting, next);
-
-            ForceBattle.broadcast(Caption.of(changedMsg, TagResolver.resolver("state",
-                    Tag.inserting(Component.text(SettingsManager.getState(setting).getDisplayName())))));
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    public void onInventoryClick(@NotNull InventoryClickEvent event) {
-        if (!(event.getInventory().getHolder() instanceof SettingsGUI)) return;
-        if (!(event.getWhoClicked() instanceof Player player)) return;
-
-        event.setCancelled(true);
-        BattlePlayer whoClicked = BattlePlayer.adapt(player);
-
-        SettingButton button = SettingButton.fromSlot(event.getSlot());
-        if (button != null) button.handleClick(whoClicked);
-
-        whoClicked.openInventory(getSettingsGUI());
-    }
-
-    public @NotNull Inventory getSettingsGUI() {
-        Inventory inventory = Bukkit.createInventory(SettingsGUI.holderInstance, 36, Caption.getAsLegacy("gui.settings_title"));
-
-        for (SettingButton button : SettingButton.values()) {
-            inventory.setItem(button.getSlot(), button.toItem());
-        }
-
-        return inventory;
-    }
-
-    @Override
-    public @NotNull Inventory getInventory() {
-        return getSettingsGUI();
-    }
-}
diff --git a/src/main/java/net/fameless/forcebattle/gui/impl/ConfigSettingsGUI.java b/src/main/java/net/fameless/forcebattle/gui/impl/ConfigSettingsGUI.java
new file mode 100644
index 0000000..6bbb042
--- /dev/null
+++ b/src/main/java/net/fameless/forcebattle/gui/impl/ConfigSettingsGUI.java
@@ -0,0 +1,119 @@
+package net.fameless.forcebattle.gui.impl;
+
+import lombok.Getter;
+import net.fameless.forcebattle.ForceBattle;
+import net.fameless.forcebattle.caption.Caption;
+import net.fameless.forcebattle.configuration.SettingsManager;
+import net.fameless.forcebattle.gui.ForceBattleGUI;
+import net.fameless.forcebattle.gui.GUIClickableItem;
+import net.fameless.forcebattle.player.BattlePlayer;
+import net.fameless.forcebattle.util.ItemStackCreator;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.bukkit.Material;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ConfigSettingsGUI extends ForceBattleGUI {
+
+    public ConfigSettingsGUI() {
+        super(Caption.getAsLegacy("gui.config_settings_title"), 27);
+    }
+
+    @Getter
+    public enum ConfigSettingButton {
+        MUSIC_DISCS(10, Material.MUSIC_DISC_CAT, SettingsManager.Setting.EXCLUDE_MUSIC_DISCS,
+                "gui.exclude_music_discs_name", "gui.exclude_music_discs_lore", "notification.exclude_music_discs_changed"),
+        BANNER_PATTERNS(11, Material.FLOWER_BANNER_PATTERN, SettingsManager.Setting.EXCLUDE_BANNER_PATTERNS,
+                "gui.exclude_banner_patterns_name", "gui.exclude_banner_patterns_lore", "notification.exclude_banner_patterns_changed"),
+        ARMOR_TEMPLATES(12, Material.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE, SettingsManager.Setting.EXCLUDE_ARMOR_TEMPLATES,
+                "gui.exclude_armor_templates_name", "gui.exclude_armor_templates_lore", "notification.exclude_armor_templates_changed"),
+        POTTERY_SHERDS(13, Material.ANGLER_POTTERY_SHERD, SettingsManager.Setting.EXCLUDE_POTTERY_SHERDS,
+                "gui.exclude_pottery_sherds_name", "gui.exclude_pottery_sherds_lore", "notification.exclude_pottery_sherds_changed"),
+        ORES(14, Material.DIAMOND_ORE, SettingsManager.Setting.EXCLUDE_ORES,
+                "gui.exclude_ores_name", "gui.exclude_ores_lore", "notification.exclude_ores_changed"),
+        END_ITEMS(15, Material.END_STONE, SettingsManager.Setting.EXCLUDE_END_ITEMS,
+                "gui.exclude_end_items_name", "gui.exclude_end_items_lore", "notification.exclude_end_items_changed"),
+        TRIAL_ITEMS(16, Material.TRIAL_SPAWNER, SettingsManager.Setting.EXCLUDE_TRIAL_ITEMS,
+                "gui.exclude_trial_items_name", "gui.exclude_trial_items_lore", "notification.exclude_trial_items_changed");
+
+        private final int slot;
+        private final Material material;
+        private final SettingsManager.Setting setting;
+        private final String name;
+        private final String lore;
+        private final String changedMsg;
+
+        ConfigSettingButton(int slot, Material material, SettingsManager.Setting setting, String name, String lore, String changedMsg) {
+            this.slot = slot;
+            this.material = material;
+            this.setting = setting;
+            this.name = name;
+            this.lore = lore;
+            this.changedMsg = changedMsg;
+        }
+
+        public ItemStack createItem() {
+            if (lore != null && setting != null) {
+                String state = SettingsManager.getState(setting).getDisplayName(SettingsManager.isMultiState(setting));
+                Component componentLore = Caption.of(lore, TagResolver.resolver("state", Tag.inserting(Component.text(state))));
+
+                String rawLore = LegacyComponentSerializer.legacySection().serialize(componentLore);
+                List<String> loreLines = new ArrayList<>(List.of(rawLore.split("\n")));
+
+                return ItemStackCreator.getStack(
+                        name.startsWith("gui.") ? Caption.getAsLegacy(name) : name,
+                        material,
+                        1,
+                        loreLines
+                );
+            } else {
+                return ItemStackCreator.createNamedItemStack(material, name.startsWith("gui.") ? Caption.getAsLegacy(name) : name);
+            }
+        }
+
+        public void handleClick(BattlePlayer whoClicked) {
+            boolean newState = !SettingsManager.isEnabled(setting);
+            SettingsManager.setState(setting, newState ? SettingsManager.SettingState.PLAYER : SettingsManager.SettingState.OFF);
+
+            if (changedMsg != null) {
+                ForceBattle.broadcast(Caption.of(changedMsg, TagResolver.resolver(
+                        "state",
+                        Tag.inserting(Component.text(SettingsManager.getState(setting).getDisplayName(false)))
+                )));
+            }
+
+            new ConfigSettingsGUI().open(whoClicked);
+        }
+    }
+
+    @Override
+    public void setItems(BattlePlayer player) {
+        fill(ItemStackCreator.createNamedItemStack(Material.GRAY_STAINED_GLASS_PANE, " "));
+        set(GUIClickableItem.getGoBackItem(0, new SettingsGUI()));
+
+        for (ConfigSettingButton button : ConfigSettingButton.values()) {
+            set(new GUIClickableItem(button.getSlot()) {
+                @Override
+                public void run(InventoryClickEvent event, BattlePlayer player) {
+                    button.handleClick(player);
+                }
+
+                @Override
+                public ItemStack getItem(BattlePlayer player) {
+                    return button.createItem();
+                }
+            });
+        }
+    }
+
+    @Override
+    public boolean allowHotkeying() {
+        return false;
+    }
+}
diff --git a/src/main/java/net/fameless/forcebattle/gui/impl/LanguageGUI.java b/src/main/java/net/fameless/forcebattle/gui/impl/LanguageGUI.java
new file mode 100644
index 0000000..0f557d8
--- /dev/null
+++ b/src/main/java/net/fameless/forcebattle/gui/impl/LanguageGUI.java
@@ -0,0 +1,91 @@
+package net.fameless.forcebattle.gui.impl;
+
+import lombok.Getter;
+import net.fameless.forcebattle.ForceBattle;
+import net.fameless.forcebattle.caption.Caption;
+import net.fameless.forcebattle.caption.Language;
+import net.fameless.forcebattle.gui.ForceBattleGUI;
+import net.fameless.forcebattle.gui.GUIClickableItem;
+import net.fameless.forcebattle.player.BattlePlayer;
+import net.fameless.forcebattle.util.ItemStackCreator;
+import net.fameless.forcebattle.util.Skull;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.ChatColor;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
+
+public class LanguageGUI extends ForceBattleGUI {
+
+    public LanguageGUI() {
+        super(Caption.getAsLegacy("gui.language_title"), 9);
+    }
+
+    @Getter
+    public enum LanguageButton {
+        ENGLISH(0, Language.ENGLISH, Skull.FLAG_UK, "English",
+                List.of("Click to set the language to English"), "Language is already set to English!"),
+        GERMAN(1, Language.GERMAN, Skull.FLAG_GERMANY, "Deutsch",
+                List.of("Klicke, um die Sprache auf Deutsch zu stellen"), "Die Sprache ist bereits auf Deutsch eingestellt."),
+        CHINESE_SIMPLIFIED(2, Language.CHINESE_SIMPLIFIED, Skull.FLAG_CHINA, "简体中文",
+                List.of("点击将语言设置为简体中文"), "成功设置为简体中文!"),
+        CHINESE_TRADITIONAL(3, Language.CHINESE_TRADITIONAL, Skull.FLAG_CHINA, "繁体中文",
+                List.of("点击将语言设置为繁体中文"), "成功設寘爲緐體中文!");
+
+        private final int slot;
+        private final Language language;
+        private final Skull skull;
+        private final String name;
+        private final List<String> lore;
+        private final String alreadyMessage;
+
+        LanguageButton(int slot, Language language, Skull skull, String name, List<String> lore, String alreadyMessage) {
+            this.slot = slot;
+            this.language = language;
+            this.skull = skull;
+            this.name = name;
+            this.lore = lore;
+            this.alreadyMessage = alreadyMessage;
+        }
+
+        public ItemStack createItem() {
+            return ItemStackCreator.getSkull(skull, ChatColor.GOLD + name, 1,
+                    lore.stream().map(line -> ChatColor.GRAY + line).toList());
+        }
+
+        public void handleClick(BattlePlayer player) {
+            if (Caption.getCurrentLanguage() == language) {
+                player.getPlayer().sendMessage(ChatColor.RED + alreadyMessage);
+                return;
+            }
+
+            Caption.setCurrentLanguage(language);
+            ForceBattle.broadcast(MiniMessage.miniMessage().deserialize( Caption.getCurrentLanguage().getUpdateMessage(), Caption.prefixTagResolver()));
+
+            new LanguageGUI().open(player);
+        }
+    }
+
+    @Override
+    public void setItems(BattlePlayer player) {
+        for (LanguageButton button : LanguageButton.values()) {
+            set(new GUIClickableItem(button.getSlot()) {
+                @Override
+                public void run(InventoryClickEvent event, BattlePlayer p) {
+                    button.handleClick(p);
+                }
+
+                @Override
+                public ItemStack getItem(BattlePlayer p) {
+                    return button.createItem();
+                }
+            });
+        }
+    }
+
+    @Override
+    public boolean allowHotkeying() {
+        return false;
+    }
+}
diff --git a/src/main/java/net/fameless/forcebattle/gui/impl/ResultGUI.java b/src/main/java/net/fameless/forcebattle/gui/impl/ResultGUI.java
new file mode 100644
index 0000000..2fd4130
--- /dev/null
+++ b/src/main/java/net/fameless/forcebattle/gui/impl/ResultGUI.java
@@ -0,0 +1,290 @@
+package net.fameless.forcebattle.gui.impl;
+
+import lombok.Getter;
+import net.fameless.forcebattle.ForceBattle;
+import net.fameless.forcebattle.caption.Caption;
+import net.fameless.forcebattle.game.Objective;
+import net.fameless.forcebattle.game.Team;
+import net.fameless.forcebattle.game.data.FBAdvancement;
+import net.fameless.forcebattle.game.data.BiomeSimplified;
+import net.fameless.forcebattle.game.data.StructureSimplified;
+import net.fameless.forcebattle.gui.ForceBattleGUI;
+import net.fameless.forcebattle.gui.GUIClickableItem;
+import net.fameless.forcebattle.gui.GUIItem;
+import net.fameless.forcebattle.player.BattlePlayer;
+import net.fameless.forcebattle.util.*;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Biome;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+
+public class ResultGUI extends ForceBattleGUI {
+
+    private static final int SPACES_ON_PAGE = 45;
+    private final int animationDelayTicks = 15;
+
+    private final ResultType resultType;
+    private final int page;
+    private final BattlePlayer targetPlayer;
+    private final Team targetTeam;
+
+    private final boolean animated;
+
+    private final Map<BattlePlayer, Integer> playerPageCache = new HashMap<>();
+    private final Map<BattlePlayer, List<Objective>> objectiveList = new HashMap<>();
+    private final Map<BattlePlayer, BukkitRunnable> activeAnimations = new HashMap<>();
+
+    public ResultGUI(ResultType resultType, int page, BattlePlayer targetPlayer, Team targetTeam, boolean animated) {
+        super(generateTitle(resultType, targetPlayer, targetTeam, animated), 54);
+        this.page = page;
+        this.resultType = resultType;
+        this.targetPlayer = targetPlayer;
+        this.targetTeam = targetTeam;
+        this.animated = animated;
+    }
+
+    public ResultGUI(BattlePlayer targetPlayer, boolean animated) {
+        this(ResultType.PLAYER, 1, targetPlayer, null, animated);
+    }
+
+    public ResultGUI(Team targetTeam, boolean animated) {
+        this(ResultType.TEAM, 1, null, targetTeam, animated);
+    }
+
+    public ResultGUI() {
+        this(ResultType.ALL, 1, null, null, false);
+    }
+
+    @Override
+    public void open(BattlePlayer viewer) {
+        Collection<Objective> collection = switch (resultType) {
+            case PLAYER -> Objective.finishedBy(targetPlayer);
+            case TEAM -> ResultCommandUtils.combineTeamObjectives(targetTeam);
+            case ALL -> Objective.finished();
+        };
+
+        List<Objective> objectives = new ArrayList<>(collection);
+        objectiveList.put(viewer, objectives);
+        playerPageCache.put(viewer, page);
+
+        super.open(viewer);
+
+        if (animated) {
+            startAnimation(viewer, objectives);
+        } else {
+            setItems(viewer);
+        }
+    }
+
+    private void startAnimation(BattlePlayer viewer, List<Objective> objectives) {
+        fill(ItemStackCreator.createNamedItemStack(Material.GRAY_STAINED_GLASS_PANE, " "));
+
+        BukkitRunnable task = new BukkitRunnable() {
+            int index = 0;
+
+            @Override
+            public void run() {
+                if (viewer.isOffline() || !viewer.getPlayer().getOpenInventory().getTopInventory().equals(getInventory())) {
+                    cancel();
+                    activeAnimations.remove(viewer);
+                    return;
+                }
+
+                if (index >= objectives.size()) {
+                    cancel();
+                    activeAnimations.remove(viewer);
+
+                    new BukkitRunnable() {
+                        @Override
+                        public void run() {
+                            viewer.getPlayer().playSound(viewer.getPlayer().getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 100, 1f);
+                            viewer.getPlayer().closeInventory();
+                            showResultSummary(viewer);
+                        }
+                    }.runTaskLater(ForceBattle.get(), 20L);
+                    return;
+                }
+
+                int slot = 9 + (index % SPACES_ON_PAGE);
+                Objective objective = objectives.get(index);
+
+                set(new GUIItem(slot) {
+                    @Override
+                    public ItemStack getItem(BattlePlayer player) {
+                        return ResultCommandUtils.buildObjectiveItem(objective, false);
+                    }
+                });
+
+                updateInventory(viewer);
+                index++;
+
+                if (index % SPACES_ON_PAGE == 0 && index < objectives.size()) {
+                    new ResultGUI(resultType, page + 1, targetPlayer, targetTeam, true).open(viewer);
+                    cancel();
+                }
+            }
+        };
+
+        task.runTaskTimer(ForceBattle.get(), 0L, animationDelayTicks);
+        activeAnimations.put(viewer, task);
+    }
+
+    @Override
+    public void setItems(BattlePlayer viewer) {
+        if (animated) return;
+
+        int currentPage = playerPageCache.getOrDefault(viewer, 1);
+        List<Objective> objectives = objectiveList.get(viewer);
+        if (objectives == null) return;
+
+        fill(ItemStackCreator.createNamedItemStack(Material.GRAY_STAINED_GLASS_PANE, " "));
+
+        int totalPages = (int) Math.ceil((double) objectives.size() / SPACES_ON_PAGE);
+
+        if (currentPage > 1) {
+            set(GUIClickableItem.getGoBackItem(0, new ResultGUI(resultType, currentPage - 1, targetPlayer, targetTeam, false)));
+        }
+
+        if (currentPage < totalPages) {
+            set(GUIClickableItem.getGoForthItem(8, new ResultGUI(resultType, currentPage + 1, targetPlayer, targetTeam, false)));
+        }
+
+        int startIndex = (currentPage - 1) * SPACES_ON_PAGE;
+        for (int i = 0; i < SPACES_ON_PAGE; i++) {
+            int index = startIndex + i;
+            int slot = 9 + i;
+            if (index >= objectives.size()) break;
+
+            Objective objective = objectives.get(index);
+            set(new GUIItem(slot) {
+                @Override
+                public ItemStack getItem(BattlePlayer player) {
+                    return ResultCommandUtils.buildObjectiveItem(objective, true);
+                }
+            });
+        }
+    }
+
+    private void showResultSummary(BattlePlayer viewer) {
+        switch (resultType) {
+            case PLAYER -> {
+                if (targetPlayer != null) {
+                    viewer.sendMessage(ResultUtils.buildPlayerResultMessage(targetPlayer));
+
+                    viewer.getPlayer().sendTitle(
+                            "§6" + targetPlayer.getName(),
+                            "§eScore: §b" + targetPlayer.getPoints(),
+                            10, 40, 10
+                    );
+                }
+            }
+            case TEAM -> {
+                if (targetTeam != null) {
+                    viewer.sendMessage(ResultUtils.buildTeamResultMessage(targetTeam));
+
+                    viewer.getPlayer().sendTitle(
+                            "§6Team " + targetTeam.getId(),
+                            "§eScore: §b" + targetTeam.getPoints(),
+                            10, 40, 10
+                    );
+                }
+            }
+            case ALL -> {
+                viewer.getPlayer().sendTitle(
+                        "§bAll Results",
+                        "§7Animation complete",
+                        10, 40, 10
+                );
+            }
+        }
+    }
+
+    @Override
+    public boolean allowHotkeying() {
+        return false;
+    }
+
+    public void onClose(BattlePlayer player, InventoryCloseEvent event) {
+        BukkitRunnable task = activeAnimations.remove(player);
+        if (task != null) task.cancel();
+
+        objectiveList.remove(player);
+        playerPageCache.remove(player);
+    }
+
+    private static String generateTitle(ResultType type, BattlePlayer player, Team team, boolean animated) {
+        if (animated) {
+            return Caption.getAsLegacy("gui.result_animated");
+        }
+
+        TagResolver resolver = switch (type) {
+            case PLAYER -> TagResolver.resolver(
+                    Placeholder.parsed("player-name", player != null ? player.getName() : "Unknown")
+            );
+            case TEAM -> TagResolver.resolver(
+                    Placeholder.parsed("team-id", team != null ? String.valueOf(team.getId()) : "N/A")
+            );
+            default -> TagResolver.empty();
+        };
+        return Caption.getAsLegacy(type.getTitleKey(), resolver);
+    }
+
+    @Getter
+    public enum ResultType {
+        ALL("gui.result_title_all"),
+        TEAM("gui.result_title_team"),
+        PLAYER("gui.result_title_player");
+
+        private final String titleKey;
+
+        ResultType(String titleKey) {
+            this.titleKey = titleKey;
+        }
+    }
+
+    public static class ResultCommandUtils {
+
+        public static @NotNull List<Objective> combineTeamObjectives(@NotNull Team team) {
+            List<Objective> objectives = new ArrayList<>();
+            team.getPlayers().forEach(teamPlayer -> objectives.addAll(Objective.finishedBy(teamPlayer)));
+            return objectives;
+        }
+
+        public static @NotNull ItemStack buildObjectiveItem(@NotNull Objective objective, boolean displayNames) {
+            Material material = Material.STONE;
+            Object obj = BukkitUtil.convertObjective(objective.getBattleType(), objective.getObjectiveString());
+
+            if (obj instanceof Material m) material = m;
+            else if (obj instanceof EntityType) material = Material.SPIDER_SPAWN_EGG;
+            else if (obj instanceof Biome || obj instanceof BiomeSimplified) material = Material.GRASS_BLOCK;
+            else if (obj instanceof FBAdvancement) material = Material.BREWING_STAND;
+            else if (obj instanceof Integer) material = Material.SCAFFOLDING;
+            else if (obj instanceof Location) material = Material.DIAMOND_BOOTS;
+            else if (obj instanceof StructureSimplified) material = Material.STRUCTURE_BLOCK;
+
+            List<String> lore = new ArrayList<>();
+            lore.add("");
+            lore.add("§7Time: §9" + StringUtility.formatTime(objective.getTime()));
+
+            if (displayNames)
+                lore.add("§7Player: §9" + objective.getWhoFinished().getName());
+            if (objective.hasBeenSkipped()) {
+                lore.add("");
+                lore.add("§cSKIPPED");
+            }
+
+            String name = "§7" + objective.getBattleType().getPrefix() + ": §9" + StringUtility.formatName(objective.getObjectiveString());
+
+            return ItemStackCreator.getStack(name, material, lore);
+        }
+    }
+}
diff --git a/src/main/java/net/fameless/forcebattle/gui/impl/SettingsGUI.java b/src/main/java/net/fameless/forcebattle/gui/impl/SettingsGUI.java
new file mode 100644
index 0000000..4ac211e
--- /dev/null
+++ b/src/main/java/net/fameless/forcebattle/gui/impl/SettingsGUI.java
@@ -0,0 +1,147 @@
+package net.fameless.forcebattle.gui.impl;
+
+import lombok.Getter;
+import net.fameless.forcebattle.ForceBattle;
+import net.fameless.forcebattle.caption.Caption;
+import net.fameless.forcebattle.configuration.SettingsManager;
+import net.fameless.forcebattle.gui.ForceBattleGUI;
+import net.fameless.forcebattle.gui.GUIClickableItem;
+import net.fameless.forcebattle.player.BattlePlayer;
+import net.fameless.forcebattle.util.ItemStackCreator;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SettingsGUI extends ForceBattleGUI {
+
+    public SettingsGUI() {
+        super(Caption.getAsLegacy("gui.settings_title"), 36);
+    }
+
+    @Getter
+    public enum SettingButton {
+        FORCE_ITEM(0, Material.ITEM_FRAME, SettingsManager.Setting.FORCE_ITEM, true,
+                "gui.force_item_name", "gui.force_item_lore", "notification.force_item_changed"),
+        FORCE_MOB(1, Material.DIAMOND_SWORD, SettingsManager.Setting.FORCE_MOB, true,
+                "gui.force_mob_name", "gui.force_mob_lore", "notification.force_mob_changed"),
+        FORCE_BIOME(2, Material.GRASS_BLOCK, SettingsManager.Setting.FORCE_BIOME, true,
+                "gui.force_biome_name", "gui.force_biome_lore", "notification.force_biome_changed"),
+        FORCE_ADVANCEMENT(3, Material.BREWING_STAND, SettingsManager.Setting.FORCE_ADVANCEMENT, true,
+                "gui.force_advancement_name", "gui.force_advancement_lore", "notification.force_advancement_changed"),
+        FORCE_HEIGHT(4, Material.SCAFFOLDING, SettingsManager.Setting.FORCE_HEIGHT, true,
+                "gui.force_height_name", "gui.force_height_lore", "notification.force_height_changed"),
+        FORCE_COORDS(5, Material.FILLED_MAP, SettingsManager.Setting.FORCE_COORDS, true,
+                "gui.force_coords_name", "gui.force_coords_lore", "notification.force_coords_changed"),
+        FORCE_STRUCTURE(6, Material.STRUCTURE_BLOCK, SettingsManager.Setting.FORCE_STRUCTURE, true,
+                "gui.force_structure_name", "gui.force_structure_lore", "notification.force_structure_changed"),
+
+        CHAIN_MODE(27, Material.CHAIN, SettingsManager.Setting.CHAIN_MODE, false,
+                "gui.chain_mode_name", "gui.chain_mode_lore", "notification.chain_mode_changed"),
+        BACKPACK(28, Material.CHEST, SettingsManager.Setting.BACKPACK, false,
+                ChatColor.BLUE + "Backpacks", "gui.backpack_lore", "notification.backpack_changed"),
+        HIDE_POINTS(29, Material.IRON_TRAPDOOR, SettingsManager.Setting.HIDE_POINTS, false,
+                "gui.hide_points_name", "gui.hide_points_lore", "notification.hide_points_changed"),
+        HIDE_OBJECTIVES(30, Material.DARK_OAK_DOOR, SettingsManager.Setting.HIDE_OBJECTIVES, false,
+                "gui.hide_objectives_name", "gui.hide_objectives_lore", "notification.hide_objectives_changed"),
+        NO_DUPLICATE_OBJECTIVES(31, Material.NAME_TAG, SettingsManager.Setting.NO_DUPLICATE_OBJECTIVES, false,
+                "gui.no_duplicate_objectives_name", "gui.no_duplicate_objectives_lore", "notification.no_duplicate_objectives_changed"),
+        SIMPLIFIED_OBJECTIVES(32, Material.DIRT, SettingsManager.Setting.SIMPLIFIED_OBJECTIVES, false,
+                "gui.simplified_objectives_name", "gui.simplified_objectives_lore", "notification.simplified_objectives_changed"),
+        EXTRA_TEAM_OBJECTIVE(33, Material.ALLAY_SPAWN_EGG, SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE, false,
+                "gui.extra_team_objective_name", "gui.extra_team_objective_lore", "notification.extra_team_objective_changed"),
+
+        RESET(35, Material.BARRIER, null, false, ChatColor.RED + "RESET", null, null);
+
+        private final int slot;
+        private final Material material;
+        private final SettingsManager.Setting setting;
+        private final boolean multiState;
+        private final String name;
+        private final String lore;
+        private final String changedMsg;
+
+        SettingButton(int slot, Material material, SettingsManager.Setting setting, boolean multiState,
+                      String name, String lore, String changedMsg) {
+            this.slot = slot;
+            this.material = material;
+            this.setting = setting;
+            this.multiState = multiState;
+            this.name = name;
+            this.lore = lore;
+            this.changedMsg = changedMsg;
+        }
+
+        public ItemStack createItem() {
+            if (lore != null && setting != null) {
+                String state = SettingsManager.getState(setting).getDisplayName(SettingsManager.isMultiState(setting));
+                Component componentLore = Caption.of(lore, TagResolver.resolver("state", Tag.inserting(Component.text(state))));
+
+                String rawLore = LegacyComponentSerializer.legacySection().serialize(componentLore);
+                List<String> loreLines = new ArrayList<>(List.of(rawLore.split("\n")));
+
+                return ItemStackCreator.getStack(
+                        name.startsWith("gui.") ? Caption.getAsLegacy(name) : name,
+                        material,
+                        1,
+                        loreLines
+                );
+            } else {
+                return ItemStackCreator.createNamedItemStack(material, name.startsWith("gui.") ? Caption.getAsLegacy(name) : name);
+            }
+        }
+
+        public void handleClick(BattlePlayer player) {
+            if (this == RESET) {
+                ForceBattle.getTimer().setRunning(false);
+                ForceBattle.getTimer().setTime(ForceBattle.getTimer().getStartTime());
+                BattlePlayer.BATTLE_PLAYERS.forEach(p -> { if (!p.isOffline()) p.reset(true); });
+                return;
+            }
+
+            if (setting == null) return;
+
+            boolean multi = SettingsManager.isMultiState(setting);
+            SettingsManager.SettingState next = SettingsManager.getState(setting).next(multi);
+            SettingsManager.setState(setting, next);
+
+            ForceBattle.broadcast(Caption.of(changedMsg, TagResolver.resolver(
+                    "state", Tag.inserting(Component.text(SettingsManager.getState(setting)
+                            .getDisplayName(SettingsManager.isMultiState(setting)))))));
+
+            new SettingsGUI().open(player);
+        }
+    }
+
+    @Override
+    public void setItems(BattlePlayer player) {
+        fill(ItemStackCreator.createNamedItemStack(Material.GRAY_STAINED_GLASS_PANE, " "));
+        set(GUIClickableItem.getGoForthItem(8, new ConfigSettingsGUI()));
+
+        for (SettingButton button : SettingButton.values()) {
+            set(new GUIClickableItem(button.getSlot()) {
+                @Override
+                public void run(final InventoryClickEvent event, final BattlePlayer player) {
+                    button.handleClick(player);
+                }
+
+                @Override
+                public ItemStack getItem(BattlePlayer p) {
+                    return button.createItem();
+                }
+            });
+        }
+    }
+
+    @Override
+    public boolean allowHotkeying() {
+        return false;
+    }
+}
diff --git a/src/main/java/net/fameless/forcebattle/player/BattlePlayer.java b/src/main/java/net/fameless/forcebattle/player/BattlePlayer.java
index 0f74f82..22b95cf 100644
--- a/src/main/java/net/fameless/forcebattle/player/BattlePlayer.java
+++ b/src/main/java/net/fameless/forcebattle/player/BattlePlayer.java
@@ -15,7 +15,7 @@
 import net.fameless.forcebattle.game.Team;
 import net.fameless.forcebattle.util.BackpackInventoryHolder;
 import net.fameless.forcebattle.util.BukkitUtil;
-import net.fameless.forcebattle.util.Format;
+import net.fameless.forcebattle.util.StringUtility;
 import net.fameless.forcebattle.util.ItemUtils;
 import net.fameless.forcebattle.util.StructureUtil;
 import net.kyori.adventure.audience.Audience;
@@ -30,7 +30,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.scoreboard.Scoreboard;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -184,6 +183,9 @@ public String getName() {
     }
 
     public Audience getAudience() {
+        if (BukkitUtil.BUKKIT_AUDIENCES == null) {
+            logger.warn("[ForceBattle] Bukkit audiences not initialized!");
+        }
         if (getPlayer() == null) {
             return Audience.empty();
         }
@@ -238,7 +240,7 @@ public void setCurrentObjective(Objective newObjective, boolean finishLast, bool
         if (ForceBattle.getTimer().isRunning() && newObjective != null) {
             sendMessage(Caption.of(
                     "notification.next_objective",
-                    TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(newObjective.getObjectiveString())))),
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(StringUtility.formatName(newObjective.getObjectiveString())))),
                     TagResolver.resolver("objective_type", Tag.inserting(Component.text(newObjective.getBattleType().getPrefix())))
             ));
         }
@@ -320,7 +322,7 @@ public void playSound(Sound sound) {
     }
 
     @Override
-    public boolean hasPermission(@NonNull String permission) {
+    public boolean hasPermission(@NotNull String permission) {
         if (getPlayer() == null) {
             return false;
         }
diff --git a/src/main/java/net/fameless/forcebattle/scoreboard/ScoreboardManager.java b/src/main/java/net/fameless/forcebattle/scoreboard/ScoreboardManager.java
new file mode 100644
index 0000000..7a388b7
--- /dev/null
+++ b/src/main/java/net/fameless/forcebattle/scoreboard/ScoreboardManager.java
@@ -0,0 +1,91 @@
+package net.fameless.forcebattle.scoreboard;
+
+import net.fameless.forcebattle.ForceBattle;
+import net.fameless.forcebattle.game.Team;
+import net.fameless.forcebattle.player.BattlePlayer;
+import net.fameless.forcebattle.util.StringUtility;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.scoreboard.DisplaySlot;
+import org.bukkit.scoreboard.Objective;
+import org.bukkit.scoreboard.Scoreboard;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ScoreboardManager {
+
+    private static final Map<BattlePlayer, Scoreboard> SCOREBOARDS = new HashMap<>();
+
+    public static void startUpdater() {
+        Bukkit.getLogger().info("[ForceBattle] Scoreboard updater started.");
+
+        Bukkit.getScheduler().runTaskTimer(ForceBattle.get(), ScoreboardManager::updateAll, 1L, 1L);
+    }
+
+    public static void updateAll() {
+        for (BattlePlayer battlePlayer : BattlePlayer.getOnlinePlayers()) {
+            if (battlePlayer.isExcluded() || !ForceBattle.getTimer().isRunning()) {
+                removeScoreboard(battlePlayer);
+                continue;
+            }
+            updateScoreboard(battlePlayer);
+        }
+    }
+
+    public static void updateScoreboard(BattlePlayer player) {
+        Scoreboard scoreboard = SCOREBOARDS.computeIfAbsent(player,
+                p -> Bukkit.getScoreboardManager().getNewScoreboard());
+
+        Objective obj = scoreboard.getObjective("fb_info");
+        if (obj == null) {
+            obj = scoreboard.registerNewObjective("fb_info", "dummy",
+                    ChatColor.GOLD + "" + ChatColor.BOLD + "ForceBattle");
+            obj.setDisplaySlot(DisplaySlot.SIDEBAR);
+        }
+
+        scoreboard.getEntries().forEach(scoreboard::resetScores);
+
+        int line = 15;
+
+        var selfObjective = player.getObjective();
+        if (selfObjective != null) {
+            obj.getScore(ChatColor.YELLOW + "Your Objective:").setScore(line--);
+            obj.getScore(ChatColor.WHITE + StringUtility.formatName(selfObjective.getObjectiveString())).setScore(line--);
+        } else {
+            obj.getScore(ChatColor.GRAY + "No current objective").setScore(line--);
+        }
+
+        obj.getScore(" ").setScore(line--);
+
+        if (player.isInTeam()) {
+            Team team = player.getTeam();
+            obj.getScore(ChatColor.AQUA + "Your Team: " + ChatColor.WHITE + team.getId()).setScore(line--);
+
+            for (BattlePlayer teammate : team.getPlayers()) {
+                if (teammate.equals(player)) continue;
+
+                var teammateObjective = teammate.getObjective();
+                String objName = teammateObjective != null
+                        ? StringUtility.formatName(teammateObjective.getObjectiveString())
+                        : "None";
+
+                String display = ChatColor.GRAY + "• " + ChatColor.YELLOW + teammate.getName() +
+                        ChatColor.WHITE + ": " +
+                        (objName.length() > 16 ? objName.substring(0, 13) + "..." : objName);
+
+                obj.getScore(display).setScore(line--);
+            }
+        } else {
+            obj.getScore(ChatColor.GRAY + "Not in a team").setScore(line--);
+        }
+
+        player.getPlayer().setScoreboard(scoreboard);
+    }
+
+    public static void removeScoreboard(BattlePlayer player) {
+        player.getPlayer().setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
+        SCOREBOARDS.remove(player);
+        Bukkit.getLogger().info("[ForceBattle] Removed scoreboard for " + player.getName());
+    }
+}
diff --git a/src/main/java/net/fameless/forcebattle/tablist/TablistManager.java b/src/main/java/net/fameless/forcebattle/tablist/TablistManager.java
index fb9f4b6..f12ecfe 100644
--- a/src/main/java/net/fameless/forcebattle/tablist/TablistManager.java
+++ b/src/main/java/net/fameless/forcebattle/tablist/TablistManager.java
@@ -3,7 +3,7 @@
 import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.player.BattlePlayer;
 import net.fameless.forcebattle.util.BattleType;
-import net.fameless.forcebattle.util.Format;
+import net.fameless.forcebattle.util.StringUtility;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
@@ -67,7 +67,7 @@ public static void updateTablist(Player player) {
     private static String formatPlayerLineString(BattlePlayer player) {
         String name = player.getName();
         String objective = player.getObjective() != null
-                ? Format.formatName(player.getObjective().getObjectiveString())
+                ? StringUtility.formatName(player.getObjective().getObjectiveString())
                 : "None";
 
         String color = "§f"; // white by default
diff --git a/src/main/java/net/fameless/forcebattle/util/BukkitUtil.java b/src/main/java/net/fameless/forcebattle/util/BukkitUtil.java
index 2e02a3a..29b82c5 100644
--- a/src/main/java/net/fameless/forcebattle/util/BukkitUtil.java
+++ b/src/main/java/net/fameless/forcebattle/util/BukkitUtil.java
@@ -1,9 +1,9 @@
 package net.fameless.forcebattle.util;
 
 import net.fameless.forcebattle.ForceBattle;
-import net.fameless.forcebattle.game.data.Advancement;
+import net.fameless.forcebattle.game.data.FBAdvancement;
 import net.fameless.forcebattle.game.data.BiomeSimplified;
-import net.fameless.forcebattle.game.data.Structure;
+import net.fameless.forcebattle.game.data.FBStructure;
 import net.fameless.forcebattle.game.data.StructureSimplified;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.Bukkit;
@@ -83,7 +83,7 @@ public final class BukkitUtil {
 
     private static @Nullable Object tryAdvancement(String value) {
         try {
-            return Advancement.valueOf(value);
+            return FBAdvancement.valueOf(value);
         } catch (IllegalArgumentException e) {
             return null;
         }
@@ -121,7 +121,7 @@ public final class BukkitUtil {
         }
 
         try {
-            return Structure.valueOf(value);
+            return FBStructure.valueOf(value);
         } catch (IllegalArgumentException e) {
             return null;
         }
diff --git a/src/main/java/net/fameless/forcebattle/util/ItemStackCreator.java b/src/main/java/net/fameless/forcebattle/util/ItemStackCreator.java
new file mode 100644
index 0000000..865d0c7
--- /dev/null
+++ b/src/main/java/net/fameless/forcebattle/util/ItemStackCreator.java
@@ -0,0 +1,186 @@
+package net.fameless.forcebattle.util;
+
+import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemFlag;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Utility class for creating {@link ItemStack} objects with various customizations,
+ * including item materials, names, lore, and player skins.
+ */
+public class ItemStackCreator {
+
+    /**
+     * Creates an {@link ItemStack} with a specified material and custom name.
+     *
+     * @param material the material of the item stack
+     * @param name     the custom name of the item stack
+     * @return a new {@link ItemStack} with the specified properties
+     */
+    public static ItemStack createNamedItemStack(Material material, String name) {
+        ItemStack item = new ItemStack(material);
+        ItemMeta meta = item.getItemMeta();
+        if (meta != null) {
+            meta.setDisplayName(color(name));
+            meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_UNBREAKABLE);
+            meta.setUnbreakable(true);
+            item.setItemMeta(meta);
+        }
+        return item;
+    }
+
+    /**
+     * Creates an {@link ItemStack} with a custom name and lore list.
+     *
+     * @param name     the display name
+     * @param material the item material
+     * @param amount   the stack amount
+     * @param lore     a list of lore lines
+     * @return a new {@link ItemStack} with the specified name and lore
+     */
+    public static ItemStack getStack(String name, Material material, int amount, List<String> lore) {
+        ItemStack item = new ItemStack(material, amount);
+        ItemMeta meta = item.getItemMeta();
+        if (meta != null) {
+            meta.setDisplayName(color(name));
+            meta.setLore(lore.stream().map(ItemStackCreator::color).collect(Collectors.toList()));
+            meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_UNBREAKABLE);
+            item.setItemMeta(meta);
+        }
+        return item;
+    }
+
+    /**
+     * Creates an {@link ItemStack} with a custom name and lore list.
+     *
+     * @param name     the display name
+     * @param material the item material
+     * @param lore     a list of lore lines
+     * @return a new {@link ItemStack} with the specified name and lore
+     */
+    public static ItemStack getStack(String name, Material material, List<String> lore) {
+        return getStack(name, material, 1, lore);
+    }
+
+    /**
+     * Creates an {@link ItemStack} with a name and multiple lore lines.
+     *
+     * @param name     the display name
+     * @param material the item material
+     * @param amount   the stack amount
+     * @param lore     one or more lore lines
+     * @return a new {@link ItemStack} with the specified name and lore
+     */
+    public static ItemStack getStack(String name, Material material, int amount, String... lore) {
+        return getStack(name, material, amount, Arrays.asList(lore));
+    }
+
+    /**
+     * Applies an enchantment glint to the given {@link ItemStack}.
+     *
+     * @param item the {@link ItemStack} to modifiy
+     * @return the same {@link ItemStack} with a glint effect
+     */
+    public static ItemStack enchant(ItemStack item) {
+        ItemMeta meta = item.getItemMeta();
+        if (meta != null) {
+            meta.addEnchant(Enchantment.UNBREAKING, 1, true);
+            meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
+            item.setItemMeta(meta);
+        }
+        return item;
+    }
+
+    /**
+     * Creates a textured skull item from a predefined {@link Skull} enum constant.
+     *
+     * @param skull   the {@link Skull} enum value
+     * @param name    the display name
+     * @param amount  the stack amount
+     * @param lore    the lore lines
+     * @return a new {@link ItemStack} representing the skull
+     */
+    public static ItemStack getSkull(Skull skull, String name, int amount, List<String> lore) {
+        ItemStack item = skull.asItemStack().clone();
+        item.setAmount(amount);
+
+        ItemMeta meta = item.getItemMeta();
+        if (meta != null) {
+            meta.setDisplayName(color(name));
+            meta.setLore(lore.stream().map(ItemStackCreator::color).collect(Collectors.toList()));
+            meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_ENCHANTS);
+            item.setItemMeta(meta);
+        }
+        return item;
+    }
+
+    /**
+     * Creates a skull item from a {@link Skull} enum with varargs lore.
+     *
+     * @param skull   the skull type
+     * @param name    the display name
+     * @param amount  the stack amount
+     * @param lore    one or more lore lines
+     * @return a new {@link ItemStack} representing the skull
+     */
+    public static ItemStack getSkull(Skull skull, String name, int amount, String... lore) {
+        return getSkull(skull, name, amount, Arrays.asList(lore));
+    }
+
+    /**
+     * Creates a player head from a player's {@link UUID}.
+     *
+     * @param uuid    the player's unique ID
+     * @param name    the display name
+     * @param amount  the stack amount
+     * @param lore    one or more lore lines
+     * @return a new {@link ItemStack} representing the player's head
+     */
+    public static ItemStack getPlayerSkull(UUID uuid, String name, int amount, String... lore) {
+        ItemStack skull = Skull.PlayerSkulls.getSkullByUUID(uuid);
+        skull.setAmount(amount);
+
+        ItemMeta meta = skull.getItemMeta();
+        if (meta != null) {
+            meta.setDisplayName(color(name));
+            meta.setLore(Arrays.stream(lore).map(ItemStackCreator::color).collect(Collectors.toList()));
+            meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_ENCHANTS);
+            skull.setItemMeta(meta);
+        }
+
+        return skull;
+    }
+
+    /**
+     * Creates an item with a single wrapped lore line split at word boundaries (max 30 characters per line).
+     *
+     * @param name     the display name
+     * @param color    the color prefix for each lore line
+     * @param material the item material
+     * @param amount   the stack amount
+     * @param lore     the long lore text to wrap
+     * @return a new {@link ItemStack} with formatted lore
+     */
+    public static ItemStack getSingleLoreStack(String name, String color, Material material, int amount, String lore) {
+        List<String> loreLines = StringUtility.splitByWordAndLength(lore, 30).stream()
+                .map(line -> color + line)
+                .collect(Collectors.toList());
+        return getStack(name, material, amount, loreLines);
+    }
+
+    /**
+     * Replaces color codes in the given string with Minecraft color codes.
+     *
+     * @param input the input string with color codes
+     * @return the string with color codes replaced
+     */
+    public static String color(String input) {
+        return input == null ? "" : input.replace("&", "§");
+    }
+
+}
diff --git a/src/main/java/net/fameless/forcebattle/util/ItemUtils.java b/src/main/java/net/fameless/forcebattle/util/ItemUtils.java
index 81aadde..dde7caa 100644
--- a/src/main/java/net/fameless/forcebattle/util/ItemUtils.java
+++ b/src/main/java/net/fameless/forcebattle/util/ItemUtils.java
@@ -14,6 +14,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -216,6 +217,11 @@ public ItemBuilder addFlag(ItemFlag flag) {
             return this;
         }
 
+        public ItemBuilder addFlags(ItemFlag... flags) {
+            this.flags.addAll(Arrays.asList(flags));
+            return this;
+        }
+
         public ItemBuilder itemStack(ItemStack itemStack) {
             this.stack = itemStack;
             return this;
@@ -257,7 +263,7 @@ public static class SpecialItems {
 
         public static @NotNull ItemStack getTeamSkipItem(int amount) {
             return createSpecialItem(
-                    Material.NETHER_STAR,
+                    Material.KNOWLEDGE_BOOK,
                     Caption.getAsLegacy("item.team_skip_item_name"),
                     Caption.getAsLegacy("item.team_skip_item_lore"),
                     TEAM_SKIP_KEY,
@@ -295,7 +301,7 @@ public static class SpecialItems {
                             .type(material)
                             .amount(amount)
                             .name(name)
-                            .lore(Format.formatLineBreaks(lore))
+                            .lore(StringUtility.formatLineBreaks(lore))
                             .build(),
                     new ItemData<>(key, PersistentDataType.INTEGER, 1)
             );
diff --git a/src/main/java/net/fameless/forcebattle/util/ResultUtils.java b/src/main/java/net/fameless/forcebattle/util/ResultUtils.java
index 58bbb24..dd73be5 100644
--- a/src/main/java/net/fameless/forcebattle/util/ResultUtils.java
+++ b/src/main/java/net/fameless/forcebattle/util/ResultUtils.java
@@ -18,9 +18,10 @@ public static Component buildPlayerResultMessage(BattlePlayer player) {
                 .append(Component.text(player.getName()).color(NamedTextColor.GOLD))
                 .append(Component.text(" | Place: " + place + " | Points: " + player.getPoints())
                         .color(NamedTextColor.YELLOW))
-                .append(Component.text(" [Open GUI]")
+                .append(Component.text(" [Open Results]")
                         .color(NamedTextColor.GREEN)
-                        .clickEvent(ClickEvent.runCommand("/result player " + player.getName())));
+                        .clickEvent(ClickEvent.runCommand("/result player " + player.getName()))
+                );
     }
 
     public static Component buildTeamResultMessage(Team team) {
@@ -35,7 +36,7 @@ public static Component buildTeamResultMessage(Team team) {
                 .append(Component.text(" [" + players + "] ")).color(NamedTextColor.GRAY)
                 .append(Component.text(" | Place: " + place + " | Points: " + team.getPoints())
                         .color(NamedTextColor.YELLOW))
-                .append(Component.text(" [Open GUI]")
+                .append(Component.text(" [Open Results]")
                         .color(NamedTextColor.GREEN)
                         .clickEvent(ClickEvent.runCommand("/result team " + team.getId())));
     }
diff --git a/src/main/java/net/fameless/forcebattle/util/StringUtil.java b/src/main/java/net/fameless/forcebattle/util/StringUtil.java
deleted file mode 100644
index fedc2e8..0000000
--- a/src/main/java/net/fameless/forcebattle/util/StringUtil.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.fameless.forcebattle.util;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-
-public final class StringUtil {
-
-    private StringUtil() {
-    }
-
-    @NotNull public static <T extends Collection<? super String>> T copyPartialMatches(
-            @NotNull final String token,
-            @NotNull final Iterable<String> originals,
-            @NotNull final T collection
-    ) throws UnsupportedOperationException, IllegalArgumentException {
-        for (String string : originals) {
-            if (startsWithIgnoreCase(string, token)) {
-                collection.add(string);
-            }
-        }
-        return collection;
-    }
-
-    public static boolean startsWithIgnoreCase(@NotNull final String string, @NotNull final String prefix) throws IllegalArgumentException, NullPointerException {
-        if (string.length() < prefix.length()) {
-            return false;
-        }
-        return string.regionMatches(true, 0, prefix, 0, prefix.length());
-    }
-
-}
diff --git a/src/main/java/net/fameless/forcebattle/util/Format.java b/src/main/java/net/fameless/forcebattle/util/StringUtility.java
similarity index 64%
rename from src/main/java/net/fameless/forcebattle/util/Format.java
rename to src/main/java/net/fameless/forcebattle/util/StringUtility.java
index 0029959..02b462e 100644
--- a/src/main/java/net/fameless/forcebattle/util/Format.java
+++ b/src/main/java/net/fameless/forcebattle/util/StringUtility.java
@@ -7,13 +7,12 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
-public final class Format {
-
-    private Format() {
-    }
+public final class StringUtility {
 
     /**
      * Converts a given time in seconds to a human-readable string.
@@ -64,6 +63,25 @@ public static String formatTime(int time) {
         return formatted.toString().trim();
     }
 
+    public static List<String> splitByWordAndLength(String text, int maxLength) {
+        List<String> lines = new ArrayList<>();
+        if (text == null || text.isEmpty()) return lines;
+
+        String[] words = text.split(" ");
+        StringBuilder line = new StringBuilder();
+
+        for (String word : words) {
+            if (line.length() + word.length() > maxLength) {
+                lines.add(line.toString());
+                line = new StringBuilder();
+            }
+            if (!line.isEmpty()) line.append(" ");
+            line.append(word);
+        }
+        if (!line.isEmpty()) lines.add(line.toString());
+        return lines;
+    }
+
     public static @NotNull String applyMiniMessageFormat(String input, TagResolver... replacements) {
         Component miniMessageComponent = MiniMessage.miniMessage().deserialize(input, replacements);
         return LegacyComponentSerializer.legacySection().serialize(miniMessageComponent);
@@ -79,4 +97,24 @@ public static String formatTime(int time) {
         return Arrays.asList(input.split("\n"));
     }
 
+    @NotNull public static <T extends Collection<? super String>> T copyPartialMatches(
+            @NotNull final String token,
+            @NotNull final Iterable<String> originals,
+            @NotNull final T collection
+    ) throws UnsupportedOperationException, IllegalArgumentException {
+        for (String string : originals) {
+            if (startsWithIgnoreCase(string, token)) {
+                collection.add(string);
+            }
+        }
+        return collection;
+    }
+
+    public static boolean startsWithIgnoreCase(@NotNull final String string, @NotNull final String prefix) throws IllegalArgumentException, NullPointerException {
+        if (string.length() < prefix.length()) {
+            return false;
+        }
+        return string.regionMatches(true, 0, prefix, 0, prefix.length());
+    }
+
 }
diff --git a/src/main/java/net/fameless/forcebattle/util/Toast.java b/src/main/java/net/fameless/forcebattle/util/Toast.java
index f6223e2..459144b 100644
--- a/src/main/java/net/fameless/forcebattle/util/Toast.java
+++ b/src/main/java/net/fameless/forcebattle/util/Toast.java
@@ -77,7 +77,9 @@ private void start(@NotNull Collection<Player> players) {
         createAdvancement();
         players.forEach(this::grantAdvancement);
 
-        Bukkit.getScheduler().runTaskLater(main, () -> players.forEach(this::revokeAdvancement), 10);
+        if (SettingsManager.isEnabled(SettingsManager.Setting.FORCE_ADVANCEMENT)) {
+            Bukkit.getScheduler().runTaskLater(main, () -> players.forEach(this::revokeAdvancement), 10);
+        }
     }
 
     private void createAdvancement() {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 30ec363..2969859 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -64,88 +64,80 @@ exclude:
         - SUSPICIOUS_SAND
         - FROGSPAWN
     mobs:
-        - EXPERIENCE_ORB
+        - ACACIA_BOAT
+        - ACACIA_CHEST_BOAT
         - AREA_EFFECT_CLOUD
-        - EGG
-        - LEASH_KNOT
-        - PAINTING
+        - ARMOR_STAND
         - ARROW
-        - SNOWBALL
-        - FIREBALL
-        - SMALL_FIREBALL
+        - BAMBOO_CHEST_RAFT
+        - BAMBOO_RAFT
+        - BIRCH_BOAT
+        - BIRCH_CHEST_BOAT
+        - BLOCK_DISPLAY
+        - BREEZE_WIND_CHARGE
+        - CHERRY_BOAT
+        - CHERRY_CHEST_BOAT
+        - CHEST_MINECART
+        - COMMAND_BLOCK_MINECART
+        - DARK_OAK_BOAT
+        - DARK_OAK_CHEST_BOAT
+        - DRAGON_FIREBALL
+        - EGG
+        - END_CRYSTAL
         - ENDER_PEARL
-        - EYE_OF_ENDER
-        - POTION
+        - EVOKER_FANGS
         - EXPERIENCE_BOTTLE
-        - ITEM_FRAME
-        - WITHER_SKULL
-        - TNT
+        - EXPERIENCE_ORB
+        - EYE_OF_ENDER
         - FALLING_BLOCK
+        - FIREBALL
         - FIREWORK_ROCKET
-        - SPECTRAL_ARROW
-        - SHULKER_BULLET
-        - DRAGON_FIREBALL
-        - ZOMBIE_HORSE
-        - ARMOR_STAND
-        - EVOKER_FANGS
-        - ILLUSIONER
-        - COMMAND_BLOCK_MINECART
-        - MINECART
-        - CHEST_MINECART
+        - FISHING_BOBBER
         - FURNACE_MINECART
-        - TNT_MINECART
-        - HOPPER_MINECART
-        - SPAWNER_MINECART
         - GIANT
-        - LLAMA_SPIT
-        - END_CRYSTAL
-        - TRIDENT
         - GLOW_ITEM_FRAME
-        - MARKER
-        - BLOCK_DISPLAY
+        - HOPPER_MINECART
+        - ILLUSIONER
         - INTERACTION
+        - ITEM
         - ITEM_DISPLAY
-        - TEXT_DISPLAY
-        - WIND_CHARGE
-        - BREEZE_WIND_CHARGE
-        - OMINOUS_ITEM_SPAWNER
-        - ACACIA_BOAT
-        - ACACIA_CHEST_BOAT
-        - BAMBOO_RAFT
-        - BAMBOO_CHEST_RAFT
-        - BIRCH_BOAT
-        - BIRCH_CHEST_BOAT
-        - CHERRY_BOAT
-        - CHERRY_CHEST_BOAT
-        - DARK_OAK_BOAT
-        - DARK_OAK_CHEST_BOAT
+        - ITEM_FRAME
         - JUNGLE_BOAT
         - JUNGLE_CHEST_BOAT
+        - LEASH_KNOT
+        - LIGHTNING_BOLT
+        - LINGERING_POTION
+        - LLAMA_SPIT
         - MANGROVE_BOAT
         - MANGROVE_CHEST_BOAT
+        - MARKER
+        - MINECART
         - OAK_BOAT
         - OAK_CHEST_BOAT
+        - OMINOUS_ITEM_SPAWNER
+        - PAINTING
         - PALE_OAK_BOAT
         - PALE_OAK_CHEST_BOAT
+        - SHULKER_BULLET
+        - SMALL_FIREBALL
+        - SNOWBALL
+        - SPAWNER_MINECART
+        - SPECTRAL_ARROW
+        - SPLASH_POTION
         - SPRUCE_BOAT
         - SPRUCE_CHEST_BOAT
-        - FISHING_BOBBER
-        - LIGHTNING_BOLT
+        - TEXT_DISPLAY
+        - TNT
+        - TNT_MINECART
+        - TRIDENT
         - UNKNOWN
-        - ITEM
+        - WIND_CHARGE
+        - WITHER_SKULL
+        - ZOMBIE_HORSE
     biomes:
         - THE_VOID
 
     # default height range: -63 - 320
     heights:
     advancements:
-
-    # Most unobtainable items are excluded by default
-    # after changing values, you don't have to restart anything or rejoin. Just use /skip <player> if they have an unwanted objective and new items will not contain excluded items
-    exclude_spawn_eggs: true # unobtainable in survival
-    exclude_music_discs: true # obtainable in survival
-    exclude_banner_patterns: true # obtainable in survival
-    exclude_banners: false # obtainable in survival
-    exclude_armor_templates: true # obtainable in survival
-    exclude_pottery_sherds: true # obtainable in survival
-    exclude_ores: true # obtainable in survival (silk touch needed)
+    structures:
diff --git a/src/main/resources/languages/en_US.json b/src/main/resources/languages/en_US.json
index 74ccfd9..daa9f19 100644
--- a/src/main/resources/languages/en_US.json
+++ b/src/main/resources/languages/en_US.json
@@ -9,6 +9,7 @@
   "gui.settings_title" : "Settings",
   "gui.reset_title" : "Reset",
   "gui.language_title" : "Choose a language",
+  "gui.config_settings_title" : "Config Settings",
   "gui.force_item_name" : "<blue>Force Item",
   "gui.force_item_lore" : " <br><gray>Click to toggle ForceItem.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.force_mob_name" : "<blue>Force Mob",
@@ -28,6 +29,7 @@
   "gui.result_title_all" : "Results | All Players",
   "gui.result_title_player" : "Results | <player-name>",
   "gui.result_title_team" : "Results | Team <team-id>",
+  "gui.result_animated" : "Results",
   "gui.backpack_title" : "<player>'s Backpack",
   "gui.backpack_lore" : " <br><gray>Click to toggle Backpacks.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.hide_points_name" : "<blue>Hide Points",
@@ -40,6 +42,20 @@
   "gui.simplified_objectives_lore" : "<br><gray>Click to toggle simplified objectives.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.extra_team_objective_name" : "<blue>Extra Team Objective",
   "gui.extra_team_objective_lore" : "<br><gray>Click to toggle the extra team objective.<br><br><blue>Current Status<dark_gray>: <state>",
+  "gui.exclude_music_discs_name" : "<blue>Exclude Music Discs",
+  "gui.exclude_music_discs_lore" : "<br><gray>Click to toggle excluding Music Discs.<br><br><blue>Current Status<dark_gray>: <state>",
+  "gui.exclude_banner_patterns_name" : "<blue>Exclude Banner Patterns",
+  "gui.exclude_banner_patterns_lore" : "<br><gray>Click to toggle excluding Banner Patterns.<br><br><blue>Current Status<dark_gray>: <state>",
+  "gui.exclude_armor_templates_name" : "<blue>Exclude Armor Templates",
+  "gui.exclude_armor_templates_lore" : "<br><gray>Click to toggle excluding Armor Templates.<br><br><blue>Current Status<dark_gray>: <state>",
+  "gui.exclude_pottery_sherds_name" : "<blue>Exclude Pottery Sherds",
+  "gui.exclude_pottery_sherds_lore" : "<br><gray>Click to toggle excluding Pottery Sherds.<br><br><blue>Current Status<dark_gray>: <state>",
+  "gui.exclude_ores_name" : "<blue>Exclude Ores",
+  "gui.exclude_ores_lore" : "<br><gray>Click to toggle excluding Ores.<br><br><blue>Current Status<dark_gray>: <state>",
+  "gui.exclude_end_items_name" : "<blue>Exclude End Items",
+  "gui.exclude_end_items_lore" : "<br><gray>Click to toggle excluding End Items.<br><br><blue>Current Status<dark_gray>: <state>",
+  "gui.exclude_trial_items_name" : "<blue>Exclude Trial Items",
+  "gui.exclude_trial_items_lore" : "<br><gray>Click to toggle excluding Trial Items.<br><br><blue>Current Status<dark_gray>: <state>",
   "notification.objective_finished" : "<prefix><gray>You finished <blue><objective><gray>.",
   "notification.objective_finished_by_teammate" : "<prefix><gray><player> has finished <blue><objective><gray>.",
   "notification.objective_skipped" : "<prefix><gray>You skipped <blue><objective><gray>.",
@@ -59,6 +75,13 @@
   "notification.no_duplicate_objectives_changed" : "<prefix><blue>No duplicate objectives <gray>has been set to <blue><state>!",
   "notification.simplified_objectives_changed" : "<prefix><blue>Simplified objectives <gray>have been set to <blue><state>!",
   "notification.extra_team_objective_changed" : "<prefix><blue>Extra team objective <gray>has been set to <blue><state>!",
+  "notification.exclude_music_discs_changed" : "<prefix><blue>Exclude Music Discs <gray>has been set to <blue><state>!",
+  "notification.exclude_banner_patterns_changed" : "<prefix><blue>Exclude Banner Patterns <gray>has been set to <blue><state>!",
+  "notification.exclude_armor_templates_changed" : "<prefix><blue>Exclude Armor Templates <gray>has been set to <blue><state>!",
+  "notification.exclude_pottery_sherds_changed" : "<prefix><blue>Exclude Pottery Sherds <gray>has been set to <blue><state>!",
+  "notification.exclude_ores_changed" : "<prefix><blue>Exclude Ores <gray>has been set to <blue><state>!",
+  "notification.exclude_end_items_changed" : "<prefix><blue>Exclude End Items <gray>has been set to <blue><state>!",
+  "notification.exclude_trial_items_changed" : "<prefix><blue>Exclude Trial Items <gray>has been set to <blue><state>!",
   "notification.team_registered" : "<prefix><gray>New team has been created. Team ID: <team-id>",
   "notification.team_join_request" : "<prefix><blue><player> <gray>has requested to join your team. /team accept|reject.",
   "notification.join_request_sent" : "<prefix><green>A join request has been sent.",
@@ -71,7 +94,7 @@
   "notification.skip_no_objective" : "<prefix><red>You don't have an objective to skip.",
   "notification.swap_timer_paused" : "<prefix><red>Can't swap while timer is paused.",
   "notification.swap_no_objective" : "<prefix><red>You don't have an objective to swap.",
-  "notification.swap_no_player" : "<prefix><red>No player to swap your objective with.",
+  "notification.swap_no_player" : "<prefix><red>There is no player to swap your objective with.",
   "notification.swap_success_target" : "<prefix><blue><player> <gray>swapped their objective with yours.",
   "notification.swap_success_player" : "<prefix><gray>Your objective has been swapped with <blue><target><gray>.",
   "notification.skip_by_admin_target" : "<prefix><green>Your objective has been skipped by an admin.",
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 202c977..d6fb9a2 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -22,6 +22,7 @@ commands:
     result:
     settings:
         aliases: [ menu ]
+    configsettings:
     skip:
     team:
     timer: