Made GUIComponent width measurement account for custom spaces

Author: Sentropic

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.sentropic.guiapi</groupId>
     <artifactId>GUI_API</artifactId>
-    <version>1.1.1</version>
+    <version>1.2</version>
     <packaging>jar</packaging>
 
     <name>GUI API</name>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.16.1-R0.1-SNAPSHOT</version>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/com/sentropic/guiapi/GUIManager.java

@@ -4,6 +4,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -59,14 +60,14 @@ public GUI getGUI(Player player) {
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerLeave(PlayerQuitEvent event) {
         Player player = event.getPlayer();
         GUIS.remove(this.getGUI(player));
         player.removeMetadata(METADATA_KEY, GUIAPI.getPlugin());
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerJoin(PlayerJoinEvent event) {
         createGUI(event.getPlayer());
     }

src/main/java/com/sentropic/guiapi/gui/Font.java

@@ -51,6 +51,13 @@ public class Font {
         DEFAULT.registerWidth('@', 7);
         DEFAULT.registerWidth('~', 7);
 
+        for (Map.Entry<Integer,String> entry : GUI.POS_SPACES.entrySet()) {
+            DEFAULT.registerWidth(entry.getValue().charAt(0), entry.getKey());
+        }
+        for (Map.Entry<Integer,String> entry : GUI.NEG_SPACES.entrySet()) {
+            DEFAULT.registerWidth(entry.getValue().charAt(0), -entry.getKey());
+        }
+
         register(DEFAULT);
     }
 

src/main/java/com/sentropic/guiapi/gui/GUI.java

@@ -24,7 +24,7 @@ public class GUI {
     private static final GUIComponent defaultComponent =
             new GUIComponent(ID_DEFAULT, new TextComponent(), 0, Alignment.LEFT, false);
 
-    private static final Map<Integer,String> POS_SPACES = new HashMap<Integer,String>() {{
+    static final Map<Integer,String> POS_SPACES = Collections.unmodifiableMap(new HashMap<Integer,String>() {{
         put(1024, "\uF82F");
         put(512, "\uF82E");
         put(256, "\uF82D");
@@ -40,8 +40,8 @@ public class GUI {
         put(3, "\uF823");
         put(2, "\uF822");
         put(1, "\uF821");
-    }};
-    private static final Map<Integer,String> NEG_SPACES = new HashMap<Integer,String>() {{
+    }});
+    static final Map<Integer,String> NEG_SPACES = Collections.unmodifiableMap(new HashMap<Integer,String>() {{
         put(1, "\uF801");
         put(2, "\uF802");
         put(3, "\uF803");
@@ -57,7 +57,7 @@ public class GUI {
         put(256, "\uF80D");
         put(512, "\uF80E");
         put(1024, "\uF80F");
-    }};
+    }});
 
     // API code
 

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: GUIAPI
-version: 1.1.1
+version: 1.2
 main: com.sentropic.guiapi.GUIAPI
 api-version: 1.16
 softdepend: [ProtocolLib]