splittet project to craftattack and varo flavors

build.gradle

@@ -1,7 +1,3 @@
-plugins {
-    id 'java'
-}
-
 allprojects {
     group = 'de.mhsl.craftattack'
     version = '1.0.0'
@@ -30,8 +26,4 @@ subprojects {
             languageVersion = JavaLanguageVersion.of(21)
         }
     }
-
-    tasks.withType(JavaCompile).configureEach {
-        options.release = 21
-    }
 }

common/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id 'java'
-    id("com.gradleup.shadow") version "8.3.5"
 }
 
 dependencies {
@@ -8,26 +7,4 @@ 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'
 }
-
-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()
-}
-
-jar {
-    enabled = false
-}
-
-build.dependsOn shadowJar

craftattack/build.gradle

@@ -0,0 +1,28 @@
+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()
+}

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.antiSignEdit;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.antiSignEdit;
 
 import eu.mhsl.craftattack.core.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.antiSignEdit;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.antiSignEdit;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import io.papermc.paper.event.player.PlayerOpenSignEvent;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.antiSignEdit;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.antiSignEdit;
 
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.autoShulker;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.autoShulker;
 
 import eu.mhsl.craftattack.core.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.autoShulker;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.autoShulker;
 
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.autoShulker;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.autoShulker;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;

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

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

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

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

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.customAdvancements;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.Appliance;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.customAdvancements;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import net.kyori.adventure.text.Component;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.doubleDoor;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.doubleDoor;
 
 import eu.mhsl.craftattack.core.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.doubleDoor;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.doubleDoor;
 
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.doubleDoor;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.doubleDoor;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.fleischerchest;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.fleischerchest;
 
 import eu.mhsl.craftattack.core.appliance.Appliance;
 import net.kyori.adventure.text.Component;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.fleischerchest;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.fleischerchest;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.Material;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.glowingBerries;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.glowingBerries;
 
 import eu.mhsl.craftattack.core.appliance.Appliance;
 import net.kyori.adventure.sound.Sound;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.glowingBerries;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.glowingBerries;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.Material;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.hotbarRefill;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.hotbarRefill;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.Appliance;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.hotbarRefill;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.hotbarRefill;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.hotbarRefill;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.hotbarRefill;
 
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.knockDoor;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.knockDoor;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.Appliance;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.knockDoor;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.knockDoor;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.GameMode;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.knockDoor;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.knockDoor;
 
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;

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

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

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

@@ -1,10 +1,10 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.outlawed;
+package eu.mhsl.craftattack.spawn.craftattack.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.common.appliances.metaGameplay.displayName.DisplayName;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.displayName.DisplayName;
-import eu.mhsl.craftattack.spawn.common.appliances.tooling.whitelist.Whitelist;
+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 net.kyori.adventure.text.Component;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.outlawed;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.outlawed;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import net.kyori.adventure.text.Component;

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

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

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.portableCrafting;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.portableCrafting;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.Material;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.portableCrafting;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.portableCrafting;
 
 import eu.mhsl.craftattack.core.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.portableCrafting;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.portableCrafting;
 
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.gameplay.snowballKnockback;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.snowballKnockback;
 
 import eu.mhsl.craftattack.core.appliance.Appliance;
 import org.bukkit.entity.Entity;

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

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

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.adminMarker;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.adminMarker;
 
 import eu.mhsl.craftattack.core.appliance.Appliance;
 import net.kyori.adventure.text.format.TextColor;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.afkTag;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.afkTag;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import io.papermc.paper.event.player.AsyncChatEvent;

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

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

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

@@ -1,12 +1,12 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.displayName;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.displayName;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.common.appliances.gameplay.outlawed.Outlawed;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.outlawed.Outlawed;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.adminMarker.AdminMarker;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.adminMarker.AdminMarker;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.afkTag.AfkTag;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.afkTag.AfkTag;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.sleepTag.SleepTag;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.sleepTag.SleepTag;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.yearRank.YearRank;
+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 net.kyori.adventure.text.Component;

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

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

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

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

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.event;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.event;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.api.client.ReqResp;
@@ -6,8 +6,8 @@ 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.common.appliances.gameplay.customAdvancements.Advancements;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements.Advancements;
-import eu.mhsl.craftattack.spawn.common.appliances.gameplay.customAdvancements.CustomAdvancements;
+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;
@@ -16,7 +16,7 @@ import eu.mhsl.craftattack.core.util.listener.PlayerInteractAtEntityEventListene
 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.common.appliances.metaGameplay.event.command.*;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.event.command.*;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.feedback;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.feedback;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.api.client.ReqResp;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.feedback;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.feedback;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.ApplianceCommand;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.feedback;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.feedback;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.ApplianceCommand;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.optionLinks;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.optionLinks;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.Appliance;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.optionLinks;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.optionLinks;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.event.EventHandler;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/ChangePackCommand.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.packSelect;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.command.Command;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackConfiguration.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.packSelect;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackConfigurationInventory.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.packSelect;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.CachedApplianceSupplier;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackSelect.java

