Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Misc inventory style 

Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2022-05-10 07:42:18 +02:00
parent ad0440711f
commit abeda20646
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minestom/server/inventory/Inventory.java
View File

@ -197,9 +197,7 @@ public non-sealed class Inventory extends AbstractInventory implements Viewable
@Override
protected void UNSAFE_itemInsert(int slot, @NotNull ItemStack itemStack, boolean sendPacket) {
itemStacks[slot] = itemStack;
if (sendPacket) {
sendPacketToViewers(new SetSlotPacket(getWindowId(), 0, (short) slot, itemStack));
}
if (sendPacket) sendPacketToViewers(new SetSlotPacket(getWindowId(), 0, (short) slot, itemStack));
}
private @NotNull WindowItemsPacket createNewWindowItemsPacket(Player player) {

41
src/main/java/net/minestom/server/inventory/PlayerInventory.java
View File

@ -109,7 +109,7 @@ public non-sealed class PlayerInventory extends AbstractInventory implements Equ
*/
@Override
public void update() {
this.player.getPlayerConnection().sendPacket(createWindowItemsPacket());
this.player.sendPacket(createWindowItemsPacket());
}
/**
@ -128,29 +128,27 @@ public non-sealed class PlayerInventory extends AbstractInventory implements Equ
*/
public void setCursorItem(@NotNull ItemStack cursorItem) {
if (this.cursorItem.equals(cursorItem)) return;
this.cursorItem = cursorItem;
final SetSlotPacket setSlotPacket = SetSlotPacket.createCursorPacket(cursorItem);
player.getPlayerConnection().sendPacket(setSlotPacket);
this.player.sendPacket(setSlotPacket);
}
@Override
protected void UNSAFE_itemInsert(int slot, @NotNull ItemStack itemStack, boolean sendPacket) {
EquipmentSlot equipmentSlot = null;
if (slot == player.getHeldSlot()) {
equipmentSlot = EquipmentSlot.MAIN_HAND;
} else if (slot == OFFHAND_SLOT) {
equipmentSlot = EquipmentSlot.OFF_HAND;
} else if (slot == HELMET_SLOT) {
equipmentSlot = EquipmentSlot.HELMET;
} else if (slot == CHESTPLATE_SLOT) {
equipmentSlot = EquipmentSlot.CHESTPLATE;
} else if (slot == LEGGINGS_SLOT) {
equipmentSlot = EquipmentSlot.LEGGINGS;
} else if (slot == BOOTS_SLOT) {
equipmentSlot = EquipmentSlot.BOOTS;
}
final EquipmentSlot equipmentSlot = switch (slot) {
case HELMET_SLOT -> EquipmentSlot.HELMET;
case CHESTPLATE_SLOT -> EquipmentSlot.CHESTPLATE;
case LEGGINGS_SLOT -> EquipmentSlot.LEGGINGS;
case BOOTS_SLOT -> EquipmentSlot.BOOTS;
default -> {
if (slot == player.getHeldSlot()) {
yield EquipmentSlot.MAIN_HAND;
} else if (slot == OFFHAND_SLOT) {
yield EquipmentSlot.OFF_HAND;
}
yield null;
}
};
if (equipmentSlot != null) {
EntityEquipEvent entityEquipEvent = new EntityEquipEvent(player, itemStack, equipmentSlot);
EventDispatcher.call(entityEquipEvent);
@ -160,10 +158,7 @@ public non-sealed class PlayerInventory extends AbstractInventory implements Equ
if (sendPacket) {
// Sync equipment
if (equipmentSlot != null) {
this.player.syncEquipment(equipmentSlot);
}
if (equipmentSlot != null) this.player.syncEquipment(equipmentSlot);
// Refresh slot
sendSlotRefresh((short) convertToPacketSlot(slot), itemStack);
}
@ -177,7 +172,7 @@ public non-sealed class PlayerInventory extends AbstractInventory implements Equ
* @param itemStack the item stack in the slot
*/
protected void sendSlotRefresh(short slot, ItemStack itemStack) {
player.getPlayerConnection().sendPacket(new SetSlotPacket((byte) 0, 0, slot, itemStack));
this.player.sendPacket(new SetSlotPacket((byte) 0, 0, slot, itemStack));
}
/**