From 09c99fb0a6004f1d507a71269b20674a5f0e28a6 Mon Sep 17 00:00:00 2001 From: wbc3467-spec Date: Fri, 5 Dec 2025 17:34:08 +0000 Subject: [PATCH 1/2] Changed the Bars texture to match real size --- .../assets/torohealth/textures/gui/bars.png | Bin 1550 -> 4092 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/torohealth/textures/gui/bars.png b/src/main/resources/assets/torohealth/textures/gui/bars.png index f24921a485f433089a2d577e7d7f96bb3b20d789..cadf1572922cca678a494c844c5f6efead47857b 100644 GIT binary patch literal 4092 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 S^U+^;0N7^dW?Q|LcIH3D;A`Um literal 1550 zcmdT^`&ZI;82)?_G%aT*GbcLd7TWLvUI??CVv30ccnc*Rc7xPOIxk3R^|c?$S#t&6 z02Q2?Wr}&D3@_}M8Rms7>!@X#rDs~sEKAXJxS#ef>^F+E~mm|@>?4U7PX-bw;cW@YP znKQ?7eGu_1>cMB~aZk^z536aj?-wwXNe_JKT}g}dI>JfRm(0Ss_7jz!lMUHn8n$@i zBPE0YiQ@pJUhS(GVi(ZuLwuy$d-HgfD#wHYwzz8?OKwF1s;Ceugyznb0Bwp#ulW)k zeb}3LDnRgjs_dwSqZjd-%bZk3O{P@^KRVb(7u0v}!NQ6yD(2a%Gb=K5I)3)Z?ET6$ z3d>;wmk6h>UOhN^!=HS6N%Fm>h$3*DR}?}|q)^rxK?E367b%K~T18cT+Qp8p^gLOU zexes%6pc}G=a+)XRbkEhwG$ZZsdL*=8V2G)2PXzddG;Y4!L`i;iF$lDOKC`3d7ddC zu(Qghk|i+SXQfh&)GVmYE0+>n@U=Rl{DA}T&U%~IV(Xxu z=uWI^_DO-&w-`#c9Vyuj?tQEQJT%Gdi(hiZxW4lq zs}dd4K~u1OX9Q*}1OQl$+&YH~{+8SbQ!jnh=mupF>(0=)9365*4xTgPlY zM`HltlaZ!3GzTZBr)F==oK6|Si8h%d%&71r2lPwoAU?h3G0-0Wqj?}sZ&#shg%Gf8 zAlL%70EAp%cP7c1Wso?w8*V*iU8~3E+1k_);WBdfO?J|BpsI=(P7%z<+M+ZOh+Urh zd2;0QwdFwqb|McpkR!_n_2*h>UXiHkX>}glxOgQ{P)5$SAbqib7wJO7v2Z13=DqvR zi+wouqYI69lBfz(uh!O6O_>qz{Ck(jv%Y2O(yKdq*kbb zLx@GKW3$5W&e|)QaQPS0xqEi&M@gTmrCbDKp^QpG6DWd&ZT}Gy@0MmXhgdDKG=>!{ zsI8|Zqxe!rACX?SA*kcX-2=%*7_zCX*+PYrcyc6_5vXdNqA6kr9jaG@)ioiQ-T|ET zob})fTSx_7XD%Fry>g&W?1J9KShFksma1@OZuAM!%X{{Rspoohu{2>)pvFAF@p$-q zoza~H0})4}bYU`4<+=pB%w){1W!@aVXK(XPgi(hxx4OYvH}GCcjD{w0sOr)+X}<{$ zRoJW&#Vd*p4DQN#|zkFAq|9krl= zc~}0ywnhqM*ok782t}V?cS-j5a#6`wmB7s$@wS)KvUzNE)XwHNBHVd2IR7CVhvy=m zrljtSN5~of;uaMbzZtH8m+`YHVx{tkPTUH(aTq+ENo6=l;GHiGZNi-%INUP{=et`QF3l{{hB#Y0>}y From 1a9b1ed28ed0762861523c542050945d3463b0ac Mon Sep 17 00:00:00 2001 From: wbc3467-spec Date: Sat, 6 Dec 2025 12:54:41 +0000 Subject: [PATCH 2/2] updated bar rendering code to match the texture change --- .../net/torocraft/torohealth/bars/HealthBarRenderer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/torocraft/torohealth/bars/HealthBarRenderer.java b/src/main/java/net/torocraft/torohealth/bars/HealthBarRenderer.java index 10ec0cac..15a6dd1d 100644 --- a/src/main/java/net/torocraft/torohealth/bars/HealthBarRenderer.java +++ b/src/main/java/net/torocraft/torohealth/bars/HealthBarRenderer.java @@ -171,8 +171,8 @@ private static void drawBar(Matrix4f matrix4f, double x, double y, float width, int color, int zOffset, boolean inWorld) { float c = 0.00390625F; int u = 0; - int v = 6 * 5 * 2 + 5; - int uw = MathHelper.ceil(92 * percent); + int v = 6 * 5 * 2 + 5 + (inWorld ? 70 : 0); + int uw = MathHelper.ceil((inWorld ? 41 : 131) * percent); int vh = 5; double size = percent * width; @@ -187,6 +187,7 @@ private static void drawBar(Matrix4f matrix4f, double x, double y, float width, RenderSystem.setShaderTexture(0, GUI_BARS_TEXTURES); RenderSystem.enableBlend(); + float half = width / 2; float zOffsetAmount = inWorld ? -0.1F : 0.1F;