Bug fixes, configurable things, and added party and guild ImageIcons.

Author: sinender

src/main/java/cc/woverflow/hysentials/Hysentials.java

@@ -103,7 +103,7 @@ public class Hysentials {
 
     public ImageIconRenderer imageIconRenderer;
     public JsonData sbBoxes;
-
+    public JsonData rankColors;
     public boolean isPatcher;
     public boolean isChatting;
     private boolean loadedCall;
@@ -125,6 +125,7 @@ public void onFMLPreInitialization(FMLPreInitializationEvent event) {
     public void init(FMLInitializationEvent event) {
         config = new HysentialsConfig();
         sbBoxes = new JsonData("./config/hysentials/lines.json", new JSONObject().put("lines", new JSONArray()));
+        rankColors = new JsonData("/assets/minecraft/textures/icons/colors.json", "./config/hysentials/color.jsonn", true);
         try {
             SSLStore store = new SSLStore();
             store.load("/ssl/hysentials.der");
@@ -175,14 +176,22 @@ public void finishedStarting(FMLLoadCompleteEvent event) {
 
     private void registerImages() {
         new ImageIcon("front", new ResourceLocation("textures/icons/front.png"));
+        new ImageIcon("back", new ResourceLocation("textures/icons/back.png"));
         new ImageIcon("globalchat", new ResourceLocation("textures/icons/globalchat.png"));
+        new ImageIcon("creator", new ResourceLocation("textures/icons/creator.png"));
+        new ImageIcon("guild", new ResourceLocation("textures/icons/guild.png"));
+        new ImageIcon("party", new ResourceLocation("textures/icons/party.png"));
 
         for (HypixelRanks rank : HypixelRanks.values()) {
             try {
                 new ImageIcon(rank.getIconName(), new ResourceLocation("textures/icons/" + rank.getIconName() + ".png"));
             } catch (Exception ignored) {
             }
         }
+
+        for (int i = 0; i < 10; i++) {
+            new ImageIcon(String.valueOf(i), new ResourceLocation("textures/icons/" + i + ".png"));
+        }
         imageIconRenderer = new ImageIconRenderer();
         Minecraft.getMinecraft().fontRendererObj = imageIconRenderer;
     }
@@ -294,6 +303,4 @@ public static InputStream post(String url, JSONObject json) throws IOException {
 
         return connection.getInputStream();
     }
-
-
 }

src/main/java/cc/woverflow/hysentials/command/ClubCommand.java

@@ -23,10 +23,23 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import static cc.woverflow.hysentials.guis.club.ClubDashboard.update;
 import static cc.woverflow.hysentials.handlers.redworks.BwRanks.randomString;
 
-@Command(value = "club", description = "Club Commands")
+@Command(value = "club", description = "Club Commands",
+customHelpMessage = {
+    "§9-----------------------------------------------------",
+    "&aClub Commands: &c[BETA]",
+    "&e/club create <name> &7- &bCreate a club with the specified name",
+    "&e/club invite <player> &7- &bInvite a player to your club",
+    "&e/club join <name> &7- &bUsed to accept a club invite",
+    "&e/club leave &7- &bLeave your current club",
+    "&e/club dashboard &7- &bOpen the club dashboard",
+    "&e/club list &7- &bList all players in your club",
+    "§9-----------------------------------------------------"
+})
 public class ClubCommand {
     @SubCommand(aliases = {"create"}, description = "Create a club")
     public void create(String name) {
@@ -61,10 +74,10 @@ public void join(String name) {
             "club", name,
             "uuid", Minecraft.getMinecraft().getSession().getProfile().getId(),
             "serverId", Socket.serverId
-            ).toString());
+        ).toString());
     }
 
-    @SubCommand(aliases = {"list"}, description = "Leave a club")
+    @SubCommand(aliases = {"list"})
     public void list() {
         try {
             String s = NetworkUtils.getString("https://hysentials.redstone.llc/api/club?uuid="
@@ -75,7 +88,8 @@ public void list() {
                 UChat.chat(HysentialsConfig.chatPrefix + " &c" + clubData.getString("message"));
                 return;
             }
-            JSONArray members = clubData.getJSONArray("members");
+            JSONObject club = clubData.getJSONObject("club");
+            JSONArray members = club.getJSONArray("members");
             Multithreading.runAsync(() -> {
                 HashMap<String, String> userMap = new HashMap<>();
                 for (int i = 0; i < members.length(); i++) {
@@ -84,25 +98,39 @@ public void list() {
                     userMap.put(uuid, name);
                 }
 
-                List<String> displayNames = new ArrayList<>();
-                for (int i = 0; i < members.length(); i++) {
-                    String uuid = members.getString(i);
-                    String name = userMap.get(uuid);
-                    displayNames.add(HypixelAPIUtils.getDisplayName(name, uuid));
-                }
-
                 UChat.chat(HysentialsConfig.chatPrefix + " &aClub Members:");
-                for (String displayName : displayNames) {
-                    UChat.chat("   - &a" + displayName);
+                for (Map.Entry<String, String> displayName : userMap.entrySet()) {
+                    String uuid = displayName.getKey();
+                    String name = displayName.getValue();
+                    UChat.chat("   - &a" + name + (club.getString("owner").equals(uuid) ? " &8(Owner)" : ""));
                 }
             });
         } catch (Exception e) {
 
         }
     }
+    @SubCommand(aliases = {"invite"}, description = "Invite a player to your club")
+    public void invite(String name) {
+        Multithreading.runAsync(() -> {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("invitee", name);
+            ClubDashboard.clubData = ClubDashboard.getClub();
+            update(jsonObject);
+        });
+    }
+
+    @SubCommand(aliases = {"leave"}, description = "Leave a club")
+    public void leave() {
+        Multithreading.runAsync(() -> {
+            JSONObject json = new JSONObject();
+            json.put("leave", true);
+            ClubDashboard.clubData = ClubDashboard.getClub();
+            update(json);
+        });
+    }
 
-    @Main()
-    public void main() {
+    @SubCommand(aliases = {"dashboard", "db"}, description = "Open the club dashboard")
+    public void dashboard() {
         try {
             String s = NetworkUtils.getString("https://hysentials.redstone.llc/api/club?uuid="
                 + Minecraft.getMinecraft().getSession().getProfile().getId().toString()

src/main/java/cc/woverflow/hysentials/command/HysentialsCommand.java

@@ -27,8 +27,10 @@
 import cc.woverflow.hysentials.config.HysentialsConfig;
 import cc.woverflow.hysentials.guis.actionLibrary.ActionLibrary;
 import cc.woverflow.hysentials.handlers.htsl.CodeEditor;
+import cc.woverflow.hysentials.handlers.imageicons.ImageIcon;
 import cc.woverflow.hysentials.htsl.compiler.Compiler;
 import cc.woverflow.hysentials.util.HypixelAPIUtils;
+import cc.woverflow.hysentials.util.JsonData;
 import cc.woverflow.hysentials.websocket.Socket;
 import cc.woverflow.hytils.HytilsReborn;
 import cc.woverflow.hytils.config.HytilsConfig;
@@ -54,6 +56,13 @@ public class HysentialsCommand {
 
     }
 
+    @SubCommand(aliases = {"reload"}, description = "Reloads the mod")
+    public void handleReload() {
+        ImageIcon.reloadIcons();
+        Hysentials.INSTANCE.rankColors = new JsonData("./config/hysentials/colors.json", new JSONObject());
+        UChat.chat("§aReloaded Hysentials!");
+    }
+
     @Main
     private void handleDefault() {
         Hysentials.INSTANCE.getConfig().openGui();

src/main/java/cc/woverflow/hysentials/config/EditorConfig.java

@@ -31,15 +31,18 @@ public class EditorConfig extends Config {
         description = "The regex to match the line. Don't edit this unless you know regex",
         category = "editor",
         subcategory = "general",
-        size = 1
+        size = 1,
+        multiline = true
     )
     public String regex = "";
 
     @Text(
         name = "display",
         description = "The text that will be displayed",
         category = "editor",
-        subcategory = "general"
+        subcategory = "general",
+        size = 1,
+        multiline = true
     )
     public String display = "";
 

src/main/java/cc/woverflow/hysentials/config/HysentialsConfig.java

@@ -20,13 +20,19 @@
 
 import cc.polyfrost.oneconfig.config.Config;
 import cc.polyfrost.oneconfig.config.annotations.*;
+import cc.polyfrost.oneconfig.config.annotations.Button;
+import cc.polyfrost.oneconfig.config.annotations.Checkbox;
+import cc.polyfrost.oneconfig.config.annotations.Color;
 import cc.polyfrost.oneconfig.config.annotations.Number;
 import cc.polyfrost.oneconfig.config.core.OneColor;
 import cc.polyfrost.oneconfig.config.data.Mod;
 import cc.polyfrost.oneconfig.config.data.ModType;
 import cc.polyfrost.oneconfig.libs.checker.units.qual.N;
 import cc.woverflow.hytils.HytilsReborn;
 
+import java.awt.*;
+import java.io.File;
+
 public class HysentialsConfig extends Config {
     // GENERAL
     @Text(
@@ -61,6 +67,22 @@ public class HysentialsConfig extends Config {
     )
     public static boolean futuristicChannels = true;
 
+    @Button(
+        name = "Rank Image Config",
+        category = "General",
+        subcategory = "Ranks",
+        description = "Opens the rank image config directory.",
+        text = "Open Folder")
+    public void openRankImageConfig() {
+        Desktop desktop = Desktop.getDesktop();
+        File directory = new File("./config/hysentials/imageicons");
+        try {
+            desktop.open(directory);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     @Button(
             name = "Additional Configs",
             category = "General",