remove no longer needed patches and fix tests

1 files changed, 19 insertions, 14 deletions

diff --git a/patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch b/patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch
index 50366dacd0..0f14e72527 100644
--- a/patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch
+++ b/patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch
@@ -5,9 +5,18 @@ Subject: [PATCH] handle converting old serialized names to new names
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index bf0870590fcf5c502cd986047efec9f754faf9a7..dabbdadf3824d1132bd4aa6d2f2360c270fa299a 100644
+index bf0870590fcf5c502cd986047efec9f754faf9a7..ee760d45c8e95c4f5a973254da7531d355aa5fee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+@@ -490,7 +490,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+             for (Object hideFlagObject : hideFlags) {
+                 String hideFlagString = (String) hideFlagObject;
+                 try {
+-                    ItemFlag hideFlatEnum = ItemFlag.valueOf(hideFlagString);
++                    ItemFlag hideFlatEnum = ItemFlag.valueOf(org.bukkit.craftbukkit.legacy.FieldRename.convertItemFlagName(org.bukkit.craftbukkit.util.ApiVersion.CURRENT, hideFlagString)); // Paper - handle old field names
+                     this.addItemFlags(hideFlatEnum);
+                 } catch (IllegalArgumentException ex) {
+                     // Ignore when we got a old String which does not map to a Enum value anymore
 @@ -661,7 +661,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  enchantKey = "SWEEPING_EDGE";
              }
@@ -17,16 +26,12 @@ index bf0870590fcf5c502cd986047efec9f754faf9a7..dabbdadf3824d1132bd4aa6d2f2360c2
              if ((enchantment != null) && (entry.getValue() instanceof Integer)) {
                  enchantments.put(enchantment, (Integer) entry.getValue());
              }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
-index a6d2370113eb44c0863b7837362dbb350f5057c6..21dbce78b1a0d42d20c9e7f87f8bee1c18c1353f 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
-@@ -138,7 +138,7 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta {
- 
-         String entityType = SerializableMeta.getString(map, CraftMetaSpawnEgg.ENTITY_ID.BUKKIT, true);
-         if (entityType != null) {
--            this.spawnedType = EntityType.fromName(entityType);
-+            this.spawnedType = EntityType.fromName(org.bukkit.craftbukkit.legacy.FieldRename.convertEntityTypeName(org.bukkit.craftbukkit.util.ApiVersion.CURRENT, entityType)); // Paper - handle old entity type field names
-         }
-     }
- 
+@@ -695,7 +695,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+                     continue;
+                 }
+                 AttributeModifier modifier = (AttributeModifier) o;
+-                Attribute attribute = EnumUtils.getEnum(Attribute.class, attributeName.toUpperCase(Locale.ROOT));
++                Attribute attribute = EnumUtils.getEnum(Attribute.class, org.bukkit.craftbukkit.legacy.FieldRename.convertAttributeName(org.bukkit.craftbukkit.util.ApiVersion.CURRENT, attributeName.toUpperCase(Locale.ROOT))); // Paper - handle old field names
+                 if (attribute == null) {
+                     continue;
+                 }