From dabe4bb43eff8133b0366e31cb546f2b12f96a7c Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Tue, 24 Sep 2019 22:05:10 +0800
Subject: [PATCH] Add error colour setting, don't over-paginate for console
 commands

---
 main/src/main/java/net/citizensnpcs/Settings.java             | 3 ++-
 main/src/main/java/net/citizensnpcs/commands/NPCCommands.java | 4 ++--
 main/src/main/java/net/citizensnpcs/trait/Poses.java          | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/Settings.java b/main/src/main/java/net/citizensnpcs/Settings.java
index a2b8f62f2..2b4b2941d 100644
--- a/main/src/main/java/net/citizensnpcs/Settings.java
+++ b/main/src/main/java/net/citizensnpcs/Settings.java
@@ -53,7 +53,7 @@ public class Settings {
             file = new File(CitizensAPI.getPlugin().getDataFolder(), Setting.DEBUG_FILE.asString());
         }
         Messaging.configure(file, Setting.DEBUG_MODE.asBoolean(), Setting.MESSAGE_COLOUR.asString(),
-                Setting.HIGHLIGHT_COLOUR.asString());
+                Setting.HIGHLIGHT_COLOUR.asString(), Setting.ERROR_COLOUR.asString());
     }
 
     public enum Setting {
@@ -96,6 +96,7 @@ public class Settings {
             }
         },
         DISABLE_TABLIST("npc.tablist.disable", true),
+        ERROR_COLOUR("general.color-scheme.message-error", "<c>"),
         HIGHLIGHT_COLOUR("general.color-scheme.message-highlight", "<e>"),
         KEEP_CHUNKS_LOADED("npc.chunks.always-keep-loaded", false),
         LOCALE("general.translation.locale", ""),
diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index b82c18731..e5620dd03 100644
--- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -201,7 +201,7 @@ public class NPCCommands {
             else
                 throw new CommandException(Messages.ANCHOR_MISSING, args.getFlag("remove"));
         } else if (!args.hasFlag('a')) {
-            Paginator paginator = new Paginator().header("Anchors");
+            Paginator paginator = new Paginator().header("Anchors").console(sender instanceof ConsoleCommandSender);
             paginator.addLine("<e>Key: <a>ID  <b>Name  <c>World  <d>Location (X,Y,Z)");
             for (int i = 0; i < trait.getAnchors().size(); i++) {
                 if (trait.getAnchors().get(i).isLoaded()) {
@@ -831,7 +831,7 @@ public class NPCCommands {
             }
         }
 
-        Paginator paginator = new Paginator().header("NPCs");
+        Paginator paginator = new Paginator().header("NPCs").console(sender instanceof ConsoleCommandSender);
         paginator.addLine("<e>Key: <a>ID  <b>Name");
         for (int i = 0; i < npcs.size(); i += 2) {
             String line = "<a>" + npcs.get(i).getId() + "<b>  " + npcs.get(i).getName();
diff --git a/main/src/main/java/net/citizensnpcs/trait/Poses.java b/main/src/main/java/net/citizensnpcs/trait/Poses.java
index 6499dec35..c8e6a9e55 100644
--- a/main/src/main/java/net/citizensnpcs/trait/Poses.java
+++ b/main/src/main/java/net/citizensnpcs/trait/Poses.java
@@ -4,6 +4,7 @@ import java.util.Map;
 
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 
 import com.google.common.collect.Maps;
 
@@ -67,7 +68,7 @@ public class Poses extends Trait {
     }
 
     public void describe(CommandSender sender, int page) throws CommandException {
-        Paginator paginator = new Paginator().header("Pose");
+        Paginator paginator = new Paginator().header("Pose").console(sender instanceof ConsoleCommandSender);
         paginator.addLine("<e>Key: <a>ID  <b>Name  <c>Pitch/Yaw");
         int i = 0;
         for (Pose pose : poses.values()) {