diff options
Diffstat (limited to 'src/main/java/org/bukkit/event/enchantment')
-rw-r--r-- | src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java | 18 | ||||
-rw-r--r-- | src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java | 8 |
2 files changed, 20 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java b/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java index 172e9e1b..4b40d366 100644 --- a/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java +++ b/src/main/java/org/bukkit/event/enchantment/EnchantItemEvent.java @@ -7,14 +7,15 @@ import org.bukkit.block.Block; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; import org.bukkit.event.HandlerList; +import org.bukkit.event.inventory.InventoryEvent; +import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.ItemStack; /** * Called when an ItemStack is successfully enchanted (currently at enchantment table) */ -public class EnchantItemEvent extends Event implements Cancellable { +public class EnchantItemEvent extends InventoryEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); private final Block table; private final ItemStack item; @@ -22,14 +23,17 @@ public class EnchantItemEvent extends Event implements Cancellable { private boolean cancelled; private final Map<Enchantment,Integer> enchants; private final Player enchanter; + private int button; - public EnchantItemEvent(final Player enchanter, final Block table, final ItemStack item, final int level, final Map<Enchantment, Integer> enchants) { + public EnchantItemEvent(final Player enchanter, final InventoryView view, final Block table, final ItemStack item, final int level, final Map<Enchantment, Integer> enchants, final int i) { + super(view); this.enchanter = enchanter; this.table = table; this.item = item; this.level = level; this.enchants = new HashMap<Enchantment, Integer>(enchants); this.cancelled = false; + this.button = i; } /** @@ -85,6 +89,14 @@ public class EnchantItemEvent extends Event implements Cancellable { return enchants; } + /** + * Which button was pressed to initiate the enchanting. + * @return The button index (0, 1, or 2). + */ + public int whichButton() { + return button; + } + public boolean isCancelled() { return cancelled; } diff --git a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java index dbc24a40..d97adf3b 100644 --- a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java +++ b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java @@ -3,14 +3,15 @@ package org.bukkit.event.enchantment; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; import org.bukkit.event.HandlerList; +import org.bukkit.event.inventory.InventoryEvent; +import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.ItemStack; /** * Called when an ItemStack is inserted in an enchantment table - can be called multiple times */ -public class PrepareItemEnchantEvent extends Event implements Cancellable { +public class PrepareItemEnchantEvent extends InventoryEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); private final Block table; private final ItemStack item; @@ -19,7 +20,8 @@ public class PrepareItemEnchantEvent extends Event implements Cancellable { private boolean cancelled; private final Player enchanter; - public PrepareItemEnchantEvent(final Player enchanter, final Block table, final ItemStack item, final int[] levelsOffered, final int bonus) { + public PrepareItemEnchantEvent(final Player enchanter, InventoryView view, final Block table, final ItemStack item, final int[] levelsOffered, final int bonus) { + super(view); this.enchanter = enchanter; this.table = table; this.item = item; |