renamed eventHandlers to listeners

This commit is contained in:
Elias Müller 2024-09-14 20:35:14 +02:00
parent d6a3fe358d
commit e11b3fd7bc
24 changed files with 45 additions and 46 deletions

View File

@ -42,7 +42,7 @@ public abstract class Appliance {
* @return List of listeners * @return List of listeners
*/ */
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return new ArrayList<>(); return new ArrayList<>();
} }
@ -82,7 +82,7 @@ public abstract class Appliance {
} }
public void initialize(@NotNull JavaPlugin plugin) { public void initialize(@NotNull JavaPlugin plugin) {
this.listeners = eventHandlers(); this.listeners = listeners();
this.commands = commands(); this.commands = commands();
listeners.forEach(listener -> Bukkit.getPluginManager().registerEvents(listener, plugin)); listeners.forEach(listener -> Bukkit.getPluginManager().registerEvents(listener, plugin));

View File

@ -18,7 +18,7 @@ public class AdminMarker extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of(new AdminMarkerListener()); return List.of(new AdminMarkerListener());
} }
} }

View File

@ -37,7 +37,7 @@ public class AntiSignEdit extends Appliance {
} }
@Override @Override
protected @NotNull List<Listener> eventHandlers() { protected @NotNull List<Listener> listeners() {
return List.of(new OnSignEditListener()); return List.of(new OnSignEditListener());
} }
} }

View File

@ -40,7 +40,7 @@ public class AutoShulker extends Appliance {
} }
@Override @Override
protected @NotNull List<Listener> eventHandlers() { protected @NotNull List<Listener> listeners() {
return List.of(new ItemPickupListener()); return List.of(new ItemPickupListener());
} }
} }

View File

@ -60,7 +60,7 @@ public class ChatMention extends Appliance {
} }
@Override @Override
protected @NotNull List<Listener> eventHandlers() { protected @NotNull List<Listener> listeners() {
return List.of(new ChatMentionListener()); return List.of(new ChatMentionListener());
} }
} }

View File

@ -22,7 +22,7 @@ public class ChatMessages extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of(new ChatMessagesListener()); return List.of(new ChatMessagesListener());
} }
} }

View File

@ -17,7 +17,7 @@ public class CustomAdvancements extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of(new CustomAdvancementsDamageEntityListener()); return List.of(new CustomAdvancementsDamageEntityListener());
} }
} }

View File

@ -48,7 +48,7 @@ public class DisplayName extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of(new AdminMarkerListener()); return List.of(new AdminMarkerListener());
} }
} }

View File

@ -38,7 +38,7 @@ public class DoubleDoor extends Appliance {
} }
@Override @Override
protected @NotNull List<Listener> eventHandlers() { protected @NotNull List<Listener> listeners() {
return List.of(new OnDoorInteractListener()); return List.of(new OnDoorInteractListener());
} }
} }

View File

@ -201,8 +201,7 @@ public class Event extends Appliance {
public void advertise() { public void advertise() {
advertiseCountdown.cancelIfRunning(); advertiseCountdown.cancelIfRunning();
this.advertiseStatus = AdvertisementStatus.ADVERTISED; this.advertiseStatus = AdvertisementStatus.ADVERTISED;
IteratorUtil.onlinePlayers(player -> { IteratorUtil.onlinePlayers(player -> player.sendMessage(
player.sendMessage(
Component.text() Component.text()
.append(Component.text("-".repeat(10), NamedTextColor.GRAY)).appendNewline() .append(Component.text("-".repeat(10), NamedTextColor.GRAY)).appendNewline()
.append(Component.text("Ein Event wurde gestartet!", NamedTextColor.GOLD)).appendNewline() .append(Component.text("Ein Event wurde gestartet!", NamedTextColor.GOLD)).appendNewline()
@ -210,8 +209,7 @@ public class Event extends Appliance {
.append(Component.text("/event", NamedTextColor.AQUA)) .append(Component.text("/event", NamedTextColor.AQUA))
.append(Component.text(", um dem Event beizutreten!")).appendNewline() .append(Component.text(", um dem Event beizutreten!")).appendNewline()
.append(Component.text("-".repeat(10), NamedTextColor.GRAY)).appendNewline() .append(Component.text("-".repeat(10), NamedTextColor.GRAY)).appendNewline()
); ));
});
advertiseCountdown.start(); advertiseCountdown.start();
} }
@ -237,7 +235,7 @@ public class Event extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of( return List.of(
new ApplyPendingRewardsListener(), new ApplyPendingRewardsListener(),
new PlayerInteractAtEntityEventListener(this.villager.getUniqueId(), playerInteractAtEntityEvent -> joinEvent(playerInteractAtEntityEvent.getPlayer())), new PlayerInteractAtEntityEventListener(this.villager.getUniqueId(), playerInteractAtEntityEvent -> joinEvent(playerInteractAtEntityEvent.getPlayer())),

View File

@ -19,7 +19,7 @@ public class Fleischerchest extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of(new FleischerchestCraftItemListener()); return List.of(new FleischerchestCraftItemListener());
} }
} }

View File

@ -46,7 +46,7 @@ public class HotbarRefill extends Appliance {
} }
@Override @Override
protected @NotNull List<Listener> eventHandlers() { protected @NotNull List<Listener> listeners() {
return List.of(new ItemRefillListener()); return List.of(new ItemRefillListener());
} }
} }

View File

@ -55,7 +55,7 @@ public class KnockDoor extends Appliance {
} }
@Override @Override
protected @NotNull List<Listener> eventHandlers() { protected @NotNull List<Listener> listeners() {
return List.of(new KnockDoorListener()); return List.of(new KnockDoorListener());
} }
} }

View File

@ -127,7 +127,7 @@ public class Outlawed extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of(new OutlawedReminderListener()); return List.of(new OutlawedReminderListener());
} }
} }

View File

@ -50,7 +50,7 @@ public class PanicBan extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of(new PanicBanJoinListener()); return List.of(new PanicBanJoinListener());
} }
} }

View File

@ -31,7 +31,7 @@ public class PlayerLimit extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of( return List.of(
new PlayerLimiterListener() new PlayerLimiterListener()
); );

View File

@ -15,7 +15,7 @@ public class PortableCrafting extends Appliance {
} }
@Override @Override
protected @NotNull List<Listener> eventHandlers() { protected @NotNull List<Listener> listeners() {
return List.of(new OnCraftingTableUseListener()); return List.of(new OnCraftingTableUseListener());
} }
} }

View File

@ -175,7 +175,7 @@ public class ProjectStart extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of( return List.of(
new PlayerInvincibleListener(), new PlayerInvincibleListener(),
new NoAdvancementsListener() new NoAdvancementsListener()

View File

@ -152,7 +152,7 @@ public class Settings extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of( return List.of(
new SettingsInventoryListener(), new SettingsInventoryListener(),
new OpenSettingsShortcutListener() new OpenSettingsShortcutListener()

View File

@ -82,7 +82,7 @@ public class Tablist extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of(new TablistListener()); return List.of(new TablistListener());
} }
} }

View File

@ -14,7 +14,7 @@ public class TitleClear extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of( return List.of(
new TitleClearListener() new TitleClearListener()
); );

View File

@ -147,7 +147,7 @@ public class Whitelist extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of( return List.of(
new PlayerJoinListener() new PlayerJoinListener()
); );

View File

@ -44,15 +44,13 @@ public class WorldMuseum extends Appliance {
public void handleVillagerInteraction(Player player) { public void handleVillagerInteraction(Player player) {
if(Floodgate.isBedrock(player)) { if(Floodgate.isBedrock(player)) {
Floodgate.runBedrockOnly(player, floodgatePlayer -> { Floodgate.runBedrockOnly(player, floodgatePlayer -> floodgatePlayer.sendForm(
floodgatePlayer.sendForm(
SimpleForm.builder() SimpleForm.builder()
.title("Nicht unterstützt") .title("Nicht unterstützt")
.content("Bedrock-Spieler werden derzeit für das Weltenmuseum aus Kompatiblitätsgründen nicht zugelassen! Tut uns Leid.") .content("Bedrock-Spieler werden derzeit für das Weltenmuseum aus Kompatiblitätsgründen nicht zugelassen! Tut uns Leid.")
.button("Ok") .button("Ok")
.build() .build()
); ));
});
return; return;
} }
@ -68,7 +66,7 @@ public class WorldMuseum extends Appliance {
@Override @Override
@NotNull @NotNull
protected List<Listener> eventHandlers() { protected List<Listener> listeners() {
return List.of( return List.of(
new PlayerInteractAtEntityEventListener(this.villager.getUniqueId(), playerInteractAtEntityEvent -> handleVillagerInteraction(playerInteractAtEntityEvent.getPlayer())), new PlayerInteractAtEntityEventListener(this.villager.getUniqueId(), playerInteractAtEntityEvent -> handleVillagerInteraction(playerInteractAtEntityEvent.getPlayer())),
new DismissInventoryOpenFromHolder(this.villager.getUniqueId()) new DismissInventoryOpenFromHolder(this.villager.getUniqueId())

View File

@ -42,10 +42,13 @@ help:
spawn: "Der Weltspawn befindet sich bei x:0 y:0 z:0" spawn: "Der Weltspawn befindet sich bei x:0 y:0 z:0"
playerLimit: playerLimit:
maxPlayers: 0 maxPlayers: 10
whitelist: whitelist:
api: https://mhsl.eu/craftattack/api/user api: https://mhsl.eu/craftattack/api/user
tablist: tablist:
interface: eth0 interface: eth0
outlawed:
voluntarily: []