From 50084c112db07979653af91464e51de44df476d2 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Fri, 11 Oct 2024 16:30:39 +0200
Subject: [PATCH] Fix tag related issues to prepare for 1.21.2 - Inline tag
 values in 1.21 enchantments - Fix TagRewriter addTags if the server doesn't
 send values for a registry - Send the tags packet in 1.12->1.13 before the
 play login packet to fix tracking in 1.20->1.20.2

---
 .../v1_12_2to1_13/Protocol1_12_2To1_13.java   |  11 ++++--
 .../Protocol1_20_3To1_20_5.java               |   1 +
 .../v1_20_5to1_21/Protocol1_20_5To1_21.java   |   5 +++
 .../viaversion/rewriter/TagRewriter.java      |  34 +++++++++++++++---
 .../viaversion/data/enchantments-1.21.nbt     | Bin 29334 -> 45633 bytes
 5 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java
index d679f1849..7df19e7cb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java
@@ -34,6 +34,7 @@ import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 import com.viaversion.viaversion.api.type.types.version.Types1_13;
@@ -145,7 +146,7 @@ public class Protocol1_12_2To1_13 extends AbstractProtocol<ClientboundPackets1_1
             }).scheduleSend(Protocol1_12_2To1_13.class);
 
             // Send tags packet
-            w.create(ClientboundPackets1_13.UPDATE_TAGS, wrapper -> {
+            final PacketWrapper tagsPacket = w.create(ClientboundPackets1_13.UPDATE_TAGS, wrapper -> {
                 wrapper.write(Types.VAR_INT, MAPPINGS.getBlockTags().size()); // block tags
                 for (Map.Entry<String, int[]> tag : MAPPINGS.getBlockTags().entrySet()) {
                     wrapper.write(Types.STRING, tag.getKey());
@@ -164,7 +165,13 @@ public class Protocol1_12_2To1_13 extends AbstractProtocol<ClientboundPackets1_1
                     // Needs copy as other protocols may modify it
                     wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, tag.getValue().clone());
                 }
-            }).scheduleSend(Protocol1_12_2To1_13.class);
+            });
+            if (w.user().getProtocolInfo().protocolVersion().newerThanOrEqualTo(ProtocolVersion.v1_20_2)) {
+                // Make sure it's included in the configuration packets
+                tagsPacket.send(Protocol1_12_2To1_13.class);
+            } else {
+                tagsPacket.scheduleSend(Protocol1_12_2To1_13.class);
+            }
         };
 
     @Override
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/Protocol1_20_3To1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/Protocol1_20_3To1_20_5.java
index 89e92006c..909b8adf4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/Protocol1_20_3To1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/Protocol1_20_3To1_20_5.java
@@ -286,6 +286,7 @@ public final class Protocol1_20_3To1_20_5 extends AbstractProtocol<ClientboundPa
         tagRewriter.renameTag(RegistryType.ITEM, "minecraft:axolotl_tempt_items", "minecraft:axolotl_food");
         tagRewriter.removeTag(RegistryType.ITEM, "minecraft:tools");
         tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:badlands_terracotta");
+        tagRewriter.addEmptyTags(RegistryType.ITEM, "minecraft:enchantable/mace");
 
         super.onMappingDataLoaded();
     }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/Protocol1_20_5To1_21.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/Protocol1_20_5To1_21.java
index e3f2c57f5..9178ff36b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/Protocol1_20_5To1_21.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/Protocol1_20_5To1_21.java
@@ -217,6 +217,11 @@ public final class Protocol1_20_5To1_21 extends AbstractProtocol<ClientboundPack
         tagRewriter.addEmptyTags(RegistryType.ENTITY, "minecraft:can_turn_in_boats", "minecraft:deflects_projectiles", "minecraft:immune_to_infested",
             "minecraft:immune_to_oozing", "minecraft:no_anger_from_wind_charge");
         tagRewriter.addTag(RegistryType.ENCHANTMENT, "minecraft:curse", 10, 41); // Binding and vanishing curse
