finalized JoinProtection

# 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,47 +1,36 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'java'
+    id 'com.gradleup.shadow' version "8.3.5"
 }
 
-group = 'eu.mhsl.craftattack'
-version = '1.0'
+allprojects {
+    group = 'de.mhsl.craftattack'
+    version = '1.0.0'
 
-repositories {
-    mavenCentral()
-    maven {
-        name = "papermc-repo"
-        url = "https://repo.papermc.io/repository/maven-public/"
-    }
-    maven {
-        name = "sonatype"
-        url = "https://oss.sonatype.org/content/groups/public/"
-    }
-    maven {
-        url = uri("https://repo.opencollab.dev/main/")
+    repositories {
+        mavenCentral()
+        maven {
+            name = "papermc-repo"
+            url = "https://repo.papermc.io/repository/maven-public/"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/groups/public/"
+        }
+        maven {
+            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'
-}
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'com.gradleup.shadow'
 
-def targetJavaVersion = 21
-java {
-    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
-    sourceCompatibility = javaVersion
-    targetCompatibility = javaVersion
-    if (JavaVersion.current() < javaVersion) {
-        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
-    }
-}
-
-tasks.withType(JavaCompile).configureEach {
-    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-        options.release = targetJavaVersion
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(21)
+        }
     }
 }
 
@@ -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) {
-    dependsOn shadowJar
-    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'
+if (file("local.gradle").exists()) {
+    apply from: "local.gradle"
 }

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.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.internal.debug.Debug;
-import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.internal.debug.Debug;
+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.spawn.appliances.internal.debug.Debug;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+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.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+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.spawn.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages.ChatMessages;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMessages.ChatMessages;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
+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.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.MultiBoolSetting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
+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.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+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.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.util.IteratorUtil;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
+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.appliances.metaGameplay.settings.SettingCategory;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
+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/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.spawn.appliances.metaGameplay.help.Help;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+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.spawn.appliances.metaGameplay.help.Help;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+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.spawn.appliances.metaGameplay.help.Help;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+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.spawn.appliances.metaGameplay.help.Help;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+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.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.MsptBar;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.PlayerCounterBar;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.TpsBar;
+import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.bars.MsptBar;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.bars.PlayerCounterBar;
+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.util.statistics.ServerMonitor;
-import eu.mhsl.craftattack.spawn.util.text.ColorUtil;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.Bar;
+import eu.mhsl.craftattack.core.util.statistics.ServerMonitor;
+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.spawn.appliances.metaGameplay.infoBars.Bar;
-import eu.mhsl.craftattack.spawn.appliances.tooling.playerlimit.PlayerLimit;
-import eu.mhsl.craftattack.spawn.util.text.ColorUtil;
+import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.Bar;
+import eu.mhsl.craftattack.spawn.common.appliances.tooling.playerlimit.PlayerLimit;
+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.util.text.ColorUtil;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.Bar;
+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.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages.ChatMessages;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.commands.PrivateMessageCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.commands.PrivateReplyCommand;
+import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMessages.ChatMessages;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.privateMessage.commands.PrivateMessageCommand;
+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.spawn.appliances.metaGameplay.privateMessage.PrivateMessage;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+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.spawn.appliances.metaGameplay.privateMessage.PrivateMessage;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+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/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.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.Setting;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.listeners.OpenSettingsShortcutListener;
-import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.listeners.SettingsInventoryListener;
+import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes.Setting;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.listeners.OpenSettingsShortcutListener;
+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;
@@ -107,6 +107,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 +142,23 @@ public class Settings extends Appliance {
         int countOfUncategorized = (int) settings.stream()
             .filter(setting -> !(setting instanceof CategorizedSetting))
             .count();
+        int rowsOfUncategorized = (int) Math.ceil((double) countOfUncategorized / 9);
 
-        return Arrays.stream(SettingCategory.values())
+        int rowsOfCategorized = 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 rows = rowsOfUncategorized + rowsOfCategorized;
+        if(rows % 9 != 0) throw new IllegalStateException(
+            String.format("Failed to calculate settings inventory size. %d is not an multiple of 9", rows)
+        );
+        return rows;
     }
 
     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/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.spawn.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
+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;

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.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+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.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+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/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.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+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.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+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.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+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.spawn.util.text.DataSizeConverter;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+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

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.appliances.tooling.endPrevent;
+package eu.mhsl.craftattack.spawn.common.appliances.tooling.endPrevent;
 
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.config.Configuration;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+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/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;

common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/endPrevent/PreventEnderEyeUseListener.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.ApplianceListener;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 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/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.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+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.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.config.Configuration;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+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.spawn.util.text.DisconnectInfo;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+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.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+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.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.config.Configuration;
+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.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.spawn.util.text.DisconnectInfo;
+import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+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.spawn.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.util.IteratorUtil;
-import eu.mhsl.craftattack.spawn.util.text.Countdown;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.util.IteratorUtil;
+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.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+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.spawn.api.server.HttpServer;
-import eu.mhsl.craftattack.spawn.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.config.Configuration;
+import eu.mhsl.craftattack.core.api.client.RepositoryLoader;
+import eu.mhsl.craftattack.core.api.server.HttpServer;
+import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.core.config.Configuration;
 import org.bukkit.Bukkit;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -44,7 +44,7 @@ public final class Main extends JavaPlugin {
         Main.logger().info(String.format("Loaded %d repositories!", this.repositoryLoader.getRepositories().size()));
 
         Main.logger().info("Loading appliances...");
-        Reflections reflections = new Reflections(this.getClass().getPackageName());
+        Reflections reflections = new Reflections("eu.mhsl.craftattack.spawn");
         Set<Class<? extends Appliance>> applianceClasses = reflections.getSubTypesOf(Appliance.class);
 
         this.appliances = applianceClasses.stream()
@@ -66,8 +66,10 @@ public final class Main extends JavaPlugin {
         });
         Main.logger().info(String.format("Initialized %d appliances!", this.appliances.size()));
 
-        Main.logger().info("Starting HTTP API...");
-        new HttpServer();
+        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!");

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.spawn.api.client.ReqResp;
-import eu.mhsl.craftattack.spawn.util.api.EventApiUtil;
+import eu.mhsl.craftattack.core.api.client.HttpRepository;
+import eu.mhsl.craftattack.core.api.client.ReqResp;
+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.spawn.api.client.ReqResp;
-import eu.mhsl.craftattack.spawn.util.api.WebsiteApiUtil;
+import eu.mhsl.craftattack.core.api.client.HttpRepository;
+import eu.mhsl.craftattack.core.api.client.ReqResp;
+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.spawn.api.client.ReqResp;
-import eu.mhsl.craftattack.spawn.util.api.WebsiteApiUtil;
+import eu.mhsl.craftattack.core.api.client.HttpRepository;
+import eu.mhsl.craftattack.core.api.client.ReqResp;
+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.spawn.api.client.ReqResp;
-import eu.mhsl.craftattack.spawn.util.api.WebsiteApiUtil;
+import eu.mhsl.craftattack.core.api.client.HttpRepository;
+import eu.mhsl.craftattack.core.api.client.ReqResp;
+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.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.core.Main;
+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.spawn.api.client.Repository;
-import eu.mhsl.craftattack.spawn.api.server.HttpServer;
-import eu.mhsl.craftattack.spawn.config.Configuration;
+import eu.mhsl.craftattack.core.Main;
+import eu.mhsl.craftattack.core.api.client.Repository;
+import eu.mhsl.craftattack.core.api.server.HttpServer;
+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);
-        if(command != null && executor != null) {
+        try {
+            PluginCommand command = this.createPluginCommand(name, plugin);
             command.setExecutor(executor);
             command.setTabCompleter(executor);
-        } else {
-            Main.logger().warning("Command " + name + " is not specified in plugin.yml!");
-            throw new RuntimeException("All commands must be registered in plugin.yml. Missing command: " + name);
+            plugin.getServer().getCommandMap().register(plugin.getName(), command);
+        } catch(Exception e) {
+            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;
 

core/src/main/java/eu/mhsl/craftattack/core/util/entity/DisplayVillager.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.util.entity;
+package eu.mhsl.craftattack.core.util.entity;
 
-import eu.mhsl.craftattack.spawn.config.ConfigUtil;
-import eu.mhsl.craftattack.spawn.config.Configuration;
-import eu.mhsl.craftattack.spawn.util.world.ChunkUtils;
+import eu.mhsl.craftattack.core.config.ConfigUtil;
+import eu.mhsl.craftattack.core.config.Configuration;
+import eu.mhsl.craftattack.core.util.world.ChunkUtils;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.EntityType;

core/src/main/java/eu/mhsl/craftattack/core/util/entity/PlayerUtils.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util.entity;
+package eu.mhsl.craftattack.core.util.entity;
 
 import org.bukkit.Material;
 import org.bukkit.Statistic;

core/src/main/java/eu/mhsl/craftattack/core/util/inventory/HeadBuilder.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util.inventory;
+package eu.mhsl.craftattack.core.util.inventory;
 
 import com.destroystokyo.paper.profile.PlayerProfile;
 import com.destroystokyo.paper.profile.ProfileProperty;

core/src/main/java/eu/mhsl/craftattack/core/util/inventory/ItemBuilder.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.util.inventory;
+package eu.mhsl.craftattack.core.util.inventory;
 
-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.format.NamedTextColor;
 import org.bukkit.Material;

core/src/main/java/eu/mhsl/craftattack/core/util/inventory/PlaceholderItems.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util.inventory;
+package eu.mhsl.craftattack.core.util.inventory;
 
 import net.kyori.adventure.text.Component;
 import org.bukkit.Material;

core/src/main/java/eu/mhsl/craftattack/core/util/listener/DismissInventoryOpenFromHolder.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util.listener;
+package eu.mhsl.craftattack.core.util.listener;
 
 import org.bukkit.entity.Entity;
 import org.bukkit.event.EventHandler;

core/src/main/java/eu/mhsl/craftattack/core/util/listener/PlayerInteractAtEntityEventListener.java

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

core/src/main/java/eu/mhsl/craftattack/core/util/server/Floodgate.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util.server;
+package eu.mhsl.craftattack.core.util.server;
 
 import org.bukkit.entity.Player;
 import org.geysermc.cumulus.form.SimpleForm;

core/src/main/java/eu/mhsl/craftattack/core/util/server/PluginMessage.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.util.server;
+package eu.mhsl.craftattack.core.util.server;
 
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
-import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.core.Main;
 import org.bukkit.entity.Player;
 
 public class PluginMessage {