PotatoCraft-Studio#394 Fix wrong event format copying after SPIGOT-7091: Update bungeecord-chat

Introduce by https://github.com/SpigotMC/BungeeCord/pull/3344/files#diff-84a270b9ce33820f05d3564ab384e29478185dd8302836fbdc17ec17cd04b949R164
We use our own method to just press event, no sure if this should be open a pull request to upstream

Author: sandtechnology

src/main/java/org/maxgamer/quickshop/chat/platform/minedown/BungeeQuickChat.java

@@ -61,28 +61,12 @@
 @AllArgsConstructor
 public class BungeeQuickChat implements QuickChat {
     private final QuickShop plugin;
+    private final String[] indexStrCache = {"{0}", "{1}", "{2}", "{3}", "{4}", "{5}", "{6}", "{7}", "{8}", "{9}"};
 
     public static BaseComponent[] fromLegacyText(String text) {
         return TextComponent.fromLegacyText(text, net.md_5.bungee.api.ChatColor.RESET);
     }
 
-    @Override
-    public void send(@NotNull CommandSender receiver, @Nullable QuickComponent component) {
-        if (component == null) {
-            return;
-        }
-        if (component.get() instanceof BaseComponent[]) {
-            receiver.spigot().sendMessage((BaseComponent[]) component.get());
-            return;
-        }
-        if (component.get() instanceof BaseComponent) {
-            receiver.spigot().sendMessage((BaseComponent) component.get());
-            return;
-        }
-        Util.debugLog("Illegal component " + component.get().getClass().getName() + " sending to " + this.getClass().getName() + " processor, trying force sending.");
-
-    }
-
     public static String toLegacyText(BaseComponent[] components) {
         StringBuilder builder = new StringBuilder();
         BaseComponent lastComponent = null;
@@ -108,6 +92,23 @@ public static String toLegacyText(BaseComponent[] components) {
         return builder.toString();
     }
 
+    @Override
+    public void send(@NotNull CommandSender receiver, @Nullable QuickComponent component) {
+        if (component == null) {
+            return;
+        }
+        if (component.get() instanceof BaseComponent[]) {
+            receiver.spigot().sendMessage((BaseComponent[]) component.get());
+            return;
+        }
+        if (component.get() instanceof BaseComponent) {
+            receiver.spigot().sendMessage((BaseComponent) component.get());
+            return;
+        }
+        Util.debugLog("Illegal component " + component.get().getClass().getName() + " sending to " + this.getClass().getName() + " processor, trying force sending.");
+
+    }
+
     @Override
     public void send(@NotNull CommandSender receiver, @Nullable String message) {
         if (StringUtils.isEmpty(message)) {
@@ -121,7 +122,6 @@ public void sendItemHologramChat(@NotNull Player player, @NotNull String text, @
         sendItemHologramChat(player, text, itemStack, false);
     }
 
-
     private BungeeComponentBuilder appendItemHoloChat(@Nullable String itemJson, @NotNull String message) {
         BungeeComponentBuilder builder = new BungeeComponentBuilder();
         TextSplitter.SpilledString spilledString = TextSplitter.deBakeItem(message);
@@ -177,7 +177,8 @@ private void sendItemHologramChat(@NotNull Player player, @NotNull String text,
             } else {
                 player.spigot().sendMessage(result);
             }
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException | InstantiationException e) {
+        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException |
+                 InstantiationException e) {
             plugin.getLogger().log(Level.WARNING, "Failed to process chat component", e);
             player.spigot().sendMessage(errorComponent);
         }
@@ -226,8 +227,103 @@ private void sendItemHologramChat(@NotNull Player player, @NotNull String text,
         }
     }
 
+    @Override
+    public @NotNull QuickComponent getItemTextComponent(@NotNull Player player, @NotNull ItemStack itemStack, @NotNull String normalText) {
+        TextComponent errorComponent = new TextComponent(plugin.text().of(player, "menu.item-holochat-error").forLocale());
+
+        String json;
+        try {
+            json = ReflectFactory.convertBukkitItemStackToJson(itemStack);
+        } catch (Exception throwable) {
+            plugin.getLogger().log(Level.SEVERE, "Failed to saving item to json for holochat", throwable);
+            return new QuickComponentImpl(errorComponent);
+        }
+        if (json == null) {
+            return new QuickComponentImpl(errorComponent);
+        }
+
+        TextComponent component = new TextComponent(normalText + " " + plugin.text().of(player, "menu.preview").forLocale());
+        ComponentBuilder cBuilder = new ComponentBuilder(json);
+        component.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_ITEM, cBuilder.create()));
+        return new QuickComponentImpl(component);
+
+    }
+
+    public String getIndexStr(int index) {
+        return index <= 9 ? indexStrCache[index] : "{" + index + "}";
+    }
+
+    @Override
+    public void sendExecutableChat(@NotNull CommandSender receiver, @NotNull String message, Map.Entry<String, String>... textToCommandMapping) {
+        List<BaseComponent> components = new ArrayList<>(Arrays.asList(fromLegacyText(message)));
+        Iterator<Map.Entry<String, String>> iterator = Arrays.asList(textToCommandMapping).iterator();
+
+        int index = 0;
+        replace:
+        while (iterator.hasNext()) {
+            Map.Entry<String, String> replacement = iterator.next();
+            for (int i = 0; i < components.size(); i++) {
+                BaseComponent component = components.get(i);
+                if (component instanceof TextComponent) {
+                    String text = ((TextComponent) component).getText();
+                    if (text.contains(getIndexStr(index))) {
+                        String[] strings = text.split(getIndexStr(index).replace("{", "\\{").replace("}", "\\}"), 2);
+                        TextComponent component1 = new TextComponent(strings[0]);
+                        TextComponent component2 = new TextComponent(strings[1]);
+                        component1.copyFormatting(component);
+                        component2.copyFormatting(component);
+                        BaseComponent[] replacementComponents = fromLegacyText(replacement.getKey());
+                        ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.RUN_COMMAND, replacement.getValue());
+                        HoverEvent hoverEvent = new HoverEvent(HoverEvent.Action.SHOW_TEXT, fromLegacyText(replacement.getKey()));
+                        for (BaseComponent baseComponent : replacementComponents) {
+                            baseComponent.setClickEvent(clickEvent);
+                            baseComponent.setHoverEvent(hoverEvent);
+                            component1.addExtra(baseComponent);
+                        }
+                        components.remove(i);
+                        components.add(i, component2);
+                        components.add(i, component1);
+                        index++;
+                        continue replace;
+                    }
+                }
+            }
+        }
+        receiver.spigot().sendMessage(components.toArray(new BaseComponent[0]));
+    }
+
+    @Override
+    public void sendExecutableChat(@NotNull CommandSender receiver, @NotNull String message, @NotNull String hoverText, @NotNull String command) {
+        BaseComponent[] components =
+                fromLegacyText(ChatColor.DARK_PURPLE + plugin.text().of(receiver, "tableformat.left_begin").forLocale() + message);
+        ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.RUN_COMMAND, command);
+        //FIXME: Update this when drop 1.15 supports
+        HoverEvent hoverEvent = new HoverEvent(HoverEvent.Action.SHOW_TEXT, fromLegacyText(hoverText));
+        for (BaseComponent component : components) {
+            component.setClickEvent(clickEvent);
+            component.setHoverEvent(
+                    hoverEvent); //FIXME: Update this when drop 1.15 supports
+        }
+        receiver.spigot().sendMessage(components);
+    }
+
+    @Override
+    public void sendSuggestedChat(@NotNull CommandSender receiver, @NotNull String message, @NotNull String hoverText, @NotNull String command) {
+        BaseComponent[] components =
+                fromLegacyText(ChatColor.DARK_PURPLE + plugin.text().of(receiver, "tableformat.left_begin").forLocale() + message);
+        ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command);
+        //FIXME: Update this when drop 1.15 supports
+        HoverEvent hoverEvent = new HoverEvent(HoverEvent.Action.SHOW_TEXT, fromLegacyText(hoverText));
+        for (BaseComponent component : components) {
+            component.setClickEvent(clickEvent);
+            component.setHoverEvent(hoverEvent);
+        }
+        receiver.spigot().sendMessage(components);
+    }
 
     public static class BungeeComponentBuilder {
+        private static final boolean isUsingResetCommitVersion = Util
+                .isMethodAvailable(BaseComponent.class, "isReset");
         private final ComponentBuilder builder;
 
         public BungeeComponentBuilder() {
@@ -237,9 +333,9 @@ public BungeeComponentBuilder() {
 
         public BungeeComponentBuilder append(BaseComponent component) {
             if (builder.getCursor() == -1) {
-                builder.append(component, ComponentBuilder.FormatRetention.EVENTS);
+                append(component, ComponentBuilder.FormatRetention.EVENTS);
             } else {
-                builder.append(component);
+                append(component);
             }
             return this;
         }
@@ -254,9 +350,9 @@ public BungeeComponentBuilder append(BaseComponent[] components) {
 
         public BungeeComponentBuilder append(String text) {
             if (builder.getCursor() == -1) {
-                builder.append(text, ComponentBuilder.FormatRetention.EVENTS);
+                append(text, ComponentBuilder.FormatRetention.EVENTS);
             } else {
-                builder.append(text);
+                append(text, ComponentBuilder.FormatRetention.ALL);
             }
             return this;
         }
@@ -269,7 +365,7 @@ public BungeeComponentBuilder appendLegacy(String... text) {
             for (int i = 1; i < text.length; i++) {
                 stringBuilder.append(text[i]);
             }
-            builder.append(fromLegacyText(stringBuilder.toString()), ComponentBuilder.FormatRetention.EVENTS);
+            append(fromLegacyText(stringBuilder.toString()), ComponentBuilder.FormatRetention.EVENTS);
             return this;
         }
 
@@ -289,17 +385,18 @@ public BungeeComponentBuilder appendLegacyAndItem(String left, BaseComponent[] i
                     for (BaseComponent baseComponent : itemsComponent) {
                         leftComponent.addExtra(baseComponent);
                     }
-                    builder.append(leftComponent, ComponentBuilder.FormatRetention.EVENTS);
-                    builder.append(rightComponent, ComponentBuilder.FormatRetention.EVENTS);
+                    append(leftComponent, ComponentBuilder.FormatRetention.EVENTS);
+                    append(rightComponent, ComponentBuilder.FormatRetention.EVENTS);
                 } else {
-                    builder.append(component, ComponentBuilder.FormatRetention.EVENTS);
+                    append(component, ComponentBuilder.FormatRetention.EVENTS);
                 }
             }
             return this;
         }
 
+
         public BungeeComponentBuilder appendLegacy(String text) {
-            builder.append(fromLegacyText(text), ComponentBuilder.FormatRetention.EVENTS);
+            append(fromLegacyText(text), ComponentBuilder.FormatRetention.EVENTS);
             return this;
         }
 
@@ -325,101 +422,43 @@ public BaseComponent[] create() {
         public ComponentBuilder color(net.md_5.bungee.api.ChatColor color) {
             return builder.color(color);
         }
-    }
-
-    @Override
-    public @NotNull QuickComponent getItemTextComponent(@NotNull Player player, @NotNull ItemStack itemStack, @NotNull String normalText) {
-        TextComponent errorComponent = new TextComponent(plugin.text().of(player, "menu.item-holochat-error").forLocale());
-
-        String json;
-        try {
-            json = ReflectFactory.convertBukkitItemStackToJson(itemStack);
-        } catch (Exception throwable) {
-            plugin.getLogger().log(Level.SEVERE, "Failed to saving item to json for holochat", throwable);
-            return new QuickComponentImpl(errorComponent);
-        }
-        if (json == null) {
-            return new QuickComponentImpl(errorComponent);
-        }
-
-        TextComponent component = new TextComponent(normalText + " " + plugin.text().of(player, "menu.preview").forLocale());
-        ComponentBuilder cBuilder = new ComponentBuilder(json);
-        component.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_ITEM, cBuilder.create()));
-        return new QuickComponentImpl(component);
-
-    }
 
