fix legacy serialization with equipOnInteract and add preconditions

Author: Lulu13022002

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

@@ -39,7 +39,7 @@ interface Builder extends DataComponentBuilder<TooltipDisplay> {
         Builder hideTooltip(boolean hide);
 
         @Contract(value = "_ -> this", mutates = "this")
-        Builder addHiddenComponents(DataComponentType... component);
+        Builder addHiddenComponents(DataComponentType... components);
 
         @Contract(value = "_ -> this", mutates = "this")
         Builder hiddenComponents(Set<DataComponentType> components);

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

@@ -24,9 +24,10 @@ static Builder builder() {
     float disableBlockingForSeconds();
 
     /**
-     * Builder for Weapon.
+     * Builder for {@link Weapon}.
      */
     interface Builder extends DataComponentBuilder<Weapon> {
+
         /**
          * Sets the damage per attack.
          *
@@ -42,6 +43,5 @@ interface Builder extends DataComponentBuilder<Weapon> {
          * @return the builder for chaining.
          */
         Builder disableBlockingForSeconds(float seconds);
-
     }
 }

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

@@ -1,5 +1,6 @@
 package io.papermc.paper.datacomponent.item;
 
+import com.google.common.base.Preconditions;
 import io.papermc.paper.adventure.PaperAdventure;
 import io.papermc.paper.registry.PaperRegistries;
 import io.papermc.paper.registry.tag.TagKey;
@@ -31,8 +32,8 @@ public float disableCooldownScale() {
 
     @Override
     public @Nullable TagKey<DamageType> bypassedBy() {
-        final Optional<TagKey<DamageType>> optionalTagKey = this.impl.bypassedBy().map(PaperRegistries::fromNms);
-        return optionalTagKey.orElse(null);
+        final Optional<TagKey<DamageType>> tagKey = this.impl.bypassedBy().map(PaperRegistries::fromNms);
+        return tagKey.orElse(null);
     }
 
     @Override
@@ -57,12 +58,14 @@ static final class BuilderImpl implements Builder {
 
         @Override
         public Builder blockDelaySeconds(final float delay) {
+            Preconditions.checkArgument(delay >= 0, "delay must be non-negative, was %s", delay);
             this.blockDelaySeconds = delay;
             return this;
         }
 
         @Override
         public Builder disableCooldownScale(final float scale) {
+            Preconditions.checkArgument(scale >= 0, "scale must be non-negative, was %s", scale);
             this.disableCooldownScale = scale;
             return this;
         }

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

@@ -1,12 +1,10 @@
 package io.papermc.paper.datacomponent.item;
 
 import io.papermc.paper.adventure.PaperAdventure;
-import io.papermc.paper.registry.PaperRegistries;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.set.PaperRegistrySets;
 import io.papermc.paper.registry.set.RegistryKeySet;
 import java.util.Optional;
-import java.util.function.Function;
 import net.kyori.adventure.key.Key;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderSet;
@@ -16,7 +14,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.util.datafix.fixes.EquippableAssetRenameFix;
 import net.minecraft.world.item.equipment.EquipmentAsset;
 import net.minecraft.world.item.equipment.EquipmentAssets;
 import org.bukkit.craftbukkit.CraftEquipmentSlot;

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

@@ -41,8 +41,8 @@ public Builder hideTooltip(final boolean hide) {
         }
 
         @Override
-        public Builder addHiddenComponents(final DataComponentType... component) {
-            this.hiddenComponents.addAll(Arrays.asList(component));
+        public Builder addHiddenComponents(final DataComponentType... components) {
+            this.hiddenComponents.addAll(Arrays.asList(components));
             return this;
         }
 

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

@@ -1,5 +1,6 @@
 package io.papermc.paper.datacomponent.item;
 
+import com.google.common.base.Preconditions;
 import org.bukkit.craftbukkit.util.Handleable;
 
 public record PaperWeapon(
@@ -28,12 +29,14 @@ static final class BuilderImpl implements Builder {
 
         @Override
         public Builder itemDamagePerAttack(final int damage) {
+            Preconditions.checkArgument(damage >= 0, "damage must be non-negative, was %s", damage);
             this.itemDamagePerAttack = damage;
             return this;
         }
 
         @Override
         public Builder disableBlockingForSeconds(final float seconds) {
+            Preconditions.checkArgument(seconds >= 0, "seconds must be non-negative, was %s", seconds);
             this.disableBlockingForSeconds = seconds;
             return this;
         }

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

@@ -64,6 +64,7 @@ public CraftEquippableComponent(Map<String, Object> map) {
         Boolean dispensable = SerializableMeta.getObject(Boolean.class, map, "dispensable", true);
         Boolean swappable = SerializableMeta.getObject(Boolean.class, map, "swappable", true);
         Boolean damageOnHurt = SerializableMeta.getObject(Boolean.class, map, "damage-on-hurt", true);
+        Boolean equipOnInteract = SerializableMeta.getObject(Boolean.class, map, "equip-on-interact", true);
 
         this.handle = new Equippable(slot,
                 (equipSound != null) ? CraftSound.bukkitToMinecraftHolder(equipSound) : SoundEvents.ARMOR_EQUIP_GENERIC,
@@ -73,7 +74,7 @@ public CraftEquippableComponent(Map<String, Object> map) {
                 (dispensable != null) ? dispensable : true,
                 (swappable != null) ? swappable : true,
                 (damageOnHurt != null) ? damageOnHurt : true,
-                false
+                (equipOnInteract != null) ? equipOnInteract : false
         );
     }
 
@@ -98,6 +99,7 @@ public Map<String, Object> serialize() {
         result.put("dispensable", this.isDispensable());
         result.put("swappable", this.isSwappable());
         result.put("damage-on-hurt", this.isDamageOnHurt());
+        result.put("equip-on-interact", this.isEquipOnInteract());
 
         return result;
     }