diff --git a/resources/assets/tinker/textures/gui/newhearts.png b/resources/assets/tinker/textures/gui/newhearts.png index 5b0e326a..be6b93ae 100644 Binary files a/resources/assets/tinker/textures/gui/newhearts.png and b/resources/assets/tinker/textures/gui/newhearts.png differ diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index f7f15e8f..a333967a 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -207,7 +207,7 @@ public class ArmorProxyClient extends ArmorProxyCommon @SubscribeEvent public void renderHealthbar (RenderGameOverlayEvent.Pre event) { - if (!Loader.isModLoaded("tukmc_Vz"))// Loader check to avoid conflicting + if (!Loader.isModLoaded("tukmc_Vz") || Loader.isModLoaded("borderlands"))// Loader check to avoid conflicting // with a GUI mod (thanks Vazkii!) { if (event.type == ElementType.HEALTH) @@ -297,12 +297,13 @@ public class ArmorProxyClient extends ArmorProxyCommon } } + int potionOffset = 0; PotionEffect potion = mc.thePlayer.getActivePotionEffect(Potion.wither); if (potion != null) - return; + potionOffset = 18; potion = mc.thePlayer.getActivePotionEffect(Potion.poison); if (potion != null) - return; + potionOffset = 9; // Extra hearts this.mc.getTextureManager().bindTexture(hearts); @@ -315,11 +316,14 @@ public class ArmorProxyClient extends ArmorProxyCommon renderHearts = 10; for (int i = 0; i < renderHearts; i++) { - this.drawTexturedModalRect(xBasePos + 8 * i, yBasePos, 0 + 18 * iter, 0, 8, 8); + int y = 0; + if (i == regen) + y -= 2; + this.drawTexturedModalRect(xBasePos + 8 * i, yBasePos + y, 0 + 18 * iter, potionOffset, 9, 9); } if (hp % 2 == 1 && renderHearts < 10) { - this.drawTexturedModalRect(xBasePos + 8 * renderHearts, yBasePos, 9 + 18 * iter, 0, 8, 8); + this.drawTexturedModalRect(xBasePos + 8 * renderHearts, yBasePos, 9 + 18 * iter, potionOffset, 9, 9); } }