-    private final String[] indexStrCache = {"{0}", "{1}", "{2}", "{3}", "{4}", "{5}", "{6}", "{7}", "{8}", "{9}"};
-
-    public String getIndexStr(int index) {
-        return index <= 9 ? indexStrCache[index] : "{" + index + "}";
-    }
+        /**
+         * The dump method for fixing append always care about reset
+         */
+        //dump start
+        private ComponentBuilder append(BaseComponent component, ComponentBuilder.FormatRetention retention) {
+            if (!isUsingResetCommitVersion) {
+                builder.append(component, retention);
+            }
 
-    @Override
-    public void sendExecutableChat(@NotNull CommandSender receiver, @NotNull String message, Map.Entry<String, String>... textToCommandMapping) {
-        List<BaseComponent> components = new ArrayList<>(Arrays.asList(fromLegacyText(message)));
-        Iterator<Map.Entry<String, String>> iterator = Arrays.asList(textToCommandMapping).iterator();
+            List<BaseComponent> parts = builder.getParts();
+            BaseComponent previous = (parts.isEmpty()) ? null : parts.get(parts.size() - 1);
 
-        int index = 0;
-        replace:
-        while (iterator.hasNext()) {
-            Map.Entry<String, String> replacement = iterator.next();
-            for (int i = 0; i < components.size(); i++) {
-                BaseComponent component = components.get(i);
-                if (component instanceof TextComponent) {
-                    String text = ((TextComponent) component).getText();
-                    if (text.contains(getIndexStr(index))) {
-                        String[] strings = text.split(getIndexStr(index).replace("{", "\\{").replace("}", "\\}"), 2);
-                        TextComponent component1 = new TextComponent(strings[0]);
-                        TextComponent component2 = new TextComponent(strings[1]);
-                        component1.copyFormatting(component);
-                        component2.copyFormatting(component);
-                        BaseComponent[] replacementComponents = fromLegacyText(replacement.getKey());
-                        ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.RUN_COMMAND, replacement.getValue());
-                        HoverEvent hoverEvent = new HoverEvent(HoverEvent.Action.SHOW_TEXT, fromLegacyText(replacement.getKey()));
-                        for (BaseComponent baseComponent : replacementComponents) {
-                            baseComponent.setClickEvent(clickEvent);
-                            baseComponent.setHoverEvent(hoverEvent);
-                            component1.addExtra(baseComponent);
-                        }
-                        components.remove(i);
-                        components.add(i, component2);
-                        components.add(i, component1);
-                        index++;
-                        continue replace;
-                    }
-                }
+            if (component.isReset() && retention == ComponentBuilder.FormatRetention.ALL) {
+                retention = ComponentBuilder.FormatRetention.EVENTS;
             }
+            if (previous != null && (!component.isReset() || retention == ComponentBuilder.FormatRetention.EVENTS)) {
+                component.copyFormatting(previous, retention, false);
+                parts.add(component);
+                builder.resetCursor();
+            } else {
+                //follow the original logic
+                builder.append(component, retention);
+            }
+            return builder;
         }
-        receiver.spigot().sendMessage(components.toArray(new BaseComponent[0]));
-    }
 
-    @Override
-    public void sendExecutableChat(@NotNull CommandSender receiver, @NotNull String message, @NotNull String hoverText, @NotNull String command) {
-        BaseComponent[] components =
-                fromLegacyText(ChatColor.DARK_PURPLE + plugin.text().of(receiver, "tableformat.left_begin").forLocale() + message);
-        ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.RUN_COMMAND, command);
-        //FIXME: Update this when drop 1.15 supports
-        HoverEvent hoverEvent = new HoverEvent(HoverEvent.Action.SHOW_TEXT, fromLegacyText(hoverText));
-        for (BaseComponent component : components) {
-            component.setClickEvent(clickEvent);
-            component.setHoverEvent(
-                    hoverEvent); //FIXME: Update this when drop 1.15 supports
+        private ComponentBuilder append(String text, ComponentBuilder.FormatRetention retention) {
+            return append(new TextComponent(text), retention);
         }
-        receiver.spigot().sendMessage(components);
-    }
 
-    @Override
-    public void sendSuggestedChat(@NotNull CommandSender receiver, @NotNull String message, @NotNull String hoverText, @NotNull String command) {
-        BaseComponent[] components =
-                fromLegacyText(ChatColor.DARK_PURPLE + plugin.text().of(receiver, "tableformat.left_begin").forLocale() + message);
-        ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command);
-        //FIXME: Update this when drop 1.15 supports
-        HoverEvent hoverEvent = new HoverEvent(HoverEvent.Action.SHOW_TEXT, fromLegacyText(hoverText));
-        for (BaseComponent component : components) {
-            component.setClickEvent(clickEvent);
-            component.setHoverEvent(hoverEvent);
+        private ComponentBuilder append(BaseComponent[] components, ComponentBuilder.FormatRetention retention) {
+            for (BaseComponent component : components) {
+                append(component, retention);
+            }
+            return builder;
         }
-        receiver.spigot().sendMessage(components);
+        //dump end
     }
 }