Also remove data component overrides in hover events

Fixes ViaVersion/ViaVersion#4395

Author: kennytv

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/ComponentRewriter1_21_2.java

@@ -54,18 +54,9 @@ protected void handleShowItem(final UserConnection connection, final CompoundTag
             food.putFloat("eat_seconds", 1.6F);
         }
 
-        TagUtil.removeNamespaced(componentsTag, "repairable");
-        TagUtil.removeNamespaced(componentsTag, "enchantable");
-        TagUtil.removeNamespaced(componentsTag, "consumable");
-        TagUtil.removeNamespaced(componentsTag, "use_remainder");
-        TagUtil.removeNamespaced(componentsTag, "use_cooldown");
-        TagUtil.removeNamespaced(componentsTag, "item_model");
-        TagUtil.removeNamespaced(componentsTag, "equippable");
-        TagUtil.removeNamespaced(componentsTag, "glider");
-        TagUtil.removeNamespaced(componentsTag, "tooltip_style");
-        TagUtil.removeNamespaced(componentsTag, "death_protection");
-        TagUtil.removeNamespaced(componentsTag, "damage_resistant");
-        TagUtil.removeNamespaced(componentsTag, "lock");
+        removeDataComponents(componentsTag, "repairable", "enchantable", "consumable",
+            "use_remainder", "use_cooldown", "item_model", "equippable", "glider",
+            "tooltip_style", "death_protection", "damage_resistant", "lock");
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/rewriter/ComponentRewriter1_21_4.java

@@ -23,7 +23,6 @@
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
 import com.viaversion.viaversion.util.SerializerVersion;
-import com.viaversion.viaversion.util.TagUtil;
 
 public final class ComponentRewriter1_21_4 extends JsonNBTComponentRewriter<ClientboundPacket1_21_2> {
 
@@ -38,8 +37,7 @@ protected void handleShowItem(final UserConnection connection, final CompoundTag
             return;
         }
 
-        TagUtil.removeNamespaced(componentsTag, "custom_model_data");
-        TagUtil.removeNamespaced(componentsTag, "trim");
+        removeDataComponents(componentsTag, "custom_model_data", "trim");
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/ComponentRewriter1_21.java

@@ -68,7 +68,7 @@ private void convertAttributeModifiersComponent(final CompoundTag tag) {
     protected void handleShowItem(final UserConnection connection, final CompoundTag itemTag, final CompoundTag componentsTag) {
         super.handleShowItem(connection, itemTag, componentsTag);
         if (componentsTag != null) {
-            TagUtil.removeNamespaced(componentsTag, "jukebox_playable");
+            removeDataComponents(componentsTag, "jukebox_playable");
             convertAttributeModifiersComponent(componentsTag);
         }
     }