From 76ceb9ef79a0b495238cc5f96253587d089db908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sat, 15 Mar 2025 21:38:55 +0100 Subject: [PATCH] removed public directive where possible to reduce number of global accessible classes --- .../gameplay/antiSignEdit/OnSignEditListener.java | 2 +- .../appliances/gameplay/autoShulker/ItemPickupListener.java | 2 +- .../{listener => }/ApplyPendingAdvancementsListener.java | 5 ++--- .../gameplay/customAdvancements/CustomAdvancements.java | 2 -- .../{listener => }/CustomAdvancementsListener.java | 6 ++---- .../gameplay/doubleDoor/OnDoorInteractListener.java | 2 +- .../fleischerchest/FleischerchestCraftItemListener.java | 2 +- .../appliances/gameplay/glowingBerries/OnBerryEaten.java | 2 +- .../gameplay/hotbarRefill/HotbarRefillListener.java | 2 +- .../appliances/gameplay/knockDoor/KnockDoorListener.java | 2 +- .../gameplay/outlawed/OutlawChangeNotPermitted.java | 2 +- .../spawn/appliances/gameplay/outlawed/OutlawedCommand.java | 2 +- .../gameplay/outlawed/OutlawedReminderListener.java | 2 +- .../portableCrafting/OnCraftingTableUseListener.java | 2 +- .../snowballKnockback/SnowballKnockbackListener.java | 2 +- .../appliances/internal/titleClear/TitleClearListener.java | 2 +- .../appliances/metaGameplay/afkTag/AfkResetListener.java | 2 +- .../metaGameplay/chatMention/ChatMentionListener.java | 2 +- .../metaGameplay/chatMessages/ChatMessagesListener.java | 2 +- .../metaGameplay/displayName/DisplayNameUpdateListener.java | 2 +- .../event/{listener => }/ApplyPendingRewardsListener.java | 5 ++--- .../spawn/appliances/metaGameplay/event/Event.java | 1 - .../spawn/appliances/metaGameplay/feedback/Feedback.java | 2 -- .../feedback/{commands => }/FeedbackCommand.java | 5 ++--- .../feedback/{commands => }/RequestFeedbackCommand.java | 5 ++--- .../appliances/metaGameplay/infoBars/InfoBarCommand.java | 2 +- .../metaGameplay/infoBars/ShowPreviousBarsListener.java | 2 +- .../metaGameplay/optionLinks/UpdateLinksListener.java | 2 +- .../metaGameplay/packSelect/ChangePackCommand.java | 2 +- .../metaGameplay/packSelect/ResourcePackInfoFactory.java | 2 +- .../appliances/metaGameplay/playtime/PlaytimeCommand.java | 2 +- .../spawn/appliances/metaGameplay/report/ReportCommand.java | 2 +- .../appliances/metaGameplay/report/ReportsCommand.java | 2 +- .../appliances/metaGameplay/settings/SettingsCommand.java | 2 +- .../metaGameplay/sleepTag/SleepStateChangeListener.java | 2 +- .../appliances/metaGameplay/tablist/TablistListener.java | 2 +- .../worldmuseum/MoveWorldMuseumVillagerCommand.java | 2 +- .../appliances/metaGameplay/yearRank/YearRankCommand.java | 2 +- .../spawn/appliances/tooling/acInform/AcInformCommand.java | 2 +- .../appliances/tooling/adminChat/AdminChatCommand.java | 2 +- .../spawn/appliances/tooling/chatMute/ChatMuteListener.java | 2 +- .../spawn/appliances/tooling/chatMute/MuteCommand.java | 2 +- .../appliances/tooling/endPrevent/EndPreventCommand.java | 2 +- .../tooling/endPrevent/PreventEnderEyeUseListener.java | 2 +- .../spawn/appliances/tooling/kick/KickCommand.java | 2 +- .../appliances/tooling/maintenance/MaintenanceCommand.java | 2 +- .../tooling/maintenance/PreventMaintenanceJoinListener.java | 2 +- .../spawn/appliances/tooling/panicBan/PanicBanCommand.java | 2 +- .../appliances/tooling/panicBan/PanicBanJoinListener.java | 2 +- .../tooling/playerlimit/PlayerLimiterListener.java | 2 +- .../tooling/playerlimit/SetPlayerLimitCommand.java | 2 +- .../tooling/restart/{command => }/CancelRestartCommand.java | 5 ++--- .../spawn/appliances/tooling/restart/Restart.java | 2 -- .../restart/{command => }/ScheduleRestartCommand.java | 5 ++--- .../appliances/tooling/spawnpoint/SetSpawnpointCommand.java | 2 +- .../tooling/spawnpoint/SpawnAtSpawnpointListener.java | 2 +- .../appliances/tooling/whitelist/PlayerJoinListener.java | 2 +- 57 files changed, 60 insertions(+), 75 deletions(-) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/{listener => }/ApplyPendingAdvancementsListener.java (63%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/{listener => }/CustomAdvancementsListener.java (87%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/{listener => }/ApplyPendingRewardsListener.java (57%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/{commands => }/FeedbackCommand.java (84%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/{commands => }/RequestFeedbackCommand.java (84%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/{command => }/CancelRestartCommand.java (69%) rename src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/{command => }/ScheduleRestartCommand.java (69%) diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/OnSignEditListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/OnSignEditListener.java index af91d97..5196b03 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/OnSignEditListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/antiSignEdit/OnSignEditListener.java @@ -5,7 +5,7 @@ import io.papermc.paper.event.player.PlayerOpenSignEvent; import org.bukkit.block.sign.SignSide; import org.bukkit.event.EventHandler; -public class OnSignEditListener extends ApplianceListener { +class OnSignEditListener extends ApplianceListener { @EventHandler public void onEdit(PlayerOpenSignEvent event) { if(event.getCause().equals(PlayerOpenSignEvent.Cause.PLACE)) return; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/ItemPickupListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/ItemPickupListener.java index 795326c..2775dc5 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/ItemPickupListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/autoShulker/ItemPickupListener.java @@ -7,7 +7,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityPickupItemEvent; -public class ItemPickupListener extends ApplianceListener { +class ItemPickupListener extends ApplianceListener { @EventHandler public void onPickup(EntityPickupItemEvent event) { if(event.getEntity() instanceof Player p) { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/listener/ApplyPendingAdvancementsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/ApplyPendingAdvancementsListener.java similarity index 63% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/listener/ApplyPendingAdvancementsListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/ApplyPendingAdvancementsListener.java index b7846ac..58bb76b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/listener/ApplyPendingAdvancementsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/ApplyPendingAdvancementsListener.java @@ -1,11 +1,10 @@ -package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.listener; +package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.CustomAdvancements; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerJoinEvent; -public class ApplyPendingAdvancementsListener extends ApplianceListener { +class ApplyPendingAdvancementsListener extends ApplianceListener { @EventHandler public void onJoin(PlayerJoinEvent event) { this.getAppliance().applyPendingAdvancements(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancements.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancements.java index a155d3f..f7ef1b8 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancements.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancements.java @@ -2,8 +2,6 @@ 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.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/gameplay/customAdvancements/listener/CustomAdvancementsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancementsListener.java similarity index 87% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/listener/CustomAdvancementsListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancementsListener.java index 407e999..3875a41 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/listener/CustomAdvancementsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/customAdvancements/CustomAdvancementsListener.java @@ -1,8 +1,6 @@ -package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.listener; +package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -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; @@ -12,7 +10,7 @@ import org.bukkit.event.inventory.CraftItemEvent; import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.inventory.ItemStack; -public class CustomAdvancementsListener extends ApplianceListener { +class CustomAdvancementsListener extends ApplianceListener { @EventHandler public void onEntityDamageEntity(EntityDamageByEntityEvent event) { if(!(event.getEntity() instanceof Player damaged)) return; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/OnDoorInteractListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/OnDoorInteractListener.java index b894a71..031b202 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/OnDoorInteractListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/doubleDoor/OnDoorInteractListener.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.EquipmentSlot; import java.util.Objects; -public class OnDoorInteractListener extends ApplianceListener { +class OnDoorInteractListener extends ApplianceListener { @EventHandler public void onPlayerInteract(PlayerInteractEvent event) { if(!event.hasBlock()) return; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java index ed53617..61ce722 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/fleischerchest/FleischerchestCraftItemListener.java @@ -6,7 +6,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.inventory.PrepareItemCraftEvent; import org.bukkit.inventory.ItemStack; -public class FleischerchestCraftItemListener extends ApplianceListener { +class FleischerchestCraftItemListener extends ApplianceListener { @EventHandler public void onPrepareItemCraft(PrepareItemCraftEvent event) { ItemStack result = event.getInventory().getResult(); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/OnBerryEaten.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/OnBerryEaten.java index 16bae0e..43a3d69 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/OnBerryEaten.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/glowingBerries/OnBerryEaten.java @@ -5,7 +5,7 @@ import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerItemConsumeEvent; -public class OnBerryEaten extends ApplianceListener { +class OnBerryEaten extends ApplianceListener { @EventHandler public void onEat(PlayerItemConsumeEvent event) { if(event.getItem().getType().equals(Material.GLOW_BERRIES)) this.getAppliance().letPlayerGlow(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillListener.java index 7c0f10e..f279a59 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/hotbarRefill/HotbarRefillListener.java @@ -12,7 +12,7 @@ import org.bukkit.inventory.ItemStack; import java.util.List; -public class HotbarRefillListener extends ApplianceListener { +class HotbarRefillListener extends ApplianceListener { private HotbarRefillSetting.HotbarReplaceConfig getPlayerSetting(Player player) { return Settings.instance().getSetting( player, diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorListener.java index dc1a2ad..9b063bd 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/knockDoor/KnockDoorListener.java @@ -7,7 +7,7 @@ import org.bukkit.block.data.type.Door; import org.bukkit.event.EventHandler; import org.bukkit.event.block.BlockDamageAbortEvent; -public class KnockDoorListener extends ApplianceListener { +class KnockDoorListener extends ApplianceListener { @EventHandler public void onKnock(BlockDamageAbortEvent event) { if(event.getPlayer().getGameMode() != GameMode.SURVIVAL) return; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java index efcce18..3f42709 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawChangeNotPermitted.java @@ -1,6 +1,6 @@ package eu.mhsl.craftattack.spawn.appliances.gameplay.outlawed; -public class OutlawChangeNotPermitted extends Exception { +class OutlawChangeNotPermitted extends Exception { public OutlawChangeNotPermitted(String message) { super(message); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedCommand.java index 9574ec8..0834785 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedCommand.java @@ -7,7 +7,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class OutlawedCommand extends ApplianceCommand.PlayerChecked { +class OutlawedCommand extends ApplianceCommand.PlayerChecked { public OutlawedCommand() { super("vogelfrei"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedReminderListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedReminderListener.java index 62eeb15..394a966 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedReminderListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/outlawed/OutlawedReminderListener.java @@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerJoinEvent; -public class OutlawedReminderListener extends ApplianceListener { +class OutlawedReminderListener extends ApplianceListener { @EventHandler public void onJoin(PlayerJoinEvent e) { if(this.getAppliance().isOutlawed(e.getPlayer())) { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java index 1e5472b..69033aa 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/portableCrafting/OnCraftingTableUseListener.java @@ -6,7 +6,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; -public class OnCraftingTableUseListener extends ApplianceListener { +class OnCraftingTableUseListener extends ApplianceListener { @EventHandler public void inInteract(PlayerInteractEvent event) { if(!event.getAction().equals(Action.RIGHT_CLICK_AIR)) return; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java index 6e1d09d..fe692fa 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/gameplay/snowballKnockback/SnowballKnockbackListener.java @@ -7,7 +7,7 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.ProjectileHitEvent; -public class SnowballKnockbackListener extends ApplianceListener { +class SnowballKnockbackListener extends ApplianceListener { @EventHandler public void onSnowballHit(ProjectileHitEvent event) { if(event.getHitEntity() == null) return; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClearListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClearListener.java index 310ce30..1841aed 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClearListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/internal/titleClear/TitleClearListener.java @@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerJoinEvent; -public class TitleClearListener extends ApplianceListener { +class TitleClearListener extends ApplianceListener { @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { this.getAppliance().clearTitle(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkResetListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkResetListener.java index 3d6b090..05906a4 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkResetListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/afkTag/AfkResetListener.java @@ -7,7 +7,7 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerMoveEvent; -public class AfkResetListener extends ApplianceListener { +class AfkResetListener extends ApplianceListener { @EventHandler public void onMove(PlayerMoveEvent event) { this.getAppliance().resetTiming(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionListener.java index 16465ef..2aeef66 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMention/ChatMentionListener.java @@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerJoinEvent; import java.util.ArrayList; import java.util.List; -public class ChatMentionListener extends ApplianceListener { +class ChatMentionListener extends ApplianceListener { @SuppressWarnings("UnstableApiUsage") @EventHandler public void coloringEvent(AsyncChatDecorateEvent event) { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessagesListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessagesListener.java index 6d9ec58..29ecf21 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessagesListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/chatMessages/ChatMessagesListener.java @@ -16,7 +16,7 @@ import org.bukkit.event.player.PlayerQuitEvent; import java.util.Optional; -public class ChatMessagesListener extends ApplianceListener { +class ChatMessagesListener extends ApplianceListener { @EventHandler public void onPlayerChatEvent(AsyncChatEvent event) { event.renderer( diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java index e91384f..b394b05 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/displayName/DisplayNameUpdateListener.java @@ -5,7 +5,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerJoinEvent; -public class DisplayNameUpdateListener extends ApplianceListener { +class DisplayNameUpdateListener extends ApplianceListener { @EventHandler(priority = EventPriority.LOW) public void onJoin(PlayerJoinEvent event) { this.getAppliance().update(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/listener/ApplyPendingRewardsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/ApplyPendingRewardsListener.java similarity index 57% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/listener/ApplyPendingRewardsListener.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/ApplyPendingRewardsListener.java index 01a173a..fae533b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/listener/ApplyPendingRewardsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/ApplyPendingRewardsListener.java @@ -1,11 +1,10 @@ -package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.listener; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.event; import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; -import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerJoinEvent; -public class ApplyPendingRewardsListener extends ApplianceListener { +class ApplyPendingRewardsListener extends ApplianceListener { @EventHandler public void onJoin(PlayerJoinEvent event) { this.getAppliance().applyPendingRewards(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/Event.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/Event.java index fb52981..23cefc0 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/Event.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/event/Event.java @@ -9,7 +9,6 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.Advancements; import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.CustomAdvancements; import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.command.*; -import eu.mhsl.craftattack.spawn.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/metaGameplay/feedback/Feedback.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/Feedback.java index 9c4214b..a0caef7 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/Feedback.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/Feedback.java @@ -5,8 +5,6 @@ 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.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/metaGameplay/feedback/commands/FeedbackCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/FeedbackCommand.java similarity index 84% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/commands/FeedbackCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/FeedbackCommand.java index 7020caa..9bb77d9 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/commands/FeedbackCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/FeedbackCommand.java @@ -1,8 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback.commands; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -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; @@ -11,7 +10,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; -public class FeedbackCommand extends ApplianceCommand.PlayerChecked { +class FeedbackCommand extends ApplianceCommand.PlayerChecked { public FeedbackCommand() { super("feedback"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/commands/RequestFeedbackCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/RequestFeedbackCommand.java similarity index 84% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/commands/RequestFeedbackCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/RequestFeedbackCommand.java index ffd4396..7baf8ab 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/commands/RequestFeedbackCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/feedback/RequestFeedbackCommand.java @@ -1,8 +1,7 @@ -package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback.commands; +package eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback.Feedback; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -10,7 +9,7 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; -public class RequestFeedbackCommand extends ApplianceCommand { +class RequestFeedbackCommand extends ApplianceCommand { public RequestFeedbackCommand() { super("requestFeedback"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBarCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBarCommand.java index d18611a..a631496 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBarCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/InfoBarCommand.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -public class InfoBarCommand extends ApplianceCommand.PlayerChecked { +class InfoBarCommand extends ApplianceCommand.PlayerChecked { public InfoBarCommand() { super("infobar"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/ShowPreviousBarsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/ShowPreviousBarsListener.java index 0fc20d1..f8513fd 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/ShowPreviousBarsListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/infoBars/ShowPreviousBarsListener.java @@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerJoinEvent; -public class ShowPreviousBarsListener extends ApplianceListener { +class ShowPreviousBarsListener extends ApplianceListener { @EventHandler public void onJoin(PlayerJoinEvent event) { // this.getAppliance().showAll(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/UpdateLinksListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/UpdateLinksListener.java index 3c18642..40cc169 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/UpdateLinksListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/optionLinks/UpdateLinksListener.java @@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerJoinEvent; -public class UpdateLinksListener extends ApplianceListener { +class UpdateLinksListener extends ApplianceListener { @EventHandler public void onJoin(PlayerJoinEvent event) { this.getAppliance().setServerLinks(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ChangePackCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ChangePackCommand.java index ca1ba51..c7a6e51 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ChangePackCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ChangePackCommand.java @@ -5,7 +5,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class ChangePackCommand extends ApplianceCommand.PlayerChecked { +class ChangePackCommand extends ApplianceCommand.PlayerChecked { public static final String commandName = "texturepack"; public ChangePackCommand() { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java index f07b7a0..36675c8 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/packSelect/ResourcePackInfoFactory.java @@ -12,7 +12,7 @@ import java.security.MessageDigest; import java.util.UUID; import java.util.concurrent.CompletableFuture; -public class ResourcePackInfoFactory { +class ResourcePackInfoFactory { private static boolean isValidHash(@Nullable String hash) { return hash != null && hash.length() == 40; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/playtime/PlaytimeCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/playtime/PlaytimeCommand.java index 31c8838..323759c 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/playtime/PlaytimeCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/playtime/PlaytimeCommand.java @@ -10,7 +10,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class PlaytimeCommand extends ApplianceCommand.PlayerChecked { +class PlaytimeCommand extends ApplianceCommand.PlayerChecked { public PlaytimeCommand() { super("playtime"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportCommand.java index f1c43c3..09b1c3b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportCommand.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -public class ReportCommand extends ApplianceCommand.PlayerChecked { +class ReportCommand extends ApplianceCommand.PlayerChecked { public ReportCommand() { super("report"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportsCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportsCommand.java index 6245469..a748413 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportsCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/report/ReportsCommand.java @@ -8,7 +8,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class ReportsCommand extends ApplianceCommand.PlayerChecked { +class ReportsCommand extends ApplianceCommand.PlayerChecked { public ReportsCommand() { super("reports"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingsCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingsCommand.java index 6c2eb20..14b9469 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingsCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/settings/SettingsCommand.java @@ -5,7 +5,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class SettingsCommand extends ApplianceCommand.PlayerChecked { +class SettingsCommand extends ApplianceCommand.PlayerChecked { public SettingsCommand() { super("settings"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java index 358910f..d0b4783 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/sleepTag/SleepStateChangeListener.java @@ -5,7 +5,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerBedEnterEvent; import org.bukkit.event.player.PlayerBedLeaveEvent; -public class SleepStateChangeListener extends ApplianceListener { +class SleepStateChangeListener extends ApplianceListener { @EventHandler public void onBedEnter(PlayerBedEnterEvent event) { if(!event.getBedEnterResult().equals(PlayerBedEnterEvent.BedEnterResult.OK)) return; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/TablistListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/TablistListener.java index 4a5f73e..c914731 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/TablistListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/tablist/TablistListener.java @@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerJoinEvent; -public class TablistListener extends ApplianceListener { +class TablistListener extends ApplianceListener { @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { this.getAppliance().fullUpdate(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java index 3ce42f4..35d9e77 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/worldmuseum/MoveWorldMuseumVillagerCommand.java @@ -5,7 +5,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class MoveWorldMuseumVillagerCommand extends ApplianceCommand.PlayerChecked { +class MoveWorldMuseumVillagerCommand extends ApplianceCommand.PlayerChecked { public MoveWorldMuseumVillagerCommand() { super("moveWorldMuseumVillager"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/yearRank/YearRankCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/yearRank/YearRankCommand.java index 0868d56..13529b0 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/yearRank/YearRankCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/metaGameplay/yearRank/YearRankCommand.java @@ -5,7 +5,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class YearRankCommand extends ApplianceCommand { +class YearRankCommand extends ApplianceCommand { public YearRankCommand() { super("yearRank"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/acInform/AcInformCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/acInform/AcInformCommand.java index 8eb575d..091dc70 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/acInform/AcInformCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/acInform/AcInformCommand.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -public class AcInformCommand extends ApplianceCommand { +class AcInformCommand extends ApplianceCommand { public AcInformCommand() { super("acInform"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/adminChat/AdminChatCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/adminChat/AdminChatCommand.java index 61f2281..8b1de97 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/adminChat/AdminChatCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/adminChat/AdminChatCommand.java @@ -5,7 +5,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class AdminChatCommand extends ApplianceCommand.PlayerChecked { +class AdminChatCommand extends ApplianceCommand.PlayerChecked { public static final String commandName = "adminchat"; public AdminChatCommand() { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/ChatMuteListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/ChatMuteListener.java index 5ab0c4d..e6a1cb4 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/ChatMuteListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/ChatMuteListener.java @@ -8,7 +8,7 @@ import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.event.EventHandler; import org.jetbrains.annotations.Nullable; -public class ChatMuteListener extends ApplianceListener { +class ChatMuteListener extends ApplianceListener { @EventHandler public void onChat(AsyncChatEvent event) { @Nullable Long muteDuration = this.getAppliance().muteStatus(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/MuteCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/MuteCommand.java index d92b479..0d3324b 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/MuteCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/chatMute/MuteCommand.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Objects; -public class MuteCommand extends ApplianceCommand { +class MuteCommand extends ApplianceCommand { public MuteCommand() { super("mute"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/EndPreventCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/EndPreventCommand.java index 2cb0af5..5401467 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/EndPreventCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/EndPreventCommand.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Map; -public class EndPreventCommand extends ApplianceCommand { +class EndPreventCommand extends ApplianceCommand { private final Map arguments = Map.of("preventEnd", true, "allowEnd", false); public EndPreventCommand() { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/PreventEnderEyeUseListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/PreventEnderEyeUseListener.java index 21459f1..4f638d9 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/PreventEnderEyeUseListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/endPrevent/PreventEnderEyeUseListener.java @@ -7,7 +7,7 @@ import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerInteractEvent; -public class PreventEnderEyeUseListener extends ApplianceListener { +class PreventEnderEyeUseListener extends ApplianceListener { @EventHandler public void onEnderEyeInteraction(PlayerInteractEvent event) { if(event.getClickedBlock() == null) return; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/kick/KickCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/kick/KickCommand.java index 9472a32..3072970 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/kick/KickCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/kick/KickCommand.java @@ -12,7 +12,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -public class KickCommand extends ApplianceCommand { +class KickCommand extends ApplianceCommand { public KickCommand() { super("kick"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/MaintenanceCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/MaintenanceCommand.java index 3b58605..3e292d1 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/MaintenanceCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/MaintenanceCommand.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Map; -public class MaintenanceCommand extends ApplianceCommand { +class MaintenanceCommand extends ApplianceCommand { private final Map arguments = Map.of("enable", true, "disable", false); public MaintenanceCommand() { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/PreventMaintenanceJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/PreventMaintenanceJoinListener.java index b19f87f..f1c298e 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/PreventMaintenanceJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/maintenance/PreventMaintenanceJoinListener.java @@ -5,7 +5,7 @@ import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerLoginEvent; -public class PreventMaintenanceJoinListener extends ApplianceListener { +class PreventMaintenanceJoinListener extends ApplianceListener { @EventHandler public void onJoin(PlayerLoginEvent event) { if(!this.getAppliance().isInMaintenance()) return; diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanCommand.java index a756c5a..aa74436 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanCommand.java @@ -13,7 +13,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -public class PanicBanCommand extends ApplianceCommand { +class PanicBanCommand extends ApplianceCommand { public PanicBanCommand() { super("panicBan"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanJoinListener.java index 7b25309..aa52aa7 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/panicBan/PanicBanJoinListener.java @@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener; import org.bukkit.event.EventHandler; import org.bukkit.event.player.AsyncPlayerPreLoginEvent; -public class PanicBanJoinListener extends ApplianceListener { +class PanicBanJoinListener extends ApplianceListener { @EventHandler public void onLogin(AsyncPlayerPreLoginEvent event) { if(this.getAppliance().isBanned(event.getUniqueId())) { diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/PlayerLimiterListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/PlayerLimiterListener.java index f588ccf..8a2b804 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/PlayerLimiterListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/PlayerLimiterListener.java @@ -6,7 +6,7 @@ import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.player.AsyncPlayerPreLoginEvent; -public class PlayerLimiterListener extends ApplianceListener { +class PlayerLimiterListener extends ApplianceListener { @EventHandler public void onLogin(AsyncPlayerPreLoginEvent playerPreLoginEvent) { playerPreLoginEvent.kickMessage( diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/SetPlayerLimitCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/SetPlayerLimitCommand.java index 2e137b3..8d7d87f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/SetPlayerLimitCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/playerlimit/SetPlayerLimitCommand.java @@ -7,7 +7,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class SetPlayerLimitCommand extends ApplianceCommand { +class SetPlayerLimitCommand extends ApplianceCommand { public SetPlayerLimitCommand() { super("setPlayerLimit"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/command/CancelRestartCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/CancelRestartCommand.java similarity index 69% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/command/CancelRestartCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/CancelRestartCommand.java index f202652..04d3f2f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/command/CancelRestartCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/CancelRestartCommand.java @@ -1,12 +1,11 @@ -package eu.mhsl.craftattack.spawn.appliances.tooling.restart.command; +package eu.mhsl.craftattack.spawn.appliances.tooling.restart; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.tooling.restart.Restart; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class CancelRestartCommand extends ApplianceCommand { +class CancelRestartCommand extends ApplianceCommand { public CancelRestartCommand() { super("cancelRestart"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/Restart.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/Restart.java index 693841e..e18d536 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/Restart.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/Restart.java @@ -2,8 +2,6 @@ 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.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/tooling/restart/command/ScheduleRestartCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/ScheduleRestartCommand.java similarity index 69% rename from src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/command/ScheduleRestartCommand.java rename to src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/ScheduleRestartCommand.java index 8a7f457..d427641 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/command/ScheduleRestartCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/restart/ScheduleRestartCommand.java @@ -1,12 +1,11 @@ -package eu.mhsl.craftattack.spawn.appliances.tooling.restart.command; +package eu.mhsl.craftattack.spawn.appliances.tooling.restart; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; -import eu.mhsl.craftattack.spawn.appliances.tooling.restart.Restart; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class ScheduleRestartCommand extends ApplianceCommand { +class ScheduleRestartCommand extends ApplianceCommand { public ScheduleRestartCommand() { super("scheduleRestart"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SetSpawnpointCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SetSpawnpointCommand.java index 72e36a8..bf7b694 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SetSpawnpointCommand.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SetSpawnpointCommand.java @@ -7,7 +7,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -public class SetSpawnpointCommand extends ApplianceCommand.PlayerChecked { +class SetSpawnpointCommand extends ApplianceCommand.PlayerChecked { public SetSpawnpointCommand() { super("setSpawnpoint"); } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SpawnAtSpawnpointListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SpawnAtSpawnpointListener.java index 8367195..98f779c 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SpawnAtSpawnpointListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/spawnpoint/SpawnAtSpawnpointListener.java @@ -5,7 +5,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerRespawnEvent; -public class SpawnAtSpawnpointListener extends ApplianceListener { +class SpawnAtSpawnpointListener extends ApplianceListener { @EventHandler public void onJoin(PlayerJoinEvent event) { this.getAppliance().handlePlayerLogin(event.getPlayer()); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/whitelist/PlayerJoinListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/whitelist/PlayerJoinListener.java index f01b87f..92131e9 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/whitelist/PlayerJoinListener.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tooling/whitelist/PlayerJoinListener.java @@ -6,7 +6,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.player.AsyncPlayerPreLoginEvent; import org.bukkit.event.player.PlayerLoginEvent; -public class PlayerJoinListener extends ApplianceListener { +class PlayerJoinListener extends ApplianceListener { @EventHandler public void preLoginEvent(AsyncPlayerPreLoginEvent event) { try {