From 76b260e5c42947b8344cf91be14fd1da1bd54a1a Mon Sep 17 00:00:00 2001 From: ThisIsALegitUsername <73719631+ThisIsALegitUsername@users.noreply.github.com> Date: Mon, 3 Apr 2023 09:42:02 -0600 Subject: [PATCH] Begin work on clickgui rewrite --- .../ui/clickgui/rewrite/ClickGuiRewrite.java | 40 ++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/src/main/java/dev/resent/visual/ui/clickgui/rewrite/ClickGuiRewrite.java b/src/main/java/dev/resent/visual/ui/clickgui/rewrite/ClickGuiRewrite.java index 737f303e..1ea5ce1f 100644 --- a/src/main/java/dev/resent/visual/ui/clickgui/rewrite/ClickGuiRewrite.java +++ b/src/main/java/dev/resent/visual/ui/clickgui/rewrite/ClickGuiRewrite.java @@ -7,28 +7,55 @@ import dev.resent.module.base.Mod; import dev.resent.module.base.setting.BooleanSetting; import dev.resent.module.base.setting.Setting; import dev.resent.util.misc.GlUtils; +import dev.resent.util.render.Color; +import dev.resent.util.render.RenderUtils; import dev.resent.visual.ui.Theme; import dev.resent.visual.ui.animation.Animation; import dev.resent.visual.ui.animation.Direction; import dev.resent.visual.ui.clickgui.rewrite.comp.Comp; import dev.resent.visual.ui.clickgui.rewrite.comp.impl.CompCheck; +import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; public class ClickGuiRewrite extends GuiScreen{ + public FontRenderer fr; public ArrayList comps = new ArrayList<>(); - public int x, y, width, height, offset; + public float x, y, width, height, offset; public Animation introAnimation; public ScaledResolution sr; public boolean closing; public Mod selectedMod; + public int backgroundColor = new Color(12, 12, 12).getRGB(), primaryColor = 0xFF000000, secondaryColor = new Color(22, 22, 22).getRGB(); @Override public void drawScreen(int mouseX, int mouseY, float var3) { GlUtils.startScale((this.x + this.width) / 2, (this.y + this.height) / 2, introAnimation != null ? (float) introAnimation.getValue() : 1); + //Navigation bar + RenderUtils.drawRoundedRect(x, y, x+width-60, y+height, 32, secondaryColor); + + //Background overlay + RenderUtils.drawRoundedRect(x+60, y, x+width, y+height, 32, backgroundColor); + Gui.drawRect(x+60, y, x+102, y+height, backgroundColor); + + //Seperating line + Gui.drawRect(x, y+90, x+width, y+95, secondaryColor); + + //Search + RenderUtils.drawRoundedRect(x+width-300, y+25, x+width-50, y+65, 9, new Color(22, 22, 22).getRGB()); + + GlStateManager.translate(x+80, y+36, 0); + GlStateManager.scale(3, 3, 1); + GlStateManager.translate(-(x+80), -(y+36), 0); + fr.drawString("Resent", x+80, y+36, -1, false); + GlStateManager.scale(0.5f, 0.5f, 0.5f); + + //Draw module button for(Mod m : Resent.INSTANCE.modManager.modules){ } @@ -82,11 +109,12 @@ public class ClickGuiRewrite extends GuiScreen{ @Override public void initGui() { sr = new ScaledResolution(mc); - x = sr.getScaledWidth()/4; - y = sr.getScaledHeight()/4; - width = x + sr.getScaledWidth()/2; - height = y + sr.getScaledHeight()/2; + x = sr.getScaledWidth()/10; + y = sr.getScaledHeight()/10; + width = sr.getScaledWidth()/1.25f; + height = sr.getScaledHeight()/1.25f; introAnimation = Theme.getAnimation(500, 1, 3, 3.8f, 1.35f, false); + fr = mc.fontRendererObj; } @Override @@ -99,6 +127,8 @@ public class ClickGuiRewrite extends GuiScreen{ for(Comp c : comps){ c.keyTyped(par1, key); } + }else { + } }