@@ -1,11 +1,11 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.packSelect;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect;
 
 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.packSelect.listeners.ClickPackInventoryListener;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect.listeners.ClickPackInventoryListener;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.packSelect.listeners.ClosePackInventoryListener;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect.listeners.ClosePackInventoryListener;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.packSelect.listeners.SetPacksOnJoinListener;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect.listeners.SetPacksOnJoinListener;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
 import net.kyori.adventure.resource.ResourcePackInfo;
 import net.kyori.adventure.resource.ResourcePackRequest;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackSelectSetting.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.packSelect;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.packSelect;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect;
 
 import eu.mhsl.craftattack.core.Main;
 import net.kyori.adventure.resource.ResourcePackInfo;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/listeners/ClickPackInventoryListener.java

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

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/listeners/ClosePackInventoryListener.java

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

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/listeners/SetPacksOnJoinListener.java

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.packSelect.listeners;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect.listeners;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.packSelect.PackSelect;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect.PackSelect;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/playtime/Playtime.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.playtime;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.playtime;
 
 import eu.mhsl.craftattack.core.appliance.Appliance;
 import eu.mhsl.craftattack.core.appliance.ApplianceCommand;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/playtime/PlaytimeCommand.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.playtime;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.playtime;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.ApplianceCommand;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.report;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.report;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.api.client.ReqResp;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.report;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.report;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import eu.mhsl.craftattack.core.util.text.ComponentUtil;

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.report;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.report;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.ApplianceCommand;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.sleepTag;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.sleepTag;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import org.bukkit.event.EventHandler;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/sleepTag/SleepTag.java

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

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

@@ -1,8 +1,8 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.tablist;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.tablist;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.report.Report;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.report.Report;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
 import eu.mhsl.craftattack.core.util.IteratorUtil;
 import eu.mhsl.craftattack.core.util.statistics.NetworkMonitor;

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

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

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

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.tablist;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.tablist;
 
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
 import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.worldmuseum;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.worldmuseum;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.command.Command;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/worldmuseum/WorldMuseum.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.worldmuseum;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.worldmuseum;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.Appliance;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/yearRank/YearRank.java

@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.yearRank;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.yearRank;
 
 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.displayName.DisplayName;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.displayName.DisplayName;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.event.ClickEvent;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/yearRank/YearRankCommand.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.yearRank;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.yearRank;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceCommand;
 import org.bukkit.command.Command;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/lightningFireControl/LightningFireControl.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.tooling.lightningFireControl;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.lightningFireControl;
 
 import eu.mhsl.craftattack.core.appliance.Appliance;
 import org.bukkit.block.Block;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/lightningFireControl/LightningFireListener.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.tooling.lightningFireControl;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.lightningFireControl;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/ProjectStart.java

@@ -1,15 +1,15 @@
-package eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart;
 
 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.gameplay.customAdvancements.Advancements;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements.Advancements;
-import eu.mhsl.craftattack.spawn.common.appliances.gameplay.customAdvancements.CustomAdvancements;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements.CustomAdvancements;
-import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.command.ProjectStartCancelCommand;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.command.ProjectStartCancelCommand;
-import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.command.ProjectStartCommand;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.command.ProjectStartCommand;
-import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.command.ProjectStartResetCommand;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.command.ProjectStartResetCommand;
-import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.listener.NoAdvancementsListener;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.listener.NoAdvancementsListener;
-import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.listener.PlayerInvincibleListener;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.listener.PlayerInvincibleListener;
 import eu.mhsl.craftattack.core.config.Configuration;
 import eu.mhsl.craftattack.core.util.IteratorUtil;
 import eu.mhsl.craftattack.core.util.entity.PlayerUtils;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/command/ProjectStartCancelCommand.java

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

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/command/ProjectStartCommand.java

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

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/command/ProjectStartResetCommand.java

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

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/listener/NoAdvancementsListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.listener;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.listener;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.ProjectStart;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.ProjectStart;
 import org.bukkit.advancement.Advancement;
 import org.bukkit.advancement.AdvancementProgress;
 import org.bukkit.event.EventHandler;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/listener/PlayerInvincibleListener.java

@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.listener;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.listener;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
-import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.ProjectStart;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.ProjectStart;
 import io.papermc.paper.event.player.PrePlayerAttackEntityEvent;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/whitelist/PlayerJoinListener.java

@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.common.appliances.tooling.whitelist;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.whitelist;
 
 import eu.mhsl.craftattack.core.appliance.ApplianceListener;
 import eu.mhsl.craftattack.core.util.text.DisconnectInfo;

craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/whitelist/Whitelist.java

@@ -1,11 +1,11 @@
-package eu.mhsl.craftattack.spawn.common.appliances.tooling.whitelist;
+package eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.whitelist;
 
 import eu.mhsl.craftattack.core.Main;
 import eu.mhsl.craftattack.core.api.client.ReqResp;
 import eu.mhsl.craftattack.core.api.client.repositories.WhitelistRepository;
 import eu.mhsl.craftattack.core.api.server.HttpServer;
 import eu.mhsl.craftattack.core.appliance.Appliance;
-import eu.mhsl.craftattack.spawn.common.appliances.gameplay.outlawed.Outlawed;
+import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.outlawed.Outlawed;
 import eu.mhsl.craftattack.core.util.api.HttpStatus;
 import eu.mhsl.craftattack.core.util.server.Floodgate;
 import eu.mhsl.craftattack.core.util.text.DisconnectInfo;

settings.gradle

@@ -1,42 +1,7 @@
-/*pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        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/")
-        }
-    }
-}*/
-/*
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
-    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/")
-        }
-    }
-}*/
-
 rootProject.name = 'spawn'
 
 include 'core'
-include 'common'
 include 'craftattack'
+include 'common'
+include 'varo'
 

varo/build.gradle

@@ -0,0 +1,27 @@
+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'
+    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()
+}