From ef628e4ecd8c490357a2073473fb8e554b4aa498 Mon Sep 17 00:00:00 2001
From: IzzelAliz <csh2001331@126.com>
Date: Tue, 1 Feb 2022 12:57:25 +0800
Subject: [PATCH] Revert "Update extend tags"

This reverts commit 4b7ac41bdcf8c5980966fd1cbc5cf42501b8d764.
---
 .../mixin/bukkit/CraftMetaItemMixin.java      | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftMetaItemMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftMetaItemMixin.java
index 52842000..13bd6a0e 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftMetaItemMixin.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftMetaItemMixin.java
@@ -19,7 +19,6 @@ import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import net.minecraft.nbt.CompoundTag;
@@ -30,27 +29,36 @@ import net.minecraft.nbt.Tag;
 public class CraftMetaItemMixin implements ItemMetaBridge {
 
     // @formatter:off
-    @Shadow @Final Map<String, Tag> unhandledTags;
-    @Shadow @Final private static Set<String> HANDLED_TAGS;
+    @Shadow(remap = false) @Final private Map<String, Tag> unhandledTags;
     // @formatter:on
 
-    private static final Set<String> EXTEND_TAGS;
-
-    static {
-        EXTEND_TAGS = new HashSet<>(HANDLED_TAGS);
-        EXTEND_TAGS.removeAll(Set.of(
-            "display",
-            "CustomModelData",
-            "BlockStateTag",
-            "RepairCost",
-            "Enchantments",
-            "HideFlags",
-            "Unbreakable",
-            "Damage",
-            "PublicBukkitValues",
-            "AttributeModifiers"
-        ));
-    }
+    private static final Set<String> EXTEND_TAGS = ImmutableSet.of(
+        "map_is_scaling",
+        "map",
+        "CustomPotionEffects",
+        "Potion",
+        "CustomPotionColor",
+        "SkullOwner",
+        "SkullProfile",
+        "EntityTag",
+        "BlockEntityTag",
+        "title",
+        "author",
+        "pages",
+        "resolved",
+        "generation",
+        "Fireworks",
+        "StoredEnchantments",
+        "Explosion",
+        "Recipes",
+        "BucketVariantTag",
+        "Charged",
+        "ChargedProjectiles",
+        "Effects",
+        "LodestoneDimension",
+        "LodestonePos",
+        "LodestoneTracked"
+    );
 
     @ModifyVariable(method = "<init>(Lnet/minecraft/nbt/CompoundTag;)V", at = @At(value = "INVOKE", target = "Lorg/bukkit/UnsafeValues;getDataVersion()I"))
     private CompoundTag arclight$provideTag(CompoundTag tag) {