Merge pull request #1549 from MagnoliaLLC/2.0

perf: drop per-call allocations in AdventureNBTSerializer style (de)serialization

Author: booky10

api/src/main/java/com/github/retrooper/packetevents/util/adventure/AdventureNBTSerializer.java

@@ -85,13 +85,14 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import static com.github.retrooper.packetevents.util.adventure.AdventureIndexUtil.indexValueOrThrow;
-
 public class AdventureNBTSerializer implements ComponentSerializer<Component, Component, NBT> {
 
+    private static final Set<TextDecoration> DECORATIONS = TextDecoration.NAMES.values();
+
     private final ClientVersion version;
     private final boolean downsampleColor;
 
@@ -470,22 +471,27 @@ public AdventureNBTSerializer(boolean downsampleColor) {
         Style.Builder style = Style.style();
         NBTReader reader = new NBTReader(wrapper, input);
 
-        reader.useUTF("font", value -> style.font(Key.key(value)));
-        reader.useUTF("color", value -> {
-            TextColor color = this.deserializeColor(value);
+        String font = reader.getUTF("font");
+        if (font != null) style.font(Key.key(font));
+
+        String colorName = reader.getUTF("color");
+        if (colorName != null) {
+            TextColor color = this.deserializeColor(colorName);
             if (color != null) style.color(color);
-        });
+        }
+
         if (BackwardCompatUtil.IS_4_18_0_OR_NEWER) {
-            reader.useNumber("shadow_color", num ->
-                    style.shadowColor(ShadowColor.shadowColor(num.intValue())));
+            Number shadowColor = reader.getNumber("shadow_color");
+            if (shadowColor != null) style.shadowColor(ShadowColor.shadowColor(shadowColor.intValue()));
         }
 
-        for (String decorationKey : TextDecoration.NAMES.keys()) {
-            reader.useBoolean(decorationKey, value -> style.decoration(
-                    indexValueOrThrow(TextDecoration.NAMES, decorationKey),
-                    TextDecoration.State.byBoolean(value)));
+        for (TextDecoration decoration : DECORATIONS) {
+            Boolean value = reader.getBoolean(decoration.toString());
+            if (value != null) style.decoration(decoration, TextDecoration.State.byBoolean(value));
         }
-        reader.useUTF("insertion", style::insertion);
+
+        String insertion = reader.getUTF("insertion");
+        if (insertion != null) style.insertion(insertion);
 
         boolean modernEvents = this.version.isNewerThanOrEquals(ClientVersion.V_1_21_5);
         NBTReader clickEvent = reader.child(modernEvents ? "click_event" : "clickEvent");
@@ -605,7 +611,7 @@ public AdventureNBTSerializer(boolean downsampleColor) {
             if (shadowColor != null) writer.writeInt("shadow_color", shadowColor.value());
         }
 
-        for (TextDecoration decoration : TextDecoration.NAMES.values()) {
+        for (TextDecoration decoration : DECORATIONS) {
             TextDecoration.State state = style.decoration(decoration);
             if (state != TextDecoration.State.NOT_SET) {
                 writer.writeBoolean(decoration.toString(), state == TextDecoration.State.TRUE);
@@ -868,6 +874,23 @@ public <R> R readUTF(String key, Function<String, R> function) {
             return withTag(key, tag -> function.apply(requireType(tag, NBTType.STRING).getValue()));
         }
 
+        public @Nullable String getUTF(String key) {
+            NBT tag = compound.getTagOrNull(key);
+            return tag == null ? null : requireType(tag, NBTType.STRING).getValue();
+        }
+
+        public @Nullable Number getNumber(String key) {
+            NBT tag = compound.getTagOrNull(key);
+            if (tag == null) return null;
+            if (tag instanceof NBTNumber) return ((NBTNumber) tag).getAsNumber();
+            throw new IllegalArgumentException("Expected number but got " + tag.getType());
+        }
+
+        public @Nullable Boolean getBoolean(String key) {
+            Number number = getNumber(key);
+            return number == null ? null : number.byteValue() != 0;
+        }
+
         public void useByteArray(String key, Consumer<byte[]> consumer) {
             useTag(key, tag -> consumer.accept(requireType(tag, NBTType.BYTE_ARRAY).getValue()));
         }