Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d3daf32
Added new SignTransactionEvent to notify external plugins about sign …
sumsar1812 Feb 24, 2025
e9c4be3
Fixing checkstyle errors and moving event to aligning with other even…
sumsar1812 Feb 25, 2025
76bf7b2
test
sumsar1812 Feb 25, 2025
22d5ab1
Update Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy…
sumsar1812 Feb 28, 2025
159a302
Update Essentials/src/main/java/com/earth2me/essentials/signs/SignSel…
sumsar1812 Feb 28, 2025
88af779
Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEv…
sumsar1812 Feb 28, 2025
f98eeaa
Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEv…
sumsar1812 Feb 28, 2025
4f90fb3
Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEv…
sumsar1812 Feb 28, 2025
6492047
Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEv…
sumsar1812 Feb 28, 2025
6405c45
Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEv…
sumsar1812 Feb 28, 2025
916db02
Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEv…
sumsar1812 Feb 28, 2025
9528361
Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEv…
sumsar1812 Feb 28, 2025
d58432f
Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEv…
sumsar1812 Feb 28, 2025
cf5b5f4
Merge branch '2.x' into task/new-sign-transaction-events
sumsar1812 Feb 28, 2025
92f7273
Merge branch '2.x' into task/new-sign-transaction-events
sumsar1812 Mar 1, 2025
aa06180
Merge branch '2.x' into task/new-sign-transaction-events
sumsar1812 Mar 2, 2025
db8330c
Merge branch '2.x' into task/new-sign-transaction-events
sumsar1812 Mar 11, 2025
cd26703
Merge branch '2.x' into task/new-sign-transaction-events
sumsar1812 Mar 13, 2025
1868d03
Merge branch '2.x' into task/new-sign-transaction-events
sumsar1812 Mar 19, 2025
626a209
Merge branch '2.x' into task/new-sign-transaction-events
sumsar1812 Mar 23, 2025
9066156
Merge branch '2.x' into task/new-sign-transaction-events
sumsar1812 Mar 24, 2025
0f6d172
Added HandlerList
sumsar1812 Mar 24, 2025
145ee7b
reverted a naming change
sumsar1812 Mar 24, 2025
24d5d8b
Merge remote-tracking branch 'origin/task/new-sign-transaction-events…
sumsar1812 Mar 24, 2025
c5016ac
Update Essentials/src/main/java/net/ess3/api/events/SignTransactionEv…
JRoy Mar 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.earth2me.essentials.ChargeException;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import net.ess3.api.events.SignTransactionEvent;
import net.ess3.api.IEssentials;
import net.ess3.api.MaxMoneyException;
import org.bukkit.inventory.ItemStack;
Expand Down Expand Up @@ -45,6 +46,19 @@ 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()
);
Comment thread
sumsar1812 marked this conversation as resolved.
Outdated

ess.getServer().getPluginManager().callEvent(signTransactionEvent);
if (signTransactionEvent.isCancelled()) {
return true;
Comment thread
JRoy marked this conversation as resolved.
}
if (!items.pay(player)) {
throw new ChargeException("inventoryFull");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.Trade.OverflowType;
import com.earth2me.essentials.User;
import net.ess3.api.events.SignTransactionEvent;
import net.ess3.api.IEssentials;
import net.ess3.api.MaxMoneyException;
import org.bukkit.inventory.ItemStack;
Expand Down Expand Up @@ -47,6 +48,21 @@ 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()

);
Comment thread
sumsar1812 marked this conversation as resolved.
Outdated
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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Comment thread
sumsar1812 marked this conversation as resolved.
Outdated
*/
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) {
Comment thread
sumsar1812 marked this conversation as resolved.
Outdated
super(sign, essSign, user);
this.itemStack = itemStack;
this.transactionType = transactionType;
this.transactionValue = transactionValue;
}

/**
*
* @return if the event should be cancelled.
*/

Comment thread
sumsar1812 marked this conversation as resolved.
Outdated
@Override
public boolean isCancelled() {
return this.isCancelled;
}

/**
*
* @param cancelled sets the event to be cancelled, this will cancel the transaction.
*/

Comment thread
sumsar1812 marked this conversation as resolved.
Outdated
@Override
public void setCancelled(boolean cancelled) {
this.isCancelled = cancelled;
}

/**
*
* @return a copy of the itemstack in the current transaction.
*/

Comment thread
sumsar1812 marked this conversation as resolved.
Outdated
public @NotNull ItemStack getItemStack() {
return itemStack.clone();
}

/**
*
* @return the type of transaction executed.
*/
Comment thread
sumsar1812 marked this conversation as resolved.
public @NotNull TransactionType getTransactionType() {
return transactionType;
}

/**
*
* @return how much was either sold or bought through the sign.
*/

Comment thread
sumsar1812 marked this conversation as resolved.
Outdated
public BigDecimal getTransactionValue() {
return transactionValue;
}

/**
* Transaction type of the event
*/

Comment thread
sumsar1812 marked this conversation as resolved.
Outdated
public enum TransactionType {
Comment thread
JRoy marked this conversation as resolved.
BUY,
SELL
}
}