finish TagKey -> HolderSet migration

Author: Lulu13022002

paper-api/src/main/java/io/papermc/paper/datacomponent/item/DamageResistant.java

@@ -23,7 +23,7 @@ static DamageResistant damageResistant(final RegistryKeySet<DamageType> types) {
     /**
      * The types that this damage type is invincible to.
      *
-     * @return the key of the tag holding the respective damage types.
+     * @return the registry key set holding the respective damage types.
      */
     @Contract(value = "-> new", pure = true)
     RegistryKeySet<DamageType> types();

paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java

@@ -1,13 +1,15 @@
 package org.bukkit.inventory.meta;
 
 import com.google.common.collect.Multimap;
+import io.papermc.paper.datacomponent.DataComponentType;
+import io.papermc.paper.datacomponent.DataComponentTypes;
+import io.papermc.paper.datacomponent.item.ItemAdventurePredicate;
+import io.papermc.paper.registry.keys.tags.DamageTypeTagKeys;
+import io.papermc.paper.registry.set.RegistryKeySet;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import io.papermc.paper.datacomponent.DataComponentType;
-import io.papermc.paper.datacomponent.DataComponentTypes;
-import io.papermc.paper.datacomponent.item.ItemAdventurePredicate;
 import net.kyori.adventure.text.Component;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Tag;
@@ -29,7 +31,6 @@
 import org.bukkit.inventory.meta.components.UseCooldownComponent;
 import org.bukkit.inventory.meta.tags.CustomItemTagContainer;
 import org.bukkit.persistence.PersistentDataHolder;
-import org.bukkit.tag.DamageTypeTags;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -634,8 +635,7 @@ default void displayName(final net.kyori.adventure.text.@Nullable Component disp
      * or lava.
      *
      * @return fire_resistant
-     * @deprecated use {@link #getDamageResistant()} and
-     * {@link DamageTypeTags#IS_FIRE}
+     * @deprecated use {@link #getDamageResistance()} and check if it matches any {@link DamageTypeTagKeys#IS_FIRE fire damage type}
      */
     @Deprecated(since = "1.21.2")
     boolean isFireResistant();
@@ -645,8 +645,7 @@ default void displayName(final net.kyori.adventure.text.@Nullable Component disp
      * or lava.
      *
      * @param fireResistant fire_resistant
-     * @deprecated use {@link #setDamageResistant(org.bukkit.Tag)} and
-     * {@link DamageTypeTags#IS_FIRE}
+     * @deprecated use {@link #setDamageResistance(RegistryKeySet)} with {@link DamageTypeTagKeys#IS_FIRE}
      */
     @Deprecated(since = "1.21.2")
     void setFireResistant(boolean fireResistant);
@@ -662,22 +661,39 @@ default void displayName(final net.kyori.adventure.text.@Nullable Component disp
      * Gets the type of damage this item will be resistant to when in entity
      * form.
      *
-     * Plugins should check {@link #hasDamageResistant()} before calling this
-     * method.
-     *
-     * @return damage type
+     * @return damage type tag
+     * @deprecated use {@link #getDamageResistance()}
      */
     @Nullable
+    @Deprecated(since = "26.1")
     Tag<DamageType> getDamageResistant();
 
     /**
      * Sets the type of damage this item will be resistant to when in entity
      * form.
      *
      * @param tag the tag, or null to clear
+     * @deprecated use {@link #setDamageResistance(RegistryKeySet)}
      */
+    @Deprecated(since = "26.1")
     void setDamageResistant(@Nullable Tag<DamageType> tag);
 
+    /**
+     * Gets the type of damage this item will be resistant to when in entity
+     * form.
+     *
+     * @return the registry key set holding the respective damage types.
+     */
+    @Nullable RegistryKeySet<DamageType> getDamageResistance();
+
+    /**
+     * Sets the type of damage this item will be resistant to when in entity
+     * form.
+     *
+     * @param types the registry key set, or null to clear
+     */
+    void setDamageResistance(@Nullable RegistryKeySet<DamageType> types);
+
     /**
      * Gets if the max_stack_size is set.
      *
@@ -1039,9 +1055,9 @@ default void displayName(final net.kyori.adventure.text.@Nullable Component disp
      * assert itemStack.isSimilar(recreatedItemStack); // Should be true*
      * </pre>
      * <p>
-     * *Components not represented or explicitly overridden by this ItemMeta instance
-     * will not be included in the resulting string and therefore may result in ItemStacks
-     * that do not match <em>exactly</em>. For example, if {@link #setDisplayName(String)}
+     * *Components not represented or explicitly overridden by this ItemMeta instance and
+     * transient components will not be included in the resulting string and therefore may
+     * result in ItemStacks that do not match <em>exactly</em>. For example, if {@link #setDisplayName(String)}
      * is not set, then the custom name component will not be included. Or if this ItemMeta
      * is a PotionMeta, it will not include any components related to lodestone compasses,
      * banners, or books, etc., only components modifiable by a PotionMeta instance.

paper-api/src/main/java/org/bukkit/inventory/meta/components/EquippableComponent.java

@@ -164,4 +164,32 @@ public interface EquippableComponent extends ConfigurationSerializable {
      * @param equip whether the item equips on interact
      */
     void setEquipOnInteract(boolean equip);
+
+    /**
+     * Checks if the item can be unequipped when interacting with an entity using shears.
+     *
+     * @return whether the item can be unequipped using shears
+     */
+    boolean canBeSheared();
+
+    /**
+     * Sets if the item can be unequipped when interacting with an entity using shears.
+     *
+     * @param sheared whether the item can be unequipped using shears
+     */
+    void setCanBeSheared(boolean sheared);
+
+    /**
+     * Gets the sound to play when the item is sheared.
+     *
+     * @return the sound
+     */
+    @Nullable Sound getShearingSound();
+
+    /**
+     * Sets the sound to play when the item is sheared.
+     *
+     * @param sound sound or null for current default
+     */
+    void setShearingSound(@Nullable Sound sound);
 }

paper-server/src/main/java/io/papermc/paper/datacomponent/item/PaperBlocksAttacks.java

@@ -106,7 +106,7 @@ public Builder itemDamage(final ItemDamageFunction function) {
         }
 
         @Override
-        public Builder bypassedBy(@Nullable final RegistryKeySet<DamageType> bypassedBy) {
+        public Builder bypassedBy(final @Nullable RegistryKeySet<DamageType> bypassedBy) {
             this.bypassedBy = bypassedBy;
             return this;
         }

paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java

@@ -5,14 +5,19 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.ImmutableSortedMap;
+import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.SetMultimap;
 import com.google.common.collect.Sets;
 import com.mojang.logging.LogUtils;
 import com.mojang.serialization.DynamicOps;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.data.util.Conversions;
+import io.papermc.paper.registry.set.PaperRegistrySets;
+import io.papermc.paper.registry.set.RegistryKeySet;
+import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -37,7 +42,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.StringJoiner;
-import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import net.minecraft.core.Holder;
@@ -47,6 +51,7 @@
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.core.component.DataComponents;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
@@ -131,6 +136,8 @@
 import org.bukkit.tag.DamageTypeTags;
 import org.slf4j.Logger;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * Children must include the following:
  *
@@ -1550,7 +1557,11 @@ public boolean isFireResistant() {
 
     @Override
     public void setFireResistant(boolean fireResistant) {
-        this.damageResistant = CraftRegistry.getMinecraftRegistry(Registries.DAMAGE_TYPE).get(net.minecraft.tags.DamageTypeTags.IS_FIRE).orElseThrow(IllegalStateException::new);
+        if (fireResistant) {
+            this.damageResistant = CraftRegistry.getMinecraftRegistry(Registries.DAMAGE_TYPE).getOrThrow(net.minecraft.tags.DamageTypeTags.IS_FIRE);
+        } else if (this.isFireResistant()) {
+            this.damageResistant = null;
+        }
     }
 
     @Override
@@ -1560,7 +1571,6 @@ public boolean hasDamageResistant() {
 
     @Override
     public Tag<DamageType> getDamageResistant() {
-        // TODO - snapshot - 26.1 API changes for holder set
         return this.hasDamageResistant() && this.damageResistant.unwrapKey().isPresent() ? Bukkit.getTag(DamageTypeTags.REGISTRY_DAMAGE_TYPES, CraftNamespacedKey.fromMinecraft(this.damageResistant.unwrapKey().get().location()), DamageType.class) : null;
     }
 
@@ -1569,6 +1579,20 @@ public void setDamageResistant(Tag<DamageType> tag) {
         this.damageResistant = (tag != null) ? CraftRegistry.getMinecraftRegistry(Registries.DAMAGE_TYPE).get(((CraftDamageTag) tag).getHandle().key()).orElseThrow(IllegalStateException::new) : null;
     }
 
+    @Override
+    public RegistryKeySet<DamageType> getDamageResistance() {
+        return this.damageResistant == null ? null : PaperRegistrySets.convertToApi(RegistryKey.DAMAGE_TYPE, this.damageResistant);
+    }
+
+    @Override
+    public void setDamageResistance(RegistryKeySet<DamageType> types) {
+        if (types == null) {
+            this.damageResistant = null;
+        } else {
+            this.damageResistant = PaperRegistrySets.convertToNms(Registries.DAMAGE_TYPE, Conversions.global().lookup(), types);
+        }
+    }
+
     @Override
     public boolean hasMaxStackSize() {
         return this.maxStackSize != null;
@@ -1836,18 +1860,20 @@ public String getAsComponentString() {
         this.applyToItem(tag);
         DataComponentPatch patch = tag.build();
 
-        RegistryAccess registryAccess = CraftRegistry.getMinecraftRegistry();
-        DynamicOps<net.minecraft.nbt.Tag> ops = registryAccess.createSerializationContext(NbtOps.INSTANCE);
-        Registry<DataComponentType<?>> componentTypeRegistry = registryAccess.lookupOrThrow(Registries.DATA_COMPONENT_TYPE);
-
+        DynamicOps<net.minecraft.nbt.Tag> ops = CraftRegistry.getMinecraftRegistry().createSerializationContext(NbtOps.INSTANCE);
         StringJoiner componentString = new StringJoiner(",", "[", "]");
+
         for (Entry<DataComponentType<?>, Optional<?>> entry : patch.entrySet()) {
-            DataComponentType<?> componentType = entry.getKey();
+            DataComponentType<?> type = entry.getKey();
+            if (type.isTransient()) {
+                continue;
+            }
+
             Optional<?> componentValue = entry.getValue();
-            String componentKey = componentTypeRegistry.getResourceKey(componentType).orElseThrow().identifier().toString();
+            String componentKey = requireNonNull(BuiltInRegistries.DATA_COMPONENT_TYPE.getKey(type)).toString();
 
             if (componentValue.isPresent()) {
-                net.minecraft.nbt.Tag componentValueAsNBT = (net.minecraft.nbt.Tag) ((DataComponentType) componentType).codecOrThrow().encodeStart(ops, componentValue.get()).getOrThrow();
+                net.minecraft.nbt.Tag componentValueAsNBT = (net.minecraft.nbt.Tag) ((DataComponentType) type).codecOrThrow().encodeStart(ops, componentValue.get()).getOrThrow();
                 String componentValueAsNBTString = new SnbtPrinterTagVisitor("", 0, new ArrayList<>()).visit(componentValueAsNBT);
                 componentString.add(componentKey + "=" + componentValueAsNBTString);
             } else {
@@ -2564,7 +2590,7 @@ private static List<net.minecraft.advancements.criterion.BlockPredicate> convert
         final net.minecraft.core.Registry<net.minecraft.world.level.block.Block> blockRegistry = CraftRegistry.getMinecraftRegistry().lookupOrThrow(net.minecraft.core.registries.Registries.BLOCK);
         for (final com.destroystokyo.paper.Namespaced namespaced : namespaceds) {
             if (namespaced instanceof final org.bukkit.NamespacedKey key) {
-                predicates.add(net.minecraft.advancements.criterion.BlockPredicate.Builder.block().of(blockRegistry, CraftBlockType.bukkitToMinecraft(Objects.requireNonNull(org.bukkit.Registry.MATERIAL.get(key)))).build());
+                predicates.add(net.minecraft.advancements.criterion.BlockPredicate.Builder.block().of(blockRegistry, CraftBlockType.bukkitToMinecraft(requireNonNull(org.bukkit.Registry.MATERIAL.get(key)))).build());
             } else if (namespaced instanceof final com.destroystokyo.paper.NamespacedTag tag) {
                 predicates.add(net.minecraft.advancements.criterion.BlockPredicate.Builder.block().of(blockRegistry, net.minecraft.tags.TagKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath(tag.getNamespace(), tag.getKey()))).build());
             }