update ui

src/main/java/net/minecraft/client/gui/GuiButton.java

@@ -115,27 +115,26 @@ public class GuiButton extends Gui
             Color rectCol = new Color(100, 100, 100, opacity);
 
             if(!this.enabled)
-                rectCol = new Color(170, 170, 170, 120);
+                rectCol = new Color(10, 10, 10, 120);
             else
-                rectCol = new Color(10, 10, 10, opacity);
+                rectCol = new Color(30, 30, 30, opacity);
-
-            Gui.drawRect(this.xPosition, this.yPosition, this.xPosition +  this.width, this.yPosition + this.height, rectCol.getRGB());
-//            RoundedUtils.drawGradientRound(this.xPosition + 1, this.yPosition + 1, (this.width) - 1, (this.height) - 1, 6, ColorUtil.getClientColor(0, 255), ColorUtil.getClientColor(90, 255), ColorUtil.getClientColor(180, 255), ColorUtil.getClientColor(270, 255));
-            //RoundedUtils.drawRoundedRect(this.xPosition + 1, this.yPosition + 1, (this.xPosition +  this.width) - 1, (this.yPosition + this.height) - 1, 12, new Color(22, 24, 27,100).getRGB());
 
+            //Gui.drawRect(this.xPosition, this.yPosition, this.xPosition +  this.width, this.yPosition + this.height, rectCol.getRGB());
+            RoundedUtils.drawRound(this.xPosition, this.yPosition, this.width, (this.height), 4, rectCol);
+            RoundedUtils.drawRoundedGradientOutlineCorner(this.xPosition, this.yPosition, (this.width + xPosition), (this.height + yPosition), 1, 6, ColorUtil.getClientColor(0, 255).getRGB(), ColorUtil.getClientColor(90, 255).getRGB(), ColorUtil.getClientColor(180, 255).getRGB(), ColorUtil.getClientColor(270, 255).getRGB());
 
             if(this.hovered && this.enabled) {
                 if (!(lineHoverAnimation.getValue() > width / 2 - 2)) {
                     lineHoverAnimation.setAnimation(width / 2 - 2, 10);
 
-                    this.drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) - lineHoverAnimation.getValue() - 1), this.yPosition + height - 1, -1);
+                    this.drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) - lineHoverAnimation.getValue()), this.yPosition + height - 1, -1);
-                    this.drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) + lineHoverAnimation.getValue() + 1), this.yPosition + height - 1, -1);
+                    this.drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) + lineHoverAnimation.getValue()), this.yPosition + height - 1, -1);
 
 
                 }
                 else if(lineHoverAnimation.getValue() >= width / 2) {
-                    this.drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) - lineHoverAnimation.getValue() - 1), this.yPosition + height - 1, -1);
+                    this.drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) - lineHoverAnimation.getValue()), this.yPosition + height - 1, -1);
-                    this.drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) + lineHoverAnimation.getValue() + 1), this.yPosition + height - 1, -1);
+                    this.drawHorizontalLine(this.xPosition + width / 2 , (int) ((xPosition + width/2) + lineHoverAnimation.getValue()), this.yPosition + height - 1, -1);
 
                 }
 
@@ -161,11 +160,11 @@ public class GuiButton extends Gui
             }
 
             rip.athena.client.utils.font.FontManager.getProductSansBold(19).drawCenteredString(displayString.toUpperCase(),
-                    xPosition + (width / 2), this.enabled ? yPosition + (height / 2) - 3 : yPosition + (height / 2) - 6, j);
+                    xPosition + (width / 2), this.enabled ? yPosition + (height / 2) - 3 : yPosition + (height / 2) - 6, -1);
 
             if (!this.enabled)
                 rip.athena.client.utils.font.FontManager.getProductSansBold(10).drawCenteredString("DISABLED",
-                        xPosition + (width / 2), yPosition + (height / 2) + 4, j);
+                        xPosition + (width / 2), yPosition + (height / 2) + 4, -1);
 
         }
     }

src/main/java/net/minecraft/client/gui/GuiScreen.java

@@ -660,7 +660,7 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback
         }
         else
         {
-            DrawUtils.drawImage(new ResourceLocation("Athena/menu/cool_wallpaper.png"), 0, 0, width, height);
+            DrawUtils.drawImage(new ResourceLocation("Athena/menu/test5.jpg"), 0, 0, width, height);
             //this.drawBackground(tint);
         }
     }

