Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
113 Zeilen
5.0 KiB
Diff
113 Zeilen
5.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: willies952002 <admin@domnian.com>
|
||
|
Date: Thu, 26 Jul 2018 02:25:46 -0400
|
||
|
Subject: [PATCH] Implement Expanded ArmorStand API
|
||
|
|
||
|
Add the following:
|
||
|
- Add proper methods for getting and setting items in both hands. Deprecates old methods
|
||
|
- Enable/Disable slot interactions
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java
|
||
|
index 829013f57128cc6c92a45098c6883f2305cf4ea5..e97d25339b37a70f91022dcb021bbe82fb8f5eda 100644
|
||
|
--- a/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java
|
||
|
+++ b/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java
|
||
|
@@ -430,6 +430,7 @@ public class EntityArmorStand extends EntityLiving {
|
||
|
return enumitemslot;
|
||
|
}
|
||
|
|
||
|
+ public final boolean isSlotDisabled(EnumItemSlot slot) { return this.d(slot); } // Paper - OBFHELPER
|
||
|
private boolean d(EnumItemSlot enumitemslot) {
|
||
|
return (this.disabledSlots & 1 << enumitemslot.getSlotFlag()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
|
||
|
}
|
||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||
|
index 6f922e4cbb095439fcd76ee0d0c08bc4160b8107..103f935d9b7a2cbe9639528c587d8ac2e5f14d07 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||
|
@@ -1,6 +1,7 @@
|
||
|
package org.bukkit.craftbukkit.entity;
|
||
|
|
||
|
import net.minecraft.core.Vector3f;
|
||
|
+import net.minecraft.world.entity.EnumItemSlot;
|
||
|
import net.minecraft.world.entity.decoration.EntityArmorStand;
|
||
|
import org.bukkit.craftbukkit.CraftEquipmentSlot;
|
||
|
import org.bukkit.craftbukkit.CraftServer;
|
||
|
@@ -239,5 +240,78 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
|
||
|
public void setCanMove(boolean move) {
|
||
|
getHandle().canMove = move;
|
||
|
}
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public ItemStack getItem(org.bukkit.inventory.EquipmentSlot slot) {
|
||
|
+ com.google.common.base.Preconditions.checkNotNull(slot, "slot");
|
||
|
+ return getHandle().getEquipment(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot)).asBukkitMirror();
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public void setItem(org.bukkit.inventory.EquipmentSlot slot, ItemStack item) {
|
||
|
+ com.google.common.base.Preconditions.checkNotNull(slot, "slot");
|
||
|
+ switch (slot) {
|
||
|
+ case HAND:
|
||
|
+ getEquipment().setItemInMainHand(item);
|
||
|
+ return;
|
||
|
+ case OFF_HAND:
|
||
|
+ getEquipment().setItemInOffHand(item);
|
||
|
+ return;
|
||
|
+ case FEET:
|
||
|
+ setBoots(item);
|
||
|
+ return;
|
||
|
+ case LEGS:
|
||
|
+ setLeggings(item);
|
||
|
+ return;
|
||
|
+ case CHEST:
|
||
|
+ setChestplate(item);
|
||
|
+ return;
|
||
|
+ case HEAD:
|
||
|
+ setHelmet(item);
|
||
|
+ return;
|
||
|
+ }
|
||
|
+ throw new UnsupportedOperationException(slot.name());
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public java.util.Set<org.bukkit.inventory.EquipmentSlot> getDisabledSlots() {
|
||
|
+ java.util.Set<org.bukkit.inventory.EquipmentSlot> disabled = new java.util.HashSet<>();
|
||
|
+ for (org.bukkit.inventory.EquipmentSlot slot : org.bukkit.inventory.EquipmentSlot.values()) {
|
||
|
+ if (this.isSlotDisabled(slot)) {
|
||
|
+ disabled.add(slot);
|
||
|
+ }
|
||
|
+ }
|
||
|
+ return disabled;
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public void setDisabledSlots(org.bukkit.inventory.EquipmentSlot... slots) {
|
||
|
+ int disabled = 0;
|
||
|
+ for (org.bukkit.inventory.EquipmentSlot slot : slots) {
|
||
|
+ if (slot == org.bukkit.inventory.EquipmentSlot.OFF_HAND) continue;
|
||
|
+ EnumItemSlot nmsSlot = org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot);
|
||
|
+ disabled += (1 << nmsSlot.getSlotFlag()) + (1 << (nmsSlot.getSlotFlag() + 8)) + (1 << (nmsSlot.getSlotFlag() + 16));
|
||
|
+ }
|
||
|
+ getHandle().disabledSlots = disabled;
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public void addDisabledSlots(org.bukkit.inventory.EquipmentSlot... slots) {
|
||
|
+ java.util.Set<org.bukkit.inventory.EquipmentSlot> disabled = getDisabledSlots();
|
||
|
+ java.util.Collections.addAll(disabled, slots);
|
||
|
+ setDisabledSlots(disabled.toArray(new org.bukkit.inventory.EquipmentSlot[0]));
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public void removeDisabledSlots(org.bukkit.inventory.EquipmentSlot... slots) {
|
||
|
+ java.util.Set<org.bukkit.inventory.EquipmentSlot> disabled = getDisabledSlots();
|
||
|
+ for (final org.bukkit.inventory.EquipmentSlot slot : slots) disabled.remove(slot);
|
||
|
+ setDisabledSlots(disabled.toArray(new org.bukkit.inventory.EquipmentSlot[0]));
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public boolean isSlotDisabled(org.bukkit.inventory.EquipmentSlot slot) {
|
||
|
+ return getHandle().isSlotDisabled(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
|
||
|
+ }
|
||
|
// Paper end
|
||
|
}
|