build.gradle

@@ -1,29 +1,68 @@
-allprojects {
-    group = 'de.mhsl.craftattack'
-    version = '1.0.0'
+plugins {
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'java'
+}
 
-    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/")
-        }
+group = 'eu.mhsl.craftattack'
+version = '1.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/")
     }
 }
 
-subprojects {
-    apply plugin: 'java'
+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'
+}
 
-    java {
-        toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
-        }
+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
+    }
+}
+
+configurations {
+    shadowImplementation.extendsFrom implementation
+}
+
+shadowJar {
+    configurations = [project.configurations.shadowImplementation]
+}
+
+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'
+}

common/build.gradle

@@ -1,10 +0,0 @@
-plugins {
-    id 'java'
-}
-
-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

@@ -1,20 +0,0 @@
-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/metaGameplay/help/Help.java

@@ -1,28 +0,0 @@
-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/settings/CategorizedSetting.java

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

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

core/build.gradle

@@ -1,11 +0,0 @@
-plugins {
-    id 'java'
-}
-
-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/resources/plugin.yml

@@ -1,5 +0,0 @@
-name: spawn
-author: olischma, muelleel
-version: '1.0'
-main: eu.mhsl.craftattack.core.Main
-api-version: '1.21'

craftattack/build.gradle

@@ -1,28 +0,0 @@
-plugins {
-    id 'java'
-    id("com.gradleup.shadow") version "8.3.5"
-}
-
-dependencies {
-    implementation project(':core')
-    implementation project(':common')
-
-    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'
-}
-
-configurations {
-    shadowImplementation.extendsFrom implementation
-}
-
-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()
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

settings.gradle

@@ -1,7 +1 @@
 rootProject.name = 'spawn'
-
-include 'core'
-include 'craftattack'
-include 'common'
-include 'varo'
-

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

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.core;
+package eu.mhsl.craftattack.spawn;
 
-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 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 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("eu.mhsl.craftattack.spawn");
+        Reflections reflections = new Reflections(this.getClass().getPackageName());
         Set<Class<? extends Appliance>> applianceClasses = reflections.getSubTypesOf(Appliance.class);
 
         this.appliances = applianceClasses.stream()

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.core.api.client.repositories;
+package eu.mhsl.craftattack.spawn.api.client.repositories;
 
-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 eu.mhsl.craftattack.spawn.api.client.HttpRepository;
+import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.util.api.EventApiUtil;
 
 import java.util.UUID;
 

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

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

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

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.core.api.client.repositories;
+package eu.mhsl.craftattack.spawn.api.client.repositories;
 
-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 eu.mhsl.craftattack.spawn.api.client.HttpRepository;
+import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.util.api.WebsiteApiUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

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

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.core.api.client.repositories;
+package eu.mhsl.craftattack.spawn.api.client.repositories;
 
-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 eu.mhsl.craftattack.spawn.api.client.HttpRepository;
+import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.util.api.WebsiteApiUtil;
 
 import java.util.UUID;
 

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

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

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

@@ -1,19 +1,17 @@
-package eu.mhsl.craftattack.core.appliance;
+package eu.mhsl.craftattack.spawn.appliance;
 
-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 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 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;
@@ -106,23 +104,16 @@ public abstract class Appliance {
     }
 
     private void setCommandExecutor(JavaPlugin plugin, String name, ApplianceCommand<?> executor) {
-        try {
-            PluginCommand command = this.createPluginCommand(name, plugin);
+        PluginCommand command = plugin.getCommand(name);
+        if(command != null && executor != null) {
             command.setExecutor(executor);
             command.setTabCompleter(executor);
-            plugin.getServer().getCommandMap().register(plugin.getName(), command);
-            throw new RuntimeException("Test");
-        } catch(Exception e) {
-            throw new RuntimeException(String.format("Failed to register command '%s'", name), e);
+        } 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);
         }
     }
 
-    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;
     }

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

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

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

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

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

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

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

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/AntiSignEdit.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.antiSignEdit;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.antiSignEdit;
 
-import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes.SelectSetting;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/OnSignEditListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.antiSignEdit;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.antiSignEdit;
 
-import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import io.papermc.paper.event.player.PlayerOpenSignEvent;
 import org.bukkit.block.sign.SignSide;
 import org.bukkit.event.EventHandler;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/SignEditSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.antiSignEdit;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.antiSignEdit;
 
-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.SelectSetting;
+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.SelectSetting;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/AutoShulker.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.autoShulker;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.autoShulker;
 