src/main/java/rip/athena/client/gui/clickgui/IngameMenu.java

@@ -137,7 +137,7 @@ public class IngameMenu extends MinecraftMenuImpl implements DrawImpl {
 
 		drawShadowDown(menu.getX(), menu.getY() + 58, menu.getWidth());
 
-		RoundedUtils.drawGradientRound(menu.getX() - 1, menu.getY() - 1, menu.getWidth() + 2, menu.getHeight() + 2, 16, ColorUtil.getClientColor(0, 255), ColorUtil.getClientColor(90, 255), ColorUtil.getClientColor(180, 255), ColorUtil.getClientColor(270, 255));
+		RoundedUtils.drawGradientRound(menu.getX() - 1, menu.getY() - 1, menu.getWidth() + 2, menu.getHeight() + 2, 10, ColorUtil.getClientColor(0, 255), ColorUtil.getClientColor(90, 255), ColorUtil.getClientColor(180, 255), ColorUtil.getClientColor(270, 255));
 		RoundedUtils.drawRoundedRect(menu.getX(), menu.getY(), menu.getX() + menu.getWidth(), menu.getY() + menu.getHeight(), 16, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getFirstColor());
 
 		rip.athena.client.utils.font.FontManager.getProductSansBold(60).drawString(Athena.INSTANCE.getClientName(), menu.getX() + 60, menu.getY() + 17, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getTextColor());

src/main/java/rip/athena/client/gui/clickgui/components/mods/CategoryButton.java

@@ -10,6 +10,7 @@ import rip.athena.client.gui.framework.draw.ButtonState;
 import rip.athena.client.gui.framework.draw.DrawType;
 import rip.athena.client.gui.clickgui.Category;
 import rip.athena.client.modules.impl.other.Settings;
+import rip.athena.client.utils.render.ColorUtil;
 import rip.athena.client.utils.render.DrawUtils;
 import rip.athena.client.utils.render.RoundedUtils;
 
@@ -56,7 +57,8 @@ public class CategoryButton extends MenuButton {
 		int height = (this.width == -1 && this.height == -1) ? (getStringHeight(text) + minOffset * 2) : this.height;
 
 		if(isActive()) {
-			RoundedUtils.drawGradientRound(x + 30, y, width - 40, height, 12, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor());
+			RoundedUtils.drawRound(x + 30, y, width - 70, height, 12, new Color(10,10,10, 150));
+			RoundedUtils.drawRoundedGradientOutlineCorner(x + 30, y, width + x - 40, height + y, 1, 12, ColorUtil.getClientColor(0, 255).getRGB(), ColorUtil.getClientColor(90, 255).getRGB(), ColorUtil.getClientColor(180, 255).getRGB(), ColorUtil.getClientColor(270, 255).getRGB());
 		}
 		if(Settings.customGuiFont) {
 			rip.athena.client.utils.font.FontManager.getNunitoBold(25).drawString(text, x + 70, y + height / 2 - (getStringHeight(text) / 2) + 2, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getTextColor());

src/main/java/rip/athena/client/gui/clickgui/components/mods/ModCategoryButton.java

@@ -11,6 +11,7 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
 import rip.athena.client.modules.Category;
 import rip.athena.client.modules.impl.other.Settings;
+import rip.athena.client.utils.render.ColorUtil;
 import rip.athena.client.utils.render.DrawUtils;
 import rip.athena.client.utils.render.RoundedUtils;
 
@@ -66,7 +67,10 @@ public class ModCategoryButton extends MenuButton {
 		GlStateManager.color(1, 1, 1);
 
 		if(isActive()) {
-			RoundedUtils.drawGradientRound(x + 17, y - 1, width - 23, height - 4, 12, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor());
+			RoundedUtils.drawRound(x + 17, y, width - 23, height - 4, 12, new Color(10,10,10, 150));
+			RoundedUtils.drawRoundedGradientOutlineCorner(x + 17, y, width + x - 7, height + y - 4, 1, 12, ColorUtil.getClientColor(0, 255).getRGB(), ColorUtil.getClientColor(90, 255).getRGB(), ColorUtil.getClientColor(180, 255).getRGB(), ColorUtil.getClientColor(270, 255).getRGB());
+
+			//RoundedUtils.drawGradientRound(x + 17, y - 1, width - 23, height - 4, 12, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor());
 			//RoundedUtils.drawRoundedRect(x + 17, y - 1, x + width - 6, y + height - 4, 12, new Color(50,50,50,255).getRGB());
 			//RoundedUtils.drawRoundedRect(x + 18, y, x + width - 7, y + height - 5, 12, backgroundColor);
 			//drawHorizontalLine(x + (width / 2 - getStringWidth(text) / 2), y + 29, (int)Minecraft.getMinecraft().fontRendererObj.getStringWidth(text), 2, textColor);
@@ -74,7 +78,7 @@ public class ModCategoryButton extends MenuButton {
 
 		if(Settings.customGuiFont) {
 			if(text.equalsIgnoreCase("EDIT HUD")) {
-				rip.athena.client.utils.font.FontManager.getProductSansBold(35).drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getTextColor());
+				rip.athena.client.utils.font.FontManager.getProductSansBold(35).drawString(text, x + (width / 2 - getStringWidth(text) / 2) - 15, y + height / 2 - (getStringHeight(text) / 2) - 3, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getTextColor());
 			} else {
 				rip.athena.client.utils.font.FontManager.getProductSansBold(25).drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getTextColor());
 			}
@@ -83,7 +87,7 @@ public class ModCategoryButton extends MenuButton {
 		}
 
 		if(text.equalsIgnoreCase("EDIT HUD")) {
-			DrawUtils.drawImage(image, x + 35, y + 3, 25, 25);
+			DrawUtils.drawImage(image, x + 25, y + 3, 25, 25);
 		}
 		//rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y, width - 10, height, backgroundColor);
 		/*DrawUtils.drawRoundedRect(x + 9, y - 1, x + width - 19, y + height + 1, 4, new Color(50,50,50,255).getRGB());

src/main/java/rip/athena/client/gui/clickgui/components/mods/ModuleBox.java

@@ -12,6 +12,7 @@ import rip.athena.client.gui.framework.draw.DrawType;
 import rip.athena.client.gui.clickgui.IngameMenu;
 import rip.athena.client.modules.Module;
 import rip.athena.client.modules.impl.other.Settings;
+import rip.athena.client.utils.render.ColorUtil;
 import rip.athena.client.utils.render.DrawUtils;
 import rip.athena.client.utils.render.RoundedUtils;
 
@@ -236,7 +237,12 @@ public class ModuleBox extends MenuComponent {
 
 			//rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + width - 14 - 17 - 4, y + 14 - 4, 25, 25, COG_BORDER);
 			//rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + width - 14 - 17 - 3, y + 14 - 3, 23, 23, drawColor);
-			RoundedUtils.drawGradientRound(x + width - 14 - 17 - 3, y + 14 - 3, 23, 23, 6, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor());
+			//RoundedUtils.drawGradientRound(x + width - 14 - 17 - 3, y + 14 - 3, 23, 23, 6, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor());
+
+			RoundedUtils.drawRound(x + width - 14 - 17 - 3, y + 14 - 3, 23, 23, 12, new Color(10,10,10, 150));
+			RoundedUtils.drawRoundedGradientOutlineCorner(x + width - 14 - 17 - 3, y + 14 - 3, width + x - 11, 34 + y, 1, 12, ColorUtil.getClientColor(0, 255).getRGB(), ColorUtil.getClientColor(90, 255).getRGB(), ColorUtil.getClientColor(180, 255).getRGB(), ColorUtil.getClientColor(270, 255).getRGB());
+
+
 			drawImage(new ResourceLocation("Athena/gui/menu/settings.png"), x + width - 14 - 17, y + 14, 17, 17);
 		}
 	}

src/main/java/rip/athena/client/gui/menu/AthenaMenu.java

@@ -184,7 +184,7 @@ public class AthenaMenu extends GuiScreen implements GuiYesNoCallback
         this.viewportTexture = new DynamicTexture(256, 256);
         this.backgroundTexture = this.mc.getTextureManager().getDynamicTextureLocation("background", this.viewportTexture);
 
-        int j = this.height / 4 + 48;
+        int j = this.height / 4 + 78;
 
 
         {
@@ -293,14 +293,14 @@ public class AthenaMenu extends GuiScreen implements GuiYesNoCallback
 
     public void drawScreen(int mouseX, int mouseY, float partialTicks)
     {
-        DrawUtils.drawImage(new ResourceLocation("Athena/menu/cool_wallpaper.png"), 0, 0, width, height);
+        DrawUtils.drawImage(new ResourceLocation("Athena/menu/test5.jpg"), 0, 0, width, height);
 
         int[] size = InputUtils.getWindowsSize();
         int startX = size[0] / 2;
         int startY = size[1] / 2;
 
         int x = startX - 75;
-        int y = this.height / 4 - 5;
+        int y = this.height / 4 + 35;
         int width = 150;
         int height = 100;
 

src/main/java/rip/athena/client/gui/menu/altmanager/GuiAccountManager.java

@@ -22,10 +22,7 @@ import rip.athena.client.utils.animations.Direction;
 import rip.athena.client.utils.animations.impl.EaseBackIn;
 import rip.athena.client.utils.animations.simple.SimpleAnimation;
 import rip.athena.client.utils.font.FontManager;
-import rip.athena.client.utils.render.ClickEffect;
+import rip.athena.client.utils.render.*;
-import rip.athena.client.utils.render.DrawUtils;
-import rip.athena.client.utils.render.RoundedUtils;
-import rip.athena.client.utils.render.StencilUtils;
 import rip.athena.client.utils.time.TimerUtil;
 
 import javax.imageio.ImageIO;
@@ -120,15 +117,15 @@ public class GuiAccountManager extends GuiScreen {
             clickTimer.reset();
         }
 
-        DrawUtils.drawImage(new ResourceLocation("Athena/menu/test.png"), 0, 0, sr.getScaledWidth(), sr.getScaledHeight());
+        DrawUtils.drawImage(new ResourceLocation("Athena/menu/test5.jpg"), 0, 0, sr.getScaledWidth(), sr.getScaledHeight());
 
         GlStateManager.pushMatrix();
 
-        RoundedUtils.drawGradientRound(x, y, width, height, 6, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor());
+        RoundedUtils.drawGradientRound(x, y, width, height, 6, ColorUtil.getClientColor(0, 255), ColorUtil.getClientColor(90, 255), ColorUtil.getClientColor(180, 255), ColorUtil.getClientColor(270, 255));
         RoundedUtils.drawRound(x + 1, y + 1, width - 2, height - 2, 6, new Color(Athena.INSTANCE.getThemeManager().getPrimaryTheme().getFirstColor()));
         FontManager.getProductSansRegular(22).drawString("Account Manager " + Athena.INSTANCE.getAccountManager().getCurrentAccount() != null ? "Account Manager | " + Athena.INSTANCE.getAccountManager().getCurrentAccount().getUsername() : "Account Manager | No Account", x + 10, y + 10, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getTextColor());
 
-        RoundedUtils.drawGradientRound(x , y + 179, width, height - 148, 6, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor());
+        RoundedUtils.drawGradientRound(x , y + 179, width, height - 148, 6, ColorUtil.getClientColor(0, 255), ColorUtil.getClientColor(90, 255), ColorUtil.getClientColor(180, 255), ColorUtil.getClientColor(270, 255));
         RoundedUtils.drawRound(x + 1, y + 180, width - 2, height - 150, 6, new Color(Athena.INSTANCE.getThemeManager().getPrimaryTheme().getFirstColor()));
         FontManager.getProductSansRegular(22).drawString("Add Account", x + 5, y + 186, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getTextColor());
 

src/main/java/rip/athena/client/gui/menu/altmanager/GuiAltManager.java

@@ -66,9 +66,9 @@ public class GuiAltManager extends GuiScreen {
         int yOffset = (screenHeight - getTotalPanelsHeight()) / 2; // Calculate vertical offset to center the panels
         int width = screenWidth - (2 * xOffset);
 
-        DrawUtils.drawImage(new ResourceLocation("Athena/menu/test.png"), 0, 0, (int) screenWidth, (int) screenHeight);
+        DrawUtils.drawImage(new ResourceLocation("Athena/menu/test5.jpg"), 0, 0, (int) screenWidth, (int) screenHeight);
 
-        RoundedUtils.drawGradientRound(xOffset + 15, yOffset - 1, width + 1, getTotalPanelsHeight() - 23, 6, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor());
+        RoundedUtils.drawGradientRound(xOffset + 15, yOffset - 1, width + 1, getTotalPanelsHeight() - 23, 6, ColorUtil.getClientColor(0, 255), ColorUtil.getClientColor(90, 255), ColorUtil.getClientColor(180, 255), ColorUtil.getClientColor(270, 255));
 
         int count = 0;
         int separation = 0;