Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-07 16:57:42 +01:00
Code Issues Projects Releases Wiki Activity

Add InventoryView#getInventory API

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot 2018-12-26 08:00:00 +11:00
parent e8f711959a
commit a487f8ec2b
2 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
paper-api/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
View File

@ -157,6 +157,16 @@ public class InventoryClickEvent extends InventoryInteractEvent {
} }
} }
/**
* Gets the inventory corresponding to the clicked slot.
*
* @see InventoryView#getInventory(int)
* @return inventory, or null if clicked outside
*/
public Inventory getClickedInventory() {
return getView().getInventory(rawSlot);
}
/** /**
* The slot number that was clicked, ready for passing to * The slot number that was clicked, ready for passing to
* {@link Inventory#getItem(int)}. Note that there may be two slots with * {@link Inventory#getItem(int)}. Note that there may be two slots with

46
paper-api/src/main/java/org/bukkit/inventory/InventoryView.java
View File

@ -1,5 +1,6 @@
package org.bukkit.inventory; package org.bukkit.inventory;
import com.google.common.base.Preconditions;
import org.bukkit.entity.HumanEntity; import org.bukkit.entity.HumanEntity;
import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType;
@ -157,12 +158,9 @@ public abstract class InventoryView {
* @param item The new item to put in the slot, or null to clear it. * @param item The new item to put in the slot, or null to clear it.
*/ */
public void setItem(int slot, ItemStack item) { public void setItem(int slot, ItemStack item) {
if (slot != OUTSIDE) { Inventory inventory = getInventory(slot);
if (slot < getTopInventory().getSize()) { if (inventory != null) {
getTopInventory().setItem(convertSlot(slot), item); inventory.setItem(convertSlot(slot), item);
} else {
getBottomInventory().setItem(convertSlot(slot), item);
}
} else { } else {
getPlayer().getWorld().dropItemNaturally(getPlayer().getLocation(), item); getPlayer().getWorld().dropItemNaturally(getPlayer().getLocation(), item);
} }
@ -175,14 +173,8 @@ public abstract class InventoryView {
* @return The item currently in the slot. * @return The item currently in the slot.
*/ */
public ItemStack getItem(int slot) { public ItemStack getItem(int slot) {
if (slot == OUTSIDE) { Inventory inventory = getInventory(slot);
return null; return (inventory == null) ? null : inventory.getItem(convertSlot(slot));
}
if (slot < getTopInventory().getSize()) {
return getTopInventory().getItem(convertSlot(slot));
} else {
return getBottomInventory().getItem(convertSlot(slot));
}
} }
/** /**
@ -205,6 +197,32 @@ public abstract class InventoryView {
return getPlayer().getItemOnCursor(); return getPlayer().getItemOnCursor();
} }
/**
* Gets the inventory corresponding to the given raw slot ID.
*
* If the slot ID is {@link #OUTSIDE} null will be returned, otherwise
* behaviour for illegal and negative slot IDs is undefined.
*
* May be used with {@link #convertSlot(int)} to directly index an
* underlying inventory.
*
* @param rawSlot The raw slot ID.
* @return corresponding inventory, or null
*/
public final Inventory getInventory(int rawSlot) {
if (rawSlot == OUTSIDE) {
return null;
}
Preconditions.checkArgument(rawSlot >= 0, "Negative, non outside slot %s", rawSlot);
Preconditions.checkArgument(rawSlot < countSlots(), "Slot %s greater than inventory slot count", rawSlot);
if (rawSlot < getTopInventory().getSize()) {
return getTopInventory();
} else {
return getBottomInventory();
}
}
/** /**
* Converts a raw slot ID into its local slot ID into whichever of the two * Converts a raw slot ID into its local slot ID into whichever of the two
* inventories the slot points to. * inventories the slot points to.