From a262e27b7cd4b912b512a4dc297799fde9e01722 Mon Sep 17 00:00:00 2001 From: Tamaized Date: Fri, 16 Nov 2018 12:57:42 -0500 Subject: [PATCH] Fixed half hearts not bouncing during regen (#113) * fixed half heart regen bounce * fix spacing * use a helper method --- .../mantle/client/ExtraHeartRenderHandler.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java b/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java index e54bd43..d7bce84 100644 --- a/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java +++ b/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java @@ -201,24 +201,26 @@ public class ExtraHeartRenderHandler { renderHearts = 10; } for(int i = 0; i < renderHearts; i++) { - int y = 0; - if(i + regenOffset == regen) { - y -= 2; - } + int y = getYRegenOffset(i, regenOffset); if(absorb) { this.drawTexturedModalRect(xBasePos + 8 * i, yBasePos + y, 0, 54, 9, 9); } this.drawTexturedModalRect(xBasePos + 8 * i, yBasePos + y, 0 + 18 * heartIndex, potionOffset, 9, 9); } if(count % 2 == 1 && renderHearts < 10) { + int y = getYRegenOffset(renderHearts, regenOffset); if(absorb) { - this.drawTexturedModalRect(xBasePos + 8 * renderHearts, yBasePos, 0, 54, 9, 9); + this.drawTexturedModalRect(xBasePos + 8 * renderHearts, yBasePos + y, 0, 54, 9, 9); } - this.drawTexturedModalRect(xBasePos + 8 * renderHearts, yBasePos, 9 + 18 * heartIndex, potionOffset, 9, 9); + this.drawTexturedModalRect(xBasePos + 8 * renderHearts, yBasePos + y, 9 + 18 * heartIndex, potionOffset, 9, 9); } } } + private int getYRegenOffset(int i, int offset) { + return i + offset == regen ? -2 : 0; + } + private int getPotionOffset(EntityPlayer player) { int potionOffset = 0; PotionEffect potion = player.getActivePotionEffect(MobEffects.WITHER);