Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-02 22:47:49 +01:00
Code Issues Projects Releases Wiki Activity

Implement shift-click equip

Browse Source
This commit is contained in:
TheMode 2021-08-24 07:23:44 +02:00
parent 7740c45982
commit 2cf4e89694
2 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/net/minestom/server/entity/EquipmentSlot.java
View File

@ -3,20 +3,34 @@ package net.minestom.server.entity;
import net.minestom.server.item.attribute.AttributeSlot; import net.minestom.server.item.attribute.AttributeSlot;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import static net.minestom.server.utils.inventory.PlayerInventoryUtils.*;
public enum EquipmentSlot { public enum EquipmentSlot {
MAIN_HAND, MAIN_HAND(false, -1),
OFF_HAND, OFF_HAND(false, -1),
BOOTS, BOOTS(true, BOOTS_SLOT),
LEGGINGS, LEGGINGS(true, LEGGINGS_SLOT),
CHESTPLATE, CHESTPLATE(true, CHESTPLATE_SLOT),
HELMET; HELMET(true, HELMET_SLOT);
private final boolean armor;
private final int armorSlot;
EquipmentSlot(boolean armor, int armorSlot) {
this.armor = armor;
this.armorSlot = armorSlot;
}
public boolean isHand() { public boolean isHand() {
return this == MAIN_HAND || this == OFF_HAND; return !armor;
} }
public boolean isArmor() { public boolean isArmor() {
return !isHand(); return armor;
}
public int armorSlot() {
return armorSlot;
} }
public static EquipmentSlot fromAttributeSlot(@NotNull AttributeSlot attributeSlot) { public static EquipmentSlot fromAttributeSlot(@NotNull AttributeSlot attributeSlot) {

27
src/main/java/net/minestom/server/inventory/click/InventoryClickProcessor.java
View File

@ -3,17 +3,16 @@ package net.minestom.server.inventory.click;
import it.unimi.dsi.fastutil.ints.Int2ObjectFunction; import it.unimi.dsi.fastutil.ints.Int2ObjectFunction;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet; import it.unimi.dsi.fastutil.ints.IntSet;
import net.minestom.server.entity.EquipmentSlot;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.event.EventDispatcher; import net.minestom.server.event.EventDispatcher;
import net.minestom.server.event.inventory.InventoryClickEvent; import net.minestom.server.event.inventory.InventoryClickEvent;
import net.minestom.server.event.inventory.InventoryPreClickEvent; import net.minestom.server.event.inventory.InventoryPreClickEvent;
import net.minestom.server.inventory.AbstractInventory; import net.minestom.server.inventory.*;
import net.minestom.server.inventory.Inventory;
import net.minestom.server.inventory.TransactionOption;
import net.minestom.server.inventory.TransactionType;
import net.minestom.server.inventory.condition.InventoryCondition; import net.minestom.server.inventory.condition.InventoryCondition;
import net.minestom.server.inventory.condition.InventoryConditionResult; import net.minestom.server.inventory.condition.InventoryConditionResult;
import net.minestom.server.item.ItemStack; import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.minestom.server.item.StackingRule; import net.minestom.server.item.StackingRule;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -126,6 +125,26 @@ public final class InventoryClickProcessor {
InventoryClickResult clickResult = startCondition(player, inventory, slot, ClickType.START_SHIFT_CLICK, clicked, cursor); InventoryClickResult clickResult = startCondition(player, inventory, slot, ClickType.START_SHIFT_CLICK, clicked, cursor);
if (clickResult.isCancel()) return clickResult; if (clickResult.isCancel()) return clickResult;
if (clicked.isAir()) return clickResult.cancelled(); if (clicked.isAir()) return clickResult.cancelled();
// Handle armor equip
if (inventory instanceof PlayerInventory && targetInventory instanceof PlayerInventory) {
final Material material = clicked.getMaterial();
final EquipmentSlot equipmentSlot = material.registry().equipmentSlot();
if (equipmentSlot != null) {
// Shift-click equip
final ItemStack currentArmor = player.getEquipment(equipmentSlot);
if (currentArmor.isAir()) {
final int armorSlot = equipmentSlot.armorSlot();
InventoryClickResult result = startCondition(player, targetInventory, armorSlot, ClickType.SHIFT_CLICK, clicked, cursor);
if (result.isCancel()) return clickResult;
result.setClicked(ItemStack.AIR);
result.setCursor(cursor);
player.setEquipment(equipmentSlot, clicked);
return result;
}
}
}
final var pair = TransactionType.ADD.process(targetInventory, clicked, (index, itemStack) -> { final var pair = TransactionType.ADD.process(targetInventory, clicked, (index, itemStack) -> {
if (inventory == targetInventory && index == slot) if (inventory == targetInventory && index == slot)
return false; // Prevent item lose/duplication return false; // Prevent item lose/duplication