From f833fd512dcc7c72b11bd0f5279c2ffd7c7c2195 Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 3 Oct 2022 19:09:35 +0200 Subject: [PATCH] the commit i missed + safer DFCs --- .../blocks/machine/FoundryCastingBase.java | 10 ++++---- .../com/hbm/items/machine/ItemScraps.java | 2 ++ .../hbm/render/block/RenderFoundryBasin.java | 3 +++ .../hbm/render/block/RenderFoundryMold.java | 3 +++ .../tileentity/machine/TileEntityCore.java | 22 ++++++++++++++++-- .../machine/TileEntityCoreStabilizer.java | 2 +- .../assets/hbm/textures/blocks/conveyor.png | Bin 263 -> 364 bytes .../textures/blocks/conveyor_curve_left.png | Bin 642 -> 1427 bytes .../textures/blocks/conveyor_curve_right.png | Bin 681 -> 1403 bytes .../hbm/textures/blocks/conveyor_double.png | Bin 258 -> 360 bytes .../blocks/conveyor_double_curve_left.png | Bin 805 -> 1340 bytes .../blocks/conveyor_double_curve_right.png | Bin 758 -> 1278 bytes .../hbm/textures/blocks/conveyor_triple.png | Bin 237 -> 365 bytes .../blocks/conveyor_triple_curve_left.png | Bin 810 -> 1363 bytes .../blocks/conveyor_triple_curve_right.png | Bin 763 -> 1335 bytes .../assets/hbm/textures/items/bandaid.png | Bin 307 -> 265 bytes 16 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/hbm/blocks/machine/FoundryCastingBase.java b/src/main/java/com/hbm/blocks/machine/FoundryCastingBase.java index 8295df32b..1ced99e75 100644 --- a/src/main/java/com/hbm/blocks/machine/FoundryCastingBase.java +++ b/src/main/java/com/hbm/blocks/machine/FoundryCastingBase.java @@ -133,10 +133,12 @@ public abstract class FoundryCastingBase extends BlockContainer implements ICruc public void breakBlock(World world, int x, int y, int z, Block b, int i) { TileEntityFoundryCastingBase cast = (TileEntityFoundryCastingBase) world.getTileEntity(x, y, z); - ItemStack scrap = ItemScraps.create(new MaterialStack(cast.type, cast.amount)); - EntityItem item = new EntityItem(world, x + 0.5, y + this.maxY, z + 0.5, scrap); - world.spawnEntityInWorld(item); - cast.amount = 0; //just for safety + if(cast.amount > 0) { + ItemStack scrap = ItemScraps.create(new MaterialStack(cast.type, cast.amount)); + EntityItem item = new EntityItem(world, x + 0.5, y + this.maxY, z + 0.5, scrap); + world.spawnEntityInWorld(item); + cast.amount = 0; //just for safety + } for(ItemStack stack : cast.slots) { if(stack != null) { diff --git a/src/main/java/com/hbm/items/machine/ItemScraps.java b/src/main/java/com/hbm/items/machine/ItemScraps.java index 3e2a0f45e..dad82669d 100644 --- a/src/main/java/com/hbm/items/machine/ItemScraps.java +++ b/src/main/java/com/hbm/items/machine/ItemScraps.java @@ -68,6 +68,8 @@ public class ItemScraps extends Item { } public static ItemStack create(MaterialStack stack) { + if(stack.material == null) + return new ItemStack(ModItems.nothing); //why do i bother adding checks for fucking everything when they don't work ItemStack scrap = new ItemStack(ModItems.scraps, 1, stack.material.id); scrap.stackTagCompound = new NBTTagCompound(); scrap.stackTagCompound.setInteger("amount", stack.amount); diff --git a/src/main/java/com/hbm/render/block/RenderFoundryBasin.java b/src/main/java/com/hbm/render/block/RenderFoundryBasin.java index 3cc464284..17917603a 100644 --- a/src/main/java/com/hbm/render/block/RenderFoundryBasin.java +++ b/src/main/java/com/hbm/render/block/RenderFoundryBasin.java @@ -59,6 +59,9 @@ public class RenderFoundryBasin implements ISimpleBlockRenderingHandler { float mulZ = 0.8F; float mulX = 0.6F; + int brightness = block.getMixedBrightnessForBlock(world, x, y, z); + tessellator.setBrightness(brightness); + if(EntityRenderer.anaglyphEnable) { float aR = (r * 30.0F + g * 59.0F + b * 11.0F) / 100.0F; float aG = (r * 30.0F + g * 70.0F) / 100.0F; diff --git a/src/main/java/com/hbm/render/block/RenderFoundryMold.java b/src/main/java/com/hbm/render/block/RenderFoundryMold.java index fb29141a4..248b98c58 100644 --- a/src/main/java/com/hbm/render/block/RenderFoundryMold.java +++ b/src/main/java/com/hbm/render/block/RenderFoundryMold.java @@ -59,6 +59,9 @@ public class RenderFoundryMold implements ISimpleBlockRenderingHandler { float mulZ = 0.8F; float mulX = 0.6F; + int brightness = block.getMixedBrightnessForBlock(world, x, y, z); + tessellator.setBrightness(brightness); + if(EntityRenderer.anaglyphEnable) { float aR = (r * 30.0F + g * 59.0F + b * 11.0F) / 100.0F; float aG = (r * 30.0F + g * 70.0F) / 100.0F; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java index 02ae5ab5c..9df3a1fb7 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java @@ -27,6 +27,7 @@ public class TileEntityCore extends TileEntityMachineBase { public int heat; public int color; public FluidTank[] tanks; + private boolean lastTickValid = false; public TileEntityCore() { super(3); @@ -45,7 +46,15 @@ public class TileEntityCore extends TileEntityMachineBase { if(!worldObj.isRemote) { - if(heat > 0 && heat >= field) { + int chunkX = xCoord << 4; + int chunkZ = zCoord << 4; + + lastTickValid = worldObj.getChunkProvider().chunkExists(chunkX + 1, chunkZ + 1) && + worldObj.getChunkProvider().chunkExists(chunkX + 1, chunkZ - 1) && + worldObj.getChunkProvider().chunkExists(chunkX - 1, chunkZ + 1) && + worldObj.getChunkProvider().chunkExists(chunkX - 1, chunkZ - 1); + + if(lastTickValid && heat > 0 && heat >= field) { int fill = tanks[0].getFill() + tanks[1].getFill(); int max = tanks[0].getMaxFill() + tanks[1].getMaxFill(); @@ -87,7 +96,11 @@ public class TileEntityCore extends TileEntityMachineBase { networkPack(data, 250); heat = 0; - field = 0; + + if(lastTickValid && field > 0) { + field -= 1; + } + this.markDirty(); } else { @@ -139,6 +152,9 @@ public class TileEntityCore extends TileEntityMachineBase { public boolean isReady() { + if(!lastTickValid) + return false; + if(getCore() == 0) return false; @@ -241,6 +257,7 @@ public class TileEntityCore extends TileEntityMachineBase { tanks[0].readFromNBT(nbt, "fuel1"); tanks[1].readFromNBT(nbt, "fuel2"); + this.field = nbt.getInteger("field"); } @Override @@ -249,6 +266,7 @@ public class TileEntityCore extends TileEntityMachineBase { tanks[0].writeToNBT(nbt, "fuel1"); tanks[1].writeToNBT(nbt, "fuel2"); + nbt.setInteger("field", this.field); } AxisAlignedBB bb = null; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java index 1ec967d45..d66736845 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java @@ -65,7 +65,7 @@ public class TileEntityCoreStabilizer extends TileEntityMachineBase implements I if(te instanceof TileEntityCore) { TileEntityCore core = (TileEntityCore)te; - core.field = watts; + core.field = Math.max(core.field, watts); this.power -= demand; beam = i; diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor.png b/src/main/resources/assets/hbm/textures/blocks/conveyor.png index 07cda57ee2f05675799bdb4593733e1f623bbc1e..c9bd51ea5d40c124913e6aa7488270c3d25c6819 100644 GIT binary patch delta 351 zcmZo?dc!n9te%m9g_(hY!K3DNEs$a?4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(kgpQp z6XKeYk#Vv^R#H+@O-;?z)b!3eO&=eh$jHdFv@{0?hoZ{7&j+NyKMB8wRq z_zrZuE9|u~y>^>B9|ICdP(U!a4PW{?A!D#OamVL?H zb1!bZFA|ZqD_xaEYVGDW-sVjPi2-72J<8m|$LeI&cupN^DNIQ`bYuPD7RSgL1{&PL rY^jNd7U=j$OljqWDXyQk<`3hnRqy9Nk1N8kFmMbCWoVE?7g1LwQ4P{wo4FC`k3h#YQ2bbG|5OM-BMy$184MW|vj@{nB zHUNHZ@ve&q24$cOl!1sa1E|;8+b7TT5wu2SpbSQ0PyjU@T<;Yz#`Kc4_Tvt9*E$YI z{vd+Zs0@_BNDQ9;gH5(Kd8Ut`H7WyTFcO0YS2YPsZd>{E00000NkvXXu0mjfp`l>U diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor_curve_left.png b/src/main/resources/assets/hbm/textures/blocks/conveyor_curve_left.png index b643de4276a4cecba4fc102f8d8d73a16aebd413..05cf8986e1819fdc0e5533b61263cd2a141a570a 100644 GIT binary patch delta 1423 zcmV;A1#tR;1(OSq7JmT%1Oos707!i6eEOPRT@pV(flRb5@MUAZER6f+tQJ2^B}eDlX@@z-*ugnvFRA2AK(6R4zaSj zvMSbA|A?KV!=uxGI~SrAzJw#!JP-q?Z`pReChWu>*~8a;;XDqa*a)|UQ`ph4XB~*R zusx#)Ya%HI?SIerYrKfwn&WX%6OLzwZm)G9?6|qackm0%=jZFst8LNOqw!JFBTY zYuFFxq5V*vn>PM-%F}Js1lCjD`}Cn8Pt*W|UVlu8k(YVaAVwa{QfADud7T;a%$JOx zsU{iIR55Nf#W=1Q>(}qESI>B4cs(n4zIZ)5N7xVLX<^T_9&4c21mzi-v<>7L8wI~e zQeq&F)g*?C$B7x9^Qbc;vQo)NtfpkxPl|DCD8^aE*m(HG`0>cdJlK!Sb8;>?k4t?h zPk&ZF5LnNBkkXTaJXr$_yjV_n8+jHQ#0X|t%8YEjXfPv-CXzAj)g|N0SB#s6Vw_cs z&70A!OFzTwS;c;MJx6%HI8XS5ZBQOZrvu~z=MOz8$m7((K%Q@t7_nzPG>PGOcAFVE zqngaHzD>!nupeghO~q(672~*KYp8)GXg%&-`#^A>g@zi)Q%=C3 zJo5$^MY)_#h=Dvm8Zl;B?lS{tl);Q>no34*p-DzCQ4Cj8jJ=An@!!=IAE&$?+7GYi z@CbXRJTE>zZpzcwQ3H7r6Aa4psM9u*Zzm-N^5FCZ!?WEXGjK-f%=ot3l9BYAl7Hbm zDMrUojN^*2?sk6pIOX-w`ONFtJ-raLo;$aV0Z^Wxj&lQfrYRU$&wQbQfjmo}7+Lr; zHs~#~yfV5X zyj*xabRP10PVs!vdfa<|OK_e*+Y*$g^ufS-7V`d@E`yX9$P;M9$a_nl8AUm-Gb7I? zlF`dF$q0PKa5cp^s~DTF>Z(;2JkDo%!Ji9SPdLKoW$^`%`)foOyot9M(|-luq;24W z_lbc#w!srkiYI17Nu)EwbJ~&-+qz^}Pm0lLD#mfe*mTuZt1fu_zacO9b8*8LJoen> z3tp%52RB#>Mn)IBM%%yzpAzE-7rai4-m;rAqnv+f%*bY`WMriw8QoMdx|fQvS1~sD dACK1l{|LKB{5MFX#sB~S00>D%PDHLkV1i6*u15d> delta 631 zcmV--0*L*S3xWlZ7JmRh2nGNE026)pmH+?%1am@3R0s$N2z&@+hyVZrIY~r8R9JayiGi;b3p)97Kf9Px$W0 zdd?bZ3gPpYM}NEY!qclT4(S|Yq&R>(v_M2We!`E#GW@iRnmH_^GsgHZ#~N+0)-n!o zzFZ5bRtw;(yl>jM2Jum^rCibi4O_(o8roUIP8FGmP$V%|-onNz3J& zlr&?E*W6oLI>|w6OK<8RKIart9BlNU1uu`5^W`dOzki<{=S!WGDU<{5_6OJAuJ#2w zfB%e1xmF8csS`gfCgaee1-kfdf1s&2=Xj{m0{8)cphc#mTGIAz>0$)&;wFcZ$~oK4 z`t}-UqFCEGE|?l;5=OA$ptN(6gS~T(k>p?;@Y)zHSUEUf1V1@`{mJ`+9Dc?hwE6;_ z6Z(S|EpUJ@J$QPJjriTMX%X4JKzGh94$XFwgVN5s9JG9FK)`|e{#JjW5gZmhSpEplIfYam{0B$SmC`3s R!|nh8002ovPDHLkV1fp}9G>|F zw`TMw^r13Y2Y=?q_M!UUeBOxd6iTDsDu`_lidJTh>MtHt`>S;l_%T#&Zf~Eznj82w zvXj1PJmTNHo0D{Q3dg-9T!rR8@K>Q+C?6Kk^W*&T$NBX+lp0-gHlFpMG`(}~7nzHU z*4yGU%aE}P-M;%ojF$U!-zUb@nRK_z&?ip9jG^spg@2*n^@XupWQx&p6=Q1V4D{U0 zzdq)-=sA=?aBwAoprrlcKu{b$a3EyVeF}t(<(dK!L-Q~YF_s<%Vn#cPZDs@^esB$K z^CAo*_7$VfsvX0{^?-M$k>kS!ELyHkwLzd7RsD%QK544ez}NFX@4lt45;90)xY z2SP^sfdV1Jh$#>;a5ADl#8^fch#8GEikV@gVJwVxxDiG$h!vyxpcuigoKb_)Bnf+~ z*E85FOCUHpmq1X_x*Q0q(=G=>hW+lflpw}H%xFew#EfN_hQiSBgJ)wI4-}(mDaLY?GitapIQ$9j*Iq#a!O^t@!u{%T zAb%(tE(bz}?ouFRbX*EV44jNUZ;CO&K+MqGNydy_W~&-He(-DdV=MjJo) zpR&Z~tHg|EtQf{1XPnRj5+Em^wM5CdXwk1ri0viJ{ zLr-5VW(3~a7e+G~2qPH$Rt(xNW`6`$&N!9hl7uwR5(wv60>N=(#)06tbI*a0(fXu7 z$k_EM5HVW!eVL6;7XvXvOFl=;7;YC^VYJ*(7(3@(G4TE2Q%m#1r#1;s)v2BH{o+7y zBKJKFamsk zgi*H?BN*q5nmV;Te1GJ;ya(9qCuON)d{N{^Kr+%Gu!g#-D9eum1-Ds*GmvdkP2G^z@m)yax1 zOYZGV#@WcR*Kgl@S_6OuV2S9^u_7X?wT7Jl060D0j!$`c1%JQ}J#fANLXce$&;uL3}{l2}v#tet?*j}$#YYYizSfSoSz-NTQRG6`%H z1OGVzpl#btOn){p2xE&UyBNeUVa6I`@Nua?Z{9gpiBie|>$LFmMY__qF6OT*rC=w# zRgn54hrd4bK-DeZ4|@R-*$RuHVCeHbz|SipvfsXFoG%MNIUeBWPR^l}b3I{2x^97(sm&A)^C*?~1ms7O%06xVXJ3Jsl7Dj!CcAQGDYtFA!r-m~zltzY zm=wu5l(G<_OwOT{flN!|i1Fl*oVgM^9k4WxUqAGlAK*RagP~upR_Y1v5vmT!9cU|G z%?BY_ay(%%lv_FfH6H-?rjnWqINxmJ-mZLyLFul{k)(2JS58`*AA6>fP30|2vgI6; zvN5Ji&VND(jN|AqDVk7tJ>IQB5f zmNVO1$de*D$0|7_XCIS8a^~&~{ecOE*S~-LjTrL<_y@MYmhExeaL51v002ovPDHLk FV1hFeF-`yg diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor_double.png b/src/main/resources/assets/hbm/textures/blocks/conveyor_double.png index 4b8ccb0395611ccffc449c5efc0fbe1d1b75d07a..aa49e18c86beb2a36b5ea9be47796a5083419b3d 100644 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^0t^g{3@pq*mPgI&S|G((9OUlAuNyKMB8wRq_zrx&uIRjt$I@|+BeUzK z)PjQ34|rL$%cj3;je7NHg0zU2zk=L)!PC}<%`G_YbJy3Ythszhbk?fVXWz)L{3d<1 zpig9(VQZzg${*{lLvE{{ndbl6v-7|C*DcF_T~wd+Z;Qusaju{F`&Dk%EvlLN^VKfX zt0rbk)?7Vh?fdi4mGkFhW-I19l^ZWSt>2tt!0o}dxq$>qMkn!uJEdE%!5= z6{OFL*>`cYI7CkS)9%yHGjDa4Gw=G#t?OQUXa~$BJrOYZe?qJpR5e@1%s!npUXO@geCwIuVtnH diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor_double_curve_left.png b/src/main/resources/assets/hbm/textures/blocks/conveyor_double_curve_left.png index 7a3063b9e348be675e6c06a79a5bd654342b3354..f5f4c4a8c824c2aef4e1529ea0c461e8248802ce 100644 GIT binary patch delta 1335 zcmV-71<3lP2D}Q87JmT%1Oos707!i6eEsO1$59X0Gq2ZcmQ-)qTlD7lj`E^e)NMy;mHn8l z6epe|x1ae@iGN?-?Oa|RbDjF`?YENZVvU_q*HOKv=HdI>Z-?rkbDw&9b(vB#H%fmP z#%Yxc7tYQE*X+e#)4MTN{zHHMRM~R2QqE^<%D?ePQ5cledK-r8^|_;xO%f(6TpZuT zgJBDdLZ(p8k->XU$-tMtgn@Nx!Wf2uW+chEW~^6+5q~!fqi7j>_m`G$|~$w$YNsVRvk>Zg^&6S|IKJV_r6#xrQhrj)ZqG9(`|n2#{9PE8nL6lg~B z)76aR*?%ww=Z2B9jDzsed20(G`AB>6=nvcD4bdOA$Me`9#Pc`@1ML}h+uW2&{-{a@ z?>!}h`3M8+)P>>scbc(8KEhab45QmNjGSfc;g8$>^u6?|KN1i7!*~Y$l45(paqC#2 zJ;^8l1MM03EpAFVTd0!3d(X&VKEl8{HN7e0zJF%?+%z;}voeff!!Ve!F!rwgb>4ir zf0d84CsROw7*97iR&0;=;Fc8QS#5nk5 zPJc}pW52H%n@LkMlE5$qEyJi<#=+qK{gL)yb|{G_y2IRHJlF0a2FN4k4;YNcYl4wK zs^oJM)1MPEn2#_x!-O%#8uAEl>1xKJV;J2F!zfzD!R?RI2RlIY`z7(9KWvYG(?3)a z&$f}m02zhJGZ<)37_&dwLOD~ke55^j^oQ+yk|FOGAHf+W46LCUOROP` z>pR1U+lEoJj6M9eYX^wrqvNU6FgFkn_Fl0)+YtR>JR8nuv?so4fPr`lIXk}2_F=y*{LWcB*49+lNOrwrw%${7$m~{+e>KaDXGWP%Zt`C=&^Go8v`z7&=g0y0L z!VvvIdp1b`2HJBI^ZY7j3YnrEUwG7i&Dj26h6!V`KG%#eFbuz87*)$SxHm`b z%Y4=cd>tj>3D!?3iKmBr7ChiP+;<-E7qTfIvsF93PCrMl`okF}jHuh!j3@k$APn!$ zFyaftC|bsWZ;sku`RI7^H8qd}9{G&rfOk26aDuJC2zkIaxG6Z`t9E?->M)NmIKzZ7 t7zUcLPF&3xuMA^+ZWuYskp4`%&VL%35_-$(Jf{Ev002ovPDHLkV1kGzgX;hQ delta 796 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 iO7qcbx>-^zE(XEp^1r8~BFY$cSo zrOe&UoRBs{k|BCiToCJq=W|PAC${8?M{S<3ufTgrA%eG{+=}7c)c3#tNN;|u{iG*z z0-Lqu7YA02(;N*dGuCZMJ05;Q^0ET&HzSRuA)a&M_!*v6F4Iw7ds99HB5qj0d??5_ Ut2wtJ9_U~OPgg&ebxsLQ0Bt2xKL7v# diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor_triple_curve_left.png b/src/main/resources/assets/hbm/textures/blocks/conveyor_triple_curve_left.png index 81857523b7183047aa74137897a30db524548e5c..f6411e3c5fc53f6c78cc8b87e642b2fd673cae11 100644 GIT binary patch delta 1358 zcmV-U1+n_72Ga_V7JmT%1Oos707!i6eE%H8ns$KxSrU zzH@dR00009a7bBm000ic000ic0Tn1pfB*mlvPnciR7l5F)ql@V<3sY-;#7(Z%N;y^n zMTq~U@4cBJDd&m(;p^|4$2Qd8M@$?EPgcB;b>k$7<5!0)p5=L*H;ath()OHbK^?A* z%S`Z!=Wk9A*?;L(H*V~Vt1Ou(lk<=NEHU9#+Sfb%A{>7H&AZKM34R`adHw18GD{|f z7w69|;8)G!4{x_0tIWDAsWZEO6hHrMdt78&>hBX~bK4cR8?Y!!)9CE3$Oeln9i*)S z6Rz-F2N-m;4h$&(h>Y|;iW%td5 zKf5Tb@=@`~kWoBuh6P6PT(!##I642UPGBV(T24(SzMMYM^rvGH6n zY#Ay>KGBS%tr@;y?2U^ruebZn4*6g_%Tbw8JP)lyhVe)X7<9COAI0{hgA9l# zt>G({S${MlhAZt3F(4nsa7CaP*_~!&EzPhDWB;=B{ku)`FH?Ug9uYEZ&zl7LgYCJ> z+f@ebsc;7vDj#4}JXiSm3M^Zlx^WBrK}JP*KM@1+Q4DE^iZP#P#=NZ=&>zLv9an$+ zcjv=;e<&V1U=+_yugb7J4`~Z4>Plhti>5y%27mF`4l=N84eCaejff#__o+XMA-q5_ z9_}<_+0hKgFn0egef`Vkbge%so+HQycocYld$adymDJZ@0&5{Za8if3Q6_QLo6bJ?Q}Q!Fag! zUVk610mGBFw2*;iqy9u$_75@ODJ^0^K8oSFfnqFsnvr!h!#51*&x`Z_^@rMX1pT3S zV#o*E6VICPK!}Gs7y59GD(Z5JCI!;0AtT9W6JmJspiK-&pK;UFVAOYiH*SVY+!G2l6! zbKM`s5Ij(f!ALWpKZ@ZS#{RE*)vo4CEqJ(pXu-q&%4xyFd|^Dc|FpmGqrigqkpb~^ z>&UoG=0jpg;Wdc?`6!0upY~+PXGV_ delta 801 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 diff --git a/src/main/resources/assets/hbm/textures/items/bandaid.png b/src/main/resources/assets/hbm/textures/items/bandaid.png index fbf2effb9348eaf8d85093bd2b85bca4192ed7ab..7f687357ca47175dbee976318717d20a45732bc7 100644 GIT binary patch delta 248 zcmdnY)X6kKvYwfNfk8u;KNv_c76-XIF|0c$^AgBmNq6*hWMJ6X&;2Kn708ze@Ck9P zcT<_4XmxFF)!R*d+be^fuWHUPlLSiM{H>S`q&P}~{DS{O0K>iJy^%mM&H|6fVg?4j z!ywFfJby(BP%zEY#W6%9IQD#Wp-_VYkMqTS3x40<=-J$(eE7U=NXYB^N;d+_*~(Z> z+6pJV&=N2TQ{YrMFUo$aE7oI+f=!mog^GD^-!$HiKJfdBv{FP?-whsziadcsdkU%^ m{4L=Xcz6EexyJLa>KN=zSi*O<-unZzlEKr}&t;ucLK6V0V_?Jp delta 291 zcmV+;0o?wH0oi=8pMH6Ie#oynn}cbWp$cx?ZNf!j;P34gF<)7=4RV}(?U;NFNi%6ouH8V#oBfe)ug`2Ljp?9;mlP4b#YRQGryL^RQ|&LGSbxo2f=FY-FU9}>002ovPDHLkV1gI`e>?yH