From 219879974cc83df98aa58703af8837f3cb3ee384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sat, 15 Mar 2025 21:20:57 +0100 Subject: [PATCH] categorized appliances in groups --- .../antiSignEdit/AntiSignEdit.java | 6 +++--- .../antiSignEdit/OnSignEditListener.java | 2 +- .../antiSignEdit/SignEditSetting.java | 10 +++++----- .../{ => gameplay}/autoShulker/AutoShulker.java | 4 ++-- .../autoShulker/AutoShulkerSetting.java | 10 +++++----- .../autoShulker/ItemPickupListener.java | 6 +++--- .../customAdvancements/Advancements.java | 2 +- .../customAdvancements/CustomAdvancements.java | 6 +++--- .../ApplyPendingAdvancementsListener.java | 4 ++-- .../listener/CustomAdvancementsListener.java | 6 +++--- .../doubleDoor}/DoubleDoor.java | 4 ++-- .../doubleDoor}/DoubleDoorSetting.java | 10 +++++----- .../doubleDoor}/OnDoorInteractListener.java | 4 ++-- .../fleischerchest/Fleischerchest.java | 2 +- .../FleischerchestCraftItemListener.java | 2 +- .../glowingBerries/GlowingBerries.java | 2 +- .../glowingBerries/OnBerryEaten.java | 2 +- .../hotbarRefill/HotbarRefill.java | 4 ++-- .../hotbarRefill/HotbarRefillListener.java | 4 ++-- .../hotbarRefill/HotbarRefillSetting.java | 10 +++++----- .../{ => gameplay}/knockDoor/KnockDoor.java | 6 +++--- .../knockDoor/KnockDoorListener.java | 2 +- .../knockDoor/KnockDoorSetting.java | 10 +++++----- .../outlawed/OutlawChangeNotPermitted.java | 2 +- .../{ => gameplay}/outlawed/Outlawed.java | 6 +++--- .../{ => gameplay}/outlawed/OutlawedCommand.java | 2 +- .../outlawed/OutlawedReminderListener.java | 2 +- .../OnCraftingTableUseListener.java | 2 +- .../portableCrafting/PortableCrafting.java | 4 ++-- .../PortableCraftingSetting.java | 10 +++++----- .../snowballKnockback/SnowballKnockback.java | 2 +- .../SnowballKnockbackListener.java | 2 +- .../appliances/{ => internal}/debug/Debug.java | 6 +++--- .../debug/command/AppliancesCommand.java | 4 ++-- .../debug/command/UserInfoCommand.java | 4 ++-- .../{ => internal}/titleClear/TitleClear.java | 2 +- .../titleClear/TitleClearListener.java | 2 +- .../adminMarker/AdminMarker.java | 2 +- .../afkTag/AfkResetListener.java | 2 +- .../{ => metaGameplay}/afkTag/AfkTag.java | 4 ++-- .../chatMention/ChatMention.java | 4 ++-- .../chatMention/ChatMentionListener.java | 6 +++--- .../chatMention/ChatMentionSetting.java | 10 +++++----- .../chatMessages/ChatMessages.java | 4 ++-- .../chatMessages/ChatMessagesListener.java | 4 ++-- .../ShowJoinAndLeaveMessagesSetting.java | 10 +++++----- .../displayName/DisplayName.java | 12 ++++++------ .../displayName/DisplayNameUpdateListener.java | 2 +- .../{ => metaGameplay}/event/Event.java | 10 +++++----- .../event/command/EventAdvertiseCommand.java | 4 ++-- .../event/command/EventCommand.java | 4 ++-- .../event/command/EventEndSessionCommand.java | 4 ++-- .../event/command/EventOpenSessionCommand.java | 4 ++-- .../event/command/MoveEventVillagerCommand.java | 4 ++-- .../listener/ApplyPendingRewardsListener.java | 4 ++-- .../{ => metaGameplay}/feedback/Feedback.java | 6 +++--- .../feedback/commands/FeedbackCommand.java | 15 ++++++++++----- .../commands/RequestFeedbackCommand.java | 14 +++++++++----- .../appliances/{ => metaGameplay}/help/Help.java | 10 +++++----- .../help/command/DiscordCommand.java | 4 ++-- .../help/command/HelpCommand.java | 4 ++-- .../help/command/SpawnCommand.java | 4 ++-- .../help/command/TeamspeakCommand.java | 4 ++-- .../{ => metaGameplay}/infoBars/Bar.java | 2 +- .../infoBars/InfoBarCommand.java | 2 +- .../{ => metaGameplay}/infoBars/InfoBars.java | 8 ++++---- .../infoBars/ShowPreviousBarsListener.java | 2 +- .../infoBars/bars/MsptBar.java | 4 ++-- .../infoBars/bars/PlayerCounterBar.java | 6 +++--- .../{ => metaGameplay}/infoBars/bars/TpsBar.java | 4 ++-- .../optionLinks/OptionLinks.java | 2 +- .../optionLinks/UpdateLinksListener.java | 2 +- .../packSelect/ChangePackCommand.java | 2 +- .../packSelect/PackConfiguration.java | 2 +- .../packSelect/PackConfigurationInventory.java | 2 +- .../packSelect/PackSelect.java | 10 +++++----- .../packSelect/PackSelectSetting.java | 8 ++++---- .../packSelect/ResourcePackInfoFactory.java | 2 +- .../listeners/ClickPackInventoryListener.java | 4 ++-- .../listeners/ClosePackInventoryListener.java | 4 ++-- .../listeners/SetPacksOnJoinListener.java | 4 ++-- .../{ => metaGameplay}/playtime/Playtime.java | 2 +- .../playtime/PlaytimeCommand.java | 2 +- .../privateMessage/PrivateMessage.java | 8 ++++---- .../commands/PrivateMessageCommand.java | 4 ++-- .../commands/PrivateReplyCommand.java | 4 ++-- .../{ => metaGameplay}/report/Report.java | 16 +++++++++------- .../{ => metaGameplay}/report/ReportCommand.java | 2 +- .../report/ReportsCommand.java | 9 +++++---- .../settings/CategorizedSetting.java | 2 +- .../settings/SettingCategory.java | 2 +- .../{ => metaGameplay}/settings/Settings.java | 8 ++++---- .../settings/SettingsCommand.java | 2 +- .../settings/SettingsShortcutSetting.java | 4 ++-- .../settings/datatypes/ActionSetting.java | 2 +- .../settings/datatypes/BoolSetting.java | 4 ++-- .../settings/datatypes/MultiBoolSetting.java | 4 ++-- .../settings/datatypes/SelectSetting.java | 4 ++-- .../settings/datatypes/Setting.java | 4 ++-- .../listeners/OpenSettingsShortcutListener.java | 4 ++-- .../listeners/SettingsInventoryListener.java | 4 ++-- .../sleepTag/SleepStateChangeListener.java | 2 +- .../{ => metaGameplay}/sleepTag/SleepTag.java | 4 ++-- .../{ => metaGameplay}/tablist/Tablist.java | 6 +++--- .../tablist/TablistListener.java | 2 +- .../tablist/TechnicalTablistSetting.java | 10 +++++----- .../MoveWorldMuseumVillagerCommand.java | 2 +- .../worldmuseum/WorldMuseum.java | 2 +- .../{ => metaGameplay}/yearRank/YearRank.java | 4 ++-- .../yearRank/YearRankCommand.java | 2 +- .../{ => tooling}/acInform/AcInform.java | 2 +- .../{ => tooling}/acInform/AcInformCommand.java | 2 +- .../{ => tooling}/adminChat/AdminChat.java | 2 +- .../adminChat/AdminChatCommand.java | 2 +- .../{ => tooling}/chatMute/ChatMute.java | 2 +- .../{ => tooling}/chatMute/ChatMuteListener.java | 2 +- .../{ => tooling}/chatMute/MuteCommand.java | 2 +- .../{ => tooling}/endPrevent/EndPrevent.java | 2 +- .../endPrevent/EndPreventCommand.java | 2 +- .../endPrevent/PreventEnderEyeUseListener.java | 2 +- .../appliances/{ => tooling}/kick/Kick.java | 2 +- .../{ => tooling}/kick/KickCommand.java | 2 +- .../{ => tooling}/maintenance/Maintenance.java | 2 +- .../maintenance/MaintenanceCommand.java | 2 +- .../PreventMaintenanceJoinListener.java | 2 +- .../{ => tooling}/panicBan/PanicBan.java | 2 +- .../{ => tooling}/panicBan/PanicBanCommand.java | 2 +- .../panicBan/PanicBanJoinListener.java | 2 +- .../{ => tooling}/playerlimit/PlayerLimit.java | 2 +- .../playerlimit/PlayerLimiterListener.java | 2 +- .../playerlimit/SetPlayerLimitCommand.java | 2 +- .../{ => tooling}/projectStart/ProjectStart.java | 16 ++++++++-------- .../command/ProjectStartCancelCommand.java | 4 ++-- .../command/ProjectStartCommand.java | 4 ++-- .../command/ProjectStartResetCommand.java | 4 ++-- .../listener/NoAdvancementsListener.java | 4 ++-- .../listener/PlayerInvincibleListener.java | 4 ++-- .../{ => tooling}/restart/Restart.java | 6 +++--- .../restart/command/CancelRestartCommand.java | 4 ++-- .../restart/command/ScheduleRestartCommand.java | 4 ++-- .../spawnpoint/SetSpawnpointCommand.java | 2 +- .../spawnpoint/SpawnAtSpawnpointListener.java | 2 +- .../{ => tooling}/spawnpoint/Spawnpoint.java | 2 +- .../whitelist/PlayerJoinListener.java | 2 +- .../{ => tooling}/whitelist/Whitelist.java | 4 ++-- 145 files changed, 317 insertions(+), 305 deletions(-) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/antiSignEdit/AntiSignEdit.java (87%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/antiSignEdit/OnSignEditListener.java (89%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/antiSignEdit/SignEditSetting.java (77%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/autoShulker/AutoShulker.java (92%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/autoShulker/AutoShulkerSetting.java (78%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/autoShulker/ItemPickupListener.java (77%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/customAdvancements/Advancements.java (85%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/customAdvancements/CustomAdvancements.java (89%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/customAdvancements/listener/ApplyPendingAdvancementsListener.java (69%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/customAdvancements/listener/CustomAdvancementsListener.java (88%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{doubeDoor => gameplay/doubleDoor}/DoubleDoor.java (93%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{doubeDoor => gameplay/doubleDoor}/DoubleDoorSetting.java (63%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{doubeDoor => gameplay/doubleDoor}/OnDoorInteractListener.java (88%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/fleischerchest/Fleischerchest.java (91%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/fleischerchest/FleischerchestCraftItemListener.java (90%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/glowingBerries/GlowingBerries.java (93%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/glowingBerries/OnBerryEaten.java (86%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/hotbarRefill/HotbarRefill.java (92%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/hotbarRefill/HotbarRefillListener.java (92%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/hotbarRefill/HotbarRefillSetting.java (73%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/knockDoor/KnockDoor.java (91%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/knockDoor/KnockDoorListener.java (90%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/knockDoor/KnockDoorSetting.java (77%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/outlawed/OutlawChangeNotPermitted.java (69%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/outlawed/Outlawed.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/outlawed/OutlawedCommand.java (93%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/outlawed/OutlawedReminderListener.java (88%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/portableCrafting/OnCraftingTableUseListener.java (89%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/portableCrafting/PortableCrafting.java (82%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/portableCrafting/PortableCraftingSetting.java (64%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/snowballKnockback/SnowballKnockback.java (89%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => gameplay}/snowballKnockback/SnowballKnockbackListener.java (91%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => internal}/debug/Debug.java (64%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => internal}/debug/command/AppliancesCommand.java (96%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => internal}/debug/command/UserInfoCommand.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => internal}/titleClear/TitleClear.java (87%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => internal}/titleClear/TitleClearListener.java (84%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/adminMarker/AdminMarker.java (86%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/afkTag/AfkResetListener.java (93%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/afkTag/AfkTag.java (94%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/chatMention/ChatMention.java (92%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/chatMention/ChatMentionListener.java (90%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/chatMention/ChatMentionSetting.java (72%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/chatMessages/ChatMessages.java (89%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/chatMessages/ChatMessagesListener.java (94%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/chatMessages/ShowJoinAndLeaveMessagesSetting.java (64%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/displayName/DisplayName.java (85%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/displayName/DisplayNameUpdateListener.java (85%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/event/Event.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/event/command/EventAdvertiseCommand.java (79%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/event/command/EventCommand.java (79%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/event/command/EventEndSessionCommand.java (78%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/event/command/EventOpenSessionCommand.java (83%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/event/command/MoveEventVillagerCommand.java (80%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/event/listener/ApplyPendingRewardsListener.java (71%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/feedback/Feedback.java (91%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/feedback/commands/FeedbackCommand.java (62%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/feedback/commands/RequestFeedbackCommand.java (57%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/help/Help.java (56%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/help/command/DiscordCommand.java (87%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/help/command/HelpCommand.java (87%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/help/command/SpawnCommand.java (86%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/help/command/TeamspeakCommand.java (89%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/infoBars/Bar.java (96%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/infoBars/InfoBarCommand.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/infoBars/InfoBars.java (90%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/infoBars/ShowPreviousBarsListener.java (84%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/infoBars/bars/MsptBar.java (91%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/infoBars/bars/PlayerCounterBar.java (86%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/infoBars/bars/TpsBar.java (90%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/optionLinks/OptionLinks.java (97%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/optionLinks/UpdateLinksListener.java (83%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/packSelect/ChangePackCommand.java (90%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/packSelect/PackConfiguration.java (98%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/packSelect/PackConfigurationInventory.java (99%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/packSelect/PackSelect.java (92%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/packSelect/PackSelectSetting.java (72%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/packSelect/ResourcePackInfoFactory.java (97%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/packSelect/listeners/ClickPackInventoryListener.java (81%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/packSelect/listeners/ClosePackInventoryListener.java (77%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/packSelect/listeners/SetPacksOnJoinListener.java (78%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/playtime/Playtime.java (94%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/playtime/PlaytimeCommand.java (94%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/privateMessage/PrivateMessage.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/privateMessage/commands/PrivateMessageCommand.java (78%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/privateMessage/commands/PrivateReplyCommand.java (77%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/report/Report.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/report/ReportCommand.java (96%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/report/ReportsCommand.java (74%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/CategorizedSetting.java (51%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/SettingCategory.java (50%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/Settings.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/SettingsCommand.java (89%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/SettingsShortcutSetting.java (83%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/datatypes/ActionSetting.java (94%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/datatypes/BoolSetting.java (92%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/datatypes/MultiBoolSetting.java (97%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/datatypes/SelectSetting.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/datatypes/Setting.java (93%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/listeners/OpenSettingsShortcutListener.java (79%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/settings/listeners/SettingsInventoryListener.java (88%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/sleepTag/SleepStateChangeListener.java (90%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/sleepTag/SleepTag.java (93%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/tablist/Tablist.java (93%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/tablist/TablistListener.java (84%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/tablist/TechnicalTablistSetting.java (64%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/worldmuseum/MoveWorldMuseumVillagerCommand.java (89%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/worldmuseum/WorldMuseum.java (96%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/yearRank/YearRank.java (96%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => metaGameplay}/yearRank/YearRankCommand.java (88%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/acInform/AcInform.java (98%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/acInform/AcInformCommand.java (91%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/adminChat/AdminChat.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/adminChat/AdminChatCommand.java (91%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/chatMute/ChatMute.java (96%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/chatMute/ChatMuteListener.java (93%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/chatMute/MuteCommand.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/endPrevent/EndPrevent.java (94%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/endPrevent/EndPreventCommand.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/endPrevent/PreventEnderEyeUseListener.java (93%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/kick/Kick.java (94%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/kick/KickCommand.java (94%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/maintenance/Maintenance.java (94%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/maintenance/MaintenanceCommand.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/maintenance/PreventMaintenanceJoinListener.java (92%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/panicBan/PanicBan.java (96%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/panicBan/PanicBanCommand.java (95%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/panicBan/PanicBanJoinListener.java (90%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/playerlimit/PlayerLimit.java (94%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/playerlimit/PlayerLimiterListener.java (93%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/playerlimit/SetPlayerLimitCommand.java (93%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/projectStart/ProjectStart.java (90%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/projectStart/command/ProjectStartCancelCommand.java (86%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/projectStart/command/ProjectStartCommand.java (86%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/projectStart/command/ProjectStartResetCommand.java (78%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/projectStart/listener/NoAdvancementsListener.java (83%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/projectStart/listener/PlayerInvincibleListener.java (85%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/restart/Restart.java (88%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/restart/command/CancelRestartCommand.java (79%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/restart/command/ScheduleRestartCommand.java (79%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/spawnpoint/SetSpawnpointCommand.java (92%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/spawnpoint/SpawnAtSpawnpointListener.java (90%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/spawnpoint/Spawnpoint.java (96%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/whitelist/PlayerJoinListener.java (94%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/{ => tooling}/whitelist/Whitelist.java (97%) diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/AntiSignEdit.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/AntiSignEdit.java similarity index 87% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/AntiSignEdit.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/AntiSignEdit.java index 67b69e0..f490848 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/AntiSignEdit.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/AntiSignEdit.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.antiSignEdit; +package eu.mhsl.craftattack.spawn.appliances.gameplay.antiSignEdit; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/OnSignEditListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/OnSignEditListener.java similarity index 89% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/OnSignEditListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/OnSignEditListener.java index 413fb9c..af91d97 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/OnSignEditListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/OnSignEditListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.antiSignEdit; +package eu.mhsl.craftattack.spawn.appliances.gameplay.antiSignEdit; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import io.papermc.paper.event.player.PlayerOpenSignEvent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/SignEditSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/SignEditSetting.java similarity index 77% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/SignEditSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/SignEditSetting.java index 699ba0e..e66988c 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/SignEditSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/SignEditSetting.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.antiSignEdit; +package eu.mhsl.craftattack.spawn.appliances.gameplay.antiSignEdit; -import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting; -import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting; import org.bukkit.Material; import org.bukkit.NamespacedKey; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulker.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/AutoShulker.java similarity index 92% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulker.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/AutoShulker.java index da39ecb..8dcd1e4 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulker.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/AutoShulker.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.autoShulker; +package eu.mhsl.craftattack.spawn.appliances.gameplay.autoShulker; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Material; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulkerSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/AutoShulkerSetting.java similarity index 78% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulkerSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/AutoShulkerSetting.java index c462516..799b00b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulkerSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/AutoShulkerSetting.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.autoShulker; +package eu.mhsl.craftattack.spawn.appliances.gameplay.autoShulker; -import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting; -import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting; import org.bukkit.Material; import org.bukkit.NamespacedKey; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/ItemPickupListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/ItemPickupListener.java similarity index 77% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/ItemPickupListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/ItemPickupListener.java index 277fe55..795326c 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/ItemPickupListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/ItemPickupListener.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.autoShulker; +package eu.mhsl.craftattack.spawn.appliances.gameplay.autoShulker; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityPickupItemEvent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/Advancements.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/Advancements.java similarity index 85% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/Advancements.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/Advancements.java index 85682de..96c7c31 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/Advancements.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/Advancements.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.customAdvancements; +package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements; public class Advancements { public static String searchTrouble = "search_trouble"; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancements.java similarity index 89% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancements.java index 0b3fe6a..a155d3f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancements.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.customAdvancements; +package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.customAdvancements.listener.ApplyPendingAdvancementsListener; -import eu.mhsl.craftattack.spawn.appliances.customAdvancements.listener.CustomAdvancementsListener; +import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.listener.ApplyPendingAdvancementsListener; +import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.listener.CustomAdvancementsListener; import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.advancement.Advancement; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/ApplyPendingAdvancementsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/listener/ApplyPendingAdvancementsListener.java similarity index 69% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/ApplyPendingAdvancementsListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/listener/ApplyPendingAdvancementsListener.java index 15cb7ed..b7846ac 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/ApplyPendingAdvancementsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/listener/ApplyPendingAdvancementsListener.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.customAdvancements.listener; +package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.listener; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.customAdvancements.CustomAdvancements; +import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.CustomAdvancements; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerJoinEvent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/CustomAdvancementsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/listener/CustomAdvancementsListener.java similarity index 88% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/CustomAdvancementsListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/listener/CustomAdvancementsListener.java index 91636df..407e999 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/CustomAdvancementsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/listener/CustomAdvancementsListener.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.customAdvancements.listener; +package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.listener; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.customAdvancements.Advancements; -import eu.mhsl.craftattack.spawn.appliances.customAdvancements.CustomAdvancements; +import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.Advancements; +import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.CustomAdvancements; import net.kyori.adventure.text.Component; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoor.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/DoubleDoor.java similarity index 93% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoor.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/DoubleDoor.java index 0e6b61d..b759456 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoor.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/DoubleDoor.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.doubeDoor; +package eu.mhsl.craftattack.spawn.appliances.gameplay.doubleDoor; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoorSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/DoubleDoorSetting.java similarity index 63% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoorSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/DoubleDoorSetting.java index 7c96b7c..8c87d46 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoorSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/DoubleDoorSetting.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.doubeDoor; +package eu.mhsl.craftattack.spawn.appliances.gameplay.doubleDoor; -import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting; -import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.BoolSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting; import org.bukkit.Material; public class DoubleDoorSetting extends BoolSetting implements CategorizedSetting { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/OnDoorInteractListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/OnDoorInteractListener.java similarity index 88% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/OnDoorInteractListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/OnDoorInteractListener.java index d7ca5ce..b894a71 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/OnDoorInteractListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/OnDoorInteractListener.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.doubeDoor; +package eu.mhsl.craftattack.spawn.appliances.gameplay.doubleDoor; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/Fleischerchest.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/Fleischerchest.java similarity index 91% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/Fleischerchest.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/Fleischerchest.java index 0fec6d1..e744fba 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/Fleischerchest.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/Fleischerchest.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.fleischerchest; +package eu.mhsl.craftattack.spawn.appliances.gameplay.fleischerchest; import eu.mhsl.craftattack.spawn.appliance.Appliance; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/FleischerchestCraftItemListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java similarity index 90% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/FleischerchestCraftItemListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java index 7bd89b0..ed53617 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/FleischerchestCraftItemListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.fleischerchest; +package eu.mhsl.craftattack.spawn.appliances.gameplay.fleischerchest; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.Material; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/glowingBerries/GlowingBerries.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/GlowingBerries.java similarity index 93% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/glowingBerries/GlowingBerries.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/GlowingBerries.java index 0ff1e5f..d4b51bc 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/glowingBerries/GlowingBerries.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/GlowingBerries.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.glowingBerries; +package eu.mhsl.craftattack.spawn.appliances.gameplay.glowingBerries; import eu.mhsl.craftattack.spawn.appliance.Appliance; import net.kyori.adventure.sound.Sound; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/glowingBerries/OnBerryEaten.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/OnBerryEaten.java similarity index 86% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/glowingBerries/OnBerryEaten.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/OnBerryEaten.java index 03c9125..16bae0e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/glowingBerries/OnBerryEaten.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/OnBerryEaten.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.glowingBerries; +package eu.mhsl.craftattack.spawn.appliances.gameplay.glowingBerries; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.Material; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefill.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefill.java similarity index 92% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefill.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefill.java index 097c9e1..27d3975 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefill.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefill.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.hotbarRefill; +package eu.mhsl.craftattack.spawn.appliances.gameplay.hotbarRefill; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillListener.java similarity index 92% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillListener.java index 14a9b17..7c0f10e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillListener.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.hotbarRefill; +package eu.mhsl.craftattack.spawn.appliances.gameplay.hotbarRefill; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillSetting.java similarity index 73% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillSetting.java index 8968415..b0d2398 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefillSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillSetting.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.hotbarRefill; +package eu.mhsl.craftattack.spawn.appliances.gameplay.hotbarRefill; -import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting; -import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.MultiBoolSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.MultiBoolSetting; import org.bukkit.Material; public class HotbarRefillSetting extends MultiBoolSetting implements CategorizedSetting { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoor.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoor.java similarity index 91% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoor.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoor.java index d80c1fa..cd94f2e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoor.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoor.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.knockDoor; +package eu.mhsl.craftattack.spawn.appliances.gameplay.knockDoor; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoorListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorListener.java similarity index 90% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoorListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorListener.java index a42ba56..dc1a2ad 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoorListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.knockDoor; +package eu.mhsl.craftattack.spawn.appliances.gameplay.knockDoor; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.GameMode; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoorSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorSetting.java similarity index 77% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoorSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorSetting.java index 09ae99b..21c41f1 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoorSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorSetting.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.knockDoor; +package eu.mhsl.craftattack.spawn.appliances.gameplay.knockDoor; -import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting; -import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.SelectSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.SelectSetting; import org.bukkit.Material; import org.bukkit.NamespacedKey; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawChangeNotPermitted.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java similarity index 69% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawChangeNotPermitted.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java index 080ee1c..efcce18 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawChangeNotPermitted.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.outlawed; +package eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed; public class OutlawChangeNotPermitted extends Exception { public OutlawChangeNotPermitted(String message) { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/Outlawed.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/Outlawed.java index 82d833c..2708b5f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/Outlawed.java @@ -1,10 +1,10 @@ -package eu.mhsl.craftattack.spawn.appliances.outlawed; +package eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.displayName.DisplayName; -import eu.mhsl.craftattack.spawn.appliances.whitelist.Whitelist; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName.DisplayName; +import eu.mhsl.craftattack.spawn.appliances.tooling.whitelist.Whitelist; import eu.mhsl.craftattack.spawn.config.Configuration; import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedCommand.java similarity index 93% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedCommand.java index 30cd049..9574ec8 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.outlawed; +package eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedReminderListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedReminderListener.java similarity index 88% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedReminderListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedReminderListener.java index 5d6d481..62eeb15 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/OutlawedReminderListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedReminderListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.outlawed; +package eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/OnCraftingTableUseListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java similarity index 89% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/OnCraftingTableUseListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java index 15b932b..1e5472b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/OnCraftingTableUseListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.portableCrafting; +package eu.mhsl.craftattack.spawn.appliances.gameplay.portableCrafting; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.Material; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/PortableCrafting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/PortableCrafting.java similarity index 82% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/PortableCrafting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/PortableCrafting.java index 0cc0b1b..2b91e07 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/PortableCrafting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/PortableCrafting.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.portableCrafting; +package eu.mhsl.craftattack.spawn.appliances.gameplay.portableCrafting; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/PortableCraftingSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/PortableCraftingSetting.java similarity index 64% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/PortableCraftingSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/PortableCraftingSetting.java index 026f7b5..8cd7e77 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/PortableCraftingSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/PortableCraftingSetting.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.portableCrafting; +package eu.mhsl.craftattack.spawn.appliances.gameplay.portableCrafting; -import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting; -import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.BoolSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting; import org.bukkit.Material; public class PortableCraftingSetting extends BoolSetting implements CategorizedSetting { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockback.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockback.java similarity index 89% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockback.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockback.java index 760bc50..0c92ea2 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockback.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockback.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.snowballKnockback; +package eu.mhsl.craftattack.spawn.appliances.gameplay.snowballKnockback; import eu.mhsl.craftattack.spawn.appliance.Appliance; import org.bukkit.entity.Entity; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockbackListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java similarity index 91% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockbackListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java index 1e2a201..6e1d09d 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/snowballKnockback/SnowballKnockbackListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.snowballKnockback; +package eu.mhsl.craftattack.spawn.appliances.gameplay.snowballKnockback; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.entity.Entity; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/debug/Debug.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/Debug.java similarity index 64% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/debug/Debug.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/Debug.java index a2ff536..e5ab922 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/debug/Debug.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/Debug.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.debug; +package eu.mhsl.craftattack.spawn.appliances.internal.debug; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.debug.command.AppliancesCommand; -import eu.mhsl.craftattack.spawn.appliances.debug.command.UserInfoCommand; +import eu.mhsl.craftattack.spawn.appliances.internal.debug.command.AppliancesCommand; +import eu.mhsl.craftattack.spawn.appliances.internal.debug.command.UserInfoCommand; import org.jetbrains.annotations.NotNull; import java.util.List; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/debug/command/AppliancesCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/command/AppliancesCommand.java similarity index 96% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/debug/command/AppliancesCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/command/AppliancesCommand.java index 3a76c90..3a81c07 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/debug/command/AppliancesCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/command/AppliancesCommand.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.debug.command; +package eu.mhsl.craftattack.spawn.appliances.internal.debug.command; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.debug.Debug; +import eu.mhsl.craftattack.spawn.appliances.internal.debug.Debug; import eu.mhsl.craftattack.spawn.util.text.ComponentUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentBuilder; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/debug/command/UserInfoCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/command/UserInfoCommand.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/debug/command/UserInfoCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/command/UserInfoCommand.java index aeb7600..fe33aa6 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/debug/command/UserInfoCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/debug/command/UserInfoCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.debug.command; +package eu.mhsl.craftattack.spawn.appliances.internal.debug.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.debug.Debug; +import eu.mhsl.craftattack.spawn.appliances.internal.debug.Debug; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClear.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClear.java similarity index 87% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClear.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClear.java index 0f79052..91c58ca 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClear.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClear.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.titleClear; +package eu.mhsl.craftattack.spawn.appliances.internal.titleClear; import eu.mhsl.craftattack.spawn.appliance.Appliance; import org.bukkit.entity.Player; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClearListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClearListener.java similarity index 84% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClearListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClearListener.java index 47d61d0..310ce30 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClearListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClearListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.titleClear; +package eu.mhsl.craftattack.spawn.appliances.internal.titleClear; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminMarker/AdminMarker.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/adminMarker/AdminMarker.java similarity index 86% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/adminMarker/AdminMarker.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/adminMarker/AdminMarker.java index 9f2b085..acc5106 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminMarker/AdminMarker.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/adminMarker/AdminMarker.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.adminMarker; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.adminMarker; import eu.mhsl.craftattack.spawn.appliance.Appliance; import net.kyori.adventure.text.format.TextColor; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkResetListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkResetListener.java similarity index 93% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkResetListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkResetListener.java index 0751b4f..3d6b090 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkResetListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkResetListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.afkTag; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.afkTag; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import io.papermc.paper.event.player.AsyncChatEvent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkTag.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkTag.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkTag.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkTag.java index 7c5dadf..dd0b0ea 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/afkTag/AfkTag.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkTag.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.afkTag; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.afkTag; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.displayName.DisplayName; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName.DisplayName; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.HoverEvent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMention.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMention.java similarity index 92% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMention.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMention.java index 5581138..8c08711 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMention.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMention.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.chatMention; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMention; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import net.kyori.adventure.sound.Sound; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionListener.java similarity index 90% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionListener.java index 64f88ce..16465ef 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionListener.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.chatMention; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMention; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.chatMessages.ChatMessages; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages.ChatMessages; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import eu.mhsl.craftattack.spawn.util.text.ComponentUtil; import io.papermc.paper.event.player.AsyncChatDecorateEvent; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionSetting.java similarity index 72% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionSetting.java index 1734cf9..5cbf186 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMentionSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionSetting.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.chatMention; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMention; -import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting; -import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.MultiBoolSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.MultiBoolSetting; import org.bukkit.Material; public class ChatMentionSetting extends MultiBoolSetting implements CategorizedSetting { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ChatMessages.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessages.java similarity index 89% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ChatMessages.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessages.java index 0c7989f..f2d24f4 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ChatMessages.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessages.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.chatMessages; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.HoverEvent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ChatMessagesListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessagesListener.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ChatMessagesListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessagesListener.java index 43ac7fc..6d9ec58 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ChatMessagesListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessagesListener.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.chatMessages; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import eu.mhsl.craftattack.spawn.util.IteratorUtil; import io.papermc.paper.event.player.AsyncChatEvent; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ShowJoinAndLeaveMessagesSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ShowJoinAndLeaveMessagesSetting.java similarity index 64% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ShowJoinAndLeaveMessagesSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ShowJoinAndLeaveMessagesSetting.java index f729a97..2e3b68b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ShowJoinAndLeaveMessagesSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ShowJoinAndLeaveMessagesSetting.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.chatMessages; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages; -import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting; -import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.BoolSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting; import org.bukkit.Material; public class ShowJoinAndLeaveMessagesSetting extends BoolSetting implements CategorizedSetting { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayName.java similarity index 85% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayName.java index 727cc18..6f19818 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayName.java @@ -1,12 +1,12 @@ -package eu.mhsl.craftattack.spawn.appliances.displayName; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.adminMarker.AdminMarker; -import eu.mhsl.craftattack.spawn.appliances.afkTag.AfkTag; -import eu.mhsl.craftattack.spawn.appliances.outlawed.Outlawed; -import eu.mhsl.craftattack.spawn.appliances.sleepTag.SleepTag; -import eu.mhsl.craftattack.spawn.appliances.yearRank.YearRank; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.adminMarker.AdminMarker; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.afkTag.AfkTag; +import eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed.Outlawed; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.sleepTag.SleepTag; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.yearRank.YearRank; import eu.mhsl.craftattack.spawn.util.server.Floodgate; import eu.mhsl.craftattack.spawn.util.text.ComponentUtil; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayNameUpdateListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java similarity index 85% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayNameUpdateListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java index 4d75209..e91384f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayNameUpdateListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.displayName; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/Event.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/Event.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/event/Event.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/Event.java index 3adc625..fb52981 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/Event.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/Event.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.event; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.api.client.ReqResp; @@ -6,10 +6,10 @@ import eu.mhsl.craftattack.spawn.api.client.repositories.EventRepository; import eu.mhsl.craftattack.spawn.api.server.HttpServer; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.customAdvancements.Advancements; -import eu.mhsl.craftattack.spawn.appliances.customAdvancements.CustomAdvancements; -import eu.mhsl.craftattack.spawn.appliances.event.command.*; -import eu.mhsl.craftattack.spawn.appliances.event.listener.ApplyPendingRewardsListener; +import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.Advancements; +import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.CustomAdvancements; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command.*; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.listener.ApplyPendingRewardsListener; import eu.mhsl.craftattack.spawn.util.IteratorUtil; import eu.mhsl.craftattack.spawn.util.api.HttpStatus; import eu.mhsl.craftattack.spawn.util.entity.DisplayVillager; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventAdvertiseCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventAdvertiseCommand.java similarity index 79% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventAdvertiseCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventAdvertiseCommand.java index 4b3f2a1..dcf8eeb 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventAdvertiseCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventAdvertiseCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.event.command; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.event.Event; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventCommand.java similarity index 79% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventCommand.java index 8367a91..7703ddb 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.event.command; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.event.Event; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventEndSessionCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventEndSessionCommand.java similarity index 78% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventEndSessionCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventEndSessionCommand.java index 42620af..838b06a 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventEndSessionCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventEndSessionCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.event.command; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.event.Event; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventOpenSessionCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventOpenSessionCommand.java similarity index 83% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventOpenSessionCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventOpenSessionCommand.java index 67f0451..bbaf9a1 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/EventOpenSessionCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/EventOpenSessionCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.event.command; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.event.Event; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.Command; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/MoveEventVillagerCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/MoveEventVillagerCommand.java similarity index 80% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/MoveEventVillagerCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/MoveEventVillagerCommand.java index 9a034f6..5c94380 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/command/MoveEventVillagerCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/command/MoveEventVillagerCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.event.command; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.event.Event; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/listener/ApplyPendingRewardsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/listener/ApplyPendingRewardsListener.java similarity index 71% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/event/listener/ApplyPendingRewardsListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/listener/ApplyPendingRewardsListener.java index cca6f58..01a173a 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/listener/ApplyPendingRewardsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/listener/ApplyPendingRewardsListener.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.event.listener; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.listener; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.event.Event; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerJoinEvent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/Feedback.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/Feedback.java similarity index 91% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/Feedback.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/Feedback.java index 79eb2c0..9c4214b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/Feedback.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/Feedback.java @@ -1,12 +1,12 @@ -package eu.mhsl.craftattack.spawn.appliances.feedback; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.api.client.ReqResp; import eu.mhsl.craftattack.spawn.api.client.repositories.FeedbackRepository; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.feedback.commands.FeedbackCommand; -import eu.mhsl.craftattack.spawn.appliances.feedback.commands.RequestFeedbackCommand; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback.commands.FeedbackCommand; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback.commands.RequestFeedbackCommand; import eu.mhsl.craftattack.spawn.util.api.HttpStatus; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentBuilder; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/FeedbackCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/commands/FeedbackCommand.java similarity index 62% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/FeedbackCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/commands/FeedbackCommand.java index 1d85934..7020caa 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/FeedbackCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/commands/FeedbackCommand.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.feedback.commands; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback.commands; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.feedback.Feedback; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback.Feedback; import eu.mhsl.craftattack.spawn.util.text.ComponentUtil; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -19,8 +19,13 @@ public class FeedbackCommand extends ApplianceCommand.PlayerChecked { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { sender.sendMessage(ComponentUtil.pleaseWait()); - Bukkit.getScheduler().runTaskAsynchronously(Main.instance(), () -> { - this.getAppliance().requestFeedback("self-issued-ingame", List.of(this.getPlayer()), null); - }); + Bukkit.getScheduler().runTaskAsynchronously( + Main.instance(), + () -> this.getAppliance().requestFeedback( + "self-issued-ingame", + List.of(this.getPlayer()), + null + ) + ); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/RequestFeedbackCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/commands/RequestFeedbackCommand.java similarity index 57% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/RequestFeedbackCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/commands/RequestFeedbackCommand.java index aced270..ffd4396 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/feedback/commands/RequestFeedbackCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/commands/RequestFeedbackCommand.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.feedback.commands; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback.commands; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.feedback.Feedback; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback.Feedback; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -17,8 +17,12 @@ public class RequestFeedbackCommand extends ApplianceCommand { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception { - Bukkit.getScheduler().runTaskAsynchronously(Main.instance(), () -> { - this.getAppliance().requestFeedback("admin-issued-ingame", new ArrayList<>(Bukkit.getOnlinePlayers()), String.join(" ", args)); - }); + Bukkit.getScheduler().runTaskAsynchronously( + Main.instance(), + () -> this.getAppliance().requestFeedback( + "admin-issued-ingame", + new ArrayList<>(Bukkit.getOnlinePlayers()), String.join(" ", args) + ) + ); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/Help.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/Help.java similarity index 56% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/help/Help.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/Help.java index 87bc465..5fb3258 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/Help.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/Help.java @@ -1,11 +1,11 @@ -package eu.mhsl.craftattack.spawn.appliances.help; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.help.command.DiscordCommand; -import eu.mhsl.craftattack.spawn.appliances.help.command.HelpCommand; -import eu.mhsl.craftattack.spawn.appliances.help.command.SpawnCommand; -import eu.mhsl.craftattack.spawn.appliances.help.command.TeamspeakCommand; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command.DiscordCommand; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command.HelpCommand; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command.SpawnCommand; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command.TeamspeakCommand; import org.jetbrains.annotations.NotNull; import java.util.List; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/DiscordCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/DiscordCommand.java similarity index 87% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/DiscordCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/DiscordCommand.java index c6de197..169f981 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/DiscordCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/DiscordCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.help.command; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.help.Help; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/HelpCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/HelpCommand.java similarity index 87% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/HelpCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/HelpCommand.java index 6c31f55..b4cd910 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/HelpCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/HelpCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.help.command; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.help.Help; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.Command; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/SpawnCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/SpawnCommand.java similarity index 86% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/SpawnCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/SpawnCommand.java index 7d6164a..813ab77 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/SpawnCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/SpawnCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.help.command; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.help.Help; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.Command; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/TeamspeakCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/TeamspeakCommand.java similarity index 89% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/TeamspeakCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/TeamspeakCommand.java index 77c1e08..952cd1e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/help/command/TeamspeakCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/help/command/TeamspeakCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.help.command; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.help.Help; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.help.Help; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.Command; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/Bar.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/Bar.java similarity index 96% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/Bar.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/Bar.java index 6977837..2b67577 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/Bar.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/Bar.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.infoBars; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars; import eu.mhsl.craftattack.spawn.Main; import net.kyori.adventure.bossbar.BossBar; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/InfoBarCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBarCommand.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/InfoBarCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBarCommand.java index 5610958..d18611a 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/InfoBarCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBarCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.infoBars; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import org.bukkit.command.Command; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/InfoBars.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBars.java similarity index 90% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/InfoBars.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBars.java index 7efeafd..eb2c304 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/InfoBars.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBars.java @@ -1,11 +1,11 @@ -package eu.mhsl.craftattack.spawn.appliances.infoBars; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.infoBars.bars.MsptBar; -import eu.mhsl.craftattack.spawn.appliances.infoBars.bars.PlayerCounterBar; -import eu.mhsl.craftattack.spawn.appliances.infoBars.bars.TpsBar; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.MsptBar; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.PlayerCounterBar; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars.TpsBar; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; import org.bukkit.event.Listener; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/ShowPreviousBarsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/ShowPreviousBarsListener.java similarity index 84% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/ShowPreviousBarsListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/ShowPreviousBarsListener.java index aa8108c..0fc20d1 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/ShowPreviousBarsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/ShowPreviousBarsListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.infoBars; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/bars/MsptBar.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/MsptBar.java similarity index 91% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/bars/MsptBar.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/MsptBar.java index 60046a5..2682676 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/bars/MsptBar.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/MsptBar.java @@ -1,6 +1,6 @@ -package eu.mhsl.craftattack.spawn.appliances.infoBars.bars; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars; -import eu.mhsl.craftattack.spawn.appliances.infoBars.Bar; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.Bar; import eu.mhsl.craftattack.spawn.util.statistics.ServerMonitor; import eu.mhsl.craftattack.spawn.util.text.ColorUtil; import net.kyori.adventure.bossbar.BossBar; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/bars/PlayerCounterBar.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/PlayerCounterBar.java similarity index 86% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/bars/PlayerCounterBar.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/PlayerCounterBar.java index 32c6966..550ba13 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/bars/PlayerCounterBar.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/PlayerCounterBar.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.infoBars.bars; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars; import eu.mhsl.craftattack.spawn.Main; -import eu.mhsl.craftattack.spawn.appliances.infoBars.Bar; -import eu.mhsl.craftattack.spawn.appliances.playerlimit.PlayerLimit; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.Bar; +import eu.mhsl.craftattack.spawn.appliances.tooling.playerlimit.PlayerLimit; import eu.mhsl.craftattack.spawn.util.text.ColorUtil; import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/bars/TpsBar.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/TpsBar.java similarity index 90% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/bars/TpsBar.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/TpsBar.java index 0d82b40..8c88b50 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/infoBars/bars/TpsBar.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/bars/TpsBar.java @@ -1,6 +1,6 @@ -package eu.mhsl.craftattack.spawn.appliances.infoBars.bars; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.bars; -import eu.mhsl.craftattack.spawn.appliances.infoBars.Bar; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.infoBars.Bar; import eu.mhsl.craftattack.spawn.util.text.ColorUtil; import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/OptionLinks.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/OptionLinks.java similarity index 97% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/OptionLinks.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/OptionLinks.java index 51f1152..44767ac 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/OptionLinks.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/OptionLinks.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.optionLinks; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.optionLinks; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/UpdateLinksListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/UpdateLinksListener.java similarity index 83% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/UpdateLinksListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/UpdateLinksListener.java index 64abc44..3c18642 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/optionLinks/UpdateLinksListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/UpdateLinksListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.optionLinks; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.optionLinks; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ChangePackCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ChangePackCommand.java similarity index 90% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ChangePackCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ChangePackCommand.java index 933a71a..ca1ba51 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ChangePackCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ChangePackCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.packSelect; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import org.bukkit.command.Command; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfiguration.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackConfiguration.java similarity index 98% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfiguration.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackConfiguration.java index 1f82742..5ea748b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfiguration.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackConfiguration.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.packSelect; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfigurationInventory.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackConfigurationInventory.java similarity index 99% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfigurationInventory.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackConfigurationInventory.java index 686967e..4c4e807 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackConfigurationInventory.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackConfigurationInventory.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.packSelect; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.CachedApplianceSupplier; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackSelect.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackSelect.java similarity index 92% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackSelect.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackSelect.java index 216df2d..7093524 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackSelect.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackSelect.java @@ -1,12 +1,12 @@ -package eu.mhsl.craftattack.spawn.appliances.packSelect; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.packSelect.listeners.ClickPackInventoryListener; -import eu.mhsl.craftattack.spawn.appliances.packSelect.listeners.ClosePackInventoryListener; -import eu.mhsl.craftattack.spawn.appliances.packSelect.listeners.SetPacksOnJoinListener; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners.ClickPackInventoryListener; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners.ClosePackInventoryListener; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners.SetPacksOnJoinListener; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import net.kyori.adventure.resource.ResourcePackInfo; import net.kyori.adventure.resource.ResourcePackRequest; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackSelectSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackSelectSetting.java similarity index 72% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackSelectSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackSelectSetting.java index 0872c17..c7338c7 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/PackSelectSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/PackSelectSetting.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.packSelect; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect; import eu.mhsl.craftattack.spawn.Main; -import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting; -import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.ActionSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.ActionSetting; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ResourcePackInfoFactory.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java similarity index 97% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ResourcePackInfoFactory.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java index 826dc4e..f07b7a0 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/ResourcePackInfoFactory.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.packSelect; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect; import eu.mhsl.craftattack.spawn.Main; import net.kyori.adventure.resource.ResourcePackInfo; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClickPackInventoryListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/ClickPackInventoryListener.java similarity index 81% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClickPackInventoryListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/ClickPackInventoryListener.java index 3f8b582..4070f03 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClickPackInventoryListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/ClickPackInventoryListener.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.packSelect.listeners; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.packSelect.PackSelect; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.PackSelect; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClosePackInventoryListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/ClosePackInventoryListener.java similarity index 77% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClosePackInventoryListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/ClosePackInventoryListener.java index bac488e..506ae14 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/ClosePackInventoryListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/ClosePackInventoryListener.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.packSelect.listeners; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.packSelect.PackSelect; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.PackSelect; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.inventory.InventoryCloseEvent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/SetPacksOnJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/SetPacksOnJoinListener.java similarity index 78% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/SetPacksOnJoinListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/SetPacksOnJoinListener.java index 2472750..3eb3046 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/packSelect/listeners/SetPacksOnJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/listeners/SetPacksOnJoinListener.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.packSelect.listeners; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.listeners; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.packSelect.PackSelect; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.packSelect.PackSelect; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerJoinEvent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playtime/Playtime.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/playtime/Playtime.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/playtime/Playtime.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/playtime/Playtime.java index 6a59694..161d25d 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playtime/Playtime.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/playtime/Playtime.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.playtime; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.playtime; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playtime/PlaytimeCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/playtime/PlaytimeCommand.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/playtime/PlaytimeCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/playtime/PlaytimeCommand.java index 031cedb..31c8838 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playtime/PlaytimeCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/playtime/PlaytimeCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.playtime; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.playtime; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/PrivateMessage.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/privateMessage/PrivateMessage.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/PrivateMessage.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/privateMessage/PrivateMessage.java index 435a032..c3a4e35 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/PrivateMessage.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/privateMessage/PrivateMessage.java @@ -1,11 +1,11 @@ -package eu.mhsl.craftattack.spawn.appliances.privateMessage; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.chatMessages.ChatMessages; -import eu.mhsl.craftattack.spawn.appliances.privateMessage.commands.PrivateMessageCommand; -import eu.mhsl.craftattack.spawn.appliances.privateMessage.commands.PrivateReplyCommand; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.chatMessages.ChatMessages; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.commands.PrivateMessageCommand; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.commands.PrivateReplyCommand; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentBuilder; import net.kyori.adventure.text.TextComponent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/commands/PrivateMessageCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/privateMessage/commands/PrivateMessageCommand.java similarity index 78% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/commands/PrivateMessageCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/privateMessage/commands/PrivateMessageCommand.java index 958f64d..47d11fe 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/commands/PrivateMessageCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/privateMessage/commands/PrivateMessageCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.privateMessage.commands; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.commands; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.privateMessage.PrivateMessage; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.PrivateMessage; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/commands/PrivateReplyCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/privateMessage/commands/PrivateReplyCommand.java similarity index 77% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/commands/PrivateReplyCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/privateMessage/commands/PrivateReplyCommand.java index 117520b..f018f0b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/privateMessage/commands/PrivateReplyCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/privateMessage/commands/PrivateReplyCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.privateMessage.commands; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.commands; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.privateMessage.PrivateMessage; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.privateMessage.PrivateMessage; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/Report.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/Report.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/report/Report.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/Report.java index 4ce170b..7964e90 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/Report.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/Report.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.report; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.report; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.api.client.ReqResp; @@ -37,9 +37,10 @@ public class Report extends Appliance { public void reportToUnknown(@NotNull Player issuer) { ReportRepository.ReportCreationInfo request = new ReportRepository.ReportCreationInfo(issuer.getUniqueId(), null, ""); - Bukkit.getScheduler().runTaskAsynchronously(Main.instance(), () -> { - this.createReport(issuer, request); - }); + Bukkit.getScheduler().runTaskAsynchronously( + Main.instance(), + () -> this.createReport(issuer, request) + ); } public void reportToKnown(@NotNull Player issuer, @NotNull String targetUsername, @Nullable String reason) { @@ -54,9 +55,10 @@ public class Report extends Appliance { offlinePlayer.getUniqueId(), Optional.ofNullable(reason).orElse("") ); - Bukkit.getScheduler().runTaskAsynchronously(Main.instance(), () -> { - this.createReport(issuer, request); - }); + Bukkit.getScheduler().runTaskAsynchronously( + Main.instance(), + () -> this.createReport(issuer, request) + ); } private void createReport(Player issuer, ReportRepository.ReportCreationInfo reportRequest) { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportCommand.java similarity index 96% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportCommand.java index 569a2a5..f1c43c3 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.report; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.report; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import eu.mhsl.craftattack.spawn.util.text.ComponentUtil; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportsCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportsCommand.java similarity index 74% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportsCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportsCommand.java index 0b76983..6245469 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/ReportsCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportsCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.report; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.report; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; @@ -16,8 +16,9 @@ public class ReportsCommand extends ApplianceCommand.PlayerChecked { @Override protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { sender.sendMessage(ComponentUtil.pleaseWait()); - Bukkit.getScheduler().runTaskAsynchronously(Main.instance(), () -> { - this.getAppliance().queryReports(this.getPlayer()); - }); + Bukkit.getScheduler().runTaskAsynchronously( + Main.instance(), + () -> this.getAppliance().queryReports(this.getPlayer()) + ); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/CategorizedSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/CategorizedSetting.java similarity index 51% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/CategorizedSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/CategorizedSetting.java index 8abb147..c8310e0 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/CategorizedSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/CategorizedSetting.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.settings; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings; public interface CategorizedSetting { SettingCategory category(); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingCategory.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingCategory.java similarity index 50% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingCategory.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingCategory.java index 6cf4503..76de3ac 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingCategory.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingCategory.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.settings; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings; public enum SettingCategory { Gameplay, diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/Settings.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/Settings.java index 831203a..02443c6 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/Settings.java @@ -1,11 +1,11 @@ -package eu.mhsl.craftattack.spawn.appliances.settings; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.Setting; -import eu.mhsl.craftattack.spawn.appliances.settings.listeners.OpenSettingsShortcutListener; -import eu.mhsl.craftattack.spawn.appliances.settings.listeners.SettingsInventoryListener; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.Setting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.listeners.OpenSettingsShortcutListener; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.listeners.SettingsInventoryListener; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingsCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingsCommand.java similarity index 89% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingsCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingsCommand.java index 102eba0..6c2eb20 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingsCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingsCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.settings; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import org.bukkit.command.Command; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingsShortcutSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingsShortcutSetting.java similarity index 83% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingsShortcutSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingsShortcutSetting.java index b43bbcb..8c7ff01 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/SettingsShortcutSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingsShortcutSetting.java @@ -1,6 +1,6 @@ -package eu.mhsl.craftattack.spawn.appliances.settings; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.BoolSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting; import org.bukkit.Material; public class SettingsShortcutSetting extends BoolSetting implements CategorizedSetting { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/ActionSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/ActionSetting.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/ActionSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/ActionSetting.java index 7209f9c..81e83ac 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/ActionSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/ActionSetting.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.settings.datatypes; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/BoolSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/BoolSetting.java similarity index 92% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/BoolSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/BoolSetting.java index d258ece..8f22caf 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/BoolSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/BoolSetting.java @@ -1,6 +1,6 @@ -package eu.mhsl.craftattack.spawn.appliances.settings.datatypes; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.entity.Player; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/MultiBoolSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/MultiBoolSetting.java similarity index 97% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/MultiBoolSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/MultiBoolSetting.java index 0067b8b..702f8b9 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/MultiBoolSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/MultiBoolSetting.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.settings.datatypes; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes; import com.google.gson.Gson; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.entity.Player; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/SelectSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/SelectSetting.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/SelectSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/SelectSetting.java index a03c3c4..4607cf3 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/SelectSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/SelectSetting.java @@ -1,6 +1,6 @@ -package eu.mhsl.craftattack.spawn.appliances.settings.datatypes; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Material; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/Setting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/Setting.java similarity index 93% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/Setting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/Setting.java index 0d9c064..ee3eadb 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/datatypes/Setting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/datatypes/Setting.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.settings.datatypes; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes; import eu.mhsl.craftattack.spawn.Main; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import eu.mhsl.craftattack.spawn.util.text.ComponentUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/OpenSettingsShortcutListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/listeners/OpenSettingsShortcutListener.java similarity index 79% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/OpenSettingsShortcutListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/listeners/OpenSettingsShortcutListener.java index 0732fc2..93b58a3 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/OpenSettingsShortcutListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/listeners/OpenSettingsShortcutListener.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.settings.listeners; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.listeners; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerSwapHandItemsEvent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/SettingsInventoryListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/listeners/SettingsInventoryListener.java similarity index 88% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/SettingsInventoryListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/listeners/SettingsInventoryListener.java index 8be442b..7a2d06e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/listeners/SettingsInventoryListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/listeners/SettingsInventoryListener.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.settings.listeners; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.listeners; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/sleepTag/SleepStateChangeListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java similarity index 90% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/sleepTag/SleepStateChangeListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java index 1f148b8..358910f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/sleepTag/SleepStateChangeListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.sleepTag; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.sleepTag; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/sleepTag/SleepTag.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/sleepTag/SleepTag.java similarity index 93% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/sleepTag/SleepTag.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/sleepTag/SleepTag.java index d38655c..cfcad05 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/sleepTag/SleepTag.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/sleepTag/SleepTag.java @@ -1,8 +1,8 @@ -package eu.mhsl.craftattack.spawn.appliances.sleepTag; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.sleepTag; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.displayName.DisplayName; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.displayName.DisplayName; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.HoverEvent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/Tablist.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/Tablist.java similarity index 93% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/Tablist.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/Tablist.java index 226e43d..e5ccc12 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/Tablist.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/Tablist.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.tablist; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.tablist; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.report.Report; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.report.Report; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; import eu.mhsl.craftattack.spawn.util.IteratorUtil; import eu.mhsl.craftattack.spawn.util.statistics.NetworkMonitor; import eu.mhsl.craftattack.spawn.util.text.ComponentUtil; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/TablistListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/TablistListener.java similarity index 84% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/TablistListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/TablistListener.java index 67521f0..4a5f73e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/TablistListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/TablistListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.tablist; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.tablist; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/TechnicalTablistSetting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/TechnicalTablistSetting.java similarity index 64% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/TechnicalTablistSetting.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/TechnicalTablistSetting.java index 854f27d..43cb690 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/TechnicalTablistSetting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/TechnicalTablistSetting.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.tablist; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.tablist; -import eu.mhsl.craftattack.spawn.appliances.settings.CategorizedSetting; -import eu.mhsl.craftattack.spawn.appliances.settings.SettingCategory; -import eu.mhsl.craftattack.spawn.appliances.settings.Settings; -import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.BoolSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.CategorizedSetting; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.SettingCategory; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.Settings; +import eu.mhsl.craftattack.spawn.appliances.metaGameplay.settings.datatypes.BoolSetting; import org.bukkit.Material; public class TechnicalTablistSetting extends BoolSetting implements CategorizedSetting { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/MoveWorldMuseumVillagerCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java similarity index 89% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/MoveWorldMuseumVillagerCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java index c3b5f9d..3ce42f4 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/MoveWorldMuseumVillagerCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.worldmuseum; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.worldmuseum; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import org.bukkit.command.Command; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/WorldMuseum.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/worldmuseum/WorldMuseum.java similarity index 96% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/WorldMuseum.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/worldmuseum/WorldMuseum.java index 0dd839b..7c8d90b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/WorldMuseum.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/worldmuseum/WorldMuseum.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.worldmuseum; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.worldmuseum; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRank.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/yearRank/YearRank.java similarity index 96% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRank.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/yearRank/YearRank.java index de5e215..f927b02 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRank.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/yearRank/YearRank.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.yearRank; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.yearRank; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.displayName.DisplayName; +import eu.mhsl.craftattack.spawn.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/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRankCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/yearRank/YearRankCommand.java similarity index 88% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRankCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/yearRank/YearRankCommand.java index 8c70ab9..0868d56 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/yearRank/YearRankCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/yearRank/YearRankCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.yearRank; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.yearRank; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import org.bukkit.command.Command; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInform.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/acInform/AcInform.java similarity index 98% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInform.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/acInform/AcInform.java index da4e5f2..be6a77f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInform.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/acInform/AcInform.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.acInform; +package eu.mhsl.craftattack.spawn.appliances.tooling.acInform; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInformCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/acInform/AcInformCommand.java similarity index 91% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInformCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/acInform/AcInformCommand.java index c914229..8eb575d 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/acInform/AcInformCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/acInform/AcInformCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.acInform; +package eu.mhsl.craftattack.spawn.appliances.tooling.acInform; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import org.bukkit.command.Command; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminChat/AdminChat.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/adminChat/AdminChat.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/adminChat/AdminChat.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/adminChat/AdminChat.java index 8891bba..30fccca 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminChat/AdminChat.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/adminChat/AdminChat.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.adminChat; +package eu.mhsl.craftattack.spawn.appliances.tooling.adminChat; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminChat/AdminChatCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/adminChat/AdminChatCommand.java similarity index 91% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/adminChat/AdminChatCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/adminChat/AdminChatCommand.java index 3477028..61f2281 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminChat/AdminChatCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/adminChat/AdminChatCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.adminChat; +package eu.mhsl.craftattack.spawn.appliances.tooling.adminChat; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import org.bukkit.command.Command; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMute/ChatMute.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/ChatMute.java similarity index 96% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMute/ChatMute.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/ChatMute.java index 688b82d..fcaebd3 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMute/ChatMute.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/ChatMute.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.chatMute; +package eu.mhsl.craftattack.spawn.appliances.tooling.chatMute; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMute/ChatMuteListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/ChatMuteListener.java similarity index 93% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMute/ChatMuteListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/ChatMuteListener.java index ca01046..5ab0c4d 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMute/ChatMuteListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/ChatMuteListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.chatMute; +package eu.mhsl.craftattack.spawn.appliances.tooling.chatMute; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import eu.mhsl.craftattack.spawn.util.text.DataSizeConverter; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMute/MuteCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/MuteCommand.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMute/MuteCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/MuteCommand.java index 27fd2a0..d92b479 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMute/MuteCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/MuteCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.chatMute; +package eu.mhsl.craftattack.spawn.appliances.tooling.chatMute; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import org.bukkit.Bukkit; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPrevent.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/EndPrevent.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPrevent.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/EndPrevent.java index 21faabb..9a92cbd 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPrevent.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/EndPrevent.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.endPrevent; +package eu.mhsl.craftattack.spawn.appliances.tooling.endPrevent; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPreventCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/EndPreventCommand.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPreventCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/EndPreventCommand.java index 1c89f21..2cb0af5 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/EndPreventCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/EndPreventCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.endPrevent; +package eu.mhsl.craftattack.spawn.appliances.tooling.endPrevent; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/PreventEnderEyeUseListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/PreventEnderEyeUseListener.java similarity index 93% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/PreventEnderEyeUseListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/PreventEnderEyeUseListener.java index 43d3532..21459f1 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/endPrevent/PreventEnderEyeUseListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/PreventEnderEyeUseListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.endPrevent; +package eu.mhsl.craftattack.spawn.appliances.tooling.endPrevent; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/kick/Kick.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/kick/Kick.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/kick/Kick.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/kick/Kick.java index b8672f5..2a9155e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/kick/Kick.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/kick/Kick.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.kick; +package eu.mhsl.craftattack.spawn.appliances.tooling.kick; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/kick/KickCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/kick/KickCommand.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/kick/KickCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/kick/KickCommand.java index c65cb7e..9472a32 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/kick/KickCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/kick/KickCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.kick; +package eu.mhsl.craftattack.spawn.appliances.tooling.kick; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import org.bukkit.Bukkit; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/Maintenance.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/Maintenance.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/Maintenance.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/Maintenance.java index 0471023..d47882e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/Maintenance.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/Maintenance.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.maintenance; +package eu.mhsl.craftattack.spawn.appliances.tooling.maintenance; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/MaintenanceCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/MaintenanceCommand.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/MaintenanceCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/MaintenanceCommand.java index 8d2e556..3b58605 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/MaintenanceCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/MaintenanceCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.maintenance; +package eu.mhsl.craftattack.spawn.appliances.tooling.maintenance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/PreventMaintenanceJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/PreventMaintenanceJoinListener.java similarity index 92% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/PreventMaintenanceJoinListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/PreventMaintenanceJoinListener.java index 6ecad38..b19f87f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/maintenance/PreventMaintenanceJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/PreventMaintenanceJoinListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.maintenance; +package eu.mhsl.craftattack.spawn.appliances.tooling.maintenance; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBan.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBan.java similarity index 96% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBan.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBan.java index 9365184..1342941 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBan.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBan.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.panicBan; +package eu.mhsl.craftattack.spawn.appliances.tooling.panicBan; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanCommand.java similarity index 95% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanCommand.java index a31e58c..a756c5a 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.panicBan; +package eu.mhsl.craftattack.spawn.appliances.tooling.panicBan; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import org.bukkit.Bukkit; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanJoinListener.java similarity index 90% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanJoinListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanJoinListener.java index a1533de..7b25309 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBanJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanJoinListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.panicBan; +package eu.mhsl.craftattack.spawn.appliances.tooling.panicBan; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimit.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/PlayerLimit.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimit.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/PlayerLimit.java index 9686cf4..99b606e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimit.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/PlayerLimit.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.playerlimit; +package eu.mhsl.craftattack.spawn.appliances.tooling.playerlimit; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimiterListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/PlayerLimiterListener.java similarity index 93% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimiterListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/PlayerLimiterListener.java index 13247f3..f588ccf 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimiterListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/PlayerLimiterListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.playerlimit; +package eu.mhsl.craftattack.spawn.appliances.tooling.playerlimit; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/SetPlayerLimitCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/SetPlayerLimitCommand.java similarity index 93% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/SetPlayerLimitCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/SetPlayerLimitCommand.java index 46caee8..2e137b3 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/SetPlayerLimitCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/SetPlayerLimitCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.playerlimit; +package eu.mhsl.craftattack.spawn.appliances.tooling.playerlimit; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/ProjectStart.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/ProjectStart.java similarity index 90% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/ProjectStart.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/ProjectStart.java index 2455bd6..951604a 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/ProjectStart.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/ProjectStart.java @@ -1,15 +1,15 @@ -package eu.mhsl.craftattack.spawn.appliances.projectStart; +package eu.mhsl.craftattack.spawn.appliances.tooling.projectStart; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.customAdvancements.Advancements; -import eu.mhsl.craftattack.spawn.appliances.customAdvancements.CustomAdvancements; -import eu.mhsl.craftattack.spawn.appliances.projectStart.command.ProjectStartCancelCommand; -import eu.mhsl.craftattack.spawn.appliances.projectStart.command.ProjectStartCommand; -import eu.mhsl.craftattack.spawn.appliances.projectStart.command.ProjectStartResetCommand; -import eu.mhsl.craftattack.spawn.appliances.projectStart.listener.NoAdvancementsListener; -import eu.mhsl.craftattack.spawn.appliances.projectStart.listener.PlayerInvincibleListener; +import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.Advancements; +import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.CustomAdvancements; +import eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.command.ProjectStartCancelCommand; +import eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.command.ProjectStartCommand; +import eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.command.ProjectStartResetCommand; +import eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.listener.NoAdvancementsListener; +import eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.listener.PlayerInvincibleListener; import eu.mhsl.craftattack.spawn.config.Configuration; import eu.mhsl.craftattack.spawn.util.IteratorUtil; import eu.mhsl.craftattack.spawn.util.entity.PlayerUtils; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCancelCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/command/ProjectStartCancelCommand.java similarity index 86% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCancelCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/command/ProjectStartCancelCommand.java index 589b286..ed7058c 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCancelCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/command/ProjectStartCancelCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.projectStart.command; +package eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.projectStart.ProjectStart; +import eu.mhsl.craftattack.spawn.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/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/command/ProjectStartCommand.java similarity index 86% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/command/ProjectStartCommand.java index cca5ebd..84916fc 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/command/ProjectStartCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.projectStart.command; +package eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.projectStart.ProjectStart; +import eu.mhsl.craftattack.spawn.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/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartResetCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/command/ProjectStartResetCommand.java similarity index 78% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartResetCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/command/ProjectStartResetCommand.java index 56e7f8b..ac3aea1 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/command/ProjectStartResetCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/command/ProjectStartResetCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.projectStart.command; +package eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.projectStart.ProjectStart; +import eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.ProjectStart; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/NoAdvancementsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/listener/NoAdvancementsListener.java similarity index 83% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/NoAdvancementsListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/listener/NoAdvancementsListener.java index 181c151..bd81c80 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/NoAdvancementsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/listener/NoAdvancementsListener.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.projectStart.listener; +package eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.listener; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.projectStart.ProjectStart; +import eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.ProjectStart; import org.bukkit.advancement.Advancement; import org.bukkit.advancement.AdvancementProgress; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/PlayerInvincibleListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/listener/PlayerInvincibleListener.java similarity index 85% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/PlayerInvincibleListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/listener/PlayerInvincibleListener.java index 674705d..cf57ac1 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/listener/PlayerInvincibleListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/projectStart/listener/PlayerInvincibleListener.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.projectStart.listener; +package eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.listener; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.projectStart.ProjectStart; +import eu.mhsl.craftattack.spawn.appliances.tooling.projectStart.ProjectStart; import io.papermc.paper.event.player.PrePlayerAttackEntityEvent; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/Restart.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/Restart.java similarity index 88% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/Restart.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/Restart.java index a8537c2..693841e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/Restart.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/Restart.java @@ -1,9 +1,9 @@ -package eu.mhsl.craftattack.spawn.appliances.restart; +package eu.mhsl.craftattack.spawn.appliances.tooling.restart; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.restart.command.CancelRestartCommand; -import eu.mhsl.craftattack.spawn.appliances.restart.command.ScheduleRestartCommand; +import eu.mhsl.craftattack.spawn.appliances.tooling.restart.command.CancelRestartCommand; +import eu.mhsl.craftattack.spawn.appliances.tooling.restart.command.ScheduleRestartCommand; import eu.mhsl.craftattack.spawn.util.IteratorUtil; import eu.mhsl.craftattack.spawn.util.text.Countdown; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/CancelRestartCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/command/CancelRestartCommand.java similarity index 79% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/CancelRestartCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/command/CancelRestartCommand.java index 3be4343..f202652 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/CancelRestartCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/command/CancelRestartCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.restart.command; +package eu.mhsl.craftattack.spawn.appliances.tooling.restart.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.restart.Restart; +import eu.mhsl.craftattack.spawn.appliances.tooling.restart.Restart; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/ScheduleRestartCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/command/ScheduleRestartCommand.java similarity index 79% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/ScheduleRestartCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/command/ScheduleRestartCommand.java index 41e40b3..8a7f457 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/restart/command/ScheduleRestartCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/command/ScheduleRestartCommand.java @@ -1,7 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.restart.command; +package eu.mhsl.craftattack.spawn.appliances.tooling.restart.command; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.restart.Restart; +import eu.mhsl.craftattack.spawn.appliances.tooling.restart.Restart; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/spawnpoint/SetSpawnpointCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SetSpawnpointCommand.java similarity index 92% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/spawnpoint/SetSpawnpointCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SetSpawnpointCommand.java index 88af683..72e36a8 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/spawnpoint/SetSpawnpointCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SetSpawnpointCommand.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.spawnpoint; +package eu.mhsl.craftattack.spawn.appliances.tooling.spawnpoint; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import net.kyori.adventure.text.Component; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/spawnpoint/SpawnAtSpawnpointListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SpawnAtSpawnpointListener.java similarity index 90% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/spawnpoint/SpawnAtSpawnpointListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SpawnAtSpawnpointListener.java index 9e67b6b..8367195 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/spawnpoint/SpawnAtSpawnpointListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SpawnAtSpawnpointListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.spawnpoint; +package eu.mhsl.craftattack.spawn.appliances.tooling.spawnpoint; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/spawnpoint/Spawnpoint.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/Spawnpoint.java similarity index 96% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/spawnpoint/Spawnpoint.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/Spawnpoint.java index 1586cf0..fd71f03 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/spawnpoint/Spawnpoint.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/Spawnpoint.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.spawnpoint; +package eu.mhsl.craftattack.spawn.appliances.tooling.spawnpoint; import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/PlayerJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/whitelist/PlayerJoinListener.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/PlayerJoinListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/whitelist/PlayerJoinListener.java index 180297f..f01b87f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/PlayerJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/whitelist/PlayerJoinListener.java @@ -1,4 +1,4 @@ -package eu.mhsl.craftattack.spawn.appliances.whitelist; +package eu.mhsl.craftattack.spawn.appliances.tooling.whitelist; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/whitelist/Whitelist.java similarity index 97% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/whitelist/Whitelist.java index a8d2c56..01ebd1a 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/whitelist/Whitelist.java @@ -1,11 +1,11 @@ -package eu.mhsl.craftattack.spawn.appliances.whitelist; +package eu.mhsl.craftattack.spawn.appliances.tooling.whitelist; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.api.client.ReqResp; import eu.mhsl.craftattack.spawn.api.client.repositories.WhitelistRepository; import eu.mhsl.craftattack.spawn.api.server.HttpServer; import eu.mhsl.craftattack.spawn.appliance.Appliance; -import eu.mhsl.craftattack.spawn.appliances.outlawed.Outlawed; +import eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed.Outlawed; import eu.mhsl.craftattack.spawn.util.api.HttpStatus; import eu.mhsl.craftattack.spawn.util.server.Floodgate; import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo;