From 6706c98091e4a9e70e4c4b4ae979e99453d39827 Mon Sep 17 00:00:00 2001 From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com> Date: Sun, 11 Jan 2026 22:10:22 +0100 Subject: [PATCH 1/3] Add custom event classes for lockers, parcels, users, and item storage Introduced new cancellable and non-cancellable event classes for locker creation/deletion, parcel send/deliver/collect, user creation/name change, and item storage updates. Also fixed a message key in DeliveryManager from 'deletedContents' to 'deletedDeliveries' for admin notifications. --- .../delivery/DeliveryManager.java | 2 +- .../event/ItemStorageUpdateEvent.java | 49 +++++++++++++++++++ .../locker/event/LockerCreateEvent.java | 49 +++++++++++++++++++ .../locker/event/LockerDeleteEvent.java | 49 +++++++++++++++++++ .../parcel/event/ParcelCollectEvent.java | 42 ++++++++++++++++ .../parcel/event/ParcelDeliverEvent.java | 43 ++++++++++++++++ .../parcel/event/ParcelSendEvent.java | 42 ++++++++++++++++ .../user/event/UserChangeNameEvent.java | 36 ++++++++++++++ .../user/event/UserCreateEvent.java | 30 ++++++++++++ 9 files changed, 341 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/eternalcode/parcellockers/itemstorage/event/ItemStorageUpdateEvent.java create mode 100644 src/main/java/com/eternalcode/parcellockers/locker/event/LockerCreateEvent.java create mode 100644 src/main/java/com/eternalcode/parcellockers/locker/event/LockerDeleteEvent.java create mode 100644 src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelCollectEvent.java create mode 100644 src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelDeliverEvent.java create mode 100644 src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelSendEvent.java create mode 100644 src/main/java/com/eternalcode/parcellockers/user/event/UserChangeNameEvent.java create mode 100644 src/main/java/com/eternalcode/parcellockers/user/event/UserCreateEvent.java diff --git a/src/main/java/com/eternalcode/parcellockers/delivery/DeliveryManager.java b/src/main/java/com/eternalcode/parcellockers/delivery/DeliveryManager.java index 2cacfa98..ceeb8edf 100644 --- a/src/main/java/com/eternalcode/parcellockers/delivery/DeliveryManager.java +++ b/src/main/java/com/eternalcode/parcellockers/delivery/DeliveryManager.java @@ -61,7 +61,7 @@ public CompletableFuture deleteAll(CommandSender sender, NoticeService not this.deliveryCache.invalidateAll(); noticeService.create() .viewer(sender) - .notice(messages -> messages.admin.deletedContents) + .notice(messages -> messages.admin.deletedDeliveries) .placeholder("{COUNT}", deleted.toString()) .send(); }); diff --git a/src/main/java/com/eternalcode/parcellockers/itemstorage/event/ItemStorageUpdateEvent.java b/src/main/java/com/eternalcode/parcellockers/itemstorage/event/ItemStorageUpdateEvent.java new file mode 100644 index 00000000..f1653887 --- /dev/null +++ b/src/main/java/com/eternalcode/parcellockers/itemstorage/event/ItemStorageUpdateEvent.java @@ -0,0 +1,49 @@ +package com.eternalcode.parcellockers.itemstorage.event; + +import com.eternalcode.parcellockers.itemstorage.ItemStorage; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; +import org.jetbrains.annotations.NotNull; + +public class ItemStorageUpdateEvent extends Event implements Cancellable { + + private static final HandlerList HANDLER_LIST = new HandlerList(); + + private final ItemStorage oldItemStorage; + private final ItemStorage updatedItemStorage; + + private boolean cancelled; + + public ItemStorageUpdateEvent(ItemStorage oldItemStorage, ItemStorage updatedItemStorage) { + this.oldItemStorage = oldItemStorage; + this.updatedItemStorage = updatedItemStorage; + } + + public static HandlerList getHandlerList() { + return HANDLER_LIST; + } + + public ItemStorage getOldItemStorage() { + return this.oldItemStorage; + } + + public ItemStorage getUpdatedItemStorage() { + return this.updatedItemStorage; + } + + @Override + public boolean isCancelled() { + return this.cancelled; + } + + @Override + public void setCancelled(boolean cancel) { + this.cancelled = cancel; + } + + @Override + public @NotNull HandlerList getHandlers() { + return HANDLER_LIST; + } +} diff --git a/src/main/java/com/eternalcode/parcellockers/locker/event/LockerCreateEvent.java b/src/main/java/com/eternalcode/parcellockers/locker/event/LockerCreateEvent.java new file mode 100644 index 00000000..db296a1f --- /dev/null +++ b/src/main/java/com/eternalcode/parcellockers/locker/event/LockerCreateEvent.java @@ -0,0 +1,49 @@ +package com.eternalcode.parcellockers.locker.event; + +import com.eternalcode.parcellockers.locker.Locker; +import java.util.UUID; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +public class LockerCreateEvent extends Event implements Cancellable { + + private static final HandlerList HANDLER_LIST = new HandlerList(); + + private final Locker locker; + private final UUID player; + private boolean cancelled; + + public LockerCreateEvent(Locker locker, UUID player) { + this.locker = locker; + this.player = player; + } + + public static HandlerList getHandlerList() { + return HANDLER_LIST; + } + + public Locker getLocker() { + return this.locker; + } + + public UUID getPlayer() { + return this.player; + } + + @Override + public boolean isCancelled() { + return this.cancelled; + } + + @Override + public void setCancelled(boolean cancel) { + this.cancelled = cancel; + } + + @Override + public HandlerList getHandlers() { + return HANDLER_LIST; + } + +} diff --git a/src/main/java/com/eternalcode/parcellockers/locker/event/LockerDeleteEvent.java b/src/main/java/com/eternalcode/parcellockers/locker/event/LockerDeleteEvent.java new file mode 100644 index 00000000..317b5060 --- /dev/null +++ b/src/main/java/com/eternalcode/parcellockers/locker/event/LockerDeleteEvent.java @@ -0,0 +1,49 @@ +package com.eternalcode.parcellockers.locker.event; + +import com.eternalcode.parcellockers.locker.Locker; +import java.util.UUID; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +public class LockerDeleteEvent extends Event implements Cancellable { + + private static final HandlerList HANDLER_LIST = new HandlerList(); + + private final Locker locker; + private final UUID player; + private boolean cancelled; + + public LockerDeleteEvent(Locker locker, UUID player) { + this.locker = locker; + this.player = player; + } + + public static HandlerList getHandlerList() { + return HANDLER_LIST; + } + + public Locker getLocker() { + return this.locker; + } + + public UUID getPlayer() { + return this.player; + } + + @Override + public boolean isCancelled() { + return this.cancelled; + } + + @Override + public void setCancelled(boolean cancel) { + this.cancelled = cancel; + } + + @Override + public HandlerList getHandlers() { + return HANDLER_LIST; + } + +} diff --git a/src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelCollectEvent.java b/src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelCollectEvent.java new file mode 100644 index 00000000..8c2a9e41 --- /dev/null +++ b/src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelCollectEvent.java @@ -0,0 +1,42 @@ +package com.eternalcode.parcellockers.parcel.event; + +import com.eternalcode.parcellockers.parcel.Parcel; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; +import org.jspecify.annotations.NonNull; + +public class ParcelCollectEvent extends Event implements Cancellable { + + private static final HandlerList HANDLER_LIST = new HandlerList(); + + private final Parcel parcel; + private boolean cancelled; + + public ParcelCollectEvent(Parcel parcel) { + this.parcel = parcel; + } + + public static HandlerList getHandlerList() { + return HANDLER_LIST; + } + + public Parcel getParcel() { + return this.parcel; + } + + @Override + public @NonNull HandlerList getHandlers() { + return HANDLER_LIST; + } + + @Override + public boolean isCancelled() { + return this.cancelled; + } + + @Override + public void setCancelled(boolean cancel) { + this.cancelled = cancel; + } +} diff --git a/src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelDeliverEvent.java b/src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelDeliverEvent.java new file mode 100644 index 00000000..5ab340f3 --- /dev/null +++ b/src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelDeliverEvent.java @@ -0,0 +1,43 @@ +package com.eternalcode.parcellockers.parcel.event; + +import com.eternalcode.parcellockers.parcel.Parcel; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; +import org.jspecify.annotations.NonNull; + +public class ParcelDeliverEvent extends Event implements Cancellable { + + private static final HandlerList HANDLER_LIST = new HandlerList(); + + private final Parcel parcel; + private boolean cancelled; + + public ParcelDeliverEvent(Parcel parcel) { + super(true); + this.parcel = parcel; + } + + public static HandlerList getHandlerList() { + return HANDLER_LIST; + } + + public Parcel getParcel() { + return this.parcel; + } + + @Override + public @NonNull HandlerList getHandlers() { + return HANDLER_LIST; + } + + @Override + public boolean isCancelled() { + return this.cancelled; + } + + @Override + public void setCancelled(boolean cancel) { + this.cancelled = cancel; + } +} diff --git a/src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelSendEvent.java b/src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelSendEvent.java new file mode 100644 index 00000000..879fec6f --- /dev/null +++ b/src/main/java/com/eternalcode/parcellockers/parcel/event/ParcelSendEvent.java @@ -0,0 +1,42 @@ +package com.eternalcode.parcellockers.parcel.event; + +import com.eternalcode.parcellockers.parcel.Parcel; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; +import org.jspecify.annotations.NonNull; + +public class ParcelSendEvent extends Event implements Cancellable { + + private static final HandlerList HANDLER_LIST = new HandlerList(); + + private final Parcel parcel; + private boolean cancelled; + + public ParcelSendEvent(Parcel parcel) { + this.parcel = parcel; + } + + public static HandlerList getHandlerList() { + return HANDLER_LIST; + } + + public Parcel getParcel() { + return this.parcel; + } + + @Override + public @NonNull HandlerList getHandlers() { + return HANDLER_LIST; + } + + @Override + public boolean isCancelled() { + return this.cancelled; + } + + @Override + public void setCancelled(boolean cancel) { + this.cancelled = cancel; + } +} diff --git a/src/main/java/com/eternalcode/parcellockers/user/event/UserChangeNameEvent.java b/src/main/java/com/eternalcode/parcellockers/user/event/UserChangeNameEvent.java new file mode 100644 index 00000000..ef9aa198 --- /dev/null +++ b/src/main/java/com/eternalcode/parcellockers/user/event/UserChangeNameEvent.java @@ -0,0 +1,36 @@ +package com.eternalcode.parcellockers.user.event; + +import com.eternalcode.parcellockers.user.User; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; +import org.jspecify.annotations.NonNull; + +public class UserChangeNameEvent extends Event { + + private static final HandlerList HANDLER_LIST = new HandlerList(); + + private final User user; + private final String oldName; + + public UserChangeNameEvent(User user, String oldName) { + this.user = user; + this.oldName = oldName; + } + + public static HandlerList getHandlerList() { + return HANDLER_LIST; + } + + public User getUser() { + return this.user; + } + + public String getOldName() { + return this.oldName; + } + + @Override + public @NonNull HandlerList getHandlers() { + return HANDLER_LIST; + } +} diff --git a/src/main/java/com/eternalcode/parcellockers/user/event/UserCreateEvent.java b/src/main/java/com/eternalcode/parcellockers/user/event/UserCreateEvent.java new file mode 100644 index 00000000..f2ba6978 --- /dev/null +++ b/src/main/java/com/eternalcode/parcellockers/user/event/UserCreateEvent.java @@ -0,0 +1,30 @@ +package com.eternalcode.parcellockers.user.event; + +import com.eternalcode.parcellockers.user.User; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; +import org.jspecify.annotations.NonNull; + +public class UserCreateEvent extends Event { + + private static final HandlerList HANDLER_LIST = new HandlerList(); + + private final User user; + + public UserCreateEvent(User user) { + this.user = user; + } + + public static HandlerList getHandlerList() { + return HANDLER_LIST; + } + + public User getUser() { + return this.user; + } + + @Override + public @NonNull HandlerList getHandlers() { + return HANDLER_LIST; + } +} From f3dc9e6692848729a8ab83c458722a11f5894376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=99dziora?= <77227023+Jakubk15@users.noreply.github.com> Date: Sun, 11 Jan 2026 22:19:17 +0100 Subject: [PATCH 2/3] Update src/main/java/com/eternalcode/parcellockers/locker/event/LockerCreateEvent.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .../parcellockers/locker/event/LockerCreateEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/eternalcode/parcellockers/locker/event/LockerCreateEvent.java b/src/main/java/com/eternalcode/parcellockers/locker/event/LockerCreateEvent.java index db296a1f..03afdbcb 100644 --- a/src/main/java/com/eternalcode/parcellockers/locker/event/LockerCreateEvent.java +++ b/src/main/java/com/eternalcode/parcellockers/locker/event/LockerCreateEvent.java @@ -42,7 +42,7 @@ public void setCancelled(boolean cancel) { } @Override - public HandlerList getHandlers() { + public @org.jetbrains.annotations.NotNull HandlerList getHandlers() { return HANDLER_LIST; } From 0d0a30d3afbb0e3ba043b64e663caaf6b62bccd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=99dziora?= <77227023+Jakubk15@users.noreply.github.com> Date: Sun, 11 Jan 2026 22:19:32 +0100 Subject: [PATCH 3/3] Update src/main/java/com/eternalcode/parcellockers/locker/event/LockerDeleteEvent.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .../parcellockers/locker/event/LockerDeleteEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/eternalcode/parcellockers/locker/event/LockerDeleteEvent.java b/src/main/java/com/eternalcode/parcellockers/locker/event/LockerDeleteEvent.java index 317b5060..9a642c1a 100644 --- a/src/main/java/com/eternalcode/parcellockers/locker/event/LockerDeleteEvent.java +++ b/src/main/java/com/eternalcode/parcellockers/locker/event/LockerDeleteEvent.java @@ -42,7 +42,7 @@ public void setCancelled(boolean cancel) { } @Override - public HandlerList getHandlers() { + public @org.jetbrains.annotations.NotNull HandlerList getHandlers() { return HANDLER_LIST; }