From afb5b376ce7cfb14d7c8401af17d06cfff4774e7 Mon Sep 17 00:00:00 2001 From: Ethan Shaughnessy Date: Mon, 6 Oct 2014 23:40:56 -0600 Subject: [PATCH] Added hardcore mode additional hearts Textures need to be fixed. --- .../assets/tinker/textures/gui/newhearts.png | Bin 4654 -> 4061 bytes .../tconstruct/armor/ArmorProxyClient.java | 2 ++ 2 files changed, 2 insertions(+) diff --git a/resources/assets/tinker/textures/gui/newhearts.png b/resources/assets/tinker/textures/gui/newhearts.png index be6b93ae8627da8c5cf8af4d63b0e2e0e73a7684..aa6b187d0171b2e43435ec7aee9780537ac7be02 100644 GIT binary patch literal 4061 zcmeHKX;f3^7X3oPBp@J&Az&FQlopvWh><}N0cB7?Km-gR&`89{6sAA|0y4H$5h_Bc zEznlLARzh>L!d}snW|t(2{MPtFa{6_A@3%<^AFVXoyCmEiElE7>u>GwLM<$Op^TBWO?@#1v@)CdwctnCr>&!I5;{w zIy*bNy1IIMdlLu*B9SPcSP#kp=mB65>>5XSrYZQ`Q1s1J#1`xcyrUFUq;%{k(*h{EZiL6zLZcvGRyf2A?Ole1gx>`^;FI%##UA`naH347bNN|@1@n8iH ziUI^bCJWwsWblY(Z1>GMB9Ht+HLXiEqZgI=5|!1jmN%&O<%s&t@%^{QwF)M*?@S!H zGof2Jp;t8V+1Hc$cP9;sCyh$kXe#?~8T-inDVxd}r`|_kfdV$NB^8H>gGg|pqZxyfTq zt+RN%CD#1>{CkdIeSKXZ5J39>ef@-04!g^afMiT1b}8cht03;~2dTtu{CL`bxz zxuLP4S?*Nf8R+?solYF{j0>3mdfxkWj7q!P$yEZo^>wynR%VXomr|i8HC0D{b^g_7 zmjpcMc3PmccF*Kdm|h2i#CIgXd$+SRpTEBru91-EjcXCXpiX7dM@l%Mr;(`)Qqk3U9I z-URC3o*?LnUqjoW(^oGD(t9 zdZCQGp(tRXIPDE=i?4J&9@e&?URtK^@let+q_Yy$1AZ8(Ns5r;;?Z@ zM8nUGnm@ewJ$?8tJw`^D z1;`Pg~zEXrtVHSsriz|Xm(KX`h=XU@?f-OSB!i2tQ zU3v9t5A-FB1V>m4)7*d|wzu*y`7DQ8tk%#nb%mpWN??f zM}iQsA8I{gY`tVZ_^>_b>J=(gYy9YSKr9RTy*v=T` zsiiJnm3mIs+SXbWgd zT){&oIpW0SEpClcAVWBOu_`n~H9zxIVtML3irK)Q$FqK~W7beyI*H|X+@%q|bbVFI z%EHrMo~zVXL9Fhlz4L7BT@A=Ed2*6;2=oPaig?UFFX?T+bjqaJyCRRK^ zqc^M_lEDXbY@cGsK;3S?SzS#upjq}#Jxf=z2&2)P`MKg~7L#6AcZJgZ4zbiMj&_kr zk(eRW9LIKiaM07Q$R2dch%(PnQi^hCVu{IcIII5K2BdnUwj zuF@nviC;StB1P%WJz5;Eo1l6eYi8h9NzD$(P+(Sda@VHs7iuBUw<2R!e*E_X%aiFl zcb3WV2NP6pdK}Kn8d8L7CZm+jD~ZDF9=K)g@#0op3-DOm!q| z=fI_lvgCf)&$UQkncjy4Ok5W%sZIjKqN2be5k@X~q27|H1hADRl1s}U?Z63ABABWU zL~x_S4m_qTg14T@i(tAs9D)P(lLLNQF%P9q;tsk6FW&|$=CQ{ljATU=^E$hii$xUS zrbms1bT)C$n+ZGwOEK4$?#H3)2_^9;cschywn+k=7KvNBDU$2i&|SKYNG@HA7ZEoC zGQLYj-D0PQ?CAR_GSPn3^gty6r8K*v$=5qURV2+TeGz^4z3{ScwUUmsR#Cdkex@P8 za$nKU_mQAhz_8Lag=!#eoJ87W|3RDFo*hkCb~~g)jYOoMof8L`JWFz^BB1pZ!Q;Y^ zfMY%dtS=x$Y57oCi)--iQLc^%_VI&3>E>Wf3m zdcf=670d-8TbI*kFMql>LG`n_%Gz;1wjYJ6z)0@t9^angA2+g-!lSe2^XA2x%%Nf1 zx1YV6*R$5=v%JJ;gFt(}xfjQJ&|uZn^Ij{iO7E9+*sm!E`@NLQTY+*iNN$ z^otKE-JxgkdnL+ff;KuMV`AI(TN`ISW&oy)Nr&mpf$TR>C8Q`^#K+>)4trny9rgi2 zK9*!+qj9@yur>Q=F;~TP=pIf|l%3x%BE6Bk57K0P4yS-j=^3Ft##XU0W6Y3v#k| KJpt|8)PDh^GdbM= literal 4654 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 diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index 2461b505..c9288d71 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -308,6 +308,8 @@ public class ArmorProxyClient extends ArmorProxyCommon potion = mc.thePlayer.getActivePotionEffect(Potion.poison); if (potion != null) potionOffset = 9; + if (mc.theWorld.getWorldInfo().isHardcoreModeEnabled()) + potionOffset += 27; // Extra hearts this.mc.getTextureManager().bindTexture(hearts);