Added debug command and config options

Sentropic · Sentropic · commit 7872a9f7eec6 · 2021-08-11T00:09:12.000-06:00
diff --git a/src/main/java/com/sentropic/guiapi/command/ReloadCommand.java b/src/main/java/com/sentropic/guiapi/command/ReloadCommand.java
@@ -1,10 +1,14 @@
 package com.sentropic.guiapi.command;
 
 import com.sentropic.guiapi.GUIAPI;
+import com.sentropic.guiapi.GUIManager;
+import com.sentropic.guiapi.gui.GUI;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 public class ReloadCommand implements CommandExecutor {
     @Override
@@ -13,6 +17,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
             GUIAPI.getPlugin().reloadConfig();
             sender.sendMessage(ChatColor.GREEN+"[GUIAPI] Reloaded config.yml");
             return true;
+        } else if (args.length == 1 && args[0].equals("debug")) {
+            if (sender instanceof Player) {
+                GUI gui = GUIAPI.getGUIManager().getGUI((Player) sender);
+                gui.setDebug(!gui.isDebugging());
+            }
         }
         return false;
     }
diff --git a/src/main/java/com/sentropic/guiapi/gui/Alignment.java b/src/main/java/com/sentropic/guiapi/gui/Alignment.java
@@ -0,0 +1,5 @@
+package com.sentropic.guiapi.gui;
+
+public enum Alignment {
+    LEFT, RIGHT, CENTER
+}
diff --git a/src/main/java/com/sentropic/guiapi/gui/Font.java b/src/main/java/com/sentropic/guiapi/gui/Font.java
@@ -1,9 +1,11 @@
 package com.sentropic.guiapi.gui;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 public class Font {
 
@@ -29,7 +31,7 @@ public class Font {
     public static Font ofName(String name) { return registeredFonts.get(name); }
 
     public static void register(Font font) {
-        String name = font.getName();
+        String name = font.getID();
         if (registeredFonts.containsKey(name)) {
             throw new IllegalArgumentException("Font \""+name+"\" already exists");
         }
@@ -44,12 +46,12 @@ public static boolean unregister(Font font) {
 
     // Instance code
 
-    private final String name;
+    private final String id;
     private final int height;
     private Map<Character,Integer> widths;
 
-    public Font(String name, int height) {
-        this.name = name;
+    public Font(@NotNull String id, int height) {
+        this.id = id;
         if (height < 5) { height += 1; } // Correction necessary for some reason
         this.height = height;
     }
@@ -59,32 +61,32 @@ public void registerWidth(char character, int width) {
         widths.put(character, width);
     }
 
-    public int getWidth(char character, boolean custom) {
+    public int getWidth(char character, boolean scale) {
         int result;
         if (this == DEFAULT) {
             result = widths.getOrDefault(character, 6);
         } else {
             result = widths == null ?
-                    DEFAULT.getWidth(character, custom) :
-                    widths.getOrDefault(character, DEFAULT.getWidth(character, custom));
+                    DEFAULT.getWidth(character, scale) :
+                    widths.getOrDefault(character, DEFAULT.getWidth(character, scale));
         }
-        if (!custom) {
+        if (!scale) {
             result = Math.round(result*height/8f); // Scale
         }
         return result;
     }
 
-    public int getWidth(String text) {
+    public int getWidth(String text, boolean scale) {
         if (text.equals("")) { return 0; }
         int total = 0;
-        for (char character : text.toCharArray()) { total += getWidth(character, false); }
+        for (char character : text.toCharArray()) { total += getWidth(character, scale); }
         return total;
     }
 
     @Override
-    public String toString() { return name; }
+    public String toString() { return id; }
 
-    public String getName() { return name; }
+    public String getID() { return id; }
 
     public int getHeight() { return height; }
 }
diff --git a/src/main/java/com/sentropic/guiapi/gui/GUI.java b/src/main/java/com/sentropic/guiapi/gui/GUI.java
@@ -2,7 +2,10 @@
 
 import com.comphenix.protocol.wrappers.EnumWrappers;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import com.sentropic.guiapi.GUIAPI;
 import com.sentropic.guiapi.packet.WrapperPlayServerTitle;
+import org.apache.commons.lang.ObjectUtils;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
@@ -17,6 +20,7 @@ public class GUI {
     private String rawJson;
     private boolean changed = true;
     private final WrapperPlayServerTitle packet;
+    private boolean debug = false;
 
     public GUI(Player player) {
         this.player = player;
@@ -27,23 +31,23 @@ public GUI(Player player) {
     public Player getPlayer() { return player; }
 
     public void putOnTop(@NotNull GUIComponent guiComponent) {
-        remove(guiComponent.getId());
+        remove(guiComponent.getID());
         guiComponents.add(guiComponent);
         changed = true;
     }
 
     public void putUnderneath(@NotNull GUIComponent guiComponent) {
-        remove(guiComponent.getId());
+        remove(guiComponent.getID());
         guiComponents.add(0, guiComponent);
         changed = true;
     }
 
     public boolean update(@NotNull GUIComponent guiComponent) {
         boolean success = false;
-        String id = guiComponent.getId();
+        String id = guiComponent.getID();
         for (ListIterator<GUIComponent> iterator = guiComponents.listIterator(); iterator.hasNext(); ) {
             GUIComponent component = iterator.next();
-            if (component.getId().equals(id)) {
+            if (component.getID().equals(id)) {
                 iterator.set(guiComponent);
                 changed = true;
                 success = true;
@@ -55,11 +59,11 @@ public boolean update(@NotNull GUIComponent guiComponent) {
 
     public boolean putAfter(String after, @NotNull GUIComponent guiComponent) {
         boolean success = false;
-        remove(guiComponent.getId());
+        remove(guiComponent.getID());
         int i = 0;
         for (GUIComponent component : guiComponents) {
             i++;
-            if (component.getId().equals(after)) {
+            if (component.getID().equals(after)) {
                 guiComponents.add(i, guiComponent);
                 changed = true;
                 success = true;
@@ -71,11 +75,11 @@ public boolean putAfter(String after, @NotNull GUIComponent guiComponent) {
 
     public boolean putBefore(String before, @NotNull GUIComponent guiComponent) {
         boolean success = false;
-        remove(guiComponent.getId());
+        remove(guiComponent.getID());
         int i = -1;
         for (GUIComponent component : guiComponents) {
             i++;
-            if (component.getId().equals(before)) {
+            if (component.getID().equals(before)) {
                 guiComponents.add(i, guiComponent);
                 changed = true;
                 success = true;
@@ -86,7 +90,7 @@ public boolean putBefore(String before, @NotNull GUIComponent guiComponent) {
     }
 
     public boolean remove(String id) {
-        boolean success = guiComponents.removeIf(guiComponent -> guiComponent.getId().equals(id));
+        boolean success = guiComponents.removeIf(guiComponent -> guiComponent.getID().equals(id));
         changed = success || changed;
         return success;
     }
@@ -95,6 +99,36 @@ public boolean removeIf(Predicate<GUIComponent> predicate) {
         return guiComponents.removeIf(predicate);
     }
 
+    public boolean isDebugging() { return debug; }
+
+    private static final String ID_DEBUG = "debug:";
+    public void setDebug(boolean debug) {
+        if (this.debug == debug) { return; }
+        else { this.debug = debug; }
+        if (debug) {
+            List<GUIComponent> debugComponents = new ArrayList<>();
+            ConfigurationSection debugSection = GUIAPI.getPlugin().getConfig().getConfigurationSection("debug");
+            if (debugSection == null) { return; }
+            for (String componentKey : debugSection.getKeys(false)) {
+                try {
+                    ConfigurationSection componentSection = Objects.requireNonNull(debugSection.getConfigurationSection(componentKey));
+                    ConfigurationSection fontSection = Objects.requireNonNull(componentSection.getConfigurationSection("font"));
+
+                    String id = ID_DEBUG+componentKey;
+                    int offset = componentSection.getInt("offset");
+                    String text = Objects.requireNonNull(componentSection.getString("text"));
+                    Font font = new Font(Objects.requireNonNull(fontSection.getString("id")),
+                                         fontSection.getInt("height"));
+                    Alignment alignment = Alignment.valueOf(Objects.requireNonNull(componentSection.getString("alignment")).toUpperCase());
+                    boolean scale = componentSection.getBoolean("scale", true);
+
+                    debugComponents.add(new GUIComponent(id, offset, text, font, alignment, scale));
+                } catch (NullPointerException | IllegalArgumentException ignored) { }
+            }
+            for (GUIComponent component : debugComponents) { putOnTop(component); }
+        } else { removeIf(component -> component.getID().startsWith(ID_DEBUG)); }
+    }
+
     private void build() {
         StringBuilder builder = new StringBuilder("[{\"text\":\"");
         int offset = 0;
diff --git a/src/main/java/com/sentropic/guiapi/gui/GUIComponent.java b/src/main/java/com/sentropic/guiapi/gui/GUIComponent.java
@@ -12,55 +12,26 @@ public class GUIComponent {
     private final int leftOffset;
     private final int rightOffset;
 
-    public enum Alignment {LEFT, RIGHT, CENTERED}
-
-    public GUIComponent(@NotNull String id,
-                        int offset,
-                        char character,
-                        Font font,
-                        @NotNull Alignment alignment) {
-        this.id = id;
-        this.text = String.valueOf(character);
-        this.font = font;
-
-        int width = font.getWidth(character, true);
-        switch (alignment) {
-            case LEFT:
-                this.leftOffset = offset;
-                this.rightOffset = -offset-width;
-                break;
-            case RIGHT:
-                this.leftOffset = offset-width;
-                this.rightOffset = -offset;
-                break;
-            case CENTERED:
-                this.leftOffset = offset-width/2;
-                this.rightOffset = -this.leftOffset-width;
-                break;
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-
     public GUIComponent(@NotNull String id,
                         int offset,
                         @NotNull String text,
                         Font font,
-                        @NotNull Alignment alignment) {
+                        @NotNull Alignment alignment,
+                        boolean scale) {
         this.id = id;
         this.text = text;
         this.font = font;
         switch (alignment) {
             case LEFT:
                 this.leftOffset = offset;
-                this.rightOffset = -offset-font.getWidth(text);
+                this.rightOffset = -offset-font.getWidth(text, scale);
                 break;
             case RIGHT:
-                this.leftOffset = offset-font.getWidth(text);
+                this.leftOffset = offset-font.getWidth(text, scale);
                 this.rightOffset = -offset;
                 break;
-            case CENTERED:
-                int width = font.getWidth(text);
+            case CENTER:
+                int width = font.getWidth(text, scale);
                 this.leftOffset = offset-width/2;
                 this.rightOffset = -this.leftOffset-width;
                 break;
@@ -92,7 +63,7 @@ public List<GUIComponent> byWord() {
         return list;
     }
 
-    public String getId() { return id; }
+    public String getID() { return id; }
 
     public String getText() { return text; }
 
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -0,0 +1,9 @@
+debug:
+  1:
+    offset: 0
+    text: Debug text
+    font:
+      id: minecraft:default
+      height: 8
+    alignment: left
+    scale: true
