mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-25 22:23:04 +02:00
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 18cda936 Fix variant of unloadChunkRequest that was incorrectly never deprecated 00763e1b Deprecate some methods 35a83d54 SPIGOT-4572: Make default no permission message clearer 6163343d Fix some misplaced material enum entries 8736469c Fix typo in TechnicalPiston documentation CraftBukkit Changes:0c715b32
SPIGOT-4579: Shulker boxes not dropping in creative50fbc3f1
SPIGOT-4576: Fix attributes in itemstack internal data being lost8059a937
SPIGOT-4577: Fix loss of int/double custom tags when serialized to yaml07e504c3
Clarify exception thrown when setting drop chance for player inventory98b862ad
Fix duplicate iron golem add843cee65
Fix a bunch of duplicate EntityCombustEvent calls43855624
SPIGOT-4571: EntityCombustEvent not firing for phantoms
421 lines
18 KiB
Diff
421 lines
18 KiB
Diff
From 3d7a3196483b58cc78e94b6ee53f867335269418 Mon Sep 17 00:00:00 2001
|
|
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
|
Date: Wed, 12 Sep 2018 18:53:55 +0300
|
|
Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java
|
|
index 8e8390282d..f529365817 100644
|
|
--- a/src/main/java/net/minecraft/server/ArgumentBlock.java
|
|
+++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
|
|
@@ -43,7 +43,7 @@ public class ArgumentBlock {
|
|
private final boolean j;
|
|
private final Map<IBlockState<?>, Comparable<?>> k = Maps.newLinkedHashMap(); // CraftBukkit - stable
|
|
private final Map<String, String> l = Maps.newHashMap();
|
|
- private MinecraftKey m = new MinecraftKey("");
|
|
+ private MinecraftKey m = new MinecraftKey(""); public MinecraftKey getBlockKey() { return this.m; } // Paper - OBFHELPER
|
|
private BlockStateList<Block, IBlockData> n;
|
|
private IBlockData o;
|
|
@Nullable
|
|
@@ -72,11 +72,13 @@ public class ArgumentBlock {
|
|
return this.p;
|
|
}
|
|
|
|
+ public @Nullable MinecraftKey getTagKey() { return d(); } // Paper - OBFHELPER
|
|
@Nullable
|
|
public MinecraftKey d() {
|
|
return this.q;
|
|
}
|
|
|
|
+ public ArgumentBlock parse(boolean parseTile) throws CommandSyntaxException { return this.a(parseTile); } // Paper - OBFHELPER
|
|
public ArgumentBlock a(boolean flag) throws CommandSyntaxException {
|
|
this.s = this::l;
|
|
if (this.i.canRead() && this.i.peek() == '#') {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
index eaf4cd11c4..03644365ce 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
@@ -81,6 +81,12 @@ import javax.annotation.Nullable;
|
|
import static org.spigotmc.ValidateUtils.*;
|
|
// Spigot end
|
|
|
|
+// Paper start
|
|
+import com.destroystokyo.paper.Namespaced;
|
|
+import com.destroystokyo.paper.NamespacedTag;
|
|
+import java.util.Collections;
|
|
+// Paper end
|
|
+
|
|
/**
|
|
* Children must include the following:
|
|
*
|
|
@@ -256,6 +262,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
@Specific(Specific.To.NBT)
|
|
static final ItemMetaKey DAMAGE = new ItemMetaKey("Damage");
|
|
static final ItemMetaKey BUKKIT_CUSTOM_TAG = new ItemMetaKey("PublicBukkitValues");
|
|
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
+ static final ItemMetaKey CAN_DESTROY = new ItemMetaKey("CanDestroy");
|
|
+ static final ItemMetaKey CAN_PLACE_ON = new ItemMetaKey("CanPlaceOn");
|
|
+ // Paper end
|
|
|
|
private IChatBaseComponent displayName;
|
|
private IChatBaseComponent locName;
|
|
@@ -266,6 +276,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
private int hideFlag;
|
|
private boolean unbreakable;
|
|
private int damage;
|
|
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
+ private Set<Namespaced> placeableKeys;
|
|
+ private Set<Namespaced> destroyableKeys;
|
|
+ // Paper end
|
|
|
|
private static final Set<String> HANDLED_TAGS = Sets.newHashSet();
|
|
private static final CraftCustomTagTypeRegistry TAG_TYPE_REGISTRY = new CraftCustomTagTypeRegistry();
|
|
@@ -298,6 +312,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
this.hideFlag = meta.hideFlag;
|
|
this.unbreakable = meta.unbreakable;
|
|
this.damage = meta.damage;
|
|
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
+ if (meta.hasPlaceableKeys()) {
|
|
+ this.placeableKeys = new java.util.HashSet<>(meta.placeableKeys);
|
|
+ }
|
|
+
|
|
+ if (meta.hasDestroyableKeys()) {
|
|
+ this.destroyableKeys = new java.util.HashSet<>(meta.destroyableKeys);
|
|
+ }
|
|
+ // Paper end
|
|
this.unhandledTags.putAll(meta.unhandledTags);
|
|
this.publicItemTagContainer.putAll(meta.publicItemTagContainer.getRaw());
|
|
|
|
@@ -361,6 +384,33 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
publicItemTagContainer.put(key, compound.get(key));
|
|
}
|
|
}
|
|
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
+ if (tag.hasKey(CAN_DESTROY.NBT)) {
|
|
+ this.destroyableKeys = Sets.newHashSet();
|
|
+ NBTTagList list = tag.getList(CAN_DESTROY.NBT, CraftMagicNumbers.NBT.TAG_STRING);
|
|
+ for (int i = 0; i < list.size(); i++) {
|
|
+ Namespaced namespaced = this.deserializeNamespaced(list.getString(i));
|
|
+ if (namespaced == null) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ this.destroyableKeys.add(namespaced);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (tag.hasKey(CAN_PLACE_ON.NBT)) {
|
|
+ this.placeableKeys = Sets.newHashSet();
|
|
+ NBTTagList list = tag.getList(CAN_PLACE_ON.NBT, CraftMagicNumbers.NBT.TAG_STRING);
|
|
+ for (int i = 0; i < list.size(); i++) {
|
|
+ Namespaced namespaced = this.deserializeNamespaced(list.getString(i));
|
|
+ if (namespaced == null) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ this.placeableKeys.add(namespaced);
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
|
|
Set<String> keys = tag.getKeys();
|
|
for (String key : keys) {
|
|
@@ -488,6 +538,36 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
setDamage(damage);
|
|
}
|
|
|
|
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
+ Iterable<?> canPlaceOnSerialized = SerializableMeta.getObject(Iterable.class, map, CAN_PLACE_ON.BUKKIT, true);
|
|
+ if (canPlaceOnSerialized != null) {
|
|
+ this.placeableKeys = Sets.newHashSet();
|
|
+ for (Object canPlaceOnElement : canPlaceOnSerialized) {
|
|
+ String canPlaceOnRaw = (String) canPlaceOnElement;
|
|
+ Namespaced value = this.deserializeNamespaced(canPlaceOnRaw);
|
|
+ if (value == null) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ this.placeableKeys.add(value);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ Iterable<?> canDestroySerialized = SerializableMeta.getObject(Iterable.class, map, CAN_DESTROY.BUKKIT, true);
|
|
+ if (canDestroySerialized != null) {
|
|
+ this.destroyableKeys = Sets.newHashSet();
|
|
+ for (Object canDestroyElement : canDestroySerialized) {
|
|
+ String canDestroyRaw = (String) canDestroyElement;
|
|
+ Namespaced value = this.deserializeNamespaced(canDestroyRaw);
|
|
+ if (value == null) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ this.destroyableKeys.add(value);
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
String internal = SerializableMeta.getString(map, "internal", true);
|
|
if (internal != null) {
|
|
ByteArrayInputStream buf = new ByteArrayInputStream(Base64.decodeBase64(internal));
|
|
@@ -608,6 +688,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
if (hasDamage()) {
|
|
itemTag.setInt(DAMAGE.NBT, damage);
|
|
}
|
|
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
+ if (hasPlaceableKeys()) {
|
|
+ List<String> items = this.placeableKeys.stream()
|
|
+ .map(this::serializeNamespaced)
|
|
+ .collect(java.util.stream.Collectors.toList());
|
|
+
|
|
+ itemTag.set(CAN_PLACE_ON.NBT, createStringList(items));
|
|
+ }
|
|
+
|
|
+ if (hasDestroyableKeys()) {
|
|
+ List<String> items = this.destroyableKeys.stream()
|
|
+ .map(this::serializeNamespaced)
|
|
+ .collect(java.util.stream.Collectors.toList());
|
|
+
|
|
+ itemTag.set(CAN_DESTROY.NBT, createStringList(items));
|
|
+ }
|
|
+ // Paper end
|
|
|
|
for (Map.Entry<String, NBTBase> e : unhandledTags.entrySet()) {
|
|
itemTag.set(e.getKey(), e.getValue());
|
|
@@ -706,7 +803,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
|
|
@Overridden
|
|
boolean isEmpty() {
|
|
- return !(hasDisplayName() || hasLocalizedName() || hasEnchants() || hasLore() || hasRepairCost() || !unhandledTags.isEmpty() || !publicItemTagContainer.isEmpty() || hideFlag != 0 || isUnbreakable() || hasDamage() || hasAttributeModifiers());
|
|
+ return !(hasDisplayName() || hasLocalizedName() || hasEnchants() || hasLore() || hasRepairCost() || !unhandledTags.isEmpty() || !publicItemTagContainer.isEmpty() || hideFlag != 0 || isUnbreakable() || hasDamage() || hasAttributeModifiers()
|
|
+ || hasPlaceableKeys() || hasDestroyableKeys()); // Paper - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
}
|
|
|
|
public String getDisplayName() {
|
|
@@ -1048,7 +1146,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
&& (this.publicItemTagContainer.equals(that.publicItemTagContainer))
|
|
&& (this.hideFlag == that.hideFlag)
|
|
&& (this.isUnbreakable() == that.isUnbreakable())
|
|
- && (this.hasDamage() ? that.hasDamage() && this.damage == that.damage : !that.hasDamage());
|
|
+ && (this.hasDamage() ? that.hasDamage() && this.damage == that.damage : !that.hasDamage())
|
|
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
+ && (this.hasPlaceableKeys() ? that.hasPlaceableKeys() && this.placeableKeys.equals(that.placeableKeys) : !that.hasPlaceableKeys())
|
|
+ && (this.hasDestroyableKeys() ? that.hasDestroyableKeys() && this.destroyableKeys.equals(that.destroyableKeys) : !that.hasDestroyableKeys());
|
|
+ // Paper end
|
|
}
|
|
|
|
/**
|
|
@@ -1080,6 +1182,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
hash = 61 * hash + (isUnbreakable() ? 1231 : 1237);
|
|
hash = 61 * hash + (hasDamage() ? this.damage : 0);
|
|
hash = 61 * hash + (hasAttributeModifiers() ? this.attributeModifiers.hashCode() : 0);
|
|
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
+ hash = 61 * hash + (hasPlaceableKeys() ? this.placeableKeys.hashCode() : 0);
|
|
+ hash = 61 * hash + (hasDestroyableKeys() ? this.destroyableKeys.hashCode() : 0);
|
|
+ // Paper end
|
|
return hash;
|
|
}
|
|
|
|
@@ -1100,6 +1206,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
clone.hideFlag = this.hideFlag;
|
|
clone.unbreakable = this.unbreakable;
|
|
clone.damage = this.damage;
|
|
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
+ if (this.placeableKeys != null) {
|
|
+ clone.placeableKeys = Sets.newHashSet(this.placeableKeys);
|
|
+ }
|
|
+
|
|
+ if (this.destroyableKeys != null) {
|
|
+ clone.destroyableKeys = Sets.newHashSet(this.destroyableKeys);
|
|
+ }
|
|
+ // Paper end
|
|
return clone;
|
|
} catch (CloneNotSupportedException e) {
|
|
throw new Error(e);
|
|
@@ -1149,6 +1264,24 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
builder.put(DAMAGE.BUKKIT, damage);
|
|
}
|
|
|
|
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
+ if (hasPlaceableKeys()) {
|
|
+ List<String> cerealPlaceable = this.placeableKeys.stream()
|
|
+ .map(this::serializeNamespaced)
|
|
+ .collect(java.util.stream.Collectors.toList());
|
|
+
|
|
+ builder.put(CAN_PLACE_ON.BUKKIT, cerealPlaceable);
|
|
+ }
|
|
+
|
|
+ if (hasDestroyableKeys()) {
|
|
+ List<String> cerealDestroyable = this.destroyableKeys.stream()
|
|
+ .map(this::serializeNamespaced)
|
|
+ .collect(java.util.stream.Collectors.toList());
|
|
+
|
|
+ builder.put(CAN_DESTROY.BUKKIT, cerealDestroyable);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
final Map<String, NBTBase> internalTags = new HashMap<String, NBTBase>(unhandledTags);
|
|
serializeInternal(internalTags);
|
|
if (!internalTags.isEmpty()) {
|
|
@@ -1298,7 +1431,9 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
CraftMetaArmorStand.NO_BASE_PLATE.NBT,
|
|
CraftMetaArmorStand.SHOW_ARMS.NBT,
|
|
CraftMetaArmorStand.SMALL.NBT,
|
|
- CraftMetaArmorStand.MARKER.NBT
|
|
+ CraftMetaArmorStand.MARKER.NBT,
|
|
+ CAN_DESTROY.NBT,
|
|
+ CAN_PLACE_ON.NBT
|
|
// Paper end
|
|
));
|
|
}
|
|
@@ -1345,4 +1480,147 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
|
return spigot;
|
|
}
|
|
// Spigot end
|
|
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
|
|
+ @Override
|
|
+ @SuppressWarnings("deprecation")
|
|
+ public Set<Material> getCanDestroy() {
|
|
+ return this.destroyableKeys == null ? Collections.emptySet() : legacyGetMatsFromKeys(this.destroyableKeys);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ @SuppressWarnings("deprecation")
|
|
+ public void setCanDestroy(Set<Material> canDestroy) {
|
|
+ Validate.notNull(canDestroy, "Cannot replace with null set!");
|
|
+ legacyClearAndReplaceKeys(this.destroyableKeys, canDestroy);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ @SuppressWarnings("deprecation")
|
|
+ public Set<Material> getCanPlaceOn() {
|
|
+ return this.placeableKeys == null ? Collections.emptySet() : legacyGetMatsFromKeys(this.placeableKeys);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ @SuppressWarnings("deprecation")
|
|
+ public void setCanPlaceOn(Set<Material> canPlaceOn) {
|
|
+ Validate.notNull(canPlaceOn, "Cannot replace with null set!");
|
|
+ legacyClearAndReplaceKeys(this.placeableKeys, canPlaceOn);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Set<Namespaced> getDestroyableKeys() {
|
|
+ return this.destroyableKeys == null ? Collections.emptySet() : Sets.newHashSet(this.destroyableKeys);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setDestroyableKeys(Collection<Namespaced> canDestroy) {
|
|
+ Validate.notNull(canDestroy, "Cannot replace with null collection!");
|
|
+ Validate.isTrue(ofAcceptableType(canDestroy), "Can only use NamespacedKey or NamespacedTag objects!");
|
|
+ this.destroyableKeys.clear();
|
|
+ this.destroyableKeys.addAll(canDestroy);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Set<Namespaced> getPlaceableKeys() {
|
|
+ return this.placeableKeys == null ? Collections.emptySet() : Sets.newHashSet(this.placeableKeys);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setPlaceableKeys(Collection<Namespaced> canPlaceOn) {
|
|
+ Validate.notNull(canPlaceOn, "Cannot replace with null collection!");
|
|
+ Validate.isTrue(ofAcceptableType(canPlaceOn), "Can only use NamespacedKey or NamespacedTag objects!");
|
|
+ this.placeableKeys.clear();
|
|
+ this.placeableKeys.addAll(canPlaceOn);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean hasPlaceableKeys() {
|
|
+ return this.placeableKeys != null && !this.placeableKeys.isEmpty();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean hasDestroyableKeys() {
|
|
+ return this.destroyableKeys != null && !this.destroyableKeys.isEmpty();
|
|
+ }
|
|
+
|
|
+ @Deprecated
|
|
+ private void legacyClearAndReplaceKeys(Collection<Namespaced> toUpdate, Collection<Material> beingSet) {
|
|
+ if (beingSet.stream().anyMatch(Material::isLegacy)) {
|
|
+ throw new IllegalArgumentException("Set must not contain any legacy materials!");
|
|
+ }
|
|
+
|
|
+ toUpdate.clear();
|
|
+ toUpdate.addAll(beingSet.stream().map(Material::getKey).collect(java.util.stream.Collectors.toSet()));
|
|
+ }
|
|
+
|
|
+ @Deprecated
|
|
+ private Set<Material> legacyGetMatsFromKeys(Collection<Namespaced> names) {
|
|
+ Set<Material> mats = Sets.newHashSet();
|
|
+ for (Namespaced key : names) {
|
|
+ if (!(key instanceof org.bukkit.NamespacedKey)) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ Material material = Material.matchMaterial(key.toString(), false);
|
|
+ if (material != null) {
|
|
+ mats.add(material);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return mats;
|
|
+ }
|
|
+
|
|
+ private @Nullable Namespaced deserializeNamespaced(String raw) {
|
|
+ boolean isTag = raw.codePointAt(0) == '#';
|
|
+ net.minecraft.server.ArgumentBlock blockParser = new net.minecraft.server.ArgumentBlock(new com.mojang.brigadier.StringReader(raw), true);
|
|
+ try {
|
|
+ blockParser = blockParser.parse(false);
|
|
+ } catch (com.mojang.brigadier.exceptions.CommandSyntaxException e) {
|
|
+ e.printStackTrace();
|
|
+ return null;
|
|
+ }
|
|
+
|
|
+ net.minecraft.server.MinecraftKey key;
|
|
+ if (isTag) {
|
|
+ key = blockParser.getTagKey();
|
|
+ } else {
|
|
+ key = blockParser.getBlockKey();
|
|
+ }
|
|
+
|
|
+ if (key == null) {
|
|
+ return null;
|
|
+ }
|
|
+
|
|
+ // don't DC the player if something slips through somehow
|
|
+ Namespaced resource = null;
|
|
+ try {
|
|
+ if (isTag) {
|
|
+ resource = new NamespacedTag(key.b(), key.getKey());
|
|
+ } else {
|
|
+ resource = CraftNamespacedKey.fromMinecraft(key);
|
|
+ }
|
|
+ } catch (IllegalArgumentException ex) {
|
|
+ org.bukkit.Bukkit.getLogger().warning("Namespaced resource does not validate: " + key.toString());
|
|
+ ex.printStackTrace();
|
|
+ }
|
|
+
|
|
+ return resource;
|
|
+ }
|
|
+
|
|
+ private @Nonnull String serializeNamespaced(Namespaced resource) {
|
|
+ return resource.toString();
|
|
+ }
|
|
+
|
|
+ // not a fan of this
|
|
+ private boolean ofAcceptableType(Collection<Namespaced> namespacedResources) {
|
|
+ boolean valid = true;
|
|
+ for (Namespaced resource : namespacedResources) {
|
|
+ if (valid && !(resource instanceof org.bukkit.NamespacedKey || resource instanceof com.destroystokyo.paper.NamespacedTag)) {
|
|
+ valid = false;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return valid;
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.20.1
|
|
|