added removal of forbidden items in containers

# Conflicts:
#	core/src/main/java/eu/mhsl/craftattack/core/appliance/Appliance.java

.gitignore

@@ -118,3 +118,5 @@ run/
 !gradle-wrapper.jar
 /gradlew
 /gradlew.bat
+
+local.gradle

build.gradle

@@ -1,10 +1,11 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'java'
+    id 'com.gradleup.shadow' version "8.3.5"
 }
 
-group = 'eu.mhsl.craftattack'
+allprojects {
-version = '1.0'
+    group = 'de.mhsl.craftattack'
+    version = '1.0.0'
 
     repositories {
         mavenCentral()
@@ -20,29 +21,17 @@ repositories {
             url = uri("https://repo.opencollab.dev/main/")
         }
     }
-
-dependencies {
-    compileOnly 'io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT'
-    compileOnly 'org.geysermc.floodgate:api:2.2.2-SNAPSHOT'
-    implementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    implementation 'com.sparkjava:spark-core:2.9.4'
-    implementation 'org.reflections:reflections:0.10.2'
 }
 
-def targetJavaVersion = 21
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'com.gradleup.shadow'
+
     java {
-    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
+        toolchain {
-    sourceCompatibility = javaVersion
+            languageVersion = JavaLanguageVersion.of(21)
-    targetCompatibility = javaVersion
-    if (JavaVersion.current() < javaVersion) {
-        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
         }
     }
-
-tasks.withType(JavaCompile).configureEach {
-    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-        options.release = targetJavaVersion
-    }
 }
 
 configurations {
@@ -51,18 +40,14 @@ configurations {
 
 shadowJar {
     configurations = [project.configurations.shadowImplementation]
+    archiveClassifier.set('')
+
+    relocate 'org.apache.httpcomponents', 'eu.mhsl.lib.shadow.httpclient'
+    relocate 'com.sparkjava', 'eu.mhsl.lib.shadow.spark-core'
+
+    mergeServiceFiles()
 }
 
-tasks.register('copyJarToServer', Exec) {
+if (file("local.gradle").exists()) {
-    dependsOn shadowJar
+    apply from: "local.gradle"
-    mustRunAfter shadowJar
-
-    commandLine 'scp', 'build/libs/spawn-1.0-all.jar', 'root@10.20.6.1:/home/minecraft/server/plugins'
-}
-
-tasks.register('copyJarToTestServer', Exec) {
-    dependsOn shadowJar
-    mustRunAfter shadowJar
-
-    commandLine 'cp', 'build/libs/spawn-1.0-all.jar', '/home/elias/Dokumente/mcTestServer/plugins/spawn-1.0-all.jar'
 }

common/build.gradle

@@ -0,0 +1,6 @@
+dependencies {
+    implementation project(':core')
+
+    compileOnly 'io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT'
+    compileOnly 'org.geysermc.floodgate:api:2.2.2-SNAPSHOT'
+}

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/internal/debug/Debug.java

@@ -0,0 +1,20 @@
+package eu.mhsl.craftattack.spawn.common.appliances.internal.debug;
+
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.internal.debug.command.AppliancesCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.internal.debug.command.UserInfoCommand;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class Debug extends Appliance {
+    @Override
+    @NotNull
+    protected List<ApplianceCommand<?>> commands() {
+        return List.of(
+            new UserInfoCommand(),
+            new AppliancesCommand()
+        );
+    }
+}

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/internal/debug/command/AppliancesCommand.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.internal.debug.command;
+package eu.mhsl.craftattack.spawn.common.appliances.internal.debug.command;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.internal.debug.Debug;
+import eu.mhsl.craftattack.spawn.common.appliances.internal.debug.Debug;
-import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import eu.mhsl.craftattack.core.util.text.ComponentUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentBuilder;
 import net.kyori.adventure.text.TextComponent;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/internal/debug/command/UserInfoCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.internal.debug.command;
+package eu.mhsl.craftattack.spawn.common.appliances.internal.debug.command;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.internal.debug.Debug;
+import eu.mhsl.craftattack.spawn.common.appliances.internal.debug.Debug;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/internal/titleClear/TitleClear.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.internal.titleClear;
+package eu.mhsl.craftattack.spawn.common.appliances.internal.titleClear;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/internal/titleClear/TitleClearListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.internal.titleClear;
+package eu.mhsl.craftattack.spawn.common.appliances.internal.titleClear;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;
 

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/chatMention/ChatMention.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMention;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMention;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.sound.Sound;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/chatMention/ChatMentionListener.java

@@ -1,10 +1,10 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMention;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMention;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages.ChatMessages;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMessages.ChatMessages;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import eu.mhsl.craftattack.core.util.text.ComponentUtil;
 import io.papermc.paper.event.player.AsyncChatDecorateEvent;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/chatMention/ChatMentionSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMention;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMention;
 
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.MultiBoolSetting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes.MultiBoolSetting;
 import org.bukkit.Material;
 
 public class ChatMentionSetting extends MultiBoolSetting<ChatMentionSetting.ChatMentionConfig> implements CategorizedSetting {

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/chatMessages/ChatMessages.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMessages;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/chatMessages/ChatMessagesListener.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMessages;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.util.IteratorUtil;
+import eu.mhsl.craftattack.core.util.IteratorUtil;
 import io.papermc.paper.event.player.AsyncChatEvent;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/chatMessages/ShowJoinAndLeaveMessagesSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMessages;
 
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes.BoolSetting;
 import org.bukkit.Material;
 
 public class ShowJoinAndLeaveMessagesSetting extends BoolSetting implements CategorizedSetting {

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/displayName/DisplayName.java

@@ -1,14 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.displayName;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed.Outlawed;
+import eu.mhsl.craftattack.core.util.server.Floodgate;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.adminMarker.AdminMarker;
+import eu.mhsl.craftattack.core.util.text.ComponentUtil;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.afkTag.AfkTag;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.sleepTag.SleepTag;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.yearRank.YearRank;
-import eu.mhsl.craftattack.spawn.util.server.Floodgate;
-import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentBuilder;
 import net.kyori.adventure.text.TextComponent;
@@ -16,11 +11,12 @@ import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Supplier;
 import java.util.logging.Level;
 
 public class DisplayName extends Appliance {
@@ -29,18 +25,33 @@ public class DisplayName extends Appliance {
         Component getNamePrefix(Player player);
     }
 
+    public interface Colored {
+        @Nullable
+        TextColor getNameColor(Player player);
+    }
+
     public void update(Player player) {
-        TextColor playerColor = this.queryAppliance(AdminMarker.class).getPlayerColor(player);
+        List<Colored> coloring = Main.instance().getAppliances().stream()
-        List<Supplier<Prefixed>> prefixes = List.of(
+            .filter(appliance -> appliance instanceof Colored)
-            () -> this.queryAppliance(Outlawed.class),
+            .map(appliance -> (Colored) appliance)
-            () -> this.queryAppliance(YearRank.class),
+            .toList();
-            () -> this.queryAppliance(AfkTag.class),
+
-            () -> this.queryAppliance(SleepTag.class)
+        if(coloring.size() > 1) throw new IllegalStateException(
+            "There are two or more appliances which provide coloring for player names. This is currently not supported!"
         );
 
+        TextColor playerColor = coloring.isEmpty()
+            ? NamedTextColor.WHITE
+            : coloring.getFirst().getNameColor(player);
+
+        List<Prefixed> prefixes = Main.instance().getAppliances().stream()
+            .filter(appliance -> appliance instanceof Prefixed)
+            .map(appliance -> (Prefixed) appliance)
+            .toList();
+
         ComponentBuilder<TextComponent, TextComponent.Builder> playerName = Component.text();
         prefixes.stream()
-            .map(prefixed -> prefixed.get().getNamePrefix(player))
+            .map(prefixed -> prefixed.getNamePrefix(player))
             .filter(Objects::nonNull)
             .forEach(prefix -> playerName
                 .append(prefix)
@@ -72,4 +83,9 @@ public class DisplayName extends Appliance {
             Main.instance().getLogger().log(Level.SEVERE, e, e::getMessage);
         }
     }
+
+    @Override
+    protected @NotNull List<Listener> listeners() {
+        return List.of(new DisplayNameUpdateListener());
+    }
 }

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.displayName;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerJoinEvent;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/help/Help.java

@@ -0,0 +1,28 @@
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help;
+
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.command.DiscordCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.command.HelpCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.command.SpawnCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.command.TeamspeakCommand;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class Help extends Appliance {
+    public Help() {
+        super("help");
+    }
+
+    @Override
+    @NotNull
+    protected List<ApplianceCommand<?>> commands() {
+        return List.of(
+            new HelpCommand(),
+            new SpawnCommand(),
+            new TeamspeakCommand(),
+            new DiscordCommand()
+        );
+    }
+}

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/help/command/DiscordCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.command;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.Help;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/help/command/HelpCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.command;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.Help;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/help/command/SpawnCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.command;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.Help;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/help/command/TeamspeakCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.command;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.help.Help;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/infoBars/Bar.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.util.Ticks;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/infoBars/InfoBarCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/infoBars/InfoBars.java

@@ -1,11 +1,11 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.MsptBar;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.bars.MsptBar;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.PlayerCounterBar;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.bars.PlayerCounterBar;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.TpsBar;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.bars.TpsBar;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/infoBars/ShowPreviousBarsListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;
 

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/infoBars/bars/MsptBar.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.bars;
 
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.Bar;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.Bar;
-import eu.mhsl.craftattack.spawn.util.statistics.ServerMonitor;
+import eu.mhsl.craftattack.core.util.statistics.ServerMonitor;
-import eu.mhsl.craftattack.spawn.util.text.ColorUtil;
+import eu.mhsl.craftattack.core.util.text.ColorUtil;
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/infoBars/bars/PlayerCounterBar.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.bars;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.Bar;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.Bar;
-import eu.mhsl.craftattack.spawn.appliances.tooling.playerlimit.PlayerLimit;
+import eu.mhsl.craftattack.spawn.common.appliances.tooling.playerlimit.PlayerLimit;
-import eu.mhsl.craftattack.spawn.util.text.ColorUtil;
+import eu.mhsl.craftattack.core.util.text.ColorUtil;
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/infoBars/bars/TpsBar.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.bars;
 
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.Bar;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.Bar;
-import eu.mhsl.craftattack.spawn.util.text.ColorUtil;
+import eu.mhsl.craftattack.core.util.text.ColorUtil;
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/privateMessage/PrivateMessage.java

@@ -1,11 +1,11 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.privateMessage;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages.ChatMessages;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMessages.ChatMessages;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.commands.PrivateMessageCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.privateMessage.commands.PrivateMessageCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.commands.PrivateReplyCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.privateMessage.commands.PrivateReplyCommand;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentBuilder;
 import net.kyori.adventure.text.TextComponent;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/privateMessage/commands/PrivateMessageCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.commands;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.privateMessage.commands;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.PrivateMessage;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.privateMessage.PrivateMessage;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/privateMessage/commands/PrivateReplyCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.commands;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.privateMessage.commands;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.PrivateMessage;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.privateMessage.PrivateMessage;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/Report.java

@@ -1,10 +1,10 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.report;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.report;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.core.api.client.ReqResp;
-import eu.mhsl.craftattack.spawn.api.client.repositories.ReportRepository;
+import eu.mhsl.craftattack.core.api.client.repositories.ReportRepository;
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentBuilder;
 import net.kyori.adventure.text.TextComponent;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/ReportCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.report;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.report;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import eu.mhsl.craftattack.core.util.text.ComponentUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/ReportsCommand.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.report;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.report;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import eu.mhsl.craftattack.core.util.text.ComponentUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/CategorizedSetting.java

@@ -0,0 +1,5 @@
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings;
+
+public interface CategorizedSetting {
+    SettingCategory category();
+}

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/SettingCategory.java

@@ -0,0 +1,7 @@
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings;
+
+public enum SettingCategory {
+    Gameplay,
+    Visuals,
+    Misc,
+}

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/Settings.java

@@ -1,11 +1,11 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.Setting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes.Setting;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.listeners.OpenSettingsShortcutListener;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.listeners.OpenSettingsShortcutListener;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.listeners.SettingsInventoryListener;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.listeners.SettingsInventoryListener;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -33,6 +33,7 @@ public class Settings extends Appliance {
         ChatMentions,
         DoubleDoors,
         KnockDoors,
+        BorderWarning
     }
 
     public static Settings instance() {
@@ -107,6 +108,9 @@ public class Settings extends Appliance {
                     .filter(setting -> ((CategorizedSetting) setting).category().equals(category))
                     .toList();
 
+                //skip empty category rows
+                if(categorizedSettings.isEmpty()) return;
+
                 for(int i = 0; i < categorizedSettings.size(); i++) {
                     int slot = row.get() * 9 + i % 9;
                     inventory.setItem(slot, categorizedSettings.get(i).buildItem());
@@ -139,17 +143,23 @@ public class Settings extends Appliance {
         int countOfUncategorized = (int) settings.stream()
             .filter(setting -> !(setting instanceof CategorizedSetting))
             .count();
+        int invSizeForUncategorized = (int) Math.ceil((double) countOfUncategorized / 9) * 9;
 
-        return Arrays.stream(SettingCategory.values())
+        int invSizeForCategorized = Arrays.stream(SettingCategory.values())
             .map(settingCategory -> settings.stream()
                 .filter(setting -> setting instanceof CategorizedSetting)
                 .map(setting -> (CategorizedSetting) setting)
                 .filter(categorizedSetting -> categorizedSetting.category().equals(settingCategory))
                 .count())
-            .map(itemCount -> itemCount + countOfUncategorized)
             .map(itemCount -> (int) Math.ceil((double) itemCount / 9))
             .reduce(Integer::sum)
             .orElse(1) * 9;
+
+        int invSize = invSizeForUncategorized + invSizeForCategorized;
+        if(invSize % 9 != 0) throw new IllegalStateException(
+            String.format("Failed to calculate settings inventory size. %d is not an multiple of 9", invSize)
+        );
+        return invSize;
     }
 
     public void onSettingsClose(Player player) {

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/SettingsCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/SettingsShortcutSetting.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings;
 
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes.BoolSetting;
 import org.bukkit.Material;
 
 public class SettingsShortcutSetting extends BoolSetting implements CategorizedSetting {

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/datatypes/ActionSetting.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/datatypes/BoolSetting.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes;
 
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.entity.Player;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/datatypes/IntegerSetting.java

@@ -0,0 +1,103 @@
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes;
+
+import com.google.gson.Gson;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+public abstract class IntegerSetting extends Setting<Integer> {
+    private final List<Integer> options;
+
+    public IntegerSetting(Settings.Key key, int minimum, int maximum) {
+        this(key, IntStream.range(minimum, maximum+1).boxed().toList());
+    }
+
+    public IntegerSetting(Settings.Key key, List<Integer> options) {
+        super(key);
+        this.options = options;
+    }
+
+    @Override
+    public ItemMeta buildMeta(ItemMeta meta) {
+        Component componentBefore = Component.text("  " + this.fillWithSpaces(this.options.getLast()));
+        Component componentAfter = Component.text("  " + this.fillWithSpaces(this.options.getFirst()));
+        int listIndex = this.options.indexOf(this.state);
+        if(listIndex > 0) componentBefore = Component.text("  " + this.fillWithSpaces(this.options.get(listIndex-1)));
+        if(listIndex < this.options.size()-1) componentAfter = Component.text("  " + this.fillWithSpaces(this.options.get(listIndex+1)));
+
+        meta.displayName(Component.text(this.title(), NamedTextColor.WHITE));
+        List<Component> lore = new ArrayList<>(Stream.of(
+            Component.empty()
+                .append(Component.text("Wert: ", NamedTextColor.DARK_GRAY)),
+            Component.empty()
+                .append(componentBefore.color(NamedTextColor.DARK_GRAY))
+                .append(Component.text("  " + this.fillWithSpaces(this.state), NamedTextColor.GREEN))
+                .append(componentAfter.color(NamedTextColor.DARK_GRAY)),
+            Component.empty()
+        ).toList());
+        lore.addAll(this.buildDescription(this.description()));
+        meta.lore(lore);
+        return meta;
+    }
+
+    private String fillWithSpaces(Integer option) {
+        String optionString = option.toString();
+        int optionLength = optionString.length();
+        int maxInteger = this.options.stream().mapToInt(value -> value).max().orElse(0);
+        int maxLength = String.valueOf(maxInteger).length();
+        int padding = maxLength - optionLength;
+
+        int padEnd = padding / 2;
+        int padStart = padding - padEnd;
+
+        optionString = " ".repeat(padStart) + optionString + " ".repeat(padEnd);
+        return optionString;
+    }
+
+    @Override
+    protected void change(Player player, ClickType clickType) {
+        int elementBefore = this.options.getLast();
+        int elementAfter = this.options.getFirst();
+        int listIndex = this.options.indexOf(this.state);
+        if(listIndex > 0) elementBefore = this.options.get(listIndex-1);
+        if(listIndex < this.options.size()-1) elementAfter = this.options.get(listIndex+1);
+
+        if(clickType.equals(ClickType.LEFT)) this.state = elementBefore;
+        if(clickType.equals(ClickType.RIGHT)) this.state = elementAfter;
+    }
+
+    @Override
+    protected void fromStorage(PersistentDataContainer container) {
+        this.state = container.has(this.getNamespacedKey())
+            ? Integer.valueOf(Objects.requireNonNull(container.get(this.getNamespacedKey(), PersistentDataType.STRING)))
+            : this.defaultValue();
+
+        if(!this.options.contains(this.state)) this.state = this.defaultValue();
+    }
+
+    @Override
+    protected void toStorage(PersistentDataContainer container, Integer value) {
+        container.set(this.getNamespacedKey(), PersistentDataType.STRING, new Gson().toJson(value));
+    }
+
+    @Override
+    public Class<?> dataType() {
+        return Integer.class;
+    }
+
+    @Override
+    public Integer state() {
+        return this.state;
+    }
+}

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/datatypes/MultiBoolSetting.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes;
 
 import com.google.gson.Gson;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.entity.Player;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/datatypes/SelectSetting.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes;
 
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/datatypes/Setting.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import eu.mhsl.craftattack.core.util.text.ComponentUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -17,7 +17,7 @@ import org.bukkit.persistence.PersistentDataContainer;
 import java.util.List;
 
 public abstract class Setting<TDataType> {
-    TDataType state;
+    protected TDataType state;
     private final Settings.Key key;
 
     public Setting(Settings.Key key) {

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/listeners/OpenSettingsShortcutListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.listeners;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.listeners;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/settings/listeners/SettingsInventoryListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.listeners;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.listeners;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.inventory.InventoryClickEvent;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/Tablist.java

@@ -1,13 +1,13 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.tablist;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.tablist;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.report.Report;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.report.Report;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.util.IteratorUtil;
+import eu.mhsl.craftattack.core.util.IteratorUtil;
-import eu.mhsl.craftattack.spawn.util.statistics.NetworkMonitor;
+import eu.mhsl.craftattack.core.util.statistics.NetworkMonitor;
-import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import eu.mhsl.craftattack.core.util.text.ComponentUtil;
-import eu.mhsl.craftattack.spawn.util.text.RainbowComponent;
+import eu.mhsl.craftattack.core.util.text.RainbowComponent;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.util.Ticks;
@@ -23,7 +23,8 @@ import java.util.List;
 
 
 public class Tablist extends Appliance {
-    private final RainbowComponent serverName = new RainbowComponent(" CraftAttack 7 ", 7, 3);
+    private final String projectTitle = this.localConfig().getString("projectTitle", "Title not configured");
+    private final RainbowComponent serverName = new RainbowComponent(String.format(" %s ", this.projectTitle), 7, 3);
     private NetworkMonitor networkMonitor;
     private OperatingSystemMXBean systemMonitor;
 

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/TablistListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.tablist;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.tablist;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;
 

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/TechnicalTablistSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.metaGameplay.tablist;
+package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.tablist;
 
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes.BoolSetting;
 import org.bukkit.Material;
 
 public class TechnicalTablistSetting extends BoolSetting implements CategorizedSetting {

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/acInform/AcInform.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.acInform;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.acInform;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentBuilder;
 import net.kyori.adventure.text.TextComponent;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/acInform/AcInformCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.acInform;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.acInform;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/adminChat/AdminChat.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.adminChat;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.adminChat;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/adminChat/AdminChatCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.adminChat;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.adminChat;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/chatMute/ChatMute.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.chatMute;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.chatMute;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/chatMute/ChatMuteListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.chatMute;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.chatMute;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.util.text.DataSizeConverter;
+import eu.mhsl.craftattack.core.util.text.DataSizeConverter;
 import io.papermc.paper.event.player.AsyncChatEvent;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/chatMute/MuteCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.chatMute;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.chatMute;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/endPrevent/EndPrevent.java

@@ -0,0 +1,63 @@
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.endPrevent;
+
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.config.Configuration;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.event.Listener;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class EndPrevent extends Appliance {
+    private final String endPreventKey = "endPrevent";
+    private State endPreventState;
+    private final World endWorld = Bukkit.getWorlds().stream().filter(world -> world.getEnvironment().equals(World.Environment.THE_END)).findFirst().orElseThrow();
+
+    public enum State {
+        OPEN,
+        CLOSED,
+        NO_OUTER
+    }
+
+    public EndPrevent() {
+        super("endPrevent");
+        this.endPreventState = State.valueOf(this.localConfig().getString(this.endPreventKey, State.OPEN.name()));
+        this.updateEndBorder();
+    }
+
+    private void updateEndBorder() {
+        if(this.endPreventState == State.NO_OUTER) this.endWorld.getWorldBorder().setSize(500);
+        if(this.endPreventState == State.OPEN) this.endWorld.getWorldBorder().setSize(this.endWorld.getWorldBorder().getMaxSize());
+    }
+
+    public void setEndState(State state) {
+        this.localConfig().set(this.endPreventKey, state.name());
+        Configuration.saveChanges();
+        this.endPreventState = state;
+        this.updateEndBorder();
+    }
+
+    public boolean isEndClosed() {
+        return this.endPreventState.equals(State.CLOSED);
+    }
+
+    public boolean isOnlyInner() {
+        return this.endPreventState.equals(State.NO_OUTER);
+    }
+
+    public State getEndPreventState() {
+        return this.endPreventState;
+    }
+
+    @Override
+    protected @NotNull List<Listener> listeners() {
+        return List.of(new EndPreventListener());
+    }
+
+    @Override
+    protected @NotNull List<ApplianceCommand<?>> commands() {
+        return List.of(new EndPreventCommand());
+    }
+}

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/endPrevent/EndPreventCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.endPrevent;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.endPrevent;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;
@@ -12,7 +12,11 @@ import java.util.List;
 import java.util.Map;
 
 class EndPreventCommand extends ApplianceCommand<EndPrevent> {
-    private final Map<String, Boolean> arguments = Map.of("preventEnd", true, "allowEnd", false);
+    private final Map<String, EndPrevent.State> arguments = Map.of(
+        "preventEnd", EndPrevent.State.CLOSED,
+        "allowEnd", EndPrevent.State.OPEN,
+        "onlyInnerEnd", EndPrevent.State.NO_OUTER
+    );
 
     public EndPreventCommand() {
         super("endPrevent");
@@ -21,11 +25,11 @@ class EndPreventCommand extends ApplianceCommand<EndPrevent> {
     @Override
     protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception {
         if(args.length == 1 && this.arguments.containsKey(args[0])) {
-            this.getAppliance().setEndDisabled(this.arguments.get(args[0]));
+            this.getAppliance().setEndState(this.arguments.get(args[0]));
             sender.sendMessage(Component.text("Setting updated!", NamedTextColor.GREEN));
         }
         sender.sendMessage(Component.text(
-            String.format("The End is %s!", this.getAppliance().isEndDisabled() ? "closed" : "open"),
+            String.format("The End is now on '%s'!", this.getAppliance().getEndPreventState().name()),
             NamedTextColor.GOLD
         ));
     }

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/endPrevent/EndPreventListener.java

@@ -0,0 +1,49 @@
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.endPrevent;
+
+import com.destroystokyo.paper.event.player.PlayerTeleportEndGatewayEvent;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerPortalEvent;
+
+class EndPreventListener extends ApplianceListener<EndPrevent> {
+    @EventHandler
+    public void onEnderEyeInteraction(PlayerInteractEvent event) {
+        if(event.getClickedBlock() == null) return;
+        if(!event.getClickedBlock().getType().equals(Material.END_PORTAL_FRAME)) return;
+        if(event.getItem() == null) return;
+        if(!event.getItem().getType().equals(Material.ENDER_EYE)) return;
+
+        this.cancelIfClosed(event, event.getPlayer());
+    }
+
+    @EventHandler
+    public void onPlayerPortal(PlayerPortalEvent event) {
+        if(!event.getTo().getWorld().getEnvironment().equals(World.Environment.THE_END)) return;
+
+        this.cancelIfClosed(event, event.getPlayer());
+    }
+
+    @EventHandler
+    public void onPlayerEndGateway(PlayerTeleportEndGatewayEvent event) {
+        this.cancelIfOnlyInner(event, event.getPlayer());
+    }
+
+    private void cancelIfClosed(Cancellable event, Player p) {
+        if(!this.getAppliance().isEndClosed()) return;
+        event.setCancelled(true);
+        p.sendActionBar(Component.text("Das End ist nicht freigeschaltet!", NamedTextColor.RED));
+    }
+
+    private void cancelIfOnlyInner(Cancellable event, Player p) {
+        if(!this.getAppliance().isOnlyInner()) return;
+        event.setCancelled(true);
+        p.sendActionBar(Component.text("Das Outer End ist nicht freigeschaltet!", NamedTextColor.RED));
+    }
+}

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/kick/Kick.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.kick;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.kick;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo;
+import eu.mhsl.craftattack.core.util.text.DisconnectInfo;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/kick/KickCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.kick;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.kick;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/maintenance/Maintenance.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.maintenance;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.maintenance;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.config.Configuration;
+import eu.mhsl.craftattack.core.config.Configuration;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
 

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/maintenance/MaintenanceCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.maintenance;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.maintenance;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/maintenance/PreventMaintenanceJoinListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.maintenance;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.maintenance;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo;
+import eu.mhsl.craftattack.core.util.text.DisconnectInfo;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerLoginEvent;
 

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/panicBan/PanicBan.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.panicBan;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.panicBan;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo;
+import eu.mhsl.craftattack.core.util.text.DisconnectInfo;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/panicBan/PanicBanCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.panicBan;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.panicBan;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/panicBan/PanicBanJoinListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.panicBan;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.panicBan;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/playerlimit/PlayerLimit.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.playerlimit;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.playerlimit;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.config.Configuration;
+import eu.mhsl.craftattack.core.config.Configuration;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/playerlimit/PlayerLimiterListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.playerlimit;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.playerlimit;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo;
+import eu.mhsl.craftattack.core.util.text.DisconnectInfo;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/playerlimit/SetPlayerLimitCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.playerlimit;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.playerlimit;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/restart/CancelRestartCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.restart;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.restart;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/restart/Restart.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.restart;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.restart;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.util.IteratorUtil;
+import eu.mhsl.craftattack.core.util.IteratorUtil;
-import eu.mhsl.craftattack.spawn.util.text.Countdown;
+import eu.mhsl.craftattack.core.util.text.Countdown;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/restart/ScheduleRestartCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.restart;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.restart;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/spawnpoint/SetSpawnpointCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.spawnpoint;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.spawnpoint;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/spawnpoint/SpawnAtSpawnpointListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.spawnpoint;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.spawnpoint;
 
-import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/spawnpoint/Spawnpoint.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.spawnpoint;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.spawnpoint;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;

core/build.gradle

@@ -0,0 +1,7 @@
+dependencies {
+    compileOnly 'io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT'
+    compileOnly 'org.geysermc.floodgate:api:2.2.2-SNAPSHOT'
+    implementation 'org.apache.httpcomponents:httpclient:4.5.14'
+    implementation 'com.sparkjava:spark-core:2.9.4'
+    implementation 'org.reflections:reflections:0.10.2'
+}

core/src/main/java/eu/mhsl/craftattack/core/Main.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn;
+package eu.mhsl.craftattack.core;
 
-import eu.mhsl.craftattack.spawn.api.client.RepositoryLoader;
+import eu.mhsl.craftattack.core.api.client.RepositoryLoader;
-import eu.mhsl.craftattack.spawn.api.server.HttpServer;
+import eu.mhsl.craftattack.core.api.server.HttpServer;
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.config.Configuration;
+import eu.mhsl.craftattack.core.config.Configuration;
 import org.bukkit.Bukkit;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -21,6 +21,7 @@ public final class Main extends JavaPlugin {
 
     private List<Appliance> appliances;
     private RepositoryLoader repositoryLoader;
+    private Reflections reflections;
 
     @Override
     public void onEnable() {
@@ -39,15 +40,15 @@ public final class Main extends JavaPlugin {
         Configuration.readConfig();
         List<String> disabledAppliances = Configuration.pluginConfig.getStringList("disabledAppliances");
 
+        Main.logger().info("Initializing reflections...");
+        this.reflections = new Reflections("eu.mhsl.craftattack.spawn");
+
         Main.logger().info("Loading Repositories...");
         this.repositoryLoader = new RepositoryLoader();
         Main.logger().info(String.format("Loaded %d repositories!", this.repositoryLoader.getRepositories().size()));
 
         Main.logger().info("Loading appliances...");
-        Reflections reflections = new Reflections(this.getClass().getPackageName());
+        this.appliances = this.findSubtypesOf(Appliance.class).stream()
-        Set<Class<? extends Appliance>> applianceClasses = reflections.getSubTypesOf(Appliance.class);
-
-        this.appliances = applianceClasses.stream()
             .filter(applianceClass -> !disabledAppliances.contains(applianceClass.getSimpleName()))
             .map(applianceClass -> {
                 try {
@@ -66,8 +67,10 @@ public final class Main extends JavaPlugin {
         });
         Main.logger().info(String.format("Initialized %d appliances!", this.appliances.size()));
 
+        if(Configuration.pluginConfig.getBoolean("httpServerEnabled", true)) {
             Main.logger().info("Starting HTTP API...");
             new HttpServer();
+        }
 
         this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
         Main.logger().info("Startup complete!");
@@ -95,6 +98,10 @@ public final class Main extends JavaPlugin {
             .orElseThrow(() -> new RuntimeException(String.format("Appliance %s not loaded or instantiated!", clazz)));
     }
 
+    public <T> Set<Class<? extends T>> findSubtypesOf(Class<T> type) {
+        return this.reflections.getSubTypesOf(type);
+    }
+
     @SuppressWarnings("unchecked")
     public static <T> Class<T> getApplianceType(Class<?> clazz) {
         return (Class<T>) ((ParameterizedType) clazz.getGenericSuperclass()).getActualTypeArguments()[0];

core/src/main/java/eu/mhsl/craftattack/core/api/client/HttpRepository.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.api.client;
+package eu.mhsl.craftattack.core.api.client;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
 import org.apache.http.client.utils.URIBuilder;
 import org.jetbrains.annotations.Nullable;
 

core/src/main/java/eu/mhsl/craftattack/core/api/client/Repository.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.api.client;
+package eu.mhsl.craftattack.core.api.client;
 
 import com.google.gson.Gson;
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
 import org.bukkit.Bukkit;
 
 import java.net.URI;

core/src/main/java/eu/mhsl/craftattack/core/api/client/RepositoryLoader.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.api.client;
+package eu.mhsl.craftattack.core.api.client;
 
 import org.apache.commons.lang3.NotImplementedException;
 import org.reflections.Reflections;

core/src/main/java/eu/mhsl/craftattack/core/api/client/ReqResp.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.api.client;
+package eu.mhsl.craftattack.core.api.client;
 
 public record ReqResp<TData>(int status, TData data) {
 }

core/src/main/java/eu/mhsl/craftattack/core/api/client/repositories/EventRepository.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.api.client.repositories;
+package eu.mhsl.craftattack.core.api.client.repositories;
 
-import eu.mhsl.craftattack.spawn.api.client.HttpRepository;
+import eu.mhsl.craftattack.core.api.client.HttpRepository;
-import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.core.api.client.ReqResp;
-import eu.mhsl.craftattack.spawn.util.api.EventApiUtil;
+import eu.mhsl.craftattack.core.util.api.EventApiUtil;
 
 import java.util.UUID;
 

core/src/main/java/eu/mhsl/craftattack/core/api/client/repositories/FeedbackRepository.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.api.client.repositories;
+package eu.mhsl.craftattack.core.api.client.repositories;
 
 import com.google.common.reflect.TypeToken;
-import eu.mhsl.craftattack.spawn.api.client.HttpRepository;
+import eu.mhsl.craftattack.core.api.client.HttpRepository;
-import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.core.api.client.ReqResp;
-import eu.mhsl.craftattack.spawn.util.api.WebsiteApiUtil;
+import eu.mhsl.craftattack.core.util.api.WebsiteApiUtil;
 
 import java.lang.reflect.Type;
 import java.util.List;

core/src/main/java/eu/mhsl/craftattack/core/api/client/repositories/ReportRepository.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.api.client.repositories;
+package eu.mhsl.craftattack.core.api.client.repositories;
 
-import eu.mhsl.craftattack.spawn.api.client.HttpRepository;
+import eu.mhsl.craftattack.core.api.client.HttpRepository;
-import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.core.api.client.ReqResp;
-import eu.mhsl.craftattack.spawn.util.api.WebsiteApiUtil;
+import eu.mhsl.craftattack.core.util.api.WebsiteApiUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

core/src/main/java/eu/mhsl/craftattack/core/api/client/repositories/WhitelistRepository.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.api.client.repositories;
+package eu.mhsl.craftattack.core.api.client.repositories;
 
-import eu.mhsl.craftattack.spawn.api.client.HttpRepository;
+import eu.mhsl.craftattack.core.api.client.HttpRepository;
-import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.core.api.client.ReqResp;
-import eu.mhsl.craftattack.spawn.util.api.WebsiteApiUtil;
+import eu.mhsl.craftattack.core.util.api.WebsiteApiUtil;
 
 import java.util.UUID;
 

core/src/main/java/eu/mhsl/craftattack/core/api/server/HttpServer.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.api.server;
+package eu.mhsl.craftattack.core.api.server;
 
 import com.google.gson.Gson;
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.Appliance;
 import org.bukkit.configuration.ConfigurationSection;
 import spark.Request;
 import spark.Spark;

core/src/main/java/eu/mhsl/craftattack/core/appliance/Appliance.java

@@ -1,17 +1,19 @@
-package eu.mhsl.craftattack.spawn.appliance;
+package eu.mhsl.craftattack.core.appliance;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.spawn.api.client.Repository;
+import eu.mhsl.craftattack.core.api.client.Repository;
-import eu.mhsl.craftattack.spawn.api.server.HttpServer;
+import eu.mhsl.craftattack.core.api.server.HttpServer;
-import eu.mhsl.craftattack.spawn.config.Configuration;
+import eu.mhsl.craftattack.core.config.Configuration;
 import org.bukkit.Bukkit;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
+import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -104,16 +106,22 @@ public abstract class Appliance {
     }
 
     private void setCommandExecutor(JavaPlugin plugin, String name, ApplianceCommand<?> executor) {
-        PluginCommand command = plugin.getCommand(name);
+        try {
-        if(command != null && executor != null) {
+            PluginCommand command = this.createPluginCommand(name, plugin);
             command.setExecutor(executor);
             command.setTabCompleter(executor);
-        } else {
+            plugin.getServer().getCommandMap().register(plugin.getName(), command);
-            Main.logger().warning("Command " + name + " is not specified in plugin.yml!");
+        } catch(Exception e) {
-            throw new RuntimeException("All commands must be registered in plugin.yml. Missing command: " + name);
+            throw new RuntimeException(String.format("Failed to register command '%s'", name), e);
         }
     }
 
+    private PluginCommand createPluginCommand(String name, JavaPlugin plugin) throws Exception {
+        Constructor<PluginCommand> constructor = PluginCommand.class.getDeclaredConstructor(String.class, Plugin.class);
+        constructor.setAccessible(true);
+        return constructor.newInstance(name, plugin);
+    }
+
     public List<Listener> getListeners() {
         return this.listeners;
     }

core/src/main/java/eu/mhsl/craftattack/core/appliance/ApplianceCommand.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliance;
+package eu.mhsl.craftattack.core.appliance;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;

core/src/main/java/eu/mhsl/craftattack/core/appliance/ApplianceListener.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliance;
+package eu.mhsl.craftattack.core.appliance;
 
 import org.bukkit.event.Listener;
 

core/src/main/java/eu/mhsl/craftattack/core/appliance/CachedApplianceSupplier.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.appliance;
+package eu.mhsl.craftattack.core.appliance;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
 
 public class CachedApplianceSupplier<T extends Appliance> implements IApplianceSupplier<T> {
     private final T appliance;

core/src/main/java/eu/mhsl/craftattack/core/appliance/IApplianceSupplier.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.appliance;
+package eu.mhsl.craftattack.core.appliance;
 
 public interface IApplianceSupplier<T extends Appliance> {
     T getAppliance();

core/src/main/java/eu/mhsl/craftattack/core/config/ConfigUtil.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.config;
+package eu.mhsl.craftattack.core.config;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

core/src/main/java/eu/mhsl/craftattack/core/config/Configuration.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.config;
+package eu.mhsl.craftattack.core.config;
 
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;

core/src/main/java/eu/mhsl/craftattack/core/util/IteratorUtil.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util;
+package eu.mhsl.craftattack.core.util;
 
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;

core/src/main/java/eu/mhsl/craftattack/core/util/NumberUtil.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util;
+package eu.mhsl.craftattack.core.util;
 
 public class NumberUtil {
     public static double map(double oldValue, double oldMin, double oldMax, double newMin, double newMax) {

core/src/main/java/eu/mhsl/craftattack/core/util/api/EventApiUtil.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.util.api;
+package eu.mhsl.craftattack.core.util.api;
 
-import eu.mhsl.craftattack.spawn.config.Configuration;
+import eu.mhsl.craftattack.core.config.Configuration;
 import org.bukkit.configuration.ConfigurationSection;
 
 import java.net.URI;

core/src/main/java/eu/mhsl/craftattack/core/util/api/HttpStatus.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util.api;
+package eu.mhsl.craftattack.core.util.api;
 
 public class HttpStatus {
     public static final int OK = 200;

core/src/main/java/eu/mhsl/craftattack/core/util/api/WebsiteApiUtil.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.util.api;
+package eu.mhsl.craftattack.core.util.api;
 
-import eu.mhsl.craftattack.spawn.config.Configuration;
+import eu.mhsl.craftattack.core.config.Configuration;
 import org.apache.http.client.utils.URIBuilder;
 import org.bukkit.configuration.ConfigurationSection;