From d517afd16c19b2394b523a8435bed441a60a4ea1 Mon Sep 17 00:00:00 2001 From: ThisIsALegitUsername Date: Tue, 10 Jan 2023 22:00:07 +0000 Subject: [PATCH] Potionhud fixes --- .gradle/7.3.1/checksums/checksums.lock | Bin 17 -> 39 bytes .../dependencies-accessors.lock | Bin 17 -> 39 bytes .../executionHistory/executionHistory.bin | Bin 1770306 -> 1770306 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 39 bytes .gradle/7.3.1/fileHashes/fileHashes.bin | Bin 990835 -> 990835 bytes .gradle/7.3.1/fileHashes/fileHashes.lock | Bin 17 -> 39 bytes .../7.3.1/fileHashes/resourceHashesCache.bin | Bin 408595 -> 408663 bytes .../buildOutputCleanup.lock | Bin 17 -> 39 bytes .../dev/resent/module/impl/hud/FakeArray.java | 39 ------------------ .../dev/resent/module/impl/hud/PotionHUD.java | 10 +++-- 10 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 src/main/java/dev/resent/module/impl/hud/FakeArray.java diff --git a/.gradle/7.3.1/checksums/checksums.lock b/.gradle/7.3.1/checksums/checksums.lock index af39b1fc5eaef37d0e1702b54c8e6c5510431ea1..f60341ca0aa9ec41a89eb079a46fbf79fd618406 100644 GIT binary patch literal 39 qcmZQRHc`xr*?jp|1_;PvW?(oZCc9m%iraZw7Xz!InTfeM0|NlQ5eT*b literal 17 UcmZQRHc`xr*?jp|1_;Ok04yg1`v3p{ diff --git a/.gradle/7.3.1/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.3.1/dependencies-accessors/dependencies-accessors.lock index b985f790ef44d2fd631d139ad5165880e2203946..eeb86ea5b60cd92fee0699d42699a6ef1eb5cd7a 100644 GIT binary patch literal 39 qcmZS9n0oI2_O4~g3{b$#z;Hyd;+J9-@^@3BT8ho+eGg^rOYu#fSbKc%i)G+# z$<a!7_(Azu$A7iD;l)ZWXb_XH>)tVyGjwfuVLFir1xd1iJP zlixC2j>e(k>E*aA5cyp6vK;OXx+sa4<1LEPADJl;w_@{mpM0Lx(%@}|9;Tse%Y-$p zB2$@i*Zh6!4RT42V^Ci+Wu0;y$U{|QlyoR?!koNU;4(B0Nr4g%DC%m5`!DQl4y~3* zg_~L?f}vY(bpCYe_UlW0aYqZC?sM1K%vij(23ZCud(Mfwg3#1sO42&P@Mt4RiyK54gHGxBv+>c_^AwyiT zbs>+CKRIF%i4-vr+*zE6QFD8ih*^W~yWwj^j8TFtUP^wdnPlXDN{Kp&Q6bkbW%WtS z4hgCorNp6S64A9$%8qFnlMr=|P?Di%HgI#vB|W2=lLvZ6wFs(Vu>CCJ)f4+SeiR#- z%~;s5ZKy}PIHzotDG+^lCVSrQ&0)BLYoxyVou72L?0xjbcD_+ zqn*fv7LAxN($?iRN2Q{b!^%b}QYzsp6c$8TSZY0Yv@d=5aeh4Kf1Y#ib4J>9BW=3= zf>JVV=O=`4@;f+Av$ZVV>?z&q>?_UsATm`|FRwm-cgl5q)cAQ%%293~8OY$Kk$ZEY z6^1%B7vKSisZ(!gT#9;HIOIOUzt!!{>pXK-vzB?s+})uR3I8wKNdEW8WJ9q$gcQqh zKN|0#$(kIiP`8mLsyM7ib|cML|k%6c-tGaZ-S}Zg0ni& zfQ4q-op>+=`7Jala^Y0;6-s&+UXvgfj6^>PBY6a34a%#atOZ5&8m9-shgo66twFgT zl=+|ty#F%0f^sq_W-nYn+(9#sy?C>LZzJrKdlKQHv6QUO;aCJEBAdtA$WCacd>-pH zJoxOf7)l*#VZ(+nE+K!8NhL%qp`zKnGzq0<*D49M9nG?TE1`5U)Z0muUur5lAnHs? zg=RZxMw?0Pm!TIXn)H=W8LTkxOQ>@qG!CUQEtMCLE-j@A$hekLg+mA~wq8cu9%B6= zh+)JvR0|`tEQ;Nqa(p{`t8TZ}3@%t1n}k0=NqzPnn)77&OIgJ9a0d1AZp$Px# diff --git a/.gradle/7.3.1/fileHashes/fileHashes.bin b/.gradle/7.3.1/fileHashes/fileHashes.bin index d711945f3f53285fb231342b52341b980773a9cd..fd850d9f77bb0f6f9abadeb0a1d30177e4783bcc 100644 GIT binary patch delta 810 zcmX|9Z%9*76yNjC&AsiuIbI6hvbF_TA95N9mG;LZ{18HYh!Qa~DoFa^C@B?N#ze@p znCL-4%E~Wc#HHc|iLnp+qFc)k%l=LKgRIoe#)!yx(tYn@7Y>}?@0|NP=iGBM6BU_> zitB#CpXEn>qd(hkdS;$p-4gCQbg}zS^^@U8*CMXwD*=N+=o+CdhYk9%fw#*fcdM&r zW;x6(%tU5ZMP0S|?1+AHK;;XGz>tXZbVNn$VNM<}hk(lI0_YgcA>gsR(6c{YC;IjtU`e)#VBy_!SY@VbcW)q0*+)E||H;iuZEb1@mJ}=@m!k`oA0} zkY+%n@lt&pAq(h~C@WhrMhMaGX`pvlTUEK5>W>R>B3;_Y zQ~JQ+X1xRg_^DZ>3j$|PLgSoKR?ZCLj}AnaV{mX>o0K`Hc3KGB8rLL}Wqh3NaO{Rj zRwl>s*`xniLk>8aunY%Ot#+~uPN|tCc${w~5M9%=N0h`G zZVw|G3qo@bTcB@RiX$4Ygod!x$Q%`XyV-u?VX0N5a}nOO8Ak65GF*yCtm52zNQT%_ z#v;<7^N2UH(m9p5I=t-kH4Jv#=HDy+i{G;^LEUSqhux_KubVwCib~ZCU4WXX6hd^~ z1$WDhMDe_l#stRK1NLMSB|Re{B+`_Hs}zCIV3WZS)2gQ|F#nAyRmC)=RK3z0lgKWo m{pQNM^3uNx(eu+qCC`g7?<3QqE1=+InCU{Y^1*B$%Kr!TIX3zL delta 802 zcmXw1T}V@L6yM$5hu-afb>15BFKrl<5w(gQDzzHcMvSZ;!X(UA5i}Syq=z}el2s3- z<^~;FM9ms8*nJo#H%PQS?7`{$crb}r>kA?zNu&a4(z*9;7Y>}?@0|NPU;mZSrj^mA zn;|Bo4Y46zNFOr1GET1AY&DsoD-GU1z1G?OfkI^}SH`$F$dxUvGVXRvTx5LI2hQhBh+7vKQ zs1GW!4(VW!ELb_wRjV$o4$@mW0d|Guu&Wk6r8x>05MfG(n$i!Jdh8_}Cc{Qfbnj8w zv*7ut6Qqk#^1*@~#NkL%o)n$)J1Z&NPs$SRggQ+qv z96G0X4?2U;vmfu1pW*|!R#B~JgxC-xKv#~J-+%}|GkBDEj(@n}U(Hqjovym0*|zHg zKcd-v>eF(@z?8$q`=6b;fY;OrR6!E zWjV3cr?iT2H5}r diff --git a/.gradle/7.3.1/fileHashes/resourceHashesCache.bin b/.gradle/7.3.1/fileHashes/resourceHashesCache.bin index 2dfbd8b0747c78e53c8df5ee67daf150feca7409..5b9efde3e728889a6e6a5d405812a974744c7288 100644 GIT binary patch delta 176 zcmbRIL*n`miG~)&ElkHN7!$Uis9-8&<)6P~j&Ueq|;T z5HoMTGLxm1hcS73)H0Tx9Q-Huh^G9?4~Hrj-p;k2rCWkAa--r7zUlKaS@(A`ce(M^`_FLCjEmLKUfvP2eSP+B-{ycVdU;1GF$@?PlW-@P?rYAmU5f<4LX&?2! SSMP0SpB&q!zKu#im2v>8$vx!& delta 93 zcmV-j0HXib_!yJ;7=VNUv;xO?0bjSscmi<+w^4oqfg1uK`IoM;1SOYavjiB2`I!QT z`I!T^`I!V@3;|-dTBZcK2)8S*1cDg1h6)AW4wK)6B9~2114M_~)&#fO)&)6bRj((C diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a44e82d9d6cbe8907bab7251abd9dba34799915e..2402a15f375b5fcb2329624656939dd9bfe83870 100644 GIT binary patch literal 39 rcmZR6D;XS8_%!Jb0~jy`Gczz85>q;#vg${laV7(+p_z%fIRgU#=Ku<% literal 17 VcmZR6D;XS8_%!Jb0~j!Q0su5w1dsp# diff --git a/src/main/java/dev/resent/module/impl/hud/FakeArray.java b/src/main/java/dev/resent/module/impl/hud/FakeArray.java deleted file mode 100644 index fb06ae58..00000000 --- a/src/main/java/dev/resent/module/impl/hud/FakeArray.java +++ /dev/null @@ -1,39 +0,0 @@ -package dev.resent.module.impl.hud; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; - -import dev.resent.module.base.Category; -import dev.resent.module.base.RenderModule; -import dev.resent.util.render.RainbowUtil; -import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; - -public class FakeArray extends RenderModule{ - - public List fakemods = new ArrayList<>(); - - public FakeArray(){ - super("Fake Hacks", Category.HUD, 800, 4); - fakemods.add("AutoClicker"); - fakemods.add("AimAssist"); - fakemods.add("Reach"); - fakemods.add("Velocity"); - } - - public int getWidth(){ return mc.fontRendererObj.getStringWidth("Autoclicker "); } - public int getHeight(){ return 50; } - - public void draw(){ - fakemods.sort(Comparator.comparingInt(m -> mc.fontRendererObj.getStringWidth((String) m)).reversed()); - int count = 0; - for (int i = 0; i < fakemods.size(); i++) { - - GlStateManager.pushMatrix(); - mc.fontRendererObj.drawStringWithShadow(fakemods.get(i), x + 2, count * mc.fontRendererObj.FONT_HEIGHT + (y) + 4, RainbowUtil.getRainbow1(50)); - GlStateManager.popMatrix(); - count++; - } - - } -} \ No newline at end of file diff --git a/src/main/java/dev/resent/module/impl/hud/PotionHUD.java b/src/main/java/dev/resent/module/impl/hud/PotionHUD.java index 8fe9f6df..65449d4b 100644 --- a/src/main/java/dev/resent/module/impl/hud/PotionHUD.java +++ b/src/main/java/dev/resent/module/impl/hud/PotionHUD.java @@ -47,11 +47,15 @@ public class PotionHUD extends RenderModule{ GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); if (potion.hasStatusIcon()) { GuiIngame guiIngame = new GuiIngame(mc); + GlStateManager.enableAlpha(); + //GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(775, 769, 1, 0); + Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("textures/gui/container/inventory.png")); int i3 = potion.getStatusIconIndex(); - guiIngame.drawTexturedModalRect(getX() + 21 - 20, getY() + i2 - 20, 0 + i3 % 8 * 18, 198 + i3 / 8 * 18, 18, 18); + guiIngame.drawTexturedModalRect(getX() + 21 - 14, getY() + i2 - 14, 0 + i3 % 8 * 18, 198 + i3 / 8 * 18, 18, 18); } String s1 = I18n.format(potion.getName(), new Object[0]); if (potioneffect.getAmplifier() == 1) { @@ -68,9 +72,9 @@ public class PotionHUD extends RenderModule{ s1 = ("" + potioneffect.getAmplifier()); } - mc.fontRendererObj.drawString(s1, (getX() + 21), (getY() + i2 - 20), 16777215, true); + mc.fontRendererObj.drawString(s1, (getX() + 21), (getY() + i2 - 14), 16777215, true); String s2 = Potion.getDurationString(potioneffect); - mc.fontRendererObj.drawString(s2, (getX() + 21), (getY() + i2 + 10 - 20), 8355711, true); + mc.fontRendererObj.drawString(s2, (getX() + 21), (getY() + i2 + 10 - 14), 8355711, true); i2 += l; } }