Lost lynx diffitem-datacomponent-api

2 files changed, 2 insertions, 37 deletions

diff --git a/patches/api/0495-DataComponent-API.patch b/patches/api/0495-DataComponent-API.patch
index 347715d17a..9284c1e00b 100644
--- a/patches/api/0495-DataComponent-API.patch
+++ b/patches/api/0495-DataComponent-API.patch
@@ -3957,18 +3957,10 @@ index ed534fe4983873a2d5f623f0d9d5e3ce254615eb..f019d490794b49d21057820bab047e2f
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index b59222b8c262545d100a9fd28b3bf1d2a4cf4eb0..9c5f61ea845237e78cc3da61c06506e14351f228 100644
+index b59222b8c262545d100a9fd28b3bf1d2a4cf4eb0..6e4ca7d95953a25c0aaafd35e54ef9254a1b5f0b 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -1,7 +1,6 @@
- package org.bukkit.inventory;
- 
- import com.google.common.base.Preconditions;
--import com.google.common.collect.ImmutableMap;
- import java.util.LinkedHashMap;
- import java.util.Locale;
- import java.util.Map;
-@@ -1137,4 +1136,185 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1137,4 +1137,185 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player);
      }
      // Paper end - expose itemstack tooltip lines
diff --git a/patches/server/1036-DataComponent-API.patch b/patches/server/1036-DataComponent-API.patch
index d334354722..744404bca8 100644
--- a/patches/server/1036-DataComponent-API.patch
+++ b/patches/server/1036-DataComponent-API.patch
@@ -4790,33 +4790,6 @@ index 629fccec144b5d66addc0e8258cde90e81904e1c..6961730365da9083e8963200ecc5f85d
      }
  
      @ParameterizedTest
-diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index c27f37fd8a0e90b1440bfd4329d044eb8df629d2..2a3ad42be9db193b843be122389c50933ded2cd9 100644
---- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-@@ -453,7 +453,7 @@ public class ItemMetaTest {
-         assertThat(providers, hasSize(ItemStackTest.COMPOUND_MATERIALS.length - 4/* Normal item meta, skulls, eggs and tile entities */), "Forgotten test?");
- 
-         for (final StackProvider provider : providers) {
--            this.downCastTest(new BukkitWrapper(provider));
-+            //this.downCastTest(new BukkitWrapper(provider));
-             this.downCastTest(new CraftWrapper(provider));
-         }
-     }
-@@ -513,13 +513,6 @@ public class ItemMetaTest {
-         final ItemStack blank = new ItemStack(Material.STONE);
-         final ItemStack craftBlank = CraftItemStack.asCraftCopy(blank);
- 
--        // Check that equality and similarity works for each meta implementation
--        assertThat(provider.stack(), is(provider.stack()), name);
--        assertThat(provider.stack().isSimilar(provider.stack()), is(true), name);
--
--        this.downCastTest(name, provider.stack(), blank);
--        blank.setItemMeta(blank.getItemMeta());
--        this.downCastTest(name, provider.stack(), blank);
- 
-         this.downCastTest(name, provider.stack(), craftBlank);
-         craftBlank.setItemMeta(craftBlank.getItemMeta());
 diff --git a/src/test/java/org/bukkit/support/provider/RegistriesArgumentProvider.java b/src/test/java/org/bukkit/support/provider/RegistriesArgumentProvider.java
 index b717a5ffa567781b0687bbe238b62844214db284..2d60c06b70201e4c993498af3c8e52da94b5a63e 100644
 --- a/src/test/java/org/bukkit/support/provider/RegistriesArgumentProvider.java