Allow loading as a service/library only

Author: simon816

src/main/java/com/simon816/chatui/ActivePlayerChatView.java

@@ -41,7 +41,6 @@ public class ActivePlayerChatView implements PlayerChatView {
         initNewTab(player);
     }
 
-    @Override
     public PlayerList getPlayerList() {
         return this.playerList;
     }
@@ -97,7 +96,6 @@ public Window getWindow() {
         return this.window;
     }
 
-    @Override
     public NewTab getNewTab() {
         return this.newTab;
     }
@@ -171,6 +169,11 @@ private void disable() {
         this.isUpdating = false;
     }
 
+    @Override
+    public void onRemove() {
+        this.window.closeAll();
+    }
+
     @Override
     public String toString() {
         return Objects.toStringHelper(this)

src/main/java/com/simon816/chatui/ChatUI.java

@@ -26,6 +26,7 @@
 import org.spongepowered.api.event.game.state.GameInitializationEvent;
 import org.spongepowered.api.event.game.state.GamePostInitializationEvent;
 import org.spongepowered.api.event.game.state.GamePreInitializationEvent;
+import org.spongepowered.api.event.game.state.GameStoppingServerEvent;
 import org.spongepowered.api.event.message.MessageChannelEvent;
 import org.spongepowered.api.event.network.ClientConnectionEvent;
 import org.spongepowered.api.plugin.Plugin;
@@ -56,6 +57,8 @@ public class ChatUI {
 
     private static ChatUI instance;
 
+    private boolean enabledAsService = false;
+
     @Inject
     @DefaultConfig(sharedRoot = true)
     private ConfigurationLoader<CommentedConfigurationNode> confLoader;
@@ -80,6 +83,14 @@ public static PlayerChatView getView(UUID uuid) {
         return instance.playerViewMap.get(uuid);
     }
 
+    public static ActivePlayerChatView getActiveView(CommandSource source) {
+        return (ActivePlayerChatView) getView(source);
+    }
+
+    public static ActivePlayerChatView getActiveView(UUID uuid) {
+        return (ActivePlayerChatView) getView(uuid);
+    }
+
     public static ClickAction<?> command(String subcommand) {
         return TextActions.runCommand("/chatui " + subcommand);
     }
@@ -102,12 +113,22 @@ public void onInit(GameInitializationEvent event) {
         Sponge.getGame().getCommandManager().register(this, new ChatUICommand(), "chatui");
         Config.init(this.confLoader, this.logger);
 
+        this.enabledAsService = !Config.getRootNode().getNode("interfaceEnabled").getBoolean(true);
+
+        if (this.enabledAsService) {
+            return;
+        }
+
         this.featuresToLoad = Maps.newHashMap();
 
         this.registerFeature(this, "privmsg", PrivateMessageFeature::new);
         this.registerFeature(this, "chatgroup", ChatGroupFeature::new);
     }
 
+    public boolean isServiceOnlyMode() {
+        return this.enabledAsService;
+    }
+
     public void registerFeature(Object plugin, String id, Supplier<AbstractFeature> featureLoader) {
         checkState(this.featuresToLoad != null, "Not accepting new features to be registered");
         String featureId = Sponge.getPluginManager().fromInstance(plugin).get().getId() + ":" + id;
@@ -116,6 +137,9 @@ public void registerFeature(Object plugin, String id, Supplier<AbstractFeature>
 
     @Listener(order = Order.POST)
     public void onPostInit(GamePostInitializationEvent event) {
+        if (this.enabledAsService) {
+            return;
+        }
         Optional<ProviderRegistration<PaginationService>> optService = Sponge.getGame().getServiceManager().getRegistration(PaginationService.class);
         if (!optService.isPresent()) {
             return;
@@ -157,6 +181,10 @@ public void onGameReload(GameReloadEvent event) {
 
     @Listener
     public void onPlayerJoin(ClientConnectionEvent.Join event) {
+        if (this.enabledAsService) {
+            this.playerViewMap.put(event.getTargetEntity().getUniqueId(), new ExternalServiceView(event.getTargetEntity()));
+            return;
+        }
         initialize(event.getTargetEntity());
     }
 
@@ -169,6 +197,9 @@ void initialize(Player player) {
             view = new ActivePlayerChatView(player, playerSettings);
         }
         PlayerChatView oldView = this.playerViewMap.put(player.getUniqueId(), view);
+        if (oldView != null) {
+            oldView.onRemove();
+        }
         for (AbstractFeature feature : this.features) {
             if (oldView != null) {
                 feature.onViewClose(oldView);
@@ -182,10 +213,12 @@ void initialize(Player player) {
     public void onPlayerQuit(ClientConnectionEvent.Disconnect event) {
         PlayerChatView view = this.playerViewMap.remove(event.getTargetEntity().getUniqueId());
         Config.saveConfig();
-        for (AbstractFeature feature : this.features) {
-            feature.onViewClose(view);
+        if (!this.enabledAsService) {
+            for (AbstractFeature feature : this.features) {
+                feature.onViewClose(view);
+            }
         }
-        view.getWindow().closeAll();
+        view.onRemove();
         // TODO Offline message buffering?
     }
 
@@ -201,6 +234,11 @@ public void onIncomingMessage(MessageChannelEvent.Chat event, @Root Player playe
         }
     }
 
+    @Listener
+    public void onServerStop(GameStoppingServerEvent event) {
+        Config.saveConfig();
+    }
+
     // Try to be last so we can wrap around any messages sent
     @Listener(order = Order.POST)
     public void onOutgoingMessage(MessageChannelEvent event) {

src/main/java/com/simon816/chatui/Config.java

@@ -65,7 +65,11 @@ public static void loadConfig() {
         }
         CommentedConfigurationNode playerSettings = config.getNode("playerSettings");
         if (playerSettings.isVirtual()) {
-            playerSettings.setValue(Collections.EMPTY_MAP);
+            playerSettings.setValue(Collections.emptyMap());
+        }
+        CommentedConfigurationNode enabled = config.getNode("interfaceEnabled");
+        if (enabled.isVirtual()) {
+            enabled.setValue(true);
         }
     }
 

src/main/java/com/simon816/chatui/DemoContent.java

@@ -38,7 +38,7 @@ public DemoTab() {
             }));
             addButton("Sine Wave Animation", new SineWaveAnimLoader());
             addButton("UI Test", new NewTab.LaunchTabAction(() -> new UITest()));
-            addButton("Back", new NewTab.LaunchTabAction(PlayerChatView::getNewTab));
+            addButton("Back", new NewTab.LaunchTabAction(ActivePlayerChatView::getNewTab));
         }
 
         @Override
@@ -53,7 +53,7 @@ public SineWaveAnimLoader() {
         }
 
         @Override
-        protected void onClick(PlayerChatView view) {
+        protected void onClick(ActivePlayerChatView view) {
             CanvasUI canvas = new CanvasUI();
             Tab sineWaveTab = new Tab(Text.of("Sine Wave Demo"), new AnchorPaneUI(canvas)) {
 

src/main/java/com/simon816/chatui/DisabledChatView.java

@@ -1,6 +1,5 @@
 package com.simon816.chatui;
 
-import com.simon816.chatui.tabs.NewTab;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.entity.living.player.Player;
@@ -24,36 +23,21 @@ public class DisabledChatView implements PlayerChatView {
         DISABLED_MESSAGE = builder.build();
     }
     private final UUID playerUuid;
-    private final PlayerList stubPlayerList;
-    private final Window stubWindow;
-    private final NewTab stubNewTab;
 
     DisabledChatView(Player player) {
         this.playerUuid = player.getUniqueId();
-        this.stubPlayerList = new PlayerList(player);
-        this.stubWindow = new Window();
-        this.stubNewTab = new NewTab();
         player.sendMessage(DISABLED_MESSAGE);
     }
 
-    @Override
-    public PlayerList getPlayerList() {
-        return this.stubPlayerList;
-    }
-
     @Override
     public Player getPlayer() {
         return Sponge.getServer().getPlayer(this.playerUuid).get();
     }
 
     @Override
-    public Window getWindow() {
-        return this.stubWindow;
-    }
-
-    @Override
-    public NewTab getNewTab() {
-        return this.stubNewTab;
+    public TopWindow getWindow() {
+        // TODO Auto-generated method stub
+        return null;
     }
 
     @Override
@@ -81,4 +65,8 @@ public boolean handleCommand(String[] args) {
         return false;
     }
 
+    @Override
+    public void onRemove() {
+    }
+
 }

src/main/java/com/simon816/chatui/ExternalServiceView.java

@@ -0,0 +1,101 @@
+package com.simon816.chatui;
+
+import com.google.common.collect.Lists;
+import org.spongepowered.api.command.CommandSource;
+import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.text.Text;
+import org.spongepowered.api.text.chat.ChatType;
+import org.spongepowered.api.util.Tuple;
+
+import java.util.List;
+import java.util.Optional;
+
+public class ExternalServiceView implements PlayerChatView {
+
+    private final PlayerContext context;
+
+    private TopWindow window;
+    private boolean isUpdating;
+
+    private final List<Tuple<Text, ChatType>> chatBuffer = Lists.newArrayList();
+
+    public ExternalServiceView(Player player) {
+        this.context = new PlayerContext(player, Config.DEFAULT_BUFFER_WIDTH, Config.DEFAULT_BUFFER_HEIGHT, false);
+    }
+
+    @Override
+    public Player getPlayer() {
+        return this.context.getPlayer();
+    }
+
+    @Override
+    public TopWindow getWindow() {
+        return this.window;
+    }
+
+    public void setWindow(TopWindow window) {
+        if (this.window != null) {
+            this.window.onClose();
+        }
+        this.window = window;
+        if (window != null) {
+            update();
+        } else {
+            flushBuffer();
+        }
+    }
+
+    private void flushBuffer() {
+        Player player = getPlayer();
+        for (Tuple<Text, ChatType> message : this.chatBuffer) {
+            player.sendMessage(message.getSecond(), message.getFirst());
+        }
+        this.chatBuffer.clear();
+    }
+
+    @Override
+    public void update() {
+        if (this.window != null) {
+            this.isUpdating = true;
+            getPlayer().sendMessage(this.window.draw(this.context));
+            this.isUpdating = false;
+        }
+    }
+
+    @Override
+    public boolean handleIncoming(Text message) {
+        if (this.window == null) {
+            return false;
+        }
+        this.window.onTextInput(this, message);
+        return true;
+    }
+
+    @Override
+    public Optional<Text> transformOutgoing(CommandSource sender, Text originalOutgoing, ChatType type) {
+        if (this.window == null || this.isUpdating) {
+            return Optional.of(originalOutgoing);
+        }
+        this.chatBuffer.add(new Tuple<>(originalOutgoing, type));
+        return Optional.empty();
+    }
+
+    @Override
+    public boolean handleCommand(String[] args) {
+        if (this.window == null) {
+            return false;
+        }
+        boolean handled = this.window.onCommand(this, args);
+        if (handled) {
+            update();
+        }
+        return handled;
+    }
+
+    @Override
+    public void onRemove() {
+        this.window = null;
+        this.chatBuffer.clear();
+    }
+
+}

src/main/java/com/simon816/chatui/PlayerChatView.java

@@ -1,6 +1,5 @@
 package com.simon816.chatui;
 
-import com.simon816.chatui.tabs.NewTab;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.text.Text;
@@ -10,13 +9,9 @@
 
 public interface PlayerChatView {
 
-    public PlayerList getPlayerList();
-
     public Player getPlayer();
 
-    public Window getWindow();
-
-    public NewTab getNewTab();
+    public TopWindow getWindow();
 
     public void update();
 
@@ -26,4 +21,6 @@ public interface PlayerChatView {
 
     public boolean handleCommand(String[] args);
 
+    public void onRemove();
+
 }

src/main/java/com/simon816/chatui/Window.java

@@ -111,10 +111,7 @@ public void onTextInput(PlayerChatView view, Text input) {
 
     @Override
     public Text draw(PlayerContext ctx) {
-        LineFactory factory = new LineFactory();
-        this.pane.draw(ctx, factory);
-        factory.fillBlank(ctx);
-        return Text.builder().append(Text.joinWith(Text.NEW_LINE, factory.getLines())).build();
+        return this.pane.draw(ctx);
     }
 
     List<Tab> getTabs() {

src/main/java/com/simon816/chatui/group/ChatGroup.java

@@ -63,7 +63,7 @@ public void setNode(ConfigurationNode node) {
     public void onRemoved() {
         this.ignoreClose = true;
         for (Entry<UUID, ChatBufferTab> entry : this.tabs.entrySet()) {
-            ChatUI.getView(entry.getKey()).getWindow().removeTab(entry.getValue());
+            ChatUI.getActiveView(entry.getKey()).getWindow().removeTab(entry.getValue());
             ChatUI.getView(entry.getKey()).update();
         }
         this.players.clear();