Split large messages into multiple messages. Fix #5

- A few other minor changes
simon816 · Jul 13, 2017 · be2b3b9 · be2b3b9
1 parent 43dec4c
commit be2b3b9
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 13 deletions.
diff --git a/src/lib/java/com/simon816/chatui/lib/ChatUILib.java b/src/lib/java/com/simon816/chatui/lib/ChatUILib.java
@@ -80,12 +80,13 @@ public static ClickAction<?> command(String subcommand) {
     public static ChatUILib getInstance() {
         return instance;
     }
-    /* Plugin event listeners (internal) */
 
     public LanguagePackManager getLanguageManager() {
         return this.languageManager;
     }
 
+    /* Plugin event listeners (internal) */
+
     @Listener
     public void onPreInit(GamePreInitializationEvent event) {
         instance = this;

diff --git a/src/lib/java/com/simon816/chatui/lib/DefaultChatView.java b/src/lib/java/com/simon816/chatui/lib/DefaultChatView.java
@@ -4,6 +4,7 @@
 
 import com.google.common.collect.Lists;
 import com.simon816.chatui.lib.config.LibConfig;
+import com.simon816.chatui.util.Utils;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.entity.living.player.Player;
@@ -91,7 +92,7 @@ private void flushBuffer() {
     public void update() {
         if (this.window != null) {
             this.isUpdating = true;
-            getPlayer().sendMessage(this.window.draw(this.context));
+            Utils.sendMessageSplitLarge(this.context, this.window.draw(this.context));
             this.isUpdating = false;
         }
     }

diff --git a/src/lib/java/com/simon816/chatui/ui/table/DefaultTableRenderer.java b/src/lib/java/com/simon816/chatui/ui/table/DefaultTableRenderer.java
@@ -131,7 +131,7 @@ public Text createBorder(TableModel model, int rowIndex, int[] colMaxWidths, Pla
         Text.Builder lineBuilder = Text.builder();
         for (int i = 0; i < colMaxWidths.length; i++) {
             char edge = i == 0 ? left : join;
-            int edgeWidth = ctx.utils().getWidth(left, false);
+            int edgeWidth = ctx.utils().getWidth(edge, false);
             int width = colMaxWidths[i] + edgeWidth;
             if (i < colMaxWidths.length - 1) {
                 ctx.utils().startAndRepeat(lineBuilder, edge, '─', width);

diff --git a/src/lib/java/com/simon816/chatui/util/FontData.java b/src/lib/java/com/simon816/chatui/util/FontData.java
@@ -7,7 +7,6 @@
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.io.BaseEncoding;
-import scala.actors.threadpool.Arrays;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -154,6 +153,9 @@ public double getWidth(int codePoint, boolean isBold, boolean forceUnicode) {
             return 0;
         }
         if (codePoint == ' ') {
+            if (isBold) {
+                return 5;
+            }
             return 4;
         }
         int nonUnicodeIdx = forceUnicode ? -1 : ASCII_PNG_CHARS.indexOf(codePoint);
@@ -191,11 +193,6 @@ public static FontData fromString(String fontData) {
         }
     }
 
-    @Override
-    public String toString() {
-        return Arrays.toString(this.asciiCharWidths);
-    }
-
     public static void checkValid(String fontData) throws IllegalArgumentException {
         if (fontData == null || fontData.isEmpty()) {
             return;

diff --git a/src/lib/java/com/simon816/chatui/util/Utils.java b/src/lib/java/com/simon816/chatui/util/Utils.java
@@ -1,12 +1,17 @@
 package com.simon816.chatui.util;
 
+import com.google.common.base.Utf8;
 import com.simon816.chatui.lib.PlayerChatView;
+import com.simon816.chatui.lib.PlayerContext;
 import com.simon816.chatui.lib.internal.ClickCallback;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.command.source.ProxySource;
+import org.spongepowered.api.text.Text;
 import org.spongepowered.api.text.action.ClickAction;
 import org.spongepowered.api.text.action.TextActions;
+import org.spongepowered.api.text.serializer.TextSerializers;
 
+import java.util.List;
 import java.util.function.Consumer;
 
 public class Utils {
@@ -28,4 +33,15 @@ public static ClickAction<?> execClick(Runnable action) {
             view.update();
         });
     }
+
+    public static void sendMessageSplitLarge(PlayerContext ctx, Text text) {
+        String json = TextSerializers.JSON.serialize(text);
+        int size = Utf8.encodedLength(json);
+        if (size > 32767) {
+            List<Text> lines = ctx.utils().splitLines(text, ctx.width);
+            ctx.getPlayer().sendMessages(lines);
+        } else {
+            ctx.getPlayer().sendMessage(text);
+        }
+    }
 }
diff --git a/src/main/java/com/simon816/chatui/ActivePlayerChatView.java b/src/main/java/com/simon816/chatui/ActivePlayerChatView.java
@@ -16,6 +16,7 @@
 import com.simon816.chatui.tabs.WindowTab;
 import com.simon816.chatui.tabs.config.ConfigEditTab;
 import com.simon816.chatui.tabs.perm.PermissionsTab;
+import com.simon816.chatui.util.Utils;
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.SimpleConfigurationNode;
 import org.spongepowered.api.Sponge;
@@ -161,7 +162,7 @@ public NewTab getNewTab() {
     @Override
     public void update() {
         this.isUpdating = true;
-        this.playerContext.getPlayer().sendMessage(this.window.draw(this.playerContext));
+        Utils.sendMessageSplitLarge(this.playerContext, this.window.draw(this.playerContext));
         this.isUpdating = false;
     }
 

diff --git a/src/main/java/com/simon816/chatui/PlayerList.java b/src/main/java/com/simon816/chatui/PlayerList.java
@@ -130,11 +130,11 @@ public void addAddon(Addon addon) {
     private void addDefaultAddons(Player player) {
         TextFormat link = TextFormat.of(TextColors.BLUE, TextStyles.UNDERLINE);
         if (player.hasPermission(PERM_KICK)) {
-            addAddon(listPlayer -> Text.builder("Kick").format(link).onClick(Utils.execClick(() -> listPlayer.kick())).build());
+            addAddon(listPlayer -> Text.builder("Kick").format(link).onClick(Utils.execClick(view -> listPlayer.kick())).build());
         }
         if (player.hasPermission(PERM_BAN)) {
             addAddon(listPlayer -> Text.builder("Ban").format(link)
-                    .onClick(Utils.execClick(() -> Sponge.getServiceManager().provideUnchecked(BanService.class).addBan(Ban.of(listPlayer.getProfile()))))
+                    .onClick(Utils.execClick(view -> Sponge.getServiceManager().provideUnchecked(BanService.class).addBan(Ban.of(listPlayer.getProfile()))))
                     .build());
         }
     }

diff --git a/src/main/java/com/simon816/chatui/tabs/WindowTab.java b/src/main/java/com/simon816/chatui/tabs/WindowTab.java
@@ -12,7 +12,11 @@ public class WindowTab extends Tab {
     private final TopWindow window;
 
     public WindowTab(TopWindow window) {
-        super(Text.of(window.getClass().getSimpleName()), new TopWindowPane(window));
+        this(window, Text.of(window.getClass().getSimpleName()));
+    }
+
+    public WindowTab(TopWindow window, Text title) {
+        super(title, new TopWindowPane(window));
         this.window = window;
     }