Merge pull request #46 from Global-Tags/development

Release `v1.2.8`

Author: RappyTV

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.rappytv.globaltags</groupId>
     <artifactId>GlobalTagsJava</artifactId>
-    <version>1.2.7</version>
+    <version>1.2.8</version>
 
     <name>GlobalTagsJava</name>
     <description>A wrapper for the GlobalTagsAPI</description>

src/main/java/com/rappytv/globaltags/wrapper/enums/AuthProvider.java

@@ -5,9 +5,14 @@
  */
 public enum AuthProvider {
     /**
-     * The Bearer auth provider is used to authenticate with GlobalTag's own Bearer tokens. At the moment the only way to receive one is by contacting the Database admin. See <a href="https://github.com/Global-Tags/API/blob/master/src/auth/providers/ApiKeyProvider.ts">ApiKeyProvider.ts</a>
+     * @deprecated Use {@link #API_KEY} instead
      */
+    @Deprecated
     BEARER("Bearer"),
+    /**
+     * The Bearer auth provider is used to authenticate with GlobalTag's own Bearer tokens. At the moment the only way to receive one is by contacting the Database admin. See <a href="https://github.com/Global-Tags/API/blob/master/src/auth/providers/ApiKeyProvider.ts">ApiKeyProvider.ts</a>
+     */
+    API_KEY("Bearer"),
     /**
      * The Yggdrasil auth provider is used to authenticate with Minecraft session tokens. These can be obtained by the Minecraft session provider. See <a href="https://github.com/Global-Tags/API/blob/master/src/auth/providers/YggdrasilProvider.ts">YggdrasilProvider.ts</a>
      */

src/main/java/com/rappytv/globaltags/wrapper/model/PlayerInfo.java

@@ -118,33 +118,66 @@ public GlobalPosition getPosition() {
         }
     }
 
+    /**
+     * Check if the player has a valid global icon
+     *
+     * @return if the player has a valid global icon
+     */
+    public boolean hasGlobalIcon() {
+        return this.hasCustomGlobalIcon() || this.getGlobalIconType() != GlobalIcon.NONE;
+    }
+
     /**
      * Gets the player's selected {@link GlobalIcon}.
      *
+     * @deprecated Use {@link #getGlobalIconType()} instead
      * @return The selected global icon. Defaults to {@link GlobalIcon#NONE} if invalid.
      */
+    @Deprecated
     @NotNull
     public GlobalIcon getGlobalIcon() {
         return this.icon.type;
     }
 
+    /**
+     * Gets the player's selected {@link GlobalIcon}.
+     *
+     * @return The selected global icon. Defaults to {@link GlobalIcon#NONE} if invalid.
+     */
+    @NotNull
+    public GlobalIcon getGlobalIconType() {
+        return this.icon.type;
+    }
+
     /**
      * Gets the hash of the player's custom global icon, if available.
      *
+     * @deprecated Use {@link #getCustomIconHash()} instead
      * @return The custom global icon hash, or {@code null} if none exists.
      */
+    @Deprecated
     @Nullable
     public String getGlobalIconHash() {
         return this.icon.hash;
     }
 
+    /**
+     * Gets the hash of the player's custom global icon, if available.
+     *
+     * @return The custom global icon hash, or {@code null} if none exists.
+     */
+    @Nullable
+    public String getCustomIconHash() {
+        return this.icon.hash;
+    }
+
     /**
      * Checks if the player has a custom global icon.
      *
      * @return {@code true} if the player has a custom global icon; otherwise {@code false}.
      */
     public boolean hasCustomGlobalIcon() {
-        return this.getGlobalIcon() == GlobalIcon.CUSTOM && this.icon.hash != null;
+        return this.getGlobalIconType() == GlobalIcon.CUSTOM && this.icon.hash != null;
     }
 
     /**
@@ -154,7 +187,7 @@ public boolean hasCustomGlobalIcon() {
      */
     @Nullable
     public String getIconUrl() {
-        GlobalIcon icon = this.getGlobalIcon();
+        GlobalIcon icon = this.getGlobalIconType();
         if (this.hasCustomGlobalIcon()) return this.urls.getCustomIcon(this.uuid, this.icon.hash);
         else if(icon == GlobalIcon.CUSTOM || icon == GlobalIcon.NONE) {
             return null;
@@ -286,8 +319,8 @@ public String toString() {
                 ", tag=" + this.tag +
                 ", plainTag='" + this.plainTag + '\'' +
                 ", position=" + this.getPosition() +
-                ", icon=PlayerIcon{type=" + this.getGlobalIcon() +
-                ", hash=" + this.getGlobalIconHash() + '}' +
+                ", icon=PlayerIcon{type=" + this.getGlobalIconType() +
+                ", hash=" + this.getCustomIconHash() + '}' +
                 ", referralInfo=" + this.referralInfo +
                 ", roleIcon='" + this.roleIcon + '\'' +
                 ", roles=" + this.roles +