Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-03-12 14:49:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #282 from Bloepiloepi/equipment-improvements

Browse Source 
Equipment improvements
This commit is contained in:
TheMode 2021-05-16 11:55:04 +02:00 committed by GitHub
commit c4b3e40225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 150 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/net/minestom/server/entity/EquipmentSlot.java Normal file
View File

@ -0,0 +1,42 @@
package net.minestom.server.entity;
import net.minestom.server.event.item.EntityEquipEvent;
import net.minestom.server.item.attribute.AttributeSlot;
import org.jetbrains.annotations.NotNull;
public enum EquipmentSlot {
MAIN_HAND,
OFF_HAND,
BOOTS,
LEGGINGS,
CHESTPLATE,
HELMET;
public boolean isHand() {
return this == MAIN_HAND || this == OFF_HAND;
}
public boolean isArmor() {
return !isHand();
}
@NotNull
public static EquipmentSlot fromAttributeSlot(AttributeSlot attributeSlot) {
switch (attributeSlot) {
case MAINHAND:
return MAIN_HAND;
case OFFHAND:
return OFF_HAND;
case FEET:
return BOOTS;
case LEGS:
return LEGGINGS;
case CHEST:
return CHESTPLATE;
case HEAD:
return HELMET;
}
throw new IllegalStateException("Something weird happened");
}
}

34
src/main/java/net/minestom/server/entity/LivingEntity.java
View File

