Fixed some bugs?

Author: sinender

src/main/java/llc/redstone/hysentials/util/ImageIconRenderer.java

@@ -117,7 +117,7 @@ private void renderStringAtPosA(String text, boolean shadow) {
                     }
                     accessor.setTextColor(textColor);
                     this.setColor((float) (textColor >> 16) / 255.0F, (float) (textColor >> 8 & 255) / 255.0F, (float) (textColor & 255) / 255.0F, accessor.alpha());
-                    i += 8;
+                    i += 8; //9?
                     continue;
                 }
             }
@@ -131,6 +131,7 @@ private void renderStringAtPosA(String text, boolean shadow) {
                     if (num.matches("\\d+") && !num.isEmpty()) {
                         this.posX += renderNumberedString(num, hex, (int) this.posX, (int) this.posY, textColor, shadow);
                         i += hex.length() + num.length() + 2;
+                        //Is this supposed to be 3?
                         continue;
                     }
                 }
@@ -569,10 +570,10 @@ public static String getFormatFromString(String text) {
 
         while ((i = text.indexOf(167, i + 1)) != -1) {
             if (i < j - 1) {
-                if (i + 3 < j - 1 && isFormatColor(text.charAt(i + 3))) {
+                char c0 = text.charAt(i + 1);
+                if (!isFormatColor(c0) && i + 3 < j - 1 && isFormatColor(text.charAt(i + 3))) {
                     continue;
                 }
-                char c0 = text.charAt(i + 1);
                 if (isFormatColor(c0)) {
                     s = "§" + c0;
                 } else if (isFormatSpecial(c0)) {

src/main/kotlin/llc/redstone/hysentials/cosmetic/CosmeticUtils.kt

@@ -20,10 +20,11 @@ import org.json.JSONObject
 import java.util.*
 
 object CosmeticManager {
-    var actions = mapOf(
-        "equip" to mutableSetOf<String>(),
-        "unequip" to mutableSetOf<String>(),
-        "purchase" to mutableSetOf<String>()
+    var actions = mutableListOf<Actions>()
+
+    data class Actions(
+        var action: String,
+        var name: String
     )
 
     var previewing = mutableListOf<String>()
@@ -37,9 +38,9 @@ object CosmeticManager {
                 it.equipped.remove(Minecraft.getMinecraft().thePlayer.uniqueID.toString())
             }
             if (preview) {
-                previewing.remove(name)
+                previewing.remove(it.name)
             } else {
-                actions["unequip"]
+                actions.add(Actions("unequip", it.name))
             }
         }
     }
@@ -51,17 +52,19 @@ object CosmeticManager {
         cosmetic?.let {
             if (BlockWAPIUtils.getCosmetic(it.type).isNotEmpty()) {
                 BlockWAPIUtils.getCosmetic(it.type).forEach { cosmetic ->
-                    unEquipCosmetic(cosmetic.name)
-                    previewing.remove(cosmetic.name)
+                    if (cosmetic.equipped.contains(Minecraft.getMinecraft().thePlayer.uniqueID.toString())) {
+                        unEquipCosmetic(cosmetic.name)
+                        previewing.remove(cosmetic.name)
+                    }
                 }
             }
             if (!it.equipped.contains(Minecraft.getMinecraft().thePlayer.uniqueID.toString())) {
                 it.equipped.add(Minecraft.getMinecraft().thePlayer.uniqueID.toString())
             }
             if (preview) {
-                previewing.add(name)
+                previewing.add(it.name)
             } else {
-                actions["equip"]?.add(name)
+                actions.add(Actions("equip", it.name))
             }
         }
     }
@@ -89,34 +92,28 @@ object CosmeticManager {
                 it.users.add(Minecraft.getMinecraft().thePlayer.uniqueID.toString())
                 Socket.cachedUser.amountSpent = Socket.cachedUser.amountSpent?.plus(it.cost)
                 Socket.cachedUser.emeralds = Socket.cachedUser.emeralds.minus(it.cost)
-                actions["purchase"]?.add(cosmeticName)
+                actions.add(Actions("purchase", it.name))
             }
         }
     }
 
     fun updateCosmetics() {
         Multithreading.runAsync {
             for (action in actions) {
-                val list = action.value
-                val func = action.key
-
-                for (name in list) {
-                    val response =
-                        NetworkUtils.postString(HYSENTIALS_API + "/cosmetic?name=$name&function=${func}&uuid=${Minecraft.getMinecraft().thePlayer.uniqueID}&key=${Socket.serverId}")
-                    val json = JSONObject(response)
-                    if (json.get("success") == false) {
-                        Hysentials.INSTANCE.sendMessage(
-                            "&cFailed to $func $name: ${json.get("message")}",
-                        )
-                    }
+                val func = action.action
+                val name = action.name
+
+                val response =
+                    NetworkUtils.postString(HYSENTIALS_API + "/cosmetic?name=$name&function=${func}&uuid=${Minecraft.getMinecraft().thePlayer.uniqueID}&key=${Socket.serverId}")
+                val json = JSONObject(response)
+                if (json.get("success") == false) {
+                    Hysentials.INSTANCE.sendMessage(
+                        "&cFailed to $func $name: ${json.get("message")}",
+                    )
                 }
             }
             previewing.clear()
-            actions = mapOf(
-                "equip" to mutableSetOf<String>(),
-                "unequip" to mutableSetOf<String>(),
-                "purchase" to mutableSetOf<String>()
-            )
+            actions = mutableListOf()
             var cosmetics: JsonElement? =
                 NetworkUtils.getJsonElement("$HYSENTIALS_API/cosmetic", true) ?: return@runAsync
             val `object` = cosmetics!!.asJsonObject

src/main/kotlin/llc/redstone/hysentials/websocket/methods/Chat.kt

@@ -51,7 +51,7 @@ class Chat : Channel("chat") {
             ).setHover(HoverEvent.Action.SHOW_TEXT, (rank.prefixCheck + hoverUsername)) // Hover over the username to see the rank
         ).appendSibling(
             UTextComponent(
-                " ${if (FormattingConfig.hexRendering()) "<#fff1d4>" else "&6"}" + // Color of the message
+                (if (FormattingConfig.hexRendering()) "<#fff1d4>" else "&6") + // Color of the message
                         ": $message" // The message
             )
         )