removed public directive where possible to reduce number of global accessible classes

This commit is contained in:
Elias Müller 2025-03-15 21:38:55 +01:00
parent 219879974c
commit 76ceb9ef79
57 changed files with 60 additions and 75 deletions

View File

@ -5,7 +5,7 @@ import io.papermc.paper.event.player.PlayerOpenSignEvent;
import org.bukkit.block.sign.SignSide; import org.bukkit.block.sign.SignSide;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
public class OnSignEditListener extends ApplianceListener<AntiSignEdit> { class OnSignEditListener extends ApplianceListener<AntiSignEdit> {
@EventHandler @EventHandler
public void onEdit(PlayerOpenSignEvent event) { public void onEdit(PlayerOpenSignEvent event) {
if(event.getCause().equals(PlayerOpenSignEvent.Cause.PLACE)) return; if(event.getCause().equals(PlayerOpenSignEvent.Cause.PLACE)) return;

View File

@ -7,7 +7,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityPickupItemEvent; import org.bukkit.event.entity.EntityPickupItemEvent;
public class ItemPickupListener extends ApplianceListener<AutoShulker> { class ItemPickupListener extends ApplianceListener<AutoShulker> {
@EventHandler @EventHandler
public void onPickup(EntityPickupItemEvent event) { public void onPickup(EntityPickupItemEvent event) {
if(event.getEntity() instanceof Player p) { if(event.getEntity() instanceof Player p) {

View File

@ -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.appliance.ApplianceListener;
import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.CustomAdvancements;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
public class ApplyPendingAdvancementsListener extends ApplianceListener<CustomAdvancements> { class ApplyPendingAdvancementsListener extends ApplianceListener<CustomAdvancements> {
@EventHandler @EventHandler
public void onJoin(PlayerJoinEvent event) { public void onJoin(PlayerJoinEvent event) {
this.getAppliance().applyPendingAdvancements(event.getPlayer()); this.getAppliance().applyPendingAdvancements(event.getPlayer());

View File

@ -2,8 +2,6 @@ package eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements;
import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.Main;
import eu.mhsl.craftattack.spawn.appliance.Appliance; 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.Bukkit;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.advancement.Advancement; import org.bukkit.advancement.Advancement;

View File

@ -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.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 net.kyori.adventure.text.Component;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -12,7 +10,7 @@ import org.bukkit.event.inventory.CraftItemEvent;
import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.event.player.PlayerChangedWorldEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
public class CustomAdvancementsListener extends ApplianceListener<CustomAdvancements> { class CustomAdvancementsListener extends ApplianceListener<CustomAdvancements> {
@EventHandler @EventHandler
public void onEntityDamageEntity(EntityDamageByEntityEvent event) { public void onEntityDamageEntity(EntityDamageByEntityEvent event) {
if(!(event.getEntity() instanceof Player damaged)) return; if(!(event.getEntity() instanceof Player damaged)) return;

View File

@ -11,7 +11,7 @@ import org.bukkit.inventory.EquipmentSlot;
import java.util.Objects; import java.util.Objects;
public class OnDoorInteractListener extends ApplianceListener<DoubleDoor> { class OnDoorInteractListener extends ApplianceListener<DoubleDoor> {
@EventHandler @EventHandler
public void onPlayerInteract(PlayerInteractEvent event) { public void onPlayerInteract(PlayerInteractEvent event) {
if(!event.hasBlock()) return; if(!event.hasBlock()) return;

View File

@ -6,7 +6,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.inventory.PrepareItemCraftEvent; import org.bukkit.event.inventory.PrepareItemCraftEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
public class FleischerchestCraftItemListener extends ApplianceListener<Fleischerchest> { class FleischerchestCraftItemListener extends ApplianceListener<Fleischerchest> {
@EventHandler @EventHandler
public void onPrepareItemCraft(PrepareItemCraftEvent event) { public void onPrepareItemCraft(PrepareItemCraftEvent event) {
ItemStack result = event.getInventory().getResult(); ItemStack result = event.getInventory().getResult();

View File

@ -5,7 +5,7 @@ import org.bukkit.Material;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerItemConsumeEvent; import org.bukkit.event.player.PlayerItemConsumeEvent;
public class OnBerryEaten extends ApplianceListener<GlowingBerries> { class OnBerryEaten extends ApplianceListener<GlowingBerries> {
@EventHandler @EventHandler
public void onEat(PlayerItemConsumeEvent event) { public void onEat(PlayerItemConsumeEvent event) {
if(event.getItem().getType().equals(Material.GLOW_BERRIES)) this.getAppliance().letPlayerGlow(event.getPlayer()); if(event.getItem().getType().equals(Material.GLOW_BERRIES)) this.getAppliance().letPlayerGlow(event.getPlayer());

View File

@ -12,7 +12,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.List; import java.util.List;
public class HotbarRefillListener extends ApplianceListener<HotbarRefill> { class HotbarRefillListener extends ApplianceListener<HotbarRefill> {
private HotbarRefillSetting.HotbarReplaceConfig getPlayerSetting(Player player) { private HotbarRefillSetting.HotbarReplaceConfig getPlayerSetting(Player player) {
return Settings.instance().getSetting( return Settings.instance().getSetting(
player, player,

View File

@ -7,7 +7,7 @@ import org.bukkit.block.data.type.Door;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.block.BlockDamageAbortEvent; import org.bukkit.event.block.BlockDamageAbortEvent;
public class KnockDoorListener extends ApplianceListener<KnockDoor> { class KnockDoorListener extends ApplianceListener<KnockDoor> {
@EventHandler @EventHandler
public void onKnock(BlockDamageAbortEvent event) { public void onKnock(BlockDamageAbortEvent event) {
if(event.getPlayer().getGameMode() != GameMode.SURVIVAL) return; if(event.getPlayer().getGameMode() != GameMode.SURVIVAL) return;

View File

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

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class OutlawedCommand extends ApplianceCommand.PlayerChecked<Outlawed> { class OutlawedCommand extends ApplianceCommand.PlayerChecked<Outlawed> {
public OutlawedCommand() { public OutlawedCommand() {
super("vogelfrei"); super("vogelfrei");
} }

View File

@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
public class OutlawedReminderListener extends ApplianceListener<Outlawed> { class OutlawedReminderListener extends ApplianceListener<Outlawed> {
@EventHandler @EventHandler
public void onJoin(PlayerJoinEvent e) { public void onJoin(PlayerJoinEvent e) {
if(this.getAppliance().isOutlawed(e.getPlayer())) { if(this.getAppliance().isOutlawed(e.getPlayer())) {

View File

@ -6,7 +6,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
public class OnCraftingTableUseListener extends ApplianceListener<PortableCrafting> { class OnCraftingTableUseListener extends ApplianceListener<PortableCrafting> {
@EventHandler @EventHandler
public void inInteract(PlayerInteractEvent event) { public void inInteract(PlayerInteractEvent event) {
if(!event.getAction().equals(Action.RIGHT_CLICK_AIR)) return; if(!event.getAction().equals(Action.RIGHT_CLICK_AIR)) return;

View File

@ -7,7 +7,7 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.entity.ProjectileHitEvent;
public class SnowballKnockbackListener extends ApplianceListener<SnowballKnockback> { class SnowballKnockbackListener extends ApplianceListener<SnowballKnockback> {
@EventHandler @EventHandler
public void onSnowballHit(ProjectileHitEvent event) { public void onSnowballHit(ProjectileHitEvent event) {
if(event.getHitEntity() == null) return; if(event.getHitEntity() == null) return;

View File

@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
public class TitleClearListener extends ApplianceListener<TitleClear> { class TitleClearListener extends ApplianceListener<TitleClear> {
@EventHandler @EventHandler
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
this.getAppliance().clearTitle(event.getPlayer()); this.getAppliance().clearTitle(event.getPlayer());

View File

@ -7,7 +7,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
public class AfkResetListener extends ApplianceListener<AfkTag> { class AfkResetListener extends ApplianceListener<AfkTag> {
@EventHandler @EventHandler
public void onMove(PlayerMoveEvent event) { public void onMove(PlayerMoveEvent event) {
this.getAppliance().resetTiming(event.getPlayer()); this.getAppliance().resetTiming(event.getPlayer());

View File

@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class ChatMentionListener extends ApplianceListener<ChatMention> { class ChatMentionListener extends ApplianceListener<ChatMention> {
@SuppressWarnings("UnstableApiUsage") @SuppressWarnings("UnstableApiUsage")
@EventHandler @EventHandler
public void coloringEvent(AsyncChatDecorateEvent event) { public void coloringEvent(AsyncChatDecorateEvent event) {

View File

@ -16,7 +16,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
import java.util.Optional; import java.util.Optional;
public class ChatMessagesListener extends ApplianceListener<ChatMessages> { class ChatMessagesListener extends ApplianceListener<ChatMessages> {
@EventHandler @EventHandler
public void onPlayerChatEvent(AsyncChatEvent event) { public void onPlayerChatEvent(AsyncChatEvent event) {
event.renderer( event.renderer(

View File

@ -5,7 +5,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
public class DisplayNameUpdateListener extends ApplianceListener<DisplayName> { class DisplayNameUpdateListener extends ApplianceListener<DisplayName> {
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
public void onJoin(PlayerJoinEvent event) { public void onJoin(PlayerJoinEvent event) {
this.getAppliance().update(event.getPlayer()); this.getAppliance().update(event.getPlayer());

View File

@ -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.appliance.ApplianceListener;
import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.Event;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
public class ApplyPendingRewardsListener extends ApplianceListener<Event> { class ApplyPendingRewardsListener extends ApplianceListener<Event> {
@EventHandler @EventHandler
public void onJoin(PlayerJoinEvent event) { public void onJoin(PlayerJoinEvent event) {
this.getAppliance().applyPendingRewards(event.getPlayer()); this.getAppliance().applyPendingRewards(event.getPlayer());

View File

@ -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.Advancements;
import eu.mhsl.craftattack.spawn.appliances.gameplay.customAdvancements.CustomAdvancements; 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.command.*;
import eu.mhsl.craftattack.spawn.appliances.metaGameplay.event.listener.ApplyPendingRewardsListener;
import eu.mhsl.craftattack.spawn.util.IteratorUtil; import eu.mhsl.craftattack.spawn.util.IteratorUtil;
import eu.mhsl.craftattack.spawn.util.api.HttpStatus; import eu.mhsl.craftattack.spawn.util.api.HttpStatus;
import eu.mhsl.craftattack.spawn.util.entity.DisplayVillager; import eu.mhsl.craftattack.spawn.util.entity.DisplayVillager;

View File

@ -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.api.client.repositories.FeedbackRepository;
import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.Appliance;
import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; 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 eu.mhsl.craftattack.spawn.util.api.HttpStatus;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentBuilder; import net.kyori.adventure.text.ComponentBuilder;

View File

@ -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.Main;
import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; 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 eu.mhsl.craftattack.spawn.util.text.ComponentUtil;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -11,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List; import java.util.List;
public class FeedbackCommand extends ApplianceCommand.PlayerChecked<Feedback> { class FeedbackCommand extends ApplianceCommand.PlayerChecked<Feedback> {
public FeedbackCommand() { public FeedbackCommand() {
super("feedback"); super("feedback");
} }

View File

@ -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.Main;
import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
import eu.mhsl.craftattack.spawn.appliances.metaGameplay.feedback.Feedback;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -10,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
public class RequestFeedbackCommand extends ApplianceCommand<Feedback> { class RequestFeedbackCommand extends ApplianceCommand<Feedback> {
public RequestFeedbackCommand() { public RequestFeedbackCommand() {
super("requestFeedback"); super("requestFeedback");
} }

View File

@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.List; import java.util.List;
public class InfoBarCommand extends ApplianceCommand.PlayerChecked<InfoBars> { class InfoBarCommand extends ApplianceCommand.PlayerChecked<InfoBars> {
public InfoBarCommand() { public InfoBarCommand() {
super("infobar"); super("infobar");
} }

View File

@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
public class ShowPreviousBarsListener extends ApplianceListener<InfoBars> { class ShowPreviousBarsListener extends ApplianceListener<InfoBars> {
@EventHandler @EventHandler
public void onJoin(PlayerJoinEvent event) { public void onJoin(PlayerJoinEvent event) {
// this.getAppliance().showAll(event.getPlayer()); // this.getAppliance().showAll(event.getPlayer());

View File

@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
public class UpdateLinksListener extends ApplianceListener<OptionLinks> { class UpdateLinksListener extends ApplianceListener<OptionLinks> {
@EventHandler @EventHandler
public void onJoin(PlayerJoinEvent event) { public void onJoin(PlayerJoinEvent event) {
this.getAppliance().setServerLinks(event.getPlayer()); this.getAppliance().setServerLinks(event.getPlayer());

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class ChangePackCommand extends ApplianceCommand.PlayerChecked<PackSelect> { class ChangePackCommand extends ApplianceCommand.PlayerChecked<PackSelect> {
public static final String commandName = "texturepack"; public static final String commandName = "texturepack";
public ChangePackCommand() { public ChangePackCommand() {

View File

@ -12,7 +12,7 @@ import java.security.MessageDigest;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
public class ResourcePackInfoFactory { class ResourcePackInfoFactory {
private static boolean isValidHash(@Nullable String hash) { private static boolean isValidHash(@Nullable String hash) {
return hash != null && hash.length() == 40; return hash != null && hash.length() == 40;

View File

@ -10,7 +10,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class PlaytimeCommand extends ApplianceCommand.PlayerChecked<Playtime> { class PlaytimeCommand extends ApplianceCommand.PlayerChecked<Playtime> {
public PlaytimeCommand() { public PlaytimeCommand() {
super("playtime"); super("playtime");
} }

View File

@ -16,7 +16,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
public class ReportCommand extends ApplianceCommand.PlayerChecked<Report> { class ReportCommand extends ApplianceCommand.PlayerChecked<Report> {
public ReportCommand() { public ReportCommand() {
super("report"); super("report");
} }

View File

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class ReportsCommand extends ApplianceCommand.PlayerChecked<Report> { class ReportsCommand extends ApplianceCommand.PlayerChecked<Report> {
public ReportsCommand() { public ReportsCommand() {
super("reports"); super("reports");
} }

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class SettingsCommand extends ApplianceCommand.PlayerChecked<Settings> { class SettingsCommand extends ApplianceCommand.PlayerChecked<Settings> {
public SettingsCommand() { public SettingsCommand() {
super("settings"); super("settings");
} }

View File

@ -5,7 +5,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerBedEnterEvent; import org.bukkit.event.player.PlayerBedEnterEvent;
import org.bukkit.event.player.PlayerBedLeaveEvent; import org.bukkit.event.player.PlayerBedLeaveEvent;
public class SleepStateChangeListener extends ApplianceListener<SleepTag> { class SleepStateChangeListener extends ApplianceListener<SleepTag> {
@EventHandler @EventHandler
public void onBedEnter(PlayerBedEnterEvent event) { public void onBedEnter(PlayerBedEnterEvent event) {
if(!event.getBedEnterResult().equals(PlayerBedEnterEvent.BedEnterResult.OK)) return; if(!event.getBedEnterResult().equals(PlayerBedEnterEvent.BedEnterResult.OK)) return;

View File

@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
public class TablistListener extends ApplianceListener<Tablist> { class TablistListener extends ApplianceListener<Tablist> {
@EventHandler @EventHandler
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
this.getAppliance().fullUpdate(event.getPlayer()); this.getAppliance().fullUpdate(event.getPlayer());

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class MoveWorldMuseumVillagerCommand extends ApplianceCommand.PlayerChecked<WorldMuseum> { class MoveWorldMuseumVillagerCommand extends ApplianceCommand.PlayerChecked<WorldMuseum> {
public MoveWorldMuseumVillagerCommand() { public MoveWorldMuseumVillagerCommand() {
super("moveWorldMuseumVillager"); super("moveWorldMuseumVillager");
} }

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class YearRankCommand extends ApplianceCommand<YearRank> { class YearRankCommand extends ApplianceCommand<YearRank> {
public YearRankCommand() { public YearRankCommand() {
super("yearRank"); super("yearRank");
} }

View File

@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class AcInformCommand extends ApplianceCommand<AcInform> { class AcInformCommand extends ApplianceCommand<AcInform> {
public AcInformCommand() { public AcInformCommand() {
super("acInform"); super("acInform");
} }

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class AdminChatCommand extends ApplianceCommand.PlayerChecked<AdminChat> { class AdminChatCommand extends ApplianceCommand.PlayerChecked<AdminChat> {
public static final String commandName = "adminchat"; public static final String commandName = "adminchat";
public AdminChatCommand() { public AdminChatCommand() {

View File

@ -8,7 +8,7 @@ import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
public class ChatMuteListener extends ApplianceListener<ChatMute> { class ChatMuteListener extends ApplianceListener<ChatMute> {
@EventHandler @EventHandler
public void onChat(AsyncChatEvent event) { public void onChat(AsyncChatEvent event) {
@Nullable Long muteDuration = this.getAppliance().muteStatus(event.getPlayer()); @Nullable Long muteDuration = this.getAppliance().muteStatus(event.getPlayer());

View File

@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
public class MuteCommand extends ApplianceCommand<ChatMute> { class MuteCommand extends ApplianceCommand<ChatMute> {
public MuteCommand() { public MuteCommand() {
super("mute"); super("mute");
} }

View File

@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class EndPreventCommand extends ApplianceCommand<EndPrevent> { class EndPreventCommand extends ApplianceCommand<EndPrevent> {
private final Map<String, Boolean> arguments = Map.of("preventEnd", true, "allowEnd", false); private final Map<String, Boolean> arguments = Map.of("preventEnd", true, "allowEnd", false);
public EndPreventCommand() { public EndPreventCommand() {

View File

@ -7,7 +7,7 @@ import org.bukkit.Material;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
public class PreventEnderEyeUseListener extends ApplianceListener<EndPrevent> { class PreventEnderEyeUseListener extends ApplianceListener<EndPrevent> {
@EventHandler @EventHandler
public void onEnderEyeInteraction(PlayerInteractEvent event) { public void onEnderEyeInteraction(PlayerInteractEvent event) {
if(event.getClickedBlock() == null) return; if(event.getClickedBlock() == null) return;

View File

@ -12,7 +12,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class KickCommand extends ApplianceCommand<Kick> { class KickCommand extends ApplianceCommand<Kick> {
public KickCommand() { public KickCommand() {
super("kick"); super("kick");
} }

View File

@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class MaintenanceCommand extends ApplianceCommand<Maintenance> { class MaintenanceCommand extends ApplianceCommand<Maintenance> {
private final Map<String, Boolean> arguments = Map.of("enable", true, "disable", false); private final Map<String, Boolean> arguments = Map.of("enable", true, "disable", false);
public MaintenanceCommand() { public MaintenanceCommand() {

View File

@ -5,7 +5,7 @@ import eu.mhsl.craftattack.spawn.util.text.DisconnectInfo;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerLoginEvent;
public class PreventMaintenanceJoinListener extends ApplianceListener<Maintenance> { class PreventMaintenanceJoinListener extends ApplianceListener<Maintenance> {
@EventHandler @EventHandler
public void onJoin(PlayerLoginEvent event) { public void onJoin(PlayerLoginEvent event) {
if(!this.getAppliance().isInMaintenance()) return; if(!this.getAppliance().isInMaintenance()) return;

View File

@ -13,7 +13,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
public class PanicBanCommand extends ApplianceCommand<PanicBan> { class PanicBanCommand extends ApplianceCommand<PanicBan> {
public PanicBanCommand() { public PanicBanCommand() {
super("panicBan"); super("panicBan");
} }

View File

@ -4,7 +4,7 @@ import eu.mhsl.craftattack.spawn.appliance.ApplianceListener;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.AsyncPlayerPreLoginEvent; import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
public class PanicBanJoinListener extends ApplianceListener<PanicBan> { class PanicBanJoinListener extends ApplianceListener<PanicBan> {
@EventHandler @EventHandler
public void onLogin(AsyncPlayerPreLoginEvent event) { public void onLogin(AsyncPlayerPreLoginEvent event) {
if(this.getAppliance().isBanned(event.getUniqueId())) { if(this.getAppliance().isBanned(event.getUniqueId())) {

View File

@ -6,7 +6,7 @@ import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.AsyncPlayerPreLoginEvent; import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
public class PlayerLimiterListener extends ApplianceListener<PlayerLimit> { class PlayerLimiterListener extends ApplianceListener<PlayerLimit> {
@EventHandler @EventHandler
public void onLogin(AsyncPlayerPreLoginEvent playerPreLoginEvent) { public void onLogin(AsyncPlayerPreLoginEvent playerPreLoginEvent) {
playerPreLoginEvent.kickMessage( playerPreLoginEvent.kickMessage(

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class SetPlayerLimitCommand extends ApplianceCommand<PlayerLimit> { class SetPlayerLimitCommand extends ApplianceCommand<PlayerLimit> {
public SetPlayerLimitCommand() { public SetPlayerLimitCommand() {
super("setPlayerLimit"); super("setPlayerLimit");
} }

View File

@ -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.appliance.ApplianceCommand;
import eu.mhsl.craftattack.spawn.appliances.tooling.restart.Restart;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class CancelRestartCommand extends ApplianceCommand<Restart> { class CancelRestartCommand extends ApplianceCommand<Restart> {
public CancelRestartCommand() { public CancelRestartCommand() {
super("cancelRestart"); super("cancelRestart");
} }

View File

@ -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.Appliance;
import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; 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.IteratorUtil;
import eu.mhsl.craftattack.spawn.util.text.Countdown; import eu.mhsl.craftattack.spawn.util.text.Countdown;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;

View File

@ -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.appliance.ApplianceCommand;
import eu.mhsl.craftattack.spawn.appliances.tooling.restart.Restart;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class ScheduleRestartCommand extends ApplianceCommand<Restart> { class ScheduleRestartCommand extends ApplianceCommand<Restart> {
public ScheduleRestartCommand() { public ScheduleRestartCommand() {
super("scheduleRestart"); super("scheduleRestart");
} }

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class SetSpawnpointCommand extends ApplianceCommand.PlayerChecked<Spawnpoint> { class SetSpawnpointCommand extends ApplianceCommand.PlayerChecked<Spawnpoint> {
public SetSpawnpointCommand() { public SetSpawnpointCommand() {
super("setSpawnpoint"); super("setSpawnpoint");
} }

View File

@ -5,7 +5,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerRespawnEvent;
public class SpawnAtSpawnpointListener extends ApplianceListener<Spawnpoint> { class SpawnAtSpawnpointListener extends ApplianceListener<Spawnpoint> {
@EventHandler @EventHandler
public void onJoin(PlayerJoinEvent event) { public void onJoin(PlayerJoinEvent event) {
this.getAppliance().handlePlayerLogin(event.getPlayer()); this.getAppliance().handlePlayerLogin(event.getPlayer());

View File

@ -6,7 +6,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.player.AsyncPlayerPreLoginEvent; import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerLoginEvent;
public class PlayerJoinListener extends ApplianceListener<Whitelist> { class PlayerJoinListener extends ApplianceListener<Whitelist> {
@EventHandler @EventHandler
public void preLoginEvent(AsyncPlayerPreLoginEvent event) { public void preLoginEvent(AsyncPlayerPreLoginEvent event) {
try { try {