@ -10,7 +10,7 @@ import net.minestom.server.entity.metadata.LivingEntityMeta;
import net.minestom.server.event.entity.EntityDamageEvent;
import net.minestom.server.event.entity.EntityDeathEvent;
import net.minestom.server.event.entity.EntityFireEvent;
import net.minestom.server.event.item.ArmorEquipEvent;
import net.minestom.server.event.item.EntityEquipEvent;
import net.minestom.server.event.item.PickupItemEvent;
import net.minestom.server.instance.Chunk;
import net.minestom.server.instance.block.Block;
@ -127,8 +127,8 @@ public class LivingEntity extends Entity implements EquipmentHandler {
@Override
public void setItemInMainHand(@NotNull ItemStack itemStack) {
this.mainHandItem = itemStack;
syncEquipment(EntityEquipmentPacket.Slot.MAIN_HAND);
this.mainHandItem = getEquipmentItem(itemStack, EquipmentSlot.MAIN_HAND);
syncEquipment(EquipmentSlot.MAIN_HAND);
}
@NotNull
@ -139,8 +139,8 @@ public class LivingEntity extends Entity implements EquipmentHandler {
@Override
public void setItemInOffHand(@NotNull ItemStack itemStack) {
this.offHandItem = itemStack;
syncEquipment(EntityEquipmentPacket.Slot.OFF_HAND);
this.offHandItem = getEquipmentItem(itemStack, EquipmentSlot.OFF_HAND);
syncEquipment(EquipmentSlot.OFF_HAND);
}
@NotNull
@ -151,8 +151,8 @@ public class LivingEntity extends Entity implements EquipmentHandler {
@Override
public void setHelmet(@NotNull ItemStack itemStack) {
this.helmet = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.HELMET);
syncEquipment(EntityEquipmentPacket.Slot.HELMET);
this.helmet = getEquipmentItem(itemStack, EquipmentSlot.HELMET);
syncEquipment(EquipmentSlot.HELMET);
}
@NotNull
@ -163,8 +163,8 @@ public class LivingEntity extends Entity implements EquipmentHandler {
@Override
public void setChestplate(@NotNull ItemStack itemStack) {
this.chestplate = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.CHESTPLATE);
syncEquipment(EntityEquipmentPacket.Slot.CHESTPLATE);
this.chestplate = getEquipmentItem(itemStack, EquipmentSlot.CHESTPLATE);
syncEquipment(EquipmentSlot.CHESTPLATE);
}
@NotNull
@ -175,8 +175,8 @@ public class LivingEntity extends Entity implements EquipmentHandler {
@Override
public void setLeggings(@NotNull ItemStack itemStack) {
this.leggings = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.LEGGINGS);
syncEquipment(EntityEquipmentPacket.Slot.LEGGINGS);
this.leggings = getEquipmentItem(itemStack, EquipmentSlot.LEGGINGS);
syncEquipment(EquipmentSlot.LEGGINGS);
}
@NotNull
@ -187,14 +187,14 @@ public class LivingEntity extends Entity implements EquipmentHandler {
@Override
public void setBoots(@NotNull ItemStack itemStack) {
this.boots = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.BOOTS);
syncEquipment(EntityEquipmentPacket.Slot.BOOTS);
this.boots = getEquipmentItem(itemStack, EquipmentSlot.BOOTS);
syncEquipment(EquipmentSlot.BOOTS);
}
private ItemStack getEquipmentItem(@NotNull ItemStack itemStack, @NotNull ArmorEquipEvent.ArmorSlot armorSlot) {
ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent(this, itemStack, armorSlot);
callEvent(ArmorEquipEvent.class, armorEquipEvent);
return armorEquipEvent.getArmorItem();
private ItemStack getEquipmentItem(@NotNull ItemStack itemStack, @NotNull EquipmentSlot slot) {
EntityEquipEvent entityEquipEvent = new EntityEquipEvent(this, itemStack, slot);
callEvent(EntityEquipEvent.class, entityEquipEvent);
return entityEquipEvent.getEquippedItem();
}
@Override

2
src/main/java/net/minestom/server/entity/Player.java
View File

@ -2262,7 +2262,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
*/
public void refreshHeldSlot(byte slot) {
this.heldSlot = slot;
syncEquipment(EntityEquipmentPacket.Slot.MAIN_HAND);
syncEquipment(EquipmentSlot.MAIN_HAND);
refreshEating(null);
}

40
src/main/java/net/minestom/server/entity/type/decoration/EntityArmorStand.java
View File

@ -1,13 +1,9 @@
package net.minestom.server.entity.type.decoration;
import net.minestom.server.entity.EntityType;
import net.minestom.server.entity.Metadata;
import net.minestom.server.entity.ObjectEntity;
import net.minestom.server.entity.Player;
import net.minestom.server.event.item.ArmorEquipEvent;
import net.minestom.server.entity.*;
import net.minestom.server.event.item.EntityEquipEvent;
import net.minestom.server.inventory.EquipmentHandler;
import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.server.play.EntityEquipmentPacket;
import net.minestom.server.utils.Position;
import net.minestom.server.utils.Vector;
import net.minestom.server.utils.binary.BitmaskUtil;
@ -73,8 +69,8 @@ public class EntityArmorStand extends ObjectEntity implements EquipmentHandler {
@Override
public void setItemInMainHand(@NotNull ItemStack itemStack) {
this.mainHandItem = itemStack;
syncEquipment(EntityEquipmentPacket.Slot.MAIN_HAND);
this.mainHandItem = getEquipmentItem(itemStack, EquipmentSlot.MAIN_HAND);
syncEquipment(EquipmentSlot.MAIN_HAND);
}
@NotNull
@ -85,8 +81,8 @@ public class EntityArmorStand extends ObjectEntity implements EquipmentHandler {
@Override
public void setItemInOffHand(@NotNull ItemStack itemStack) {
this.offHandItem = itemStack;
syncEquipment(EntityEquipmentPacket.Slot.OFF_HAND);
this.offHandItem = getEquipmentItem(itemStack, EquipmentSlot.OFF_HAND);
syncEquipment(EquipmentSlot.OFF_HAND);
}
@NotNull
@ -97,8 +93,8 @@ public class EntityArmorStand extends ObjectEntity implements EquipmentHandler {
@Override
public void setHelmet(@NotNull ItemStack itemStack) {
this.helmet = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.HELMET);
syncEquipment(EntityEquipmentPacket.Slot.HELMET);
this.helmet = getEquipmentItem(itemStack, EquipmentSlot.HELMET);
syncEquipment(EquipmentSlot.HELMET);
}
@NotNull
@ -109,8 +105,8 @@ public class EntityArmorStand extends ObjectEntity implements EquipmentHandler {
@Override
public void setChestplate(@NotNull ItemStack itemStack) {
this.chestplate = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.CHESTPLATE);
syncEquipment(EntityEquipmentPacket.Slot.CHESTPLATE);
this.chestplate = getEquipmentItem(itemStack, EquipmentSlot.CHESTPLATE);
syncEquipment(EquipmentSlot.CHESTPLATE);
}
@NotNull
@ -121,8 +117,8 @@ public class EntityArmorStand extends ObjectEntity implements EquipmentHandler {
@Override
public void setLeggings(@NotNull ItemStack itemStack) {
this.leggings = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.LEGGINGS);
syncEquipment(EntityEquipmentPacket.Slot.LEGGINGS);
this.leggings = getEquipmentItem(itemStack, EquipmentSlot.LEGGINGS);
syncEquipment(EquipmentSlot.LEGGINGS);
}
@NotNull
@ -133,8 +129,8 @@ public class EntityArmorStand extends ObjectEntity implements EquipmentHandler {
@Override
public void setBoots(@NotNull ItemStack itemStack) {
this.boots = getEquipmentItem(itemStack, ArmorEquipEvent.ArmorSlot.BOOTS);
syncEquipment(EntityEquipmentPacket.Slot.BOOTS);
this.boots = getEquipmentItem(itemStack, EquipmentSlot.BOOTS);
syncEquipment(EquipmentSlot.BOOTS);
}
public boolean isSmall() {
@ -239,9 +235,9 @@ public class EntityArmorStand extends ObjectEntity implements EquipmentHandler {
// Equipments
private ItemStack getEquipmentItem(@NotNull ItemStack itemStack, @NotNull ArmorEquipEvent.ArmorSlot armorSlot) {
ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent(this, itemStack, armorSlot);
callEvent(ArmorEquipEvent.class, armorEquipEvent);
return armorEquipEvent.getArmorItem();
private ItemStack getEquipmentItem(@NotNull ItemStack itemStack, @NotNull EquipmentSlot slot) {
EntityEquipEvent entityEquipEvent = new EntityEquipEvent(this, itemStack, slot);
callEvent(EntityEquipEvent.class, entityEquipEvent);
return entityEquipEvent.getEquippedItem();
}
}

45
src/main/java/net/minestom/server/event/item/ArmorEquipEvent.java
View File

@ -1,45 +0,0 @@
package net.minestom.server.event.item;
import net.minestom.server.entity.Entity;
import net.minestom.server.event.Event;
import net.minestom.server.item.ItemStack;
import org.jetbrains.annotations.NotNull;
public class ArmorEquipEvent extends Event {
private final Entity entity;
private ItemStack armorItem;
private final ArmorSlot armorSlot;
public ArmorEquipEvent(@NotNull Entity entity, @NotNull ItemStack armorItem, @NotNull ArmorSlot armorSlot) {
this.entity = entity;
this.armorItem = armorItem;
this.armorSlot = armorSlot;
}
@NotNull
public Entity getEntity() {
return entity;
}
@NotNull
public ItemStack getArmorItem() {
return armorItem;
}
public void setArmorItem(@NotNull ItemStack armorItem) {
this.armorItem = armorItem;
}
@NotNull
public ArmorSlot getArmorSlot() {
return armorSlot;
}
public enum ArmorSlot {
HELMET,
CHESTPLATE,
LEGGINGS,
BOOTS
}
}

39
src/main/java/net/minestom/server/event/item/EntityEquipEvent.java Normal file
View File

@ -0,0 +1,39 @@
package net.minestom.server.event.item;
import net.minestom.server.entity.Entity;
import net.minestom.server.entity.EquipmentSlot;
import net.minestom.server.event.Event;
import net.minestom.server.item.ItemStack;
import org.jetbrains.annotations.NotNull;
public class EntityEquipEvent extends Event {
private final Entity entity;
private ItemStack equippedItem;
private final EquipmentSlot slot;
public EntityEquipEvent(@NotNull Entity entity, @NotNull ItemStack equippedItem, @NotNull EquipmentSlot slot) {
this.entity = entity;
this.equippedItem = equippedItem;
this.slot = slot;
}
@NotNull
public Entity getEntity() {
return entity;
}
@NotNull
public ItemStack getEquippedItem() {
return equippedItem;
}
public void setEquippedItem(@NotNull ItemStack armorItem) {
this.equippedItem = armorItem;
}
@NotNull
public EquipmentSlot getSlot() {
return slot;
}
}

13
src/main/java/net/minestom/server/inventory/EquipmentHandler.java
View File

@ -1,6 +1,7 @@
package net.minestom.server.inventory;
import net.minestom.server.entity.Entity;
import net.minestom.server.entity.EquipmentSlot;
import net.minestom.server.entity.Player;
import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.server.play.EntityEquipmentPacket;
@ -139,7 +140,7 @@ public interface EquipmentHandler {
* @param slot the equipment to get the item from
* @return the equipment {@link ItemStack}
*/
default @NotNull ItemStack getEquipment(@NotNull EntityEquipmentPacket.Slot slot) {
default @NotNull ItemStack getEquipment(@NotNull EquipmentSlot slot) {
switch (slot) {
case MAIN_HAND:
return getItemInMainHand();
@ -157,7 +158,7 @@ public interface EquipmentHandler {
throw new IllegalStateException("Something weird happened");
}
default void setEquipment(@NotNull EntityEquipmentPacket.Slot slot, @NotNull ItemStack itemStack) {
default void setEquipment(@NotNull EquipmentSlot slot, @NotNull ItemStack itemStack) {
switch (slot) {
case MAIN_HAND:
setItemInMainHand(itemStack);
@ -187,7 +188,7 @@ public interface EquipmentHandler {
*
* @param slot the slot of the equipment
*/
default void syncEquipment(@NotNull EntityEquipmentPacket.Slot slot) {
default void syncEquipment(@NotNull EquipmentSlot slot) {
Check.stateCondition(!(this instanceof Entity), "Only accessible for Entity");
Entity entity = (Entity) this;
@ -196,7 +197,7 @@ public interface EquipmentHandler {
EntityEquipmentPacket entityEquipmentPacket = new EntityEquipmentPacket();
entityEquipmentPacket.entityId = entity.getEntityId();
entityEquipmentPacket.slots = new EntityEquipmentPacket.Slot[]{slot};
entityEquipmentPacket.slots = new EquipmentSlot[]{slot};
entityEquipmentPacket.itemStacks = new ItemStack[]{itemStack};
entity.sendPacketToViewers(entityEquipmentPacket);
@ -213,12 +214,12 @@ public interface EquipmentHandler {
final Entity entity = (Entity) this;
final EntityEquipmentPacket.Slot[] slots = EntityEquipmentPacket.Slot.values();
final EquipmentSlot[] slots = EquipmentSlot.values();
List<ItemStack> itemStacks = new ArrayList<>(slots.length);
// Fill items
for (EntityEquipmentPacket.Slot slot : slots) {
for (EquipmentSlot slot : slots) {
final ItemStack equipment = getEquipment(slot);
itemStacks.add(equipment);
}

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

@ -1,12 +1,12 @@
package net.minestom.server.inventory;
import net.minestom.server.entity.EquipmentSlot;
import net.minestom.server.entity.Player;
import net.minestom.server.event.item.ArmorEquipEvent;
import net.minestom.server.event.item.EntityEquipEvent;
import net.minestom.server.inventory.click.ClickType;
import net.minestom.server.inventory.click.InventoryClickResult;
import net.minestom.server.inventory.condition.InventoryCondition;
import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.server.play.EntityEquipmentPacket;
import net.minestom.server.network.packet.server.play.SetSlotPacket;
import net.minestom.server.network.packet.server.play.WindowItemsPacket;
import net.minestom.server.utils.MathUtils;
@ -170,33 +170,27 @@ public class PlayerInventory extends AbstractInventory implements EquipmentHandl
"The slot {0} does not exist for player", slot);
Check.notNull(itemStack, "The ItemStack cannot be null, you can set air instead");
EntityEquipmentPacket.Slot equipmentSlot;
EquipmentSlot equipmentSlot = null;
if (slot == player.getHeldSlot()) {
equipmentSlot = EntityEquipmentPacket.Slot.MAIN_HAND;
equipmentSlot = EquipmentSlot.MAIN_HAND;
} else if (slot == OFFHAND_SLOT) {
equipmentSlot = EntityEquipmentPacket.Slot.OFF_HAND;
} else {
ArmorEquipEvent armorEquipEvent = null;
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;
}
if (slot == HELMET_SLOT) {
armorEquipEvent = new ArmorEquipEvent(player, itemStack, ArmorEquipEvent.ArmorSlot.HELMET);
} else if (slot == CHESTPLATE_SLOT) {
armorEquipEvent = new ArmorEquipEvent(player, itemStack, ArmorEquipEvent.ArmorSlot.CHESTPLATE);
} else if (slot == LEGGINGS_SLOT) {
armorEquipEvent = new ArmorEquipEvent(player, itemStack, ArmorEquipEvent.ArmorSlot.LEGGINGS);
} else if (slot == BOOTS_SLOT) {
armorEquipEvent = new ArmorEquipEvent(player, itemStack, ArmorEquipEvent.ArmorSlot.BOOTS);
}
if (equipmentSlot != null) {
EntityEquipEvent entityEquipEvent = new EntityEquipEvent(player, itemStack, equipmentSlot);
if (armorEquipEvent != null) {
ArmorEquipEvent.ArmorSlot armorSlot = armorEquipEvent.getArmorSlot();
equipmentSlot = EntityEquipmentPacket.Slot.fromArmorSlot(armorSlot);
player.callEvent(ArmorEquipEvent.class, armorEquipEvent);
itemStack = armorEquipEvent.getArmorItem();
} else {
equipmentSlot = null;
}
player.callEvent(EntityEquipEvent.class, entityEquipEvent);
itemStack = entityEquipEvent.getEquippedItem();
}
this.itemStacks[slot] = itemStack;

37
src/main/java/net/minestom/server/network/packet/server/play/EntityEquipmentPacket.java
View File

@ -1,6 +1,6 @@
package net.minestom.server.network.packet.server.play;
import net.minestom.server.event.item.ArmorEquipEvent;
import net.minestom.server.entity.EquipmentSlot;
import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.network.packet.server.ServerPacketIdentifier;
@ -14,7 +14,7 @@ import java.util.List;
public class EntityEquipmentPacket implements ServerPacket {
public int entityId;
public Slot[] slots;
public EquipmentSlot[] slots;
public ItemStack[] itemStacks;
public EntityEquipmentPacket() {
@ -33,7 +33,7 @@ public class EntityEquipmentPacket implements ServerPacket {
}
for (int i = 0; i < slots.length; i++) {
final Slot slot = slots[i];
final EquipmentSlot slot = slots[i];
final ItemStack itemStack = itemStacks[i];
final boolean last = i == slots.length - 1;
@ -52,17 +52,17 @@ public class EntityEquipmentPacket implements ServerPacket {
entityId = reader.readVarInt();
boolean hasRemaining = true;
List<Slot> slots = new LinkedList<>();
List<EquipmentSlot> slots = new LinkedList<>();
List<ItemStack> stacks = new LinkedList<>();
while (hasRemaining) {
byte slotEnum = reader.readByte();
hasRemaining = (slotEnum & 0x80) == 0x80;
slots.add(Slot.values()[slotEnum & 0x7F]);
slots.add(EquipmentSlot.values()[slotEnum & 0x7F]);
stacks.add(reader.readItemStack());
}
this.slots = slots.toArray(new Slot[0]);
this.slots = slots.toArray(new EquipmentSlot[0]);
this.itemStacks = stacks.toArray(new ItemStack[0]);
}
@ -71,29 +71,4 @@ public class EntityEquipmentPacket implements ServerPacket {
return ServerPacketIdentifier.ENTITY_EQUIPMENT;
}
public enum Slot {
MAIN_HAND,
OFF_HAND,
BOOTS,
LEGGINGS,
CHESTPLATE,
HELMET;
@NotNull
public static Slot fromArmorSlot(ArmorEquipEvent.ArmorSlot armorSlot) {
switch (armorSlot) {
case HELMET:
return HELMET;
case CHESTPLATE:
return CHESTPLATE;
case LEGGINGS:
return LEGGINGS;
case BOOTS:
return BOOTS;
}
throw new IllegalStateException("Something weird happened");
}
}
}

3
src/test/java/readwritepackets/ReadWritePackets.java
View File

@ -2,6 +2,7 @@ package readwritepackets;
import com.google.common.reflect.ClassPath;
import net.minestom.server.MinecraftServer;
import net.minestom.server.entity.EquipmentSlot;
import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.client.ClientPacket;
import net.minestom.server.network.packet.server.ServerPacket;
@ -67,7 +68,7 @@ public class ReadWritePackets {
// requires at least one slot and one item
EntityEquipmentPacket p = new EntityEquipmentPacket();
p.itemStacks = new ItemStack[]{ItemStack.AIR};
p.slots = new EntityEquipmentPacket.Slot[]{EntityEquipmentPacket.Slot.MAIN_HAND};
p.slots = new EquipmentSlot[]{EquipmentSlot.MAIN_HAND};
packet = (T) p;
} else {
packet = (T) constructor.newInstance();