From d3daf32e747f3e4c7c1a1498585ef2c4e72a70cc Mon Sep 17 00:00:00 2001 From: Rasmus Date: Mon, 24 Feb 2025 22:35:01 +0100 Subject: [PATCH 01/16] Added new SignTransactionEvent to notify external plugins about sign transactions --- .../earth2me/essentials/signs/SignBuy.java | 13 +++ .../earth2me/essentials/signs/SignSell.java | 13 +++ .../signs/event/SignTransactionEvent.java | 99 +++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 Essentials/src/main/java/com/earth2me/essentials/signs/event/SignTransactionEvent.java diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java index 8b59f79f62b..b3f5bd3a19e 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java @@ -3,8 +3,10 @@ import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; +import com.earth2me.essentials.signs.event.SignTransactionEvent; import net.ess3.api.IEssentials; import net.ess3.api.MaxMoneyException; +import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import java.math.BigDecimal; @@ -45,6 +47,17 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri } charge.isAffordableFor(player); + SignTransactionEvent signTransactionEvent = new SignTransactionEvent( + items.getItemStack(), + player.getBase(), + sign.getBlock().getLocation(), + SignTransactionEvent.TransactionType.BUY + ); + + ess.getServer().getPluginManager().callEvent(signTransactionEvent); + if (signTransactionEvent.isCancelled()) { + return true; + } if (!items.pay(player)) { throw new ChargeException("inventoryFull"); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java index 5841e2b6ee6..63e3bf16ca1 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java @@ -4,6 +4,7 @@ import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade.OverflowType; import com.earth2me.essentials.User; +import com.earth2me.essentials.signs.event.SignTransactionEvent; import net.ess3.api.IEssentials; import net.ess3.api.MaxMoneyException; import org.bukkit.inventory.ItemStack; @@ -47,6 +48,18 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri } charge.isAffordableFor(player); + + SignTransactionEvent signTransactionEvent = new SignTransactionEvent( + charge.getItemStack(), + player.getBase(), + sign.getBlock().getLocation(), + SignTransactionEvent.TransactionType.SELL + ); + ess.getServer().getPluginManager().callEvent(signTransactionEvent); + if (signTransactionEvent.isCancelled()) { + return false; + } + money.pay(player, OverflowType.DROP); charge.charge(player); Trade.log("Sign", "Sell", "Interact", username, charge, username, money, sign.getBlock().getLocation(), player.getMoney(), ess); diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/event/SignTransactionEvent.java b/Essentials/src/main/java/com/earth2me/essentials/signs/event/SignTransactionEvent.java new file mode 100644 index 00000000000..2ab6d8c30df --- /dev/null +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/event/SignTransactionEvent.java @@ -0,0 +1,99 @@ +package com.earth2me.essentials.signs.event; + +import org.bukkit.Location; +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; +import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.NotNull; + +public class SignTransactionEvent extends Event implements Cancellable { + private static final HandlerList handlerList = new HandlerList(); + private final ItemStack itemStack; + private final Player player; + private final Location signLocation; + private final TransactionType transactionType; + private boolean isCancelled = false; + + public SignTransactionEvent(ItemStack itemStack, + Player player, + Location signLocation, + TransactionType transactionType) { + this.itemStack = itemStack; + this.player = player; + this.signLocation = signLocation; + this.transactionType = transactionType; + } + + + public static @NotNull HandlerList getHandlerList() { + return handlerList; + } + + @Override + public @NotNull HandlerList getHandlers() { + return handlerList; + } + + /** + * + * @return if the event should be cancelled + */ + + @Override + public boolean isCancelled() { + return this.isCancelled; + } + + /** + * + * @param cancelled sets the event to be cancelled, this will cancel the transaction + */ + + @Override + public void setCancelled(boolean cancelled) { + this.isCancelled = cancelled; + } + + /** + * + * @return a copy of the itemstack in the current transaction + */ + + public ItemStack getItemStack() { + return itemStack.clone(); + } + + /** + * + * @return The player activating the transaction + */ + + public Player getPlayer() { + return player; + } + + /** + * + * @return The sign location where the transaction happened. + */ + + public Location getSignLocation() { + return signLocation; + } + + /** + * + * @return The transaction type, ether BUY or SELL + */ + + public TransactionType getTransactionType() { + return transactionType; + } + + public enum TransactionType { + BUY, + SELL + } +} From e9c4be365bd511bb6d5cb64b3e719b9fce19dd6d Mon Sep 17 00:00:00 2001 From: Rasmus Date: Tue, 25 Feb 2025 08:38:52 +0100 Subject: [PATCH 02/16] Fixing checkstyle errors and moving event to aligning with other event location. --- .../earth2me/essentials/signs/SignBuy.java | 13 +-- .../earth2me/essentials/signs/SignSell.java | 13 ++- .../signs/event/SignTransactionEvent.java | 99 ------------------- .../ess3/api/events/SignTransactionEvent.java | 86 ++++++++++++++++ 4 files changed, 101 insertions(+), 110 deletions(-) delete mode 100644 Essentials/src/main/java/com/earth2me/essentials/signs/event/SignTransactionEvent.java create mode 100644 Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java index b3f5bd3a19e..0efbe832396 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java @@ -3,10 +3,9 @@ import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; -import com.earth2me.essentials.signs.event.SignTransactionEvent; +import net.ess3.api.events.SignTransactionEvent; import net.ess3.api.IEssentials; import net.ess3.api.MaxMoneyException; -import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import java.math.BigDecimal; @@ -47,11 +46,13 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri } charge.isAffordableFor(player); - SignTransactionEvent signTransactionEvent = new SignTransactionEvent( + final SignTransactionEvent signTransactionEvent = new SignTransactionEvent( + sign, + this, + player, items.getItemStack(), - player.getBase(), - sign.getBlock().getLocation(), - SignTransactionEvent.TransactionType.BUY + SignTransactionEvent.TransactionType.BUY, + charge.getMoney() ); ess.getServer().getPluginManager().callEvent(signTransactionEvent); diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java index 63e3bf16ca1..5e35cedc3c3 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java @@ -4,7 +4,7 @@ import com.earth2me.essentials.Trade; import com.earth2me.essentials.Trade.OverflowType; import com.earth2me.essentials.User; -import com.earth2me.essentials.signs.event.SignTransactionEvent; +import net.ess3.api.events.SignTransactionEvent; import net.ess3.api.IEssentials; import net.ess3.api.MaxMoneyException; import org.bukkit.inventory.ItemStack; @@ -49,11 +49,14 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri charge.isAffordableFor(player); - SignTransactionEvent signTransactionEvent = new SignTransactionEvent( + final SignTransactionEvent signTransactionEvent = new SignTransactionEvent( + sign, + this, + player, charge.getItemStack(), - player.getBase(), - sign.getBlock().getLocation(), - SignTransactionEvent.TransactionType.SELL + SignTransactionEvent.TransactionType.SELL, + money.getMoney() + ); ess.getServer().getPluginManager().callEvent(signTransactionEvent); if (signTransactionEvent.isCancelled()) { diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/event/SignTransactionEvent.java b/Essentials/src/main/java/com/earth2me/essentials/signs/event/SignTransactionEvent.java deleted file mode 100644 index 2ab6d8c30df..00000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/event/SignTransactionEvent.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.earth2me.essentials.signs.event; - -import org.bukkit.Location; -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public class SignTransactionEvent extends Event implements Cancellable { - private static final HandlerList handlerList = new HandlerList(); - private final ItemStack itemStack; - private final Player player; - private final Location signLocation; - private final TransactionType transactionType; - private boolean isCancelled = false; - - public SignTransactionEvent(ItemStack itemStack, - Player player, - Location signLocation, - TransactionType transactionType) { - this.itemStack = itemStack; - this.player = player; - this.signLocation = signLocation; - this.transactionType = transactionType; - } - - - public static @NotNull HandlerList getHandlerList() { - return handlerList; - } - - @Override - public @NotNull HandlerList getHandlers() { - return handlerList; - } - - /** - * - * @return if the event should be cancelled - */ - - @Override - public boolean isCancelled() { - return this.isCancelled; - } - - /** - * - * @param cancelled sets the event to be cancelled, this will cancel the transaction - */ - - @Override - public void setCancelled(boolean cancelled) { - this.isCancelled = cancelled; - } - - /** - * - * @return a copy of the itemstack in the current transaction - */ - - public ItemStack getItemStack() { - return itemStack.clone(); - } - - /** - * - * @return The player activating the transaction - */ - - public Player getPlayer() { - return player; - } - - /** - * - * @return The sign location where the transaction happened. - */ - - public Location getSignLocation() { - return signLocation; - } - - /** - * - * @return The transaction type, ether BUY or SELL - */ - - public TransactionType getTransactionType() { - return transactionType; - } - - public enum TransactionType { - BUY, - SELL - } -} diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java new file mode 100644 index 00000000000..8c7132d64c3 --- /dev/null +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -0,0 +1,86 @@ +package net.ess3.api.events; + +import com.earth2me.essentials.signs.EssentialsSign; +import net.ess3.api.IUser; +import org.bukkit.event.Cancellable; +import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.NotNull; + +import java.math.BigDecimal; + +/** + * Fired when a player either buys or sells from an essentials sign + */ +public final class SignTransactionEvent extends SignInteractEvent implements Cancellable { + private final ItemStack itemStack; + private final TransactionType transactionType; + private final BigDecimal transactionValue; + private boolean isCancelled = false; + + public SignTransactionEvent(EssentialsSign.ISign sign, + EssentialsSign essSign, + IUser user, + @NotNull ItemStack itemStack, + @NotNull TransactionType transactionType, + BigDecimal transactionValue) { + super(sign, essSign, user); + this.itemStack = itemStack; + this.transactionType = transactionType; + this.transactionValue = transactionValue; + } + + /** + * + * @return if the event should be cancelled. + */ + + @Override + public boolean isCancelled() { + return this.isCancelled; + } + + /** + * + * @param cancelled sets the event to be cancelled, this will cancel the transaction. + */ + + @Override + public void setCancelled(boolean cancelled) { + this.isCancelled = cancelled; + } + + /** + * + * @return a copy of the itemstack in the current transaction. + */ + + public @NotNull ItemStack getItemStack() { + return itemStack.clone(); + } + + /** + * + * @return the type of transaction executed. + */ + public @NotNull TransactionType getTransactionType() { + return transactionType; + } + + /** + * + * @return how much was either sold or bought through the sign. + */ + + public BigDecimal getTransactionValue() { + return transactionValue; + } + + /** + * Transaction type of the event + */ + + public enum TransactionType { + BUY, + SELL + } +} From 76bf7b250ebdb4b745d2dedc8e5f01715a9d68b1 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Tue, 25 Feb 2025 15:16:01 +0100 Subject: [PATCH 03/16] test --- .../src/main/java/net/ess3/api/events/SignTransactionEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index 8c7132d64c3..7d049a127ce 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -31,7 +31,7 @@ public SignTransactionEvent(EssentialsSign.ISign sign, /** * - * @return if the event should be cancelled. + * @return if the event should bee cancelled. */ @Override From 22d5ab17a5f2b1f025b75a13d0924d1e57c34c93 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Fri, 28 Feb 2025 18:44:38 +0100 Subject: [PATCH 04/16] Update Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .../main/java/com/earth2me/essentials/signs/SignBuy.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java index 0efbe832396..ef6508c0987 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java @@ -46,14 +46,7 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri } charge.isAffordableFor(player); - final SignTransactionEvent signTransactionEvent = new SignTransactionEvent( - sign, - this, - player, - items.getItemStack(), - SignTransactionEvent.TransactionType.BUY, - charge.getMoney() - ); + final SignTransactionEvent signTransactionEvent = new SignTransactionEvent(sign, this, player, items.getItemStack(), SignTransactionEvent.TransactionType.BUY, charge.getMoney()); ess.getServer().getPluginManager().callEvent(signTransactionEvent); if (signTransactionEvent.isCancelled()) { From 159a3028c5a131236127f30590b335b16ff4426a Mon Sep 17 00:00:00 2001 From: Rasmus Date: Fri, 28 Feb 2025 18:44:44 +0100 Subject: [PATCH 05/16] Update Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .../java/com/earth2me/essentials/signs/SignSell.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java index 5e35cedc3c3..34b8a23ffa3 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java @@ -49,15 +49,7 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri charge.isAffordableFor(player); - final SignTransactionEvent signTransactionEvent = new SignTransactionEvent( - sign, - this, - player, - charge.getItemStack(), - SignTransactionEvent.TransactionType.SELL, - money.getMoney() - - ); + final SignTransactionEvent signTransactionEvent = new SignTransactionEvent(sign, this, player, charge.getItemStack(), SignTransactionEvent.TransactionType.SELL, money.getMoney()); ess.getServer().getPluginManager().callEvent(signTransactionEvent); if (signTransactionEvent.isCancelled()) { return false; From 88af779fd7b77db45d78ca496ba192dec5cd69b5 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Fri, 28 Feb 2025 18:44:53 +0100 Subject: [PATCH 06/16] Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .../main/java/net/ess3/api/events/SignTransactionEvent.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index 8c7132d64c3..88785ca4697 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -67,10 +67,9 @@ public void setCancelled(boolean cancelled) { } /** - * - * @return how much was either sold or bought through the sign. + * Gets the value of the item being bought or sold. + * @return The item's value. */ - public BigDecimal getTransactionValue() { return transactionValue; } From f98eeaa1aec11fe0d44fd254d05c5e4e1d6215c3 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Fri, 28 Feb 2025 18:44:59 +0100 Subject: [PATCH 07/16] Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .../main/java/net/ess3/api/events/SignTransactionEvent.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index 88785ca4697..8b82418792a 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -74,10 +74,6 @@ public BigDecimal getTransactionValue() { return transactionValue; } - /** - * Transaction type of the event - */ - public enum TransactionType { BUY, SELL From 4f90fb37059deec33e0dcea55650c2d0fc216b23 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Fri, 28 Feb 2025 18:45:05 +0100 Subject: [PATCH 08/16] Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .../main/java/net/ess3/api/events/SignTransactionEvent.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index 8b82418792a..c3150a05d77 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -59,8 +59,8 @@ public void setCancelled(boolean cancelled) { } /** - * - * @return the type of transaction executed. + * Gets the type of transaction, either buy or sell. + * @return The transaction type. */ public @NotNull TransactionType getTransactionType() { return transactionType; From 6492047eace65a4f90822e18f0335a2f6fd0d063 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Fri, 28 Feb 2025 18:45:11 +0100 Subject: [PATCH 09/16] Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .../main/java/net/ess3/api/events/SignTransactionEvent.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index c3150a05d77..90e55d47942 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -50,10 +50,9 @@ public void setCancelled(boolean cancelled) { } /** - * - * @return a copy of the itemstack in the current transaction. + * Gets the ItemStack that is about to be bought or sold in this transition. + * @return The ItemStack being bought or sold. */ - public @NotNull ItemStack getItemStack() { return itemStack.clone(); } From 6405c45db8165a766abdb1aa358834e71698bb7b Mon Sep 17 00:00:00 2001 From: Rasmus Date: Fri, 28 Feb 2025 18:45:23 +0100 Subject: [PATCH 10/16] Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .../main/java/net/ess3/api/events/SignTransactionEvent.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index 90e55d47942..8eacc7e04bd 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -39,11 +39,6 @@ public boolean isCancelled() { return this.isCancelled; } - /** - * - * @param cancelled sets the event to be cancelled, this will cancel the transaction. - */ - @Override public void setCancelled(boolean cancelled) { this.isCancelled = cancelled; From 916db0222ab122f841edb3456330ad43f30470e4 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Fri, 28 Feb 2025 18:45:28 +0100 Subject: [PATCH 11/16] Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .../main/java/net/ess3/api/events/SignTransactionEvent.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index 8eacc7e04bd..99b3c331a49 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -29,11 +29,6 @@ public SignTransactionEvent(EssentialsSign.ISign sign, this.transactionValue = transactionValue; } - /** - * - * @return if the event should be cancelled. - */ - @Override public boolean isCancelled() { return this.isCancelled; From 952836109caf937d977c68341117913a8aa80f4b Mon Sep 17 00:00:00 2001 From: Rasmus Date: Fri, 28 Feb 2025 18:45:44 +0100 Subject: [PATCH 12/16] Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .../java/net/ess3/api/events/SignTransactionEvent.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index 99b3c331a49..8277d26dd71 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -17,12 +17,7 @@ public final class SignTransactionEvent extends SignInteractEvent implements Can private final BigDecimal transactionValue; private boolean isCancelled = false; - public SignTransactionEvent(EssentialsSign.ISign sign, - EssentialsSign essSign, - IUser user, - @NotNull ItemStack itemStack, - @NotNull TransactionType transactionType, - BigDecimal transactionValue) { + public SignTransactionEvent(EssentialsSign.ISign sign, EssentialsSign essSign, IUser user, ItemStack itemStack, TransactionType transactionType, BigDecimal transactionValue) { super(sign, essSign, user); this.itemStack = itemStack; this.transactionType = transactionType; From d58432f9406542d06192a7cf36f1db5923549cb5 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Fri, 28 Feb 2025 18:45:54 +0100 Subject: [PATCH 13/16] Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .../src/main/java/net/ess3/api/events/SignTransactionEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index 8277d26dd71..a10b25af414 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; /** - * Fired when a player either buys or sells from an essentials sign + * Fired when a player either buys or sells from an Essentials sign */ public final class SignTransactionEvent extends SignInteractEvent implements Cancellable { private final ItemStack itemStack; From 0f6d17234f29b72d190c03c78d5a7194429cdac5 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Mon, 24 Mar 2025 19:58:18 +0100 Subject: [PATCH 14/16] Added HandlerList --- .../net/ess3/api/events/SignTransactionEvent.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index 7d049a127ce..4d99ac53130 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -5,6 +5,7 @@ import org.bukkit.event.Cancellable; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; +import org.bukkit.event.HandlerList; import java.math.BigDecimal; @@ -12,6 +13,7 @@ * Fired when a player either buys or sells from an essentials sign */ public final class SignTransactionEvent extends SignInteractEvent implements Cancellable { + private static final HandlerList handlers = new HandlerList(); private final ItemStack itemStack; private final TransactionType transactionType; private final BigDecimal transactionValue; @@ -83,4 +85,13 @@ public enum TransactionType { BUY, SELL } + + @Override + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } } From 145ee7b24354da602817ad6c54b5395cdba26afb Mon Sep 17 00:00:00 2001 From: Rasmus Date: Mon, 24 Mar 2025 19:58:47 +0100 Subject: [PATCH 15/16] reverted a naming change --- .../src/main/java/net/ess3/api/events/SignTransactionEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index 4d99ac53130..c32dd50bdc2 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -33,7 +33,7 @@ public SignTransactionEvent(EssentialsSign.ISign sign, /** * - * @return if the event should bee cancelled. + * @return if the event should be cancelled. */ @Override From c5016ac880798bf3ade4e6773b4da078884c4ce8 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Mon, 24 Mar 2025 19:42:34 -0400 Subject: [PATCH 16/16] Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java --- .../main/java/net/ess3/api/events/SignTransactionEvent.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java index b82b7969b5f..18dac137ad1 100644 --- a/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/SignTransactionEvent.java @@ -60,6 +60,9 @@ public BigDecimal getTransactionValue() { return transactionValue; } + /** + * The type of transaction for this sign transaction. + */ public enum TransactionType { BUY, SELL