From f0a534b9d7923d9b3636dc020f1e61b11f5e924a Mon Sep 17 00:00:00 2001
From: Sarah Engel <justsweetluna@gmail.com>
Date: Wed, 11 Sep 2024 22:04:11 +0200
Subject: [PATCH] MAKE THE ADDON WORK ON 1.8.9

---
 build.gradle.kts                                     |  4 ++--
 core/build.gradle.kts                                |  2 +-
 .../main/java/com/funkeln/pronouns/PronounAddon.java |  5 ++---
 .../com/funkeln/pronouns/nametag/FlagNameTag.java    |  5 +++++
 .../java/com/funkeln/pronouns/profile/Profile.java   | 12 +++++++++---
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c7d09cd..438767f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "de.funkeln.pronouns"
-version = System.getenv().getOrDefault("VERSION", "1.0.5")
+version = System.getenv().getOrDefault("VERSION", "1.0.6")
 
 labyMod {
     defaultPackageName = "de.funkeln.pronouns" //change this to your main package name (used by all modules)
@@ -14,7 +14,7 @@ labyMod {
         displayName = "PronounsDisplay"
         author = "funkeln"
         description = "Display your Pronouns from pronouns.page ingame"
-        minecraftVersion = "1.20.1<*"
+        minecraftVersion = "*"
         version = getVersion().toString()
     }
 
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 168fd2b..41039c5 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -1,4 +1,4 @@
-version = "0.1.0"
+version = "0.1.6"
 
 plugins {
     id("java-library")
diff --git a/core/src/main/java/com/funkeln/pronouns/PronounAddon.java b/core/src/main/java/com/funkeln/pronouns/PronounAddon.java
index 3ac51a1..47f9bcc 100644
--- a/core/src/main/java/com/funkeln/pronouns/PronounAddon.java
+++ b/core/src/main/java/com/funkeln/pronouns/PronounAddon.java
@@ -73,10 +73,9 @@ protected void enable() {
 
   public void publishNameUpdate() {
     String newName = configuration().name().get();
-    logger().info("Publishing name change to " + newName);
+    logger().info("Publishing pronoun name change to " + newName);
     JsonObject data = new JsonObject();
-    data.addProperty("name", newName
-    );
+    data.addProperty("name", newName);
     labyAPI().labyConnect().getSession().sendBroadcastPayload("pronouns", data);
     ProfileRepository.clearExpired();
   }
diff --git a/core/src/main/java/com/funkeln/pronouns/nametag/FlagNameTag.java b/core/src/main/java/com/funkeln/pronouns/nametag/FlagNameTag.java
index c42cb19..4d01799 100644
--- a/core/src/main/java/com/funkeln/pronouns/nametag/FlagNameTag.java
+++ b/core/src/main/java/com/funkeln/pronouns/nametag/FlagNameTag.java
@@ -58,6 +58,11 @@ public FlagNameTag(RectangleRenderer rectangleRenderer) {
         return null;
       }
 
+      Icon[] flags = myFlags();
+      if (flags == null || flags.length == 0) {
+        return null;
+      }
+
       return RenderableComponent.of(component, alignment);
     } else {
       return null;
diff --git a/core/src/main/java/com/funkeln/pronouns/profile/Profile.java b/core/src/main/java/com/funkeln/pronouns/profile/Profile.java
index f91a698..ba6fe29 100644
--- a/core/src/main/java/com/funkeln/pronouns/profile/Profile.java
+++ b/core/src/main/java/com/funkeln/pronouns/profile/Profile.java
@@ -61,7 +61,9 @@ public void update() {
         URL url = new URI(API_URL + "profile/get/" + websiteName + "?version=2").toURL();
         JsonObject profile = null;
         try (InputStream stream = url.openStream()) {
-          JsonElement element = JsonParser.parseReader(new InputStreamReader(stream));
+          // Deprecated API usage is required as static methods do not exist in gson 2.2.4
+          // noinspection deprecation
+          JsonElement element = new JsonParser().parse(new InputStreamReader(stream));
           profile = element.getAsJsonObject();
         }
         updatePronouns(pronounFromJson(profile));
@@ -83,7 +85,9 @@ public boolean requiresUpdateNow() {
 
   public static String pronounFromJson(JsonObject profile) {
     JsonArray pronounsArray = profile.getAsJsonObject("profiles").getAsJsonObject("en").getAsJsonArray("pronouns");
-    if (pronounsArray == null || pronounsArray.isEmpty()) return null;
+    // JsonArray#isEmpty() doesn't exist in 2.2.4
+    //noinspection SizeReplaceableByIsEmpty
+    if (pronounsArray == null || pronounsArray.size() == 0) return null;
     List<String> outputPronounList = new ArrayList<>();
     for(JsonElement pronoun : pronounsArray) {
       outputPronounList.add(pronoun.getAsJsonObject().get("value").getAsString());
@@ -104,7 +108,9 @@ public static List<String> flagNamesFromJson(JsonObject profile) {
       return null;
     }
     JsonArray flagsArray = enProfile.getAsJsonArray("flags");
-    if (flagsArray == null || flagsArray.isEmpty()) {
+    // JsonArray#isEmpty() doesn't exist in 2.2.4
+    //noinspection SizeReplaceableByIsEmpty
+    if (flagsArray == null || flagsArray.size() == 0) {
       return null;
     }
     List<String> flagNamesList = new ArrayList<>();