diff --git a/build.gradle b/build.gradle index eed3beb..68ed940 100644 --- a/build.gradle +++ b/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 - } } \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index b831872..785d855 100644 --- a/common/build.gradle +++ b/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 diff --git a/common/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml similarity index 100% rename from common/src/main/resources/plugin.yml rename to core/src/main/resources/plugin.yml diff --git a/craftattack/build.gradle b/craftattack/build.gradle new file mode 100644 index 0000000..0f7c7ce --- /dev/null +++ b/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() +} \ No newline at end of file diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/antiSignEdit/AntiSignEdit.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/antiSignEdit/AntiSignEdit.java similarity index 95% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/antiSignEdit/AntiSignEdit.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/antiSignEdit/AntiSignEdit.java index 2a8aac6..715d32b 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/antiSignEdit/AntiSignEdit.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/antiSignEdit/OnSignEditListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/antiSignEdit/OnSignEditListener.java similarity index 87% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/antiSignEdit/OnSignEditListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/antiSignEdit/OnSignEditListener.java index 82d0386..274599c 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/antiSignEdit/OnSignEditListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/antiSignEdit/SignEditSetting.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/antiSignEdit/SignEditSetting.java similarity index 95% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/antiSignEdit/SignEditSetting.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/antiSignEdit/SignEditSetting.java index d56c3a4..b8cddc5 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/antiSignEdit/SignEditSetting.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/autoShulker/AutoShulker.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/autoShulker/AutoShulker.java similarity index 96% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/autoShulker/AutoShulker.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/autoShulker/AutoShulker.java index a6594fb..a0b9083 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/autoShulker/AutoShulker.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/autoShulker/AutoShulkerSetting.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/autoShulker/AutoShulkerSetting.java similarity index 95% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/autoShulker/AutoShulkerSetting.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/autoShulker/AutoShulkerSetting.java index 010ae53..3795da6 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/autoShulker/AutoShulkerSetting.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/autoShulker/ItemPickupListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/autoShulker/ItemPickupListener.java similarity index 92% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/autoShulker/ItemPickupListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/autoShulker/ItemPickupListener.java index f84704f..399fc45 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/autoShulker/ItemPickupListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/Advancements.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/customAdvancements/Advancements.java similarity index 83% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/Advancements.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/customAdvancements/Advancements.java index ee12a66..08de6ff 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/Advancements.java +++ b/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"; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/ApplyPendingAdvancementsListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/customAdvancements/ApplyPendingAdvancementsListener.java similarity index 81% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/ApplyPendingAdvancementsListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/customAdvancements/ApplyPendingAdvancementsListener.java index 059ab3c..3a5370a 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/ApplyPendingAdvancementsListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/CustomAdvancements.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/customAdvancements/CustomAdvancements.java similarity index 96% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/CustomAdvancements.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/customAdvancements/CustomAdvancements.java index 32a4e76..1353f09 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/CustomAdvancements.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/CustomAdvancementsListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/customAdvancements/CustomAdvancementsListener.java similarity index 95% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/CustomAdvancementsListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/customAdvancements/CustomAdvancementsListener.java index 6f15ea4..fc2352b 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/customAdvancements/CustomAdvancementsListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/doubleDoor/DoubleDoor.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/doubleDoor/DoubleDoor.java similarity index 96% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/doubleDoor/DoubleDoor.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/doubleDoor/DoubleDoor.java index de20645..a157714 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/doubleDoor/DoubleDoor.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/doubleDoor/DoubleDoorSetting.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/doubleDoor/DoubleDoorSetting.java similarity index 93% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/doubleDoor/DoubleDoorSetting.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/doubleDoor/DoubleDoorSetting.java index 7c8a479..3d0d610 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/doubleDoor/DoubleDoorSetting.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/doubleDoor/OnDoorInteractListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/doubleDoor/OnDoorInteractListener.java similarity index 93% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/doubleDoor/OnDoorInteractListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/doubleDoor/OnDoorInteractListener.java index beb66d6..de8a894 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/doubleDoor/OnDoorInteractListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/fleischerchest/Fleischerchest.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/fleischerchest/Fleischerchest.java similarity index 90% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/fleischerchest/Fleischerchest.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/fleischerchest/Fleischerchest.java index 59e55b8..14fa42d 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/fleischerchest/Fleischerchest.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java similarity index 88% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java index 0d9f21a..33a2553 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/glowingBerries/GlowingBerries.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/glowingBerries/GlowingBerries.java similarity index 92% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/glowingBerries/GlowingBerries.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/glowingBerries/GlowingBerries.java index f367624..1aa9ed5 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/glowingBerries/GlowingBerries.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/glowingBerries/OnBerryEaten.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/glowingBerries/OnBerryEaten.java similarity index 84% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/glowingBerries/OnBerryEaten.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/glowingBerries/OnBerryEaten.java index 4141a55..acd2b09 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/glowingBerries/OnBerryEaten.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/hotbarRefill/HotbarRefill.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefill.java similarity index 96% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/hotbarRefill/HotbarRefill.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefill.java index d1aed2a..5af8180 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/hotbarRefill/HotbarRefill.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/hotbarRefill/HotbarRefillListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefillListener.java similarity index 95% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/hotbarRefill/HotbarRefillListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefillListener.java index a807650..b92cd79 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/hotbarRefill/HotbarRefillListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/hotbarRefill/HotbarRefillSetting.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefillSetting.java similarity index 94% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/hotbarRefill/HotbarRefillSetting.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefillSetting.java index d1ea474..eba5c83 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/hotbarRefill/HotbarRefillSetting.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/knockDoor/KnockDoor.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/knockDoor/KnockDoor.java similarity index 97% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/knockDoor/KnockDoor.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/knockDoor/KnockDoor.java index d1d6f36..6feacfa 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/knockDoor/KnockDoor.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/knockDoor/KnockDoorListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/knockDoor/KnockDoorListener.java similarity index 89% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/knockDoor/KnockDoorListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/knockDoor/KnockDoorListener.java index ca48d09..6be30d0 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/knockDoor/KnockDoorListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/knockDoor/KnockDoorSetting.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/knockDoor/KnockDoorSetting.java similarity index 95% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/knockDoor/KnockDoorSetting.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/knockDoor/KnockDoorSetting.java index c848901..b137450 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/knockDoor/KnockDoorSetting.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java similarity index 64% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java index 959be74..605fca3 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java +++ b/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) { diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/Outlawed.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/outlawed/Outlawed.java similarity index 95% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/Outlawed.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/outlawed/Outlawed.java index 8b49439..044dc51 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/Outlawed.java +++ b/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.common.appliances.tooling.whitelist.Whitelist; +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 net.kyori.adventure.text.Component; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/OutlawedCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/outlawed/OutlawedCommand.java similarity index 92% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/OutlawedCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/outlawed/OutlawedCommand.java index 4c8fc3b..d6d3317 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/OutlawedCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/OutlawedReminderListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/outlawed/OutlawedReminderListener.java similarity index 86% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/OutlawedReminderListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/outlawed/OutlawedReminderListener.java index 3ab5da3..5769bc7 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/outlawed/OutlawedReminderListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java similarity index 87% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java index aedc4e6..8dbff58 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/portableCrafting/PortableCrafting.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/portableCrafting/PortableCrafting.java similarity index 90% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/portableCrafting/PortableCrafting.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/portableCrafting/PortableCrafting.java index b60a2fc..d56baec 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/portableCrafting/PortableCrafting.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/portableCrafting/PortableCraftingSetting.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/portableCrafting/PortableCraftingSetting.java similarity index 92% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/portableCrafting/PortableCraftingSetting.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/portableCrafting/PortableCraftingSetting.java index bfb19ca..b533bfa 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/portableCrafting/PortableCraftingSetting.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/snowballKnockback/SnowballKnockback.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/snowballKnockback/SnowballKnockback.java similarity index 87% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/snowballKnockback/SnowballKnockback.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/snowballKnockback/SnowballKnockback.java index 6e0b552..2cf43d3 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/snowballKnockback/SnowballKnockback.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java similarity index 89% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java index 42996a1..a2b8d37 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/adminMarker/AdminMarker.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/adminMarker/AdminMarker.java similarity index 84% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/adminMarker/AdminMarker.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/adminMarker/AdminMarker.java index 582097f..9edf678 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/adminMarker/AdminMarker.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/afkTag/AfkResetListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/afkTag/AfkResetListener.java similarity index 92% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/afkTag/AfkResetListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/afkTag/AfkResetListener.java index 08ca667..7133fc0 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/afkTag/AfkResetListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/afkTag/AfkTag.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/afkTag/AfkTag.java similarity index 93% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/afkTag/AfkTag.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/afkTag/AfkTag.java index 4994e96..2f38916 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/afkTag/AfkTag.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/displayName/DisplayName.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/displayName/DisplayName.java similarity index 83% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/displayName/DisplayName.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/displayName/DisplayName.java index da1766c..78a036e 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/displayName/DisplayName.java +++ b/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.common.appliances.metaGameplay.adminMarker.AdminMarker; -import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.afkTag.AfkTag; -import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.sleepTag.SleepTag; -import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.yearRank.YearRank; +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 net.kyori.adventure.text.Component; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java similarity index 83% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java index c4ab190..4308fd8 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/ApplyPendingRewardsListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/ApplyPendingRewardsListener.java similarity index 82% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/ApplyPendingRewardsListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/ApplyPendingRewardsListener.java index 6b6462b..35a6cd3 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/ApplyPendingRewardsListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/Event.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/Event.java similarity index 96% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/Event.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/Event.java index d8814d3..1f92f22 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/Event.java +++ b/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.common.appliances.gameplay.customAdvancements.CustomAdvancements; +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; @@ -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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventAdvertiseCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/command/EventAdvertiseCommand.java similarity index 76% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventAdvertiseCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/command/EventAdvertiseCommand.java index a372eee..68283da 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventAdvertiseCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/command/EventCommand.java similarity index 76% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/command/EventCommand.java index 5d2f51a..3073230 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventEndSessionCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/command/EventEndSessionCommand.java similarity index 75% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventEndSessionCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/command/EventEndSessionCommand.java index af2a8e3..23ad9f3 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventEndSessionCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventOpenSessionCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/command/EventOpenSessionCommand.java similarity index 81% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventOpenSessionCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/command/EventOpenSessionCommand.java index 3f50814..bd66098 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/EventOpenSessionCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/MoveEventVillagerCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/command/MoveEventVillagerCommand.java similarity index 77% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/MoveEventVillagerCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/event/command/MoveEventVillagerCommand.java index 7e10d5d..697323f 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/event/command/MoveEventVillagerCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/feedback/Feedback.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/feedback/Feedback.java similarity index 97% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/feedback/Feedback.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/feedback/Feedback.java index c01442b..7407e0a 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/feedback/Feedback.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/feedback/FeedbackCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/feedback/FeedbackCommand.java similarity index 92% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/feedback/FeedbackCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/feedback/FeedbackCommand.java index 8259389..9c5933b 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/feedback/FeedbackCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/feedback/RequestFeedbackCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/feedback/RequestFeedbackCommand.java similarity index 91% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/feedback/RequestFeedbackCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/feedback/RequestFeedbackCommand.java index f7ccb6f..3881f34 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/feedback/RequestFeedbackCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/optionLinks/OptionLinks.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/optionLinks/OptionLinks.java similarity index 96% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/optionLinks/OptionLinks.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/optionLinks/OptionLinks.java index 86bdbbb..1cb64f8 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/optionLinks/OptionLinks.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/optionLinks/UpdateLinksListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/optionLinks/UpdateLinksListener.java similarity index 80% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/optionLinks/UpdateLinksListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/optionLinks/UpdateLinksListener.java index fc33089..0e49080 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/optionLinks/UpdateLinksListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/ChangePackCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/ChangePackCommand.java similarity index 88% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/ChangePackCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/ChangePackCommand.java index ccf0a97..a46a884 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/ChangePackCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackConfiguration.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackConfiguration.java similarity index 97% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackConfiguration.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackConfiguration.java index d73575b..711901c 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackConfiguration.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackConfigurationInventory.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackConfigurationInventory.java similarity index 98% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackConfigurationInventory.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackConfigurationInventory.java index 81dc788..75f0560 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackConfigurationInventory.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackSelect.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackSelect.java similarity index 93% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackSelect.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackSelect.java index aecb902..10474b3 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackSelect.java +++ b/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.common.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.ClickPackInventoryListener; +import eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.packSelect.listeners.ClosePackInventoryListener; +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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackSelectSetting.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackSelectSetting.java similarity index 93% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackSelectSetting.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/PackSelectSetting.java index 0cb1931..1cdde2f 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/PackSelectSetting.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java similarity index 96% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java index 482362e..799592e 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/listeners/ClickPackInventoryListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/listeners/ClickPackInventoryListener.java similarity index 79% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/listeners/ClickPackInventoryListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/listeners/ClickPackInventoryListener.java index 199640a..278c077 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/listeners/ClickPackInventoryListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/listeners/ClosePackInventoryListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/listeners/ClosePackInventoryListener.java similarity index 75% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/listeners/ClosePackInventoryListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/listeners/ClosePackInventoryListener.java index 25b681c..7f6b2d6 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/listeners/ClosePackInventoryListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/listeners/SetPacksOnJoinListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/listeners/SetPacksOnJoinListener.java similarity index 75% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/listeners/SetPacksOnJoinListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/packSelect/listeners/SetPacksOnJoinListener.java index f2e5ab6..3848a01 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/packSelect/listeners/SetPacksOnJoinListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/playtime/Playtime.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/playtime/Playtime.java similarity index 94% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/playtime/Playtime.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/playtime/Playtime.java index 57018fb..2f7979e 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/playtime/Playtime.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/playtime/PlaytimeCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/playtime/PlaytimeCommand.java similarity index 93% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/playtime/PlaytimeCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/playtime/PlaytimeCommand.java index 3bfbd02..11af3e7 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/playtime/PlaytimeCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/Report.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/report/Report.java similarity index 98% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/Report.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/report/Report.java index 00f560a..e27103e 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/Report.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/ReportCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/report/ReportCommand.java similarity index 96% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/ReportCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/report/ReportCommand.java index d1eee37..b58e207 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/ReportCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/ReportsCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/report/ReportsCommand.java similarity index 91% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/ReportsCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/report/ReportsCommand.java index 14d185e..abd4b78 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/report/ReportsCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java similarity index 89% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java index 915f87c..5115fec 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/sleepTag/SleepTag.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/sleepTag/SleepTag.java similarity index 92% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/sleepTag/SleepTag.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/sleepTag/SleepTag.java index a6c76bc..e42e26b 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/sleepTag/SleepTag.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/Tablist.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/tablist/Tablist.java similarity index 95% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/Tablist.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/tablist/Tablist.java index 0218cfc..798b606 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/Tablist.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/TablistListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/tablist/TablistListener.java similarity index 81% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/TablistListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/tablist/TablistListener.java index 0828c41..4201899 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/TablistListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/TechnicalTablistSetting.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/tablist/TechnicalTablistSetting.java similarity index 93% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/TechnicalTablistSetting.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/tablist/TechnicalTablistSetting.java index 9e69ffa..10af89c 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/tablist/TechnicalTablistSetting.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java similarity index 87% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java index e98397b..fea0dc7 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/worldmuseum/WorldMuseum.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/worldmuseum/WorldMuseum.java similarity index 96% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/worldmuseum/WorldMuseum.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/worldmuseum/WorldMuseum.java index d80991f..a99d066 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/worldmuseum/WorldMuseum.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/yearRank/YearRank.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/yearRank/YearRank.java similarity index 95% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/yearRank/YearRank.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/yearRank/YearRank.java index fc1e14e..ce80fdb 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/yearRank/YearRank.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/yearRank/YearRankCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/yearRank/YearRankCommand.java similarity index 87% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/yearRank/YearRankCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/metaGameplay/yearRank/YearRankCommand.java index 344a3f1..ce2c193 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/yearRank/YearRankCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/lightningFireControl/LightningFireControl.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/lightningFireControl/LightningFireControl.java similarity index 84% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/lightningFireControl/LightningFireControl.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/lightningFireControl/LightningFireControl.java index 17cf178..902a546 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/lightningFireControl/LightningFireControl.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/lightningFireControl/LightningFireListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/lightningFireControl/LightningFireListener.java similarity index 95% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/lightningFireControl/LightningFireListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/lightningFireControl/LightningFireListener.java index 2ca2644..dd343f3 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/lightningFireControl/LightningFireListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/ProjectStart.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/ProjectStart.java similarity index 89% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/ProjectStart.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/ProjectStart.java index 6a7b338..6f2459c 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/ProjectStart.java +++ b/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.common.appliances.gameplay.customAdvancements.CustomAdvancements; -import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.command.ProjectStartCancelCommand; -import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.command.ProjectStartCommand; -import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.command.ProjectStartResetCommand; -import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.listener.NoAdvancementsListener; -import eu.mhsl.craftattack.spawn.common.appliances.tooling.projectStart.listener.PlayerInvincibleListener; +import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements.Advancements; +import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.customAdvancements.CustomAdvancements; +import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.command.ProjectStartCancelCommand; +import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.command.ProjectStartCommand; +import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.command.ProjectStartResetCommand; +import eu.mhsl.craftattack.spawn.craftattack.appliances.tooling.projectStart.listener.NoAdvancementsListener; +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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/command/ProjectStartCancelCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/command/ProjectStartCancelCommand.java similarity index 84% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/command/ProjectStartCancelCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/command/ProjectStartCancelCommand.java index c120e56..e0fd19c 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/command/ProjectStartCancelCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/command/ProjectStartCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/command/ProjectStartCommand.java similarity index 85% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/command/ProjectStartCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/command/ProjectStartCommand.java index d29e321..3eac57c 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/command/ProjectStartCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/command/ProjectStartResetCommand.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/command/ProjectStartResetCommand.java similarity index 75% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/command/ProjectStartResetCommand.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/command/ProjectStartResetCommand.java index e6094fe..a2c59de 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/command/ProjectStartResetCommand.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/listener/NoAdvancementsListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/listener/NoAdvancementsListener.java similarity index 81% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/listener/NoAdvancementsListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/listener/NoAdvancementsListener.java index ebb5999..3de9621 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/listener/NoAdvancementsListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/listener/PlayerInvincibleListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/listener/PlayerInvincibleListener.java similarity index 83% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/listener/PlayerInvincibleListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/listener/PlayerInvincibleListener.java index 95fcca3..c379898 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/projectStart/listener/PlayerInvincibleListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/whitelist/PlayerJoinListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/whitelist/PlayerJoinListener.java similarity index 93% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/whitelist/PlayerJoinListener.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/whitelist/PlayerJoinListener.java index 8958a73..53b1057 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/whitelist/PlayerJoinListener.java +++ b/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; diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/whitelist/Whitelist.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/whitelist/Whitelist.java similarity index 97% rename from common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/whitelist/Whitelist.java rename to craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/whitelist/Whitelist.java index 508395e..205bfe3 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/tooling/whitelist/Whitelist.java +++ b/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; diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/settings.gradle b/settings.gradle index 378bf80..9efb310 100644 --- a/settings.gradle +++ b/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' diff --git a/varo/build.gradle b/varo/build.gradle new file mode 100644 index 0000000..378d1b7 --- /dev/null +++ b/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() +} \ No newline at end of file