Fix weird graphic when GlobalIcon equals GlobalIcon#NONE

Global-Tags · Jul 22, 2024 · f7b1ef8 · f7b1ef8
1 parent b151d4b
commit f7b1ef8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/api/src/main/java/com/rappytv/globaltags/types/GlobalIcon.java b/api/src/main/java/com/rappytv/globaltags/types/GlobalIcon.java
@@ -2,6 +2,7 @@
 
 import net.labymod.api.client.gui.icon.Icon;
 import net.labymod.api.client.resources.ResourceLocation;
+import org.jetbrains.annotations.Nullable;
 
 @SuppressWarnings("unused")
 public enum GlobalIcon {
@@ -33,7 +34,12 @@ public enum GlobalIcon {
         ));
     }
 
+    /**
+     * Get the {@link Icon} of the {@link GlobalIcon}
+     * @return The {@link Icon} or null if the {@link GlobalIcon} equals {@link GlobalIcon#NONE}
+     */
+    @Nullable
     public Icon getIcon() {
-        return icon;
+        return this != NONE ? icon : null;
     }
 }
diff --git a/api/src/main/java/com/rappytv/globaltags/types/GlobalRole.java b/api/src/main/java/com/rappytv/globaltags/types/GlobalRole.java
@@ -2,6 +2,7 @@
 
 import net.labymod.api.client.gui.icon.Icon;
 import net.labymod.api.client.resources.ResourceLocation;
+import org.jetbrains.annotations.NotNull;
 
 public enum GlobalRole {
     ADMIN("purple"),
@@ -18,6 +19,7 @@ public enum GlobalRole {
         ));
     }
 
+    @NotNull
     public Icon getIcon() {
         return icon;
     }

diff --git a/api/src/main/java/com/rappytv/globaltags/types/PlayerInfo.java b/api/src/main/java/com/rappytv/globaltags/types/PlayerInfo.java
@@ -103,6 +103,7 @@ public GlobalIcon getGlobalIcon() {
     /**
      * Returns the global icon of the player. See {@link GlobalIcon#getIcon()}
      */
+    @Nullable
     public Icon getIcon() {
         return getGlobalIcon().getIcon();
     }