From a3a0e468623b63dae069eba760b2de7cab482f96 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Sat, 26 Oct 2024 19:11:37 +0200
Subject: [PATCH] fix item meta

---
 .../api/Fix-Spigot-annotation-mistakes.patch  | 13 +++++
 patches/server/General-ItemMeta-fixes.patch   | 52 +++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/patches/api/Fix-Spigot-annotation-mistakes.patch b/patches/api/Fix-Spigot-annotation-mistakes.patch
index 67cd33c729..b86fc36e59 100644
--- a/patches/api/Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/Fix-Spigot-annotation-mistakes.patch
@@ -1845,6 +1845,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    //@Deprecated // Paper
      int getMapId();
  
+     /**
+diff --git a/src/main/java/org/bukkit/inventory/meta/components/EquippableComponent.java b/src/main/java/org/bukkit/inventory/meta/components/EquippableComponent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/inventory/meta/components/EquippableComponent.java
++++ b/src/main/java/org/bukkit/inventory/meta/components/EquippableComponent.java
+@@ -0,0 +0,0 @@ public interface EquippableComponent extends ConfigurationSerializable {
+      *
+      * @return the sound
+      */
+-    @Nullable
++    @NotNull // Paper
+     Sound getEquipSound();
+ 
      /**
 diff --git a/src/main/java/org/bukkit/map/MapCanvas.java b/src/main/java/org/bukkit/map/MapCanvas.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
diff --git a/patches/server/General-ItemMeta-fixes.patch b/patches/server/General-ItemMeta-fixes.patch
index 4de96d1e23..75e2e59347 100644
--- a/patches/server/General-ItemMeta-fixes.patch
+++ b/patches/server/General-ItemMeta-fixes.patch
@@ -1179,6 +1179,32 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          } else {
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
+     @Override
+     public void setUseRemainder(ItemStack useRemainder) {
++        Preconditions.checkArgument(useRemainder == null || !useRemainder.isEmpty(), "Item cannot be empty"); // Paper
+         this.useRemainder = useRemainder;
+     }
+ 
+@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+ 
+     @Override
+     public UseCooldownComponent getUseCooldown() {
+-        return (this.hasUseCooldown()) ? new CraftUseCooldownComponent(this.useCooldown) : new CraftUseCooldownComponent(new UseCooldown(0));
++        return (this.hasUseCooldown()) ? new CraftUseCooldownComponent(this.useCooldown) : new CraftUseCooldownComponent(new UseCooldown(1.0F)); // Paper - Create a valid use_cooldown component
+     }
+ 
+     @Override
+@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+ 
+     @Override
+     public void setEquippable(EquippableComponent equippable) {
+-        this.equippable = (equippable == null) ? null : new CraftEquippableComponent((CraftEquippableComponent) this.equippable);
++        this.equippable = (equippable == null) ? null : new CraftEquippableComponent((CraftEquippableComponent) equippable); // Paper
+     }
+ 
+     @Override
+@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+ 
      @Override
      public Multimap<Attribute, AttributeModifier> getAttributeModifiers(@Nullable EquipmentSlot slot) {
 -        this.checkAttributeList();
@@ -2027,6 +2053,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end - General ItemMeta Fixes
  }
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftEquippableComponent.java b/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftEquippableComponent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftEquippableComponent.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftEquippableComponent.java
+@@ -0,0 +0,0 @@ public final class CraftEquippableComponent implements EquippableComponent {
+ 
+     @Override
+     public void setAllowedEntities(Tag<EntityType> tag) {
+-        Preconditions.checkArgument(tag instanceof CraftEntityTag, "tag must be an entity tag");
++        Preconditions.checkArgument(tag == null || tag instanceof CraftEntityTag, "tag must be an entity tag"); // Paper
+ 
+         this.handle = new Equippable(this.handle.slot(), this.handle.equipSound(), this.handle.model(), this.handle.cameraOverlay(),
+                 (tag != null) ? Optional.of(((CraftEntityTag) tag).getHandle()) : Optional.empty(),
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftToolComponent.java b/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftToolComponent.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftToolComponent.java
@@ -2063,6 +2102,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.handle = new Tool.Rule(this.handle.blocks(), Optional.ofNullable(speed), this.handle.correctForDrops());
          }
  
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java b/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java
+@@ -0,0 +0,0 @@ public final class CraftUseCooldownComponent implements UseCooldownComponent {
+ 
+     @Override
+     public void setCooldownSeconds(float eatSeconds) {
+-        Preconditions.checkArgument(eatSeconds >= 0, "eatSeconds cannot be less than 0");
++        Preconditions.checkArgument(eatSeconds > 0, "eatSeconds must be positive"); // Paper
+ 
+         this.handle = new UseCooldown(eatSeconds, this.handle.cooldownGroup());
+     }
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/DeprecatedItemMetaCustomValueTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/DeprecatedItemMetaCustomValueTest.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/DeprecatedItemMetaCustomValueTest.java