Skip to content

Commit 7dfc85f

Browse files
committed
Make use of BaseItemStack in Inventory
1 parent 55328ba commit 7dfc85f

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

protocolize-api/src/main/java/dev/simplix/protocolize/api/inventory/PlayerInventory.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.simplix.protocolize.api.inventory;
22

3+
import dev.simplix.protocolize.api.item.BaseItemStack;
34
import dev.simplix.protocolize.api.item.ItemStack;
45
import dev.simplix.protocolize.api.player.ProtocolizePlayer;
56
import dev.simplix.protocolize.data.packets.HeldItemChange;
@@ -21,38 +22,38 @@
2122
public class PlayerInventory {
2223

2324
private final ProtocolizePlayer player;
24-
private final Map<Integer, ItemStack> items = new HashMap<>();
25+
private final Map<Integer, BaseItemStack> items = new HashMap<>();
2526
private final Set<Integer> draggingSlots = new HashSet<>();
26-
private ItemStack cursorItem;
27+
private BaseItemStack cursorItem;
2728
private short heldItem;
2829
private boolean dragging;
2930

3031
public PlayerInventory(ProtocolizePlayer player) {
3132
this.player = player;
3233
}
3334

34-
public void item(int slot, ItemStack stack) {
35+
public void item(int slot, BaseItemStack stack) {
3536
items.put(slot, stack);
3637
}
3738

38-
public ItemStack item(int slot) {
39+
public BaseItemStack item(int slot) {
3940
return items.get(slot);
4041
}
4142

4243
public boolean removeItem(int slot) {
4344
return items.remove(slot) != null;
4445
}
4546

46-
public List<ItemStack> itemsIndexed() {
47-
ItemStack[] outArray = new ItemStack[46];
47+
public List<BaseItemStack> itemsIndexed() {
48+
BaseItemStack[] outArray = new ItemStack[46];
4849
for (Integer id : items.keySet()) {
4950
outArray[id] = items.get(id);
5051
}
5152
return Arrays.asList(outArray);
5253
}
5354

54-
public List<ItemStack> itemsIndexedContainer() {
55-
ItemStack[] outArray = new ItemStack[45 - 9];
55+
public List<BaseItemStack> itemsIndexedContainer() {
56+
BaseItemStack[] outArray = new ItemStack[45 - 9];
5657
for (Integer id : items.keySet()) {
5758
if (id < 9 || id == 45)
5859
continue;
@@ -79,7 +80,7 @@ public void dragging(boolean dragging) {
7980

8081
public void update() {
8182
for (int i = 0; i <= 44; i++) {
82-
ItemStack stack = item(i);
83+
BaseItemStack stack = item(i);
8384
if (stack != null) {
8485
player.sendPacket(new SetSlot((byte) 0, (short) i, stack, 0));
8586
}

0 commit comments

Comments
 (0)