#1036: Add API for InventoryView derivatives

By: Miles Holder <mwholder2005@gmail.com>
This commit is contained in:
Bukkit/Spigot
2024-07-27 10:01:25 +10:00
parent fa9505e579
commit 2c04f1b473
17 changed files with 478 additions and 6 deletions

View File

@@ -6,8 +6,8 @@ import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
import org.bukkit.event.inventory.InventoryEvent;
import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.view.EnchantmentView;
import org.jetbrains.annotations.NotNull;
/**
@@ -23,7 +23,7 @@ public class PrepareItemEnchantEvent extends InventoryEvent implements Cancellab
private boolean cancelled;
private final Player enchanter;
public PrepareItemEnchantEvent(@NotNull final Player enchanter, @NotNull InventoryView view, @NotNull final Block table, @NotNull final ItemStack item, @NotNull final EnchantmentOffer[] offers, final int bonus) {
public PrepareItemEnchantEvent(@NotNull final Player enchanter, @NotNull EnchantmentView view, @NotNull final Block table, @NotNull final ItemStack item, @NotNull final EnchantmentOffer[] offers, final int bonus) {
super(view);
this.enchanter = enchanter;
this.table = table;
@@ -100,6 +100,12 @@ public class PrepareItemEnchantEvent extends InventoryEvent implements Cancellab
return bonus;
}
@NotNull
@Override
public EnchantmentView getView() {
return (EnchantmentView) super.getView();
}
@Override
public boolean isCancelled() {
return cancelled;

View File

@@ -2,8 +2,8 @@ package org.bukkit.event.inventory;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.AnvilInventory;
import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.view.AnvilView;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -14,7 +14,7 @@ public class PrepareAnvilEvent extends PrepareInventoryResultEvent {
private static final HandlerList handlers = new HandlerList();
public PrepareAnvilEvent(@NotNull InventoryView inventory, @Nullable ItemStack result) {
public PrepareAnvilEvent(@NotNull AnvilView inventory, @Nullable ItemStack result) {
super(inventory, result);
}
@@ -24,6 +24,12 @@ public class PrepareAnvilEvent extends PrepareInventoryResultEvent {
return (AnvilInventory) super.getInventory();
}
@NotNull
@Override
public AnvilView getView() {
return (AnvilView) super.getView();
}
@NotNull
@Override
public HandlerList getHandlers() {

View File

@@ -1,9 +1,9 @@
package org.bukkit.event.inventory;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.Merchant;
import org.bukkit.inventory.MerchantInventory;
import org.bukkit.inventory.view.MerchantView;
import org.jetbrains.annotations.NotNull;
/**
@@ -19,7 +19,7 @@ public class TradeSelectEvent extends InventoryInteractEvent {
//
private final int index;
public TradeSelectEvent(@NotNull InventoryView transaction, int newIndex) {
public TradeSelectEvent(@NotNull MerchantView transaction, int newIndex) {
super(transaction);
this.index = newIndex;
}
@@ -49,6 +49,12 @@ public class TradeSelectEvent extends InventoryInteractEvent {
return getInventory().getMerchant();
}
@NotNull
@Override
public MerchantView getView() {
return (MerchantView) super.getView();
}
@NotNull
@Override
public HandlerList getHandlers() {