-import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/AutoShulkerSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.autoShulker;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.autoShulker;
 
-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.SelectSetting;
+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.SelectSetting;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/ItemPickupListener.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.autoShulker;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.autoShulker;
 
-import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes.SelectSetting;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.EntityPickupItemEvent;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/Advancements.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements;
 
 public class Advancements {
     public static String searchTrouble = "search_trouble";

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/ApplyPendingAdvancementsListener.java

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancements.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements;
 
-import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.advancement.Advancement;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancementsListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements;
 
-import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/DoubleDoor.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.doubleDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.doubleDoor;
 
-import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.BlockData;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/DoubleDoorSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.doubleDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.doubleDoor;
 
-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 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 org.bukkit.Material;
 
 public class DoubleDoorSetting extends BoolSetting implements CategorizedSetting {

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/OnDoorInteractListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.doubleDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.doubleDoor;
 
-import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/Fleischerchest.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.fleischerchest;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.fleischerchest;
 
-import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;
 import org.bukkit.event.Listener;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.fleischerchest;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.fleischerchest;
 
-import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.inventory.PrepareItemCraftEvent;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/GlowingBerries.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.glowingBerries;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.glowingBerries;
 
-import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import net.kyori.adventure.sound.Sound;
 import net.kyori.adventure.util.Ticks;
 import org.bukkit.entity.Player;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/OnBerryEaten.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.glowingBerries;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.glowingBerries;
 
-import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerItemConsumeEvent;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefill.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.hotbarRefill;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.hotbarRefill;
 
-import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillListener.java

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.hotbarRefill;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.hotbarRefill;
 
-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 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 org.bukkit.Material;
 
 public class HotbarRefillSetting extends MultiBoolSetting<HotbarRefillSetting.HotbarReplaceConfig> implements CategorizedSetting {

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoor.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.knockDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.knockDoor;
 
-import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes.SelectSetting;
+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.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.knockDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.knockDoor;
 
-import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.GameMode;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.type.Door;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.knockDoor;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.knockDoor;
 
-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.SelectSetting;
+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.SelectSetting;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.outlawed;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed;
 
 class OutlawChangeNotPermitted extends Exception {
     public OutlawChangeNotPermitted(String message) {

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/Outlawed.java

@@ -1,12 +1,12 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.outlawed;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed;
 
-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.craftattack.appliances.metaGameplay.displayName.DisplayName;
-import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.whitelist.Whitelist;
-import eu.mhsl.craftattack.core.config.Configuration;
-import eu.mhsl.craftattack.core.util.text.DisconnectInfo;
+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.displayName.DisplayName;
+import eu.mhsl.craftattack.spawn.appliances.tooling.whitelist.Whitelist;
+import eu.mhsl.craftattack.spawn.config.Configuration;
+import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedCommand.java

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedReminderListener.java

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.portableCrafting;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.portableCrafting;
 
-import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/PortableCrafting.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.portableCrafting;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.portableCrafting;
 
-import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/PortableCraftingSetting.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.portableCrafting;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.portableCrafting;
 
-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 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 org.bukkit.Material;
 
 public class PortableCraftingSetting extends BoolSetting implements CategorizedSetting {

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockback.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.snowballKnockback;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.snowballKnockback;
 
-import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Listener;

src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.snowballKnockback;
+package eu.mhsl.craftattack.spawn.appliances.gameplay.snowballKnockback;
 
-import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;

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

@@ -0,0 +1,20 @@
+package eu.mhsl.craftattack.spawn.appliances.internal.debug;
+
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.appliances.internal.debug.command.AppliancesCommand;
+import eu.mhsl.craftattack.spawn.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()
+        );
+    }
+}

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

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.common.appliances.internal.debug.command;
+package eu.mhsl.craftattack.spawn.appliances.internal.debug.command;
 
-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 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 net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentBuilder;
 import net.kyori.adventure.text.TextComponent;

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

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

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

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

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

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/adminMarker/AdminMarker.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.adminMarker;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.adminMarker;
 
-import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import net.kyori.adventure.text.format.TextColor;
 import org.bukkit.Color;
 import org.bukkit.entity.Player;

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkResetListener.java

@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.afkTag;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.afkTag;
 
-import eu.mhsl.craftattack.core.appliance.ApplianceListener;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
 import io.papermc.paper.event.player.AsyncChatEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerInteractEvent;

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkTag.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.afkTag;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.afkTag;
 
-import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.displayName.DisplayName;
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName.DisplayName;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;

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

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

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

@@ -1,10 +1,10 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMention;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMention;
 
-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 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 io.papermc.paper.event.player.AsyncChatDecorateEvent;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

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

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMention;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMention;
 
-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 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 org.bukkit.Material;
 
 public class ChatMentionSetting extends MultiBoolSetting<ChatMentionSetting.ChatMentionConfig> implements CategorizedSetting {

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

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

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

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

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

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.chatMessages;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages;
 
-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 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 org.bukkit.Material;
 
 public class ShowJoinAndLeaveMessagesSetting extends BoolSetting implements CategorizedSetting {

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

@@ -1,14 +1,14 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.displayName;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName;
 
-import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.outlawed.Outlawed;
-import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.adminMarker.AdminMarker;
-import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.afkTag.AfkTag;
-import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.sleepTag.SleepTag;
-import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.yearRank.YearRank;
-import eu.mhsl.craftattack.core.util.server.Floodgate;
-import eu.mhsl.craftattack.core.util.text.ComponentUtil;
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed.Outlawed;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.adminMarker.AdminMarker;
+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;

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

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/ApplyPendingRewardsListener.java

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/Event.java

@@ -1,22 +1,22 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.event;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event;
 
-import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.core.api.client.ReqResp;
-import eu.mhsl.craftattack.core.api.client.repositories.EventRepository;
-import eu.mhsl.craftattack.core.api.server.HttpServer;
-import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements.Advancements;
-import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements.CustomAdvancements;
-import eu.mhsl.craftattack.core.util.IteratorUtil;
-import eu.mhsl.craftattack.core.util.api.HttpStatus;
-import eu.mhsl.craftattack.core.util.entity.DisplayVillager;
-import eu.mhsl.craftattack.core.util.listener.DismissInventoryOpenFromHolder;
-import eu.mhsl.craftattack.core.util.listener.PlayerInteractAtEntityEventListener;
-import eu.mhsl.craftattack.core.util.server.PluginMessage;
-import eu.mhsl.craftattack.core.util.text.ComponentUtil;
-import eu.mhsl.craftattack.core.util.text.Countdown;
-import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.event.command.*;
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.api.client.repositories.EventRepository;
+import eu.mhsl.craftattack.spawn.api.server.HttpServer;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.Advancements;
+import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.CustomAdvancements;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command.*;
+import eu.mhsl.craftattack.spawn.util.IteratorUtil;
+import eu.mhsl.craftattack.spawn.util.api.HttpStatus;
+import eu.mhsl.craftattack.spawn.util.entity.DisplayVillager;
+import eu.mhsl.craftattack.spawn.util.listener.DismissInventoryOpenFromHolder;
+import eu.mhsl.craftattack.spawn.util.listener.PlayerInteractAtEntityEventListener;
+import eu.mhsl.craftattack.spawn.util.server.PluginMessage;
+import eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
+import eu.mhsl.craftattack.spawn.util.text.Countdown;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventAdvertiseCommand.java

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventCommand.java

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventEndSessionCommand.java

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventOpenSessionCommand.java

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/MoveEventVillagerCommand.java

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/Feedback.java

@@ -1,11 +1,11 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.feedback;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback;
 
-import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.core.api.client.ReqResp;
-import eu.mhsl.craftattack.core.api.client.repositories.FeedbackRepository;
-import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
-import eu.mhsl.craftattack.core.util.api.HttpStatus;
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.api.client.ReqResp;
+import eu.mhsl.craftattack.spawn.api.client.repositories.FeedbackRepository;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.util.api.HttpStatus;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentBuilder;
 import net.kyori.adventure.text.TextComponent;

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/FeedbackCommand.java

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/RequestFeedbackCommand.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.feedback;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback;
 
-import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

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

@@ -0,0 +1,28 @@
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help;
+
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command.DiscordCommand;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command.HelpCommand;
+import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command.SpawnCommand;
+import eu.mhsl.craftattack.spawn.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()
+        );
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,11 +1,11 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars;
 
-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 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 org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;

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

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

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

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.bars;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars;
 
-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 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 net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

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

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.infoBars.bars;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars;
 
-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 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 net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;

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

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

src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/OptionLinks.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.optionLinks;
+package eu.mhsl.craftattack.spawn.appliances.metaGameplay.optionLinks;
 
-import eu.mhsl.craftattack.core.Main;
-import eu.mhsl.craftattack.core.appliance.Appliance;
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;