diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java b/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java index 7bd1142..960e6a3 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java @@ -42,7 +42,7 @@ public abstract class Appliance { * @return List of listeners */ @NotNull - protected List eventHandlers() { + protected List listeners() { return new ArrayList<>(); } @@ -82,7 +82,7 @@ public abstract class Appliance { } public void initialize(@NotNull JavaPlugin plugin) { - this.listeners = eventHandlers(); + this.listeners = listeners(); this.commands = commands(); listeners.forEach(listener -> Bukkit.getPluginManager().registerEvents(listener, plugin)); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminMarker/AdminMarker.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminMarker/AdminMarker.java index ecbe4ff..6a36841 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminMarker/AdminMarker.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/adminMarker/AdminMarker.java @@ -18,7 +18,7 @@ public class AdminMarker extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of(new AdminMarkerListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/AntiSignEdit.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/AntiSignEdit.java index 2e8e622..4a13e2f 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/AntiSignEdit.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/antiSignEdit/AntiSignEdit.java @@ -37,7 +37,7 @@ public class AntiSignEdit extends Appliance { } @Override - protected @NotNull List eventHandlers() { + protected @NotNull List listeners() { return List.of(new OnSignEditListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulker.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulker.java index 0d85e3b..db787ad 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulker.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/autoShulker/AutoShulker.java @@ -40,7 +40,7 @@ public class AutoShulker extends Appliance { } @Override - protected @NotNull List eventHandlers() { + protected @NotNull List listeners() { return List.of(new ItemPickupListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMention.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMention.java index e9904b8..cdc8231 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMention.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMention/ChatMention.java @@ -60,7 +60,7 @@ public class ChatMention extends Appliance { } @Override - protected @NotNull List eventHandlers() { + protected @NotNull List listeners() { return List.of(new ChatMentionListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ChatMessages.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ChatMessages.java index 53108ec..a0d36d8 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ChatMessages.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/chatMessages/ChatMessages.java @@ -22,7 +22,7 @@ public class ChatMessages extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of(new ChatMessagesListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java index b0e13a1..9a92105 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java @@ -17,7 +17,7 @@ public class CustomAdvancements extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of(new CustomAdvancementsDamageEntityListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java index b4ffd2e..2ec3533 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/displayName/DisplayName.java @@ -48,7 +48,7 @@ public class DisplayName extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of(new AdminMarkerListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoor.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoor.java index c70f61a..b554185 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoor.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/doubeDoor/DoubleDoor.java @@ -38,7 +38,7 @@ public class DoubleDoor extends Appliance { } @Override - protected @NotNull List eventHandlers() { + protected @NotNull List listeners() { return List.of(new OnDoorInteractListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/Event.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/Event.java index 548db72..4609f06 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/Event.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/event/Event.java @@ -201,17 +201,15 @@ public class Event extends Appliance { public void advertise() { advertiseCountdown.cancelIfRunning(); this.advertiseStatus = AdvertisementStatus.ADVERTISED; - IteratorUtil.onlinePlayers(player -> { - player.sendMessage( - Component.text() - .append(Component.text("-".repeat(10), NamedTextColor.GRAY)).appendNewline() - .append(Component.text("Ein Event wurde gestartet!", NamedTextColor.GOLD)).appendNewline() - .append(Component.text("Nutze ")) - .append(Component.text("/event", NamedTextColor.AQUA)) - .append(Component.text(", um dem Event beizutreten!")).appendNewline() - .append(Component.text("-".repeat(10), NamedTextColor.GRAY)).appendNewline() - ); - }); + IteratorUtil.onlinePlayers(player -> player.sendMessage( + Component.text() + .append(Component.text("-".repeat(10), NamedTextColor.GRAY)).appendNewline() + .append(Component.text("Ein Event wurde gestartet!", NamedTextColor.GOLD)).appendNewline() + .append(Component.text("Nutze ")) + .append(Component.text("/event", NamedTextColor.AQUA)) + .append(Component.text(", um dem Event beizutreten!")).appendNewline() + .append(Component.text("-".repeat(10), NamedTextColor.GRAY)).appendNewline() + )); advertiseCountdown.start(); } @@ -237,7 +235,7 @@ public class Event extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of( new ApplyPendingRewardsListener(), new PlayerInteractAtEntityEventListener(this.villager.getUniqueId(), playerInteractAtEntityEvent -> joinEvent(playerInteractAtEntityEvent.getPlayer())), diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/Fleischerchest.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/Fleischerchest.java index add3457..0fec6d1 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/Fleischerchest.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/fleischerchest/Fleischerchest.java @@ -19,7 +19,7 @@ public class Fleischerchest extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of(new FleischerchestCraftItemListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefill.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefill.java index 5a7a425..7c53dc6 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefill.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/hotbarRefill/HotbarRefill.java @@ -46,7 +46,7 @@ public class HotbarRefill extends Appliance { } @Override - protected @NotNull List eventHandlers() { + protected @NotNull List listeners() { return List.of(new ItemRefillListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoor.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoor.java index 1b5219b..93f3cd2 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoor.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/knockDoor/KnockDoor.java @@ -55,7 +55,7 @@ public class KnockDoor extends Appliance { } @Override - protected @NotNull List eventHandlers() { + protected @NotNull List listeners() { return List.of(new KnockDoorListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java index d341d6d..e71ffc0 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java @@ -127,7 +127,7 @@ public class Outlawed extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of(new OutlawedReminderListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBan.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBan.java index 5ecd1fc..fef73a8 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBan.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/panicBan/PanicBan.java @@ -50,7 +50,7 @@ public class PanicBan extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of(new PanicBanJoinListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimit.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimit.java index 90ee541..4f620b3 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimit.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/playerlimit/PlayerLimit.java @@ -31,7 +31,7 @@ public class PlayerLimit extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of( new PlayerLimiterListener() ); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/PortableCrafting.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/PortableCrafting.java index 5b00283..c51e7fd 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/PortableCrafting.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/portableCrafting/PortableCrafting.java @@ -15,7 +15,7 @@ public class PortableCrafting extends Appliance { } @Override - protected @NotNull List eventHandlers() { + protected @NotNull List listeners() { return List.of(new OnCraftingTableUseListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/ProjectStart.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/ProjectStart.java index 2f7560c..e12abce 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/ProjectStart.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/projectStart/ProjectStart.java @@ -175,7 +175,7 @@ public class ProjectStart extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of( new PlayerInvincibleListener(), new NoAdvancementsListener() diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java index d235b08..80d4fa0 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java @@ -152,7 +152,7 @@ public class Settings extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of( new SettingsInventoryListener(), new OpenSettingsShortcutListener() diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/Tablist.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/Tablist.java index 6497dca..1abb9c0 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/Tablist.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/Tablist.java @@ -82,7 +82,7 @@ public class Tablist extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of(new TablistListener()); } } diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClear.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClear.java index 678fac7..0f79052 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClear.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/titleClear/TitleClear.java @@ -14,7 +14,7 @@ public class TitleClear extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of( new TitleClearListener() ); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java index 6f6da89..16da0c5 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java @@ -147,7 +147,7 @@ public class Whitelist extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of( new PlayerJoinListener() ); diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/WorldMuseum.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/WorldMuseum.java index 5e55ac2..0520a48 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/WorldMuseum.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/worldmuseum/WorldMuseum.java @@ -44,15 +44,13 @@ public class WorldMuseum extends Appliance { public void handleVillagerInteraction(Player player) { if(Floodgate.isBedrock(player)) { - Floodgate.runBedrockOnly(player, floodgatePlayer -> { - floodgatePlayer.sendForm( - SimpleForm.builder() - .title("Nicht unterstützt") - .content("Bedrock-Spieler werden derzeit für das Weltenmuseum aus Kompatiblitätsgründen nicht zugelassen! Tut uns Leid.") - .button("Ok") - .build() - ); - }); + Floodgate.runBedrockOnly(player, floodgatePlayer -> floodgatePlayer.sendForm( + SimpleForm.builder() + .title("Nicht unterstützt") + .content("Bedrock-Spieler werden derzeit für das Weltenmuseum aus Kompatiblitätsgründen nicht zugelassen! Tut uns Leid.") + .button("Ok") + .build() + )); return; } @@ -68,7 +66,7 @@ public class WorldMuseum extends Appliance { @Override @NotNull - protected List eventHandlers() { + protected List listeners() { return List.of( new PlayerInteractAtEntityEventListener(this.villager.getUniqueId(), playerInteractAtEntityEvent -> handleVillagerInteraction(playerInteractAtEntityEvent.getPlayer())), new DismissInventoryOpenFromHolder(this.villager.getUniqueId()) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index af22dde..a685b93 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -42,10 +42,13 @@ help: spawn: "Der Weltspawn befindet sich bei x:0 y:0 z:0" playerLimit: - maxPlayers: 0 + maxPlayers: 10 whitelist: api: https://mhsl.eu/craftattack/api/user tablist: - interface: eth0 \ No newline at end of file + interface: eth0 + +outlawed: + voluntarily: []