+        // Add other enchantment tags empty
+        tagRewriter.addEmptyTags(RegistryType.ENCHANTMENT, "double_trade_price", "in_enchanting_table", "non_treasure", "on_mob_spawn_equipment", "on_random_loot",
+            "on_traded_equipment", "prevents_bee_spawns_when_mining", "prevents_decorated_pot_shattering", "prevents_ice_melting", "prevents_infested_spawns", "smelts_loot",
+            "tooltip_order", "tradeable", "treasure", "exclusive_set/armor", "exclusive_set/boots", "exclusive_set/bow", "exclusive_set/crossbow", "exclusive_set/damage",
+            "exclusive_set/mining", "exclusive_set/riptide");
     }
 
     @Override
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
index 164795732..6647e3723 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
@@ -31,6 +31,7 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 import java.util.ArrayList;
 import java.util.EnumMap;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -143,11 +144,14 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
 
     public void handleGeneric(final PacketWrapper wrapper) {
         final int length = wrapper.passthrough(Types.VAR_INT);
-        int editedLength = length;
+        int finalLength = length;
+        final Set<RegistryType> readTypes = EnumSet.noneOf(RegistryType.class);
         for (int i = 0; i < length; i++) {
             final String registryKey = wrapper.read(Types.STRING);
-            if (toRemoveRegistries.contains(Key.stripMinecraftNamespace(registryKey))) {
-                wrapper.set(Types.VAR_INT, 0, --editedLength);
+            final String strippedKey = Key.stripMinecraftNamespace(registryKey);
+            if (toRemoveRegistries.contains(strippedKey)) {
+                finalLength--;
+
                 final int tagsSize = wrapper.read(Types.VAR_INT);
                 for (int j = 0; j < tagsSize; j++) {
                     wrapper.read(Types.STRING);
@@ -157,7 +161,29 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
             }
 
             wrapper.write(Types.STRING, registryKey);
-            handle(wrapper, Key.stripMinecraftNamespace(registryKey));
+
+            final RegistryType type = RegistryType.getByKey(registryKey);
+            if (type != null) {
+                handle(wrapper, type);
+                readTypes.add(type);
+            } else {
+                handle(wrapper, null, null, null, null);
+            }
+        }
+
+        for (final Map.Entry<RegistryType, List<TagData>> entry : toAdd.entrySet()) {
+            if (readTypes.contains(entry.getKey())) {
+                continue;
+            }
+
+            // Registry wasn't present in the packet, add them here
+            wrapper.write(Types.STRING, entry.getKey().resourceLocation());
+            appendNewTags(wrapper, entry.getKey());
+            finalLength++;
+        }
+
+        if (length != finalLength) {
+            wrapper.set(Types.VAR_INT, 0, finalLength);
         }
     }
 
diff --git a/common/src/main/resources/assets/viaversion/data/enchantments-1.21.nbt b/common/src/main/resources/assets/viaversion/data/enchantments-1.21.nbt
index 91baa7abd9a92e78490a2e66f97aade7b5e11fcd..5989737d8b5c0919d55b7e69fd8ce12456568707 100644
GIT binary patch
literal 45633
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

delta 4827
zcmcgwU2GIp6rQQwrnHpxhjvTbrEIPJ+q8&FtCUJ@3k0y(HLXqYhhe&VyPYzBotfRG
z^aoH-QJP{8h}41-jHHP%HkUVz3C5WCAl2~ZZ#3{A(J1Px#yh)Pcb4vw-g)q8)199A
z&iT%FzjN+hxt{g<4fX@fKA6im^{}ccnt_6xU?53n%I=p083i<cz-UHtV33y$zF$P^
zc}-F@7|z~Lf(p=qfEd<=2;y{PFl((L)+g~G%sH-Q*@5yxY5q29IN%%}=qh{~?_Jr+
zHm0f2V@=mm;eetT++vv~b}^n=^^?ua(dzBCGRIwo@7d~$7p|{)oF1~x{S3U_QwvR{
z*J!vJM0_y8mA|7MyWD4}sJ4VVeeLj3dFw`^DpeCCUK>dWu_8m80)t3j?9++!O>i=&
z0Nl+UT;ut~266rlFT8usg>OFaDpds*v6!#eUDH9seLs<!4$i7|aL!kb3v2ge(~xh$
zuAlJ27iV1XT!WV$pL3MMuMNj(pwVzxP*u|qu+#TWR&_3u(=RH4{i(j8D`An-RYXiB
z{uDfoEzsa!3FFN!*wu7{CJtYGxP+w%fK|Iz;O0%EbV0S7uPhtn(w3nZ$my1^mkok1
zZ8>OLVUc!xciRz`9Fiq|y)MHs5mD&B1A4S}$?3{u^T6$>h4Wh%Hl%@aXMl<#UR7i$
z@AksnDHr^*y@o{JHY3Wdu_-em$V+?(!TfYFRhI2lxlFb(q9VqcmX2gyFwDVZD4Z^l
zkp{QMHp1bi9MZ6_Y!=lw;ex%LmH$Ukp2ec-EPSOD1$_5?@W+@hQPU7qbOq?5aD)Fc
zYl{lq76p~Cqvs}ZrzO(Oq(MEZXhATo&6HDF?_<js2L8LZoQ2?29r#~bc_@!@#QZ1e
zQr6QlAZUo=iA@CzP833eu|0=`=mu|~T;?uOFc`-GFY1V4$kzj6SO}6g#Xfb$X<3sb
z)fi!zTxLZ;k%L5jip&&~$8hju5&Uqn<j}o_CWJyr<3hZII21v$!4xIqV>xo>sud!*
zaZ#^LJ|-(x+(tQ7Q&glG0@CxCyyPE=T(b==Oj30)IlQEVWux`5nG<;(Y};G{-4!Kp
z`L!DOt|A|v=xc0B(~nFO*Fu!pm1(yNkMH@6YS_kGYEDY^gbUX{n?<!&C8KxOxbPY-
zN+n;yq#%c4_B5OA!kYptOH+M3oD<2&hN*%5G)EwT{PCO{o(ere49l^M9UHd|^{~tQ
zUuYYu#FE@gHCTdSjqewTx<|kt`PnWNiC)5&BUKF)ZciwI-;Pwn_q#WgENcB8i`Vg*
zrbKmO+Q;DAt(EZpOg;Gb<->*1MuM`$K}sx<*2_x25{>n{Z=x7l$42jfgl~-%v0jQ-
z<GP8RENw1MpBKm!!QUL}v=uvk)&)~Xs+SU-VxcKx)udp4x)O?>|MQ_V<)z%&td}4`
zA2d&k+1}E87an<GCu<`f|9<pXT3R#VLhE!9a2;i)KfsSKjuOj{8==*)QwE_Rsk~^W
znjG-6K(^U*&AcOOLw6aN1TP$~ra9d4y#>Gg3fL|5Q9|r(Ym&9vluPz{O;8OXXzods
z*g09?peYl#POr}LrBOl3R%TH_KvQ(xRFEm$xl^qq_O?V*F3~B%Ta3k3r=QG9mt`hU
zJac9;EtQ!9VAt7UJDJ7Kg?r|objg)wa1_|`rbw@j7}CDkzt*SWJ`<9}2N3z4#k`ib
z*hF+r#`Yh$dj7*^(m6qr!ZJ!+#h4mPh4I@N7Zv27xqoOOvYi}IMMWnojE+BjYc_2^
jGGz{(k?j{hzhHM5nOZYX{~L2xX)ZbuUQT${!o2n`OS0AS