Probably lots of things.

Author: sinender

README.md

@@ -1,2 +1,3 @@
 # Hysentials
 
+// Now. I will make a command.

gradle.properties

@@ -6,10 +6,10 @@ org.gradle.jvmargs=-Xmx8G
 
 mod_name = Hysentials
 mod_id = hysentials
-mod_version = 1.2.0-beta4
-dev_version = 1.2.0-dev
+mod_version = 1.2.1-beta1
+dev_version = 1.2.1-dev
 
-dev = true
+dev = false
 
 loom.platform = forge
 

src/main/java/llc/redstone/hysentials/GuiIngameHysentials.java

@@ -188,7 +188,7 @@ else if (renderExperiance)
         GlStateManager.disableLighting();
         GlStateManager.enableAlpha();
 
-        if (HysentialsConfig.macroWheelKeyBind.isActive() && mc.currentScreen == null) {
+        if (HysentialsConfig.macroWheelKeyBind.isActive() && mc.currentScreen == null && cooldown < System.currentTimeMillis()) {
             if (!MacroWheelOverlayKt.getStopped()) {
                 MacroWheelOverlay overlay = MacroWheelOverlay.Companion.newI();
                 InputHandler inputHandler = new InputHandler();
@@ -215,11 +215,13 @@ else if (renderExperiance)
             if (Minecraft.getMinecraft().currentScreen == null) {
                 Minecraft.getMinecraft().mouseHelper.grabMouseCursor();
             }
+            cooldown = System.currentTimeMillis() + 1000;
         }
 
         post(ALL);
     }
 
+    public static long cooldown = System.currentTimeMillis();
     public static boolean wasMacroWheelActive = false;
 
     public void drawMacroWheel(MacroWheelOverlay overlay, float partialTicks, InputHandler inputHandler) {

src/main/java/llc/redstone/hysentials/Hysentials.java

@@ -6,6 +6,8 @@
 import cc.polyfrost.oneconfig.libs.universal.UChat;
 import llc.redstone.hysentials.capes.CapeHandler;
 import llc.redstone.hysentials.config.hysentialMods.FormattingConfig;
+import llc.redstone.hysentials.config.hysentialMods.IconsConfig;
+import llc.redstone.hysentials.config.hysentialMods.icons.IconStuff;
 import llc.redstone.hysentials.cosmetic.CosmeticManager;
 import llc.redstone.hysentials.cosmetics.backpack.BackpackCosmetic;
 import llc.redstone.hysentials.cosmetics.hamster.HamsterCompanion;
@@ -21,6 +23,7 @@
 import llc.redstone.hysentials.handlers.chat.modules.misc.Limit256;
 import llc.redstone.hysentials.handlers.guis.GuiScreenPost;
 import llc.redstone.hysentials.handlers.htsl.*;
+import llc.redstone.hysentials.handlers.misc.HousingJoinHandler;
 import llc.redstone.hysentials.handlers.misc.QuestHandler;
 import llc.redstone.hysentials.handlers.redworks.FormatPlayerName;
 import llc.redstone.hysentials.macrowheel.MacroWheelData;
@@ -54,6 +57,7 @@
 import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.renderer.entity.layers.LayerArmorBase;
 import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
+import net.minecraft.command.ICommand;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.common.MinecraftForge;
@@ -77,6 +81,8 @@
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
 
 @Mod(
     modid = Hysentials.MOD_ID,
@@ -106,6 +112,7 @@ public class Hysentials {
 
     public final GuiDisplayHandler guiDisplayHandler = new GuiDisplayHandler();
     public final CosmeticManager cosmeticManager = new CosmeticManager();
+    public static List<ICommand> commands;
 
     public ImageIconRenderer imageIconRenderer;
     public JsonData sbBoxes;
@@ -140,7 +147,9 @@ public void onFMLPreInitialization(FMLPreInitializationEvent event) {
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
+        registerImages();
         config = new HysentialsConfig();
+        updateAndAdd();
         File file = new File(modDir, "./config/hysentials");
         if (!file.exists() && !file.mkdirs()) {
             throw new RuntimeException("Failed to create config directory! Please report this to sinender on Discord");
@@ -172,22 +181,27 @@ public void init(FMLInitializationEvent event) {
         Socket.createSocket();
 
         CommandManager.INSTANCE.registerCommand(new GroupChatCommand());
-        ClientCommandHandler.instance.registerCommand(new HysentialsCommand());
-        ClientCommandHandler.instance.registerCommand(new GlobalChatCommand());
-        ClientCommandHandler.instance.registerCommand(new HypixelChatCommand());
-        ClientCommandHandler.instance.registerCommand(new VisitCommand());
-        ClientCommandHandler.instance.registerCommand(new VisitPlayerCommand());
-        ClientCommandHandler.instance.registerCommand(new RemoveGlowCommand());
-        ClientCommandHandler.instance.registerCommand(new GlowCommand());
-        ClientCommandHandler.instance.registerCommand(new SetLoreLineCommand());
-        ClientCommandHandler.instance.registerCommand(new RenameCommand());
-        ClientCommandHandler.instance.registerCommand(new RemoveNameCommand());
-        ClientCommandHandler.instance.registerCommand(new InsertLoreLineCommand());
-        ClientCommandHandler.instance.registerCommand(new RemoveLoreLineCommand());
-        ClientCommandHandler.instance.registerCommand(new OpenInvCommand());
-        ClientCommandHandler.instance.registerCommand(new SetTextureCommand());
-        ClientCommandHandler.instance.registerCommand(new HymojiCommand());
-        ClientCommandHandler.instance.registerCommand(new ClaimCommand());
+        commands = new ArrayList<>();
+        commands.add(new HysentialsCommand());
+        commands.add(new GlobalChatCommand());
+        commands.add(new HypixelChatCommand());
+        commands.add(new VisitCommand());
+        commands.add(new VisitPlayerCommand());
+        commands.add(new RemoveGlowCommand());
+        commands.add(new QwestiiTestCommand());
+        commands.add(new GlowCommand());
+        commands.add(new SetLoreLineCommand());
+        commands.add(new RenameCommand());
+        commands.add(new RemoveNameCommand());
+        commands.add(new InsertLoreLineCommand());
+        commands.add(new RemoveLoreLineCommand());
+        commands.add(new OpenInvCommand());
+        commands.add(new SetTextureCommand());
+        commands.add(new HymojiCommand());
+        commands.add(new ClaimCommand());
+        for (ICommand command : commands) {
+            ClientCommandHandler.instance.registerCommand(command);
+        }
         CommandManager.INSTANCE.registerCommand(new SBBoxesCommand());
         CommandManager.INSTANCE.registerCommand(new ActionLibraryCommand());
         CommandManager.INSTANCE.registerCommand(new ClubCommand());
@@ -209,7 +223,12 @@ public void postInit(FMLPostInitializationEvent event) {
         isHytils = Loader.isModLoaded("hytils-reborn");
         chatHandler.init();
 
-        registerImages();
+        imageIconRenderer = new ImageIconRenderer();
+        minecraftFont = Minecraft.getMinecraft().fontRendererObj;
+        if (FormattingConfig.fancyRendering()) {
+            Minecraft.getMinecraft().fontRendererObj = imageIconRenderer;
+        }
+
         llc.redstone.hysentials.htsl.Loader.registerLoaders();
         Cluster.registerClusters();
 
@@ -218,6 +237,10 @@ public void postInit(FMLPostInitializationEvent event) {
 
         LayerArmorBase armorBase;
         LayerBipedArmor bipedArmor;
+
+        if (config.macroWheelHud.position.getX() == 0 && config.macroWheelHud.position.getY() == 0) {
+            config.macroWheelHud.position.setPosition((Renderer.screen.getWidth() / 2f) - (34*5f) / 2, (Renderer.screen.getHeight() / 2f) - (34*5f) / 2);
+        }
     }
 
     @Mod.EventHandler
@@ -226,6 +249,26 @@ public void finishedStarting(FMLLoadCompleteEvent event) {
     }
 
     public static FontRenderer minecraftFont;
+
+    public static void updateAndAdd() {
+        try {
+            for (ImageIcon icon : ImageIcon.imageIcons.values()) {
+                icon.handleImageIcon();
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        for (IconStuff icon : Hysentials.INSTANCE.config.iconsConfig.icons) {
+            if (icon.custom) {
+                if (icon.localPath == null || icon.name.isEmpty() || ImageIcon.imageIcons.containsKey(icon.name)) continue;
+                ImageIcon icon1 = new ImageIcon(icon.name, null, false);
+                icon1.width = icon.width;
+                icon1.height = icon.height;
+            }
+        }
+    }
+
     private void registerImages() {
         new ImageIcon("front", new ResourceLocation("textures/icons/front.png"));
         new ImageIcon("back", new ResourceLocation("textures/icons/back.png"));
@@ -323,11 +366,6 @@ private void registerImages() {
         for (int i = 0; i < 10; i++) {
             new ImageIcon(String.valueOf(i), new ResourceLocation("textures/icons/" + i + ".png"));
         }
-        imageIconRenderer = new ImageIconRenderer();
-        minecraftFont = Minecraft.getMinecraft().fontRendererObj;
-        if (FormattingConfig.fancyRendering()) {
-            Minecraft.getMinecraft().fontRendererObj = imageIconRenderer;
-        }
     }
 
     private void registerHandlers() {
@@ -352,6 +390,7 @@ private void registerHandlers() {
         eventBus.register(new SbbRenderer());
         eventBus.register(new llc.redstone.hysentials.handlers.SbbRenderer());
         eventBus.register(new GuiScreenPost());
+        eventBus.register(new HousingJoinHandler());
 
 
         eventBus.register(new Actionbar());

src/main/java/llc/redstone/hysentials/capes/CapeHandler.java

@@ -2,6 +2,7 @@
 
 import llc.redstone.hysentials.Hysentials;
 import llc.redstone.hysentials.cosmetic.CosmeticGui;
+import llc.redstone.hysentials.cosmetic.CosmeticUtilsKt;
 import llc.redstone.hysentials.schema.HysentialsSchema;
 import llc.redstone.hysentials.websocket.Socket;
 import llc.redstone.hysentials.cosmetic.CosmeticGui;
@@ -30,11 +31,11 @@ public void onTickEvent(TickEvent.ClientTickEvent event) {
             for (String id : Socket.cachedUsersNew.keySet()) {
                 UUID uuid = UUID.fromString(id);
                 boolean wearingCape = false;
-                for (HysentialsSchema.Cosmetic cosmetic : CosmeticGui.Companion.getEquippedCosmetics(uuid)) {
+                for (HysentialsSchema.Cosmetic cosmetic : CosmeticUtilsKt.getEquippedCosmetics(uuid)) {
                     if (cosmetic.getSubType() != null && cosmetic.getSubType().equals("cape")) {
                         wearingCape = true;
                         String name = cosmetic.getName();
-                        if (CosmeticGui.Companion.hasCosmetic(uuid, name)) {
+                        if (CosmeticUtilsKt.hasCosmetic(uuid, name)) {
                             ResourceLocation location = new ResourceLocation(cosmetic.getResource());
                             resourceMap.put(uuid, cosmetic.getResource());
                             try {

src/main/java/llc/redstone/hysentials/capes/CustomCapeRenderLayer.java

@@ -1,6 +1,7 @@
 package llc.redstone.hysentials.capes;
 
 import llc.redstone.hysentials.config.HysentialsConfig;
+import llc.redstone.hysentials.config.hysentialMods.CosmeticConfig;
 import llc.redstone.hysentials.cosmetic.CosmeticGui;
 import llc.redstone.hysentials.util.BlockWAPIUtils;
 import llc.redstone.hysentials.config.HysentialsConfig;
@@ -51,9 +52,9 @@ public void doRenderLayer(AbstractClientPlayer abstractClientPlayer, float param
 
         if (!abstractClientPlayer.hasPlayerInfo() || abstractClientPlayer.isInvisible()
             || !abstractClientPlayer.isWearing(EnumPlayerModelParts.CAPE)
+            || (BlockWAPIUtils.isWearingType(abstractClientPlayer.getUniqueID(), "backpack"))
             || abstractClientPlayer.getLocationCape() == null
-            || BlockWAPIUtils.isWearingType(abstractClientPlayer.getUniqueID(), "backpack")
-            || HysentialsConfig.disableCustomCapes) {
+            || CosmeticConfig.disableCustomCapes) {
             return;
         }
 
@@ -67,7 +68,7 @@ public void doRenderLayer(AbstractClientPlayer abstractClientPlayer, float param
             GlStateManager.bindTexture(CapeHandler.textureMap.get(abstractClientPlayer.getUniqueID()).getGlTextureId());
         }
 
-        if (HysentialsConfig.blockyCapes == 1) {
+        if (CosmeticConfig.blockyCapes == 1) {
             smoothCapeRenderer.renderSmoothCape(this, abstractClientPlayer, deltaTick);
         } else {
             ModelRenderer[] parts = customCape;
@@ -166,7 +167,7 @@ void modifyPoseStackVanilla(AbstractClientPlayer abstractClientPlayer, float h,
     }
 
     float getNatrualWindSwing(int part) {
-        if (HysentialsConfig.windEffect) {
+        if (CosmeticConfig.windEffect) {
             long highlightedPart = (System.currentTimeMillis() / 3) % 360;
             float relativePart = (float) (part + 1) / partCount;
             return (float) (Math.sin(Math.toRadians((relativePart) * 360 - (highlightedPart))) * 3);