From 82dafa437bb88902973b00e64f03b48325f9ff85 Mon Sep 17 00:00:00 2001 From: Boblet Date: Fri, 8 Sep 2023 15:20:47 +0200 Subject: [PATCH] hopefully fixed the malicious gigglefish from the silly dimension --- changelog | 13 ++++++++++++ src/main/java/api/hbm/fluid/IFluidUser.java | 7 +++++-- src/main/java/api/hbm/fluid/PipeNet.java | 19 ++++++++++-------- .../com/hbm/items/armor/ArmorBJJetpack.java | 16 +++++++-------- .../java/com/hbm/items/armor/ArmorFSB.java | 4 ++++ .../hbm/items/armor/ArmorTrenchmaster.java | 13 ++++++++++++ .../machine/TileEntityMachineTurbineGas.java | 13 +++++------- .../machine/storage/TileEntityBarrel.java | 18 +++++++++++++++++ src/main/resources/assets/hbm/lang/de_DE.lang | 3 +++ src/main/resources/assets/hbm/lang/en_US.lang | 3 +++ .../hbm/textures/gui/machine/gui_telex.png | Bin 2760 -> 3290 bytes .../assets/hbm/textures/items/dnt_sword.png | Bin 528 -> 1004 bytes .../hbm/textures/items/dont_they_know.png | Bin 827 -> 0 bytes .../assets/hbm/textures/items/ingot_uzh.png | Bin 0 -> 368 bytes .../textures/items/template_folder_alt.png | Bin 366 -> 0 bytes 15 files changed, 83 insertions(+), 26 deletions(-) delete mode 100644 src/main/resources/assets/hbm/textures/items/dont_they_know.png create mode 100644 src/main/resources/assets/hbm/textures/items/ingot_uzh.png delete mode 100644 src/main/resources/assets/hbm/textures/items/template_folder_alt.png diff --git a/changelog b/changelog index e69de29bb..ff10295e2 100644 --- a/changelog +++ b/changelog @@ -0,0 +1,13 @@ +## Added + +## Changed +* Updated russian localization +* The UAC pistol's UV now looks prettier +* The UAC pistol now fires a burst on right click +* CCGTs can no longer have smoke removed from them, on the count of there not being enough connections anyway. The pollution rate is now equivalent to three small furnaces + +## Fixed +* Fixed the bomber not spawning if the chunkloading radios is too small +* Fixed a couple spelling mistakes like BFB fuel being called ZFB and the broken ZIRNOX +* Potentially fixed a compat issue where galacticraft moon soil isn't shreddable into NTM moon turf +* Hopefully fixed the disappearing fluid buf once and for all \ No newline at end of file diff --git a/src/main/java/api/hbm/fluid/IFluidUser.java b/src/main/java/api/hbm/fluid/IFluidUser.java index 7c4a36a92..a0b5a47f0 100644 --- a/src/main/java/api/hbm/fluid/IFluidUser.java +++ b/src/main/java/api/hbm/fluid/IFluidUser.java @@ -37,8 +37,11 @@ public interface IFluidUser extends IFluidConnector { if(con.canConnect(type, dir.getOpposite())) { long toSend = this.getTotalFluidForSend(type, pressure); - long transfer = toSend - con.transferFluid(type, pressure, toSend); - this.removeFluidForTransfer(type, pressure, transfer); + + if(toSend > 0) { + long transfer = toSend - con.transferFluid(type, pressure, toSend); + this.removeFluidForTransfer(type, pressure, transfer); + } red = true; } } diff --git a/src/main/java/api/hbm/fluid/PipeNet.java b/src/main/java/api/hbm/fluid/PipeNet.java index 019aa3dcd..8ad18725d 100644 --- a/src/main/java/api/hbm/fluid/PipeNet.java +++ b/src/main/java/api/hbm/fluid/PipeNet.java @@ -127,14 +127,17 @@ public class PipeNet implements IPipeNet { long given = (long) Math.floor(fraction * fill); - totalGiven += (given - con.transferFluid(type, pressure, given)); - - if(trackingInstances != null) { - for(int j = 0; j < trackingInstances.size(); j++) { - PipeNet net = trackingInstances.get(j); - SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss:SSS"); - sdf.setTimeZone(TimeZone.getTimeZone("UTC")); - log(net, sdf.format(new Date(System.currentTimeMillis())) + " Sending " + given + "mB to " + conToString(con)); + if(given > 0) { + + totalGiven += (given - con.transferFluid(type, pressure, given)); + + if(trackingInstances != null) { + for(int j = 0; j < trackingInstances.size(); j++) { + PipeNet net = trackingInstances.get(j); + SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss:SSS"); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + log(net, sdf.format(new Date(System.currentTimeMillis())) + " Sending " + given + "mB to " + conToString(con)); + } } } } diff --git a/src/main/java/com/hbm/items/armor/ArmorBJJetpack.java b/src/main/java/com/hbm/items/armor/ArmorBJJetpack.java index 93f8d34a3..5882236e7 100644 --- a/src/main/java/com/hbm/items/armor/ArmorBJJetpack.java +++ b/src/main/java/com/hbm/items/armor/ArmorBJJetpack.java @@ -89,13 +89,13 @@ public class ArmorBJJetpack extends ArmorBJ { } } } - } - - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { - super.addInformation(stack, player, list, ext); + } - list.add(EnumChatFormatting.RED + " + " + I18nUtil.resolveKey("armor.electricJetpack")); - list.add(EnumChatFormatting.GRAY + " + " + I18nUtil.resolveKey("armor.glider")); - } + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + super.addInformation(stack, player, list, ext); + + list.add(EnumChatFormatting.RED + " + " + I18nUtil.resolveKey("armor.electricJetpack")); + list.add(EnumChatFormatting.GRAY + " + " + I18nUtil.resolveKey("armor.glider")); + } } diff --git a/src/main/java/com/hbm/items/armor/ArmorFSB.java b/src/main/java/com/hbm/items/armor/ArmorFSB.java index 3cacd975c..d6eb33079 100644 --- a/src/main/java/com/hbm/items/armor/ArmorFSB.java +++ b/src/main/java/com/hbm/items/armor/ArmorFSB.java @@ -289,6 +289,10 @@ public class ArmorFSB extends ItemArmor implements IArmorDisableModel { list.add(EnumChatFormatting.BLUE + " " + I18nUtil.resolveKey("armor.gravity", gravity)); } + if(stepSize != 0) { + list.add(EnumChatFormatting.BLUE + " " + I18nUtil.resolveKey("armor.stepSize", stepSize)); + } + if(dashCount > 0) { list.add(EnumChatFormatting.AQUA + " " + I18nUtil.resolveKey("armor.dash", dashCount)); } diff --git a/src/main/java/com/hbm/items/armor/ArmorTrenchmaster.java b/src/main/java/com/hbm/items/armor/ArmorTrenchmaster.java index b2168b8af..5182cbdb5 100644 --- a/src/main/java/com/hbm/items/armor/ArmorTrenchmaster.java +++ b/src/main/java/com/hbm/items/armor/ArmorTrenchmaster.java @@ -1,12 +1,17 @@ package com.hbm.items.armor; +import java.util.List; + import com.hbm.render.model.ModelArmorTrenchmaster; +import com.hbm.util.I18nUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; public class ArmorTrenchmaster extends ArmorFSB { @@ -30,4 +35,12 @@ public class ArmorTrenchmaster extends ArmorFSB { return models[armorSlot]; } + + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + super.addInformation(stack, player, list, ext); + + list.add(EnumChatFormatting.RED + " + " + I18nUtil.resolveKey("armor.fasterReload")); + list.add(EnumChatFormatting.GRAY + " + " + I18nUtil.resolveKey("armor.moreAmmo")); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java index b98d7daf0..32d1df24d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java @@ -18,7 +18,7 @@ import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.sound.AudioWrapper; import com.hbm.tileentity.IGUIProvider; -import com.hbm.tileentity.TileEntityMachinePolluting; +import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IEnergyGenerator; import api.hbm.fluid.IFluidStandardTransceiver; @@ -33,7 +33,7 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineTurbineGas extends TileEntityMachinePolluting implements IFluidStandardTransceiver, IEnergyGenerator, IControlReceiver, IGUIProvider { +public class TileEntityMachineTurbineGas extends TileEntityMachineBase implements IFluidStandardTransceiver, IEnergyGenerator, IControlReceiver, IGUIProvider { public long power; public static final long maxPower = 1000000L; @@ -69,7 +69,7 @@ public class TileEntityMachineTurbineGas extends TileEntityMachinePolluting impl //TODO particles from heat exchanger maybe? maybe in a future public TileEntityMachineTurbineGas() { - super(2, 200); + super(2); this.tanks = new FluidTank[4]; tanks[0] = new FluidTank(Fluids.GAS, 100000); tanks[1] = new FluidTank(Fluids.LUBRICANT, 16000); @@ -137,9 +137,6 @@ public class TileEntityMachineTurbineGas extends TileEntityMachinePolluting impl for(int i = 0; i < 2; i++) { //fuel and lube this.trySubscribe(tanks[i].getTankType(), worldObj, xCoord - dir.offsetX * 2 + rot.offsetX, yCoord, zCoord - dir.offsetZ * 2 + rot.offsetZ, dir.getOpposite()); this.trySubscribe(tanks[i].getTankType(), worldObj, xCoord + dir.offsetX * 2 + rot.offsetX, yCoord, zCoord + dir.offsetZ * 2 + rot.offsetZ, dir); - - this.sendSmoke(xCoord - dir.offsetX * 2 + rot.offsetX, yCoord, zCoord - dir.offsetZ * 2 + rot.offsetZ, dir.getOpposite()); - this.sendSmoke(xCoord + dir.offsetX * 2 + rot.offsetX, yCoord, zCoord + dir.offsetZ * 2 + rot.offsetZ, dir); } //water this.trySubscribe(tanks[2].getTankType(), worldObj, xCoord - dir.offsetX * 2 + rot.offsetX * -4, yCoord, zCoord - dir.offsetZ * 2 + rot.offsetZ * -4, dir.getOpposite()); @@ -303,7 +300,7 @@ public class TileEntityMachineTurbineGas extends TileEntityMachinePolluting impl } double consumption = fuelMaxCons.containsKey(tanks[0].getTankType()) ? fuelMaxCons.get(tanks[0].getTankType()) : 5D; - if(worldObj.getTotalWorldTime() % 20 == 0 && tanks[0].getTankType() != Fluids.OXYHYDROGEN) this.pollute(PollutionType.SOOT, PollutionHandler.SOOT_PER_SECOND * (float) consumption * 0.25F); + if(worldObj.getTotalWorldTime() % 20 == 0 && tanks[0].getTankType() != Fluids.OXYHYDROGEN) PollutionHandler.incrementPollution(worldObj, xCoord, yCoord, zCoord, PollutionType.SOOT, 3F); makePower(consumption, throttle); } @@ -536,7 +533,7 @@ public class TileEntityMachineTurbineGas extends TileEntityMachinePolluting impl @Override public FluidTank[] getSendingTanks() { - return new FluidTank[] { tanks[3], smoke, smoke_leaded, smoke_poison }; + return new FluidTank[] { tanks[3] }; } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java index 32444fda7..ac0cd0be4 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java @@ -72,6 +72,24 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc return (byte) (MathHelper.clamp_int((int) frac + 1, 0, 15)); } + @Override + public long getDemand(FluidType type, int pressure) { + + if(this.mode == 2 || this.mode == 3 || this.sendingBrake) + return 0; + + if(tank.getPressure() != pressure) return 0; + + return type == tank.getTankType() ? tank.getMaxFill() - tank.getFill() : 0; + } + + @Override + public long transferFluid(FluidType type, int pressure, long fluid) { + long toTransfer = Math.min(getDemand(type, pressure), fluid); + tank.setFill(tank.getFill() + (int) toTransfer); + return fluid - toTransfer; + } + @Override public void updateEntity() { diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 17f3b4acd..24f23de44 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -88,6 +88,7 @@ armor.cap=Schadensobergrenze: %s armor.damageModifier=Modifikator: %s (%s) armor.electricJetpack=Ionentriebwerke armor.explosionImmune=Kann nur Schaden durch Explosionen nehmen +armor.fasterReload=Schneklleres Nachladen armor.fastFall=Schneller Fall armor.fireproof=Feuerfest armor.fullSetBonus=Set-Bonus: @@ -98,10 +99,12 @@ armor.gravity=Schwerkraftsmodifikator: %s armor.hardLanding=Harte Landung armor.ignoreLimit=Resistenz ist nicht limitiert armor.modifier=Genereller Schadensmodifikator: %s +armor.moreAmmo=Mehr Munition armor.nullDamage=Nichtet Schaden von %s armor.projectileProtection=Projektilmodifikator: %s armor.rocketBoots=Rocket boots armor.sprintBoost=Verstärkter Sprint +armor.stepSize=Schritthöhe: %s armor.thermal=Wärmebildkamera armor.threshold=Schadensschwelle: %s armor.vats=Feinde-HUD diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index a6079a665..c4c2b6dbc 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -135,6 +135,7 @@ armor.damageModifier=Damage modifier of %s against %s armor.dash=Grants %s dashes armor.electricJetpack=Ion Jetpack armor.explosionImmune=Cannot take any damage except from explosions +armor.fasterReload=Faster Reload armor.fastFall=Fast Fall armor.fireproof=Fireproof armor.fullSetBonus=Full Set Bonus: @@ -145,10 +146,12 @@ armor.gravity=Gravity modifier of %s armor.hardLanding=Hard Landing armor.ignoreLimit=Resistance is not affected by resistance limit armor.modifier=General damage modifier of %s +armor.moreAmmo=More Ammo armor.nullDamage=Nullifies all damage from %s armor.projectileProtection=Damage modifier of %s against projectiles armor.rocketBoots=Rocket Boots armor.sprintBoost=Boosted Sprint +armor.stepSize=Stepsize: %s armor.thermal=Thermal Sight armor.threshold=Damage threshold of %s armor.vats=Enemy HUD diff --git a/src/main/resources/assets/hbm/textures/gui/machine/gui_telex.png b/src/main/resources/assets/hbm/textures/gui/machine/gui_telex.png index 2866b7299c9e258c628e1f81edb2808ac8bee978..32635945dfbfec330c55e2d47300777d9d4e6348 100644 GIT binary patch literal 3290 zcmd^>i#rrpAIHy(Nt8?L9*t2=N`!rDmkhZ?8I>tnL~fOFSqzJ@E@LLG6mN<$Hkp}{ zLaq^V8GSZUn{4WJqNe7FtK|9MxO1#XaYXHclqiwC7f6bX?TV5N& zYPT*N*M&h{gMDnA^1^k_jfOTJWzd`ZKWa1>sx@yvcms9Rex~RUt4hI_UAsL$r}b(J z4;tFH4d2gtDtbBGGoqIB`TR`Eb{73%j5qpVR}hxV-*E0ibrnVTCvf=bhq{hwI=~ny zZ#?ahQ{$=L>V2AkRU5yYc1RP}j*d)VWKcHqA9cP$pdE%F!^86d-ZumY;wHRYsh z2UQe6#@C6_8Fx+C{lgyWp}hxzEwSj41t6a+gy^hs0!^eCyKVvS(jJg}k$_>W1bj4P zf$_g#K;sw`$nA!JtLguMJ8>xA3(=y4d-DUJ=#r-pd-BT*s`JB198RlSVu&_etj|v+25j&_JbRv_ZH*E(E zi!_6yZ&zlN1@{St#Pb6cY_?~V8GM$lXQxN52zzG=hu`u(4GF6UwFH8q zj>psC%%!xf8jADhT|Sx74{PU;9!b%~6ji@Zo3iRkUT3B)d#)#siMkUeU7i?;>;%n( zO&4k|5Hjcm&POdi&fch9sgEH7^1&`mt8qysT1vz>d*OsC)77tv2(dd<9jyEqu|T=b*a zn!$mH8rdJ)2MkjlGrJa%hu7lm;5)RZCYD)+);gY!nN#adr)2M!{zhuC|LQgKv^)Is zlCmE?d@85}Q|~C0 zkyPyZX$$Z~)^k>o4VM`?2N>UIRvP{AT+D0DFtS7fq8hbWZIaiMF&JwePi-T`&8M#c?IV4Jvhat%LRMmP@ z9jj|<)cdvp))Zfu!3{5rrFO&0zqs(vpe6bWfbpKjZHyL6M%p)((<5jDMo|4UNhlPZc^tFP3 zV@19D;}!i2`xBeiR_n;pkbw5SB#&h|(9nT!I~B1JVg-sW|HEYK@8nul0hG9$Pn}5b zH6~w|U1_S?MmSXAD^F5YRaNe(ME8=uRRx>OSYs_d-)pQ|+tsWudI6EKgc&SxzL#f8 zEx@pYerWw40Pj{4E9$v$SXXSQ7pLdN$eEFalxqEDyZa^x@2r8~Hc7~p#ouvDHdnqC zeF|TBHmLQ&`o80h1m#;emF7AL3?nRwf-gP|L!r2UrLLBt?F~=vQa1&NMfu1;vCwF5 z-`T*JGZrMj7`Q+Jr0do?V^ft zX-iY{YZ5S7jv1Q92rVJL=u2&!(6DbzRl+jN5!t)4!X0EBW z;p>I@X=3^1>z~i~ryYe`R#FZ%NR&o(uL9x*MWAU-a8KPfv305_Ul@b?|TJIXk)Ky$`YCw~0lfq9NQIdgSL#59+0MBEiWVaZ`j@ zQ+@I3x~JSfc9zS)Zkv z^&;_ujq)AwlmSUzuvwKQdNAIwe{0`SKYzQ)>4Z)~0^iw}Y>jN;1Ja%mE!Yqas>bFT zedPE*hTZxvAlDb^GGkjjkp}g|6n_YKsTrqlj8m5;V=m%0P0Thkxz*Z=G;SH%HCyOH zYij1*rI%*~)tGFdK@BPi1F_h{UVo+zYZyI?hIVV5O(R+ z#VmgeIdHYSu~fL8zOBKmT0dAHe+oMowrM<+2Gi S`vx=oZ5nOoXj^LIllULjA=c9X literal 2760 zcmeHJeK^y58~@FYR%Fg{qB7>F$4imqh?(Q%Je)&CokC8CN(tLA*@iW%J(cXRN?yv# zJXGG2h>gimnG^ETi4il+%XZSd46`lf%z3Ws`Rn=n{Po=b-1l{VuJ8AIU-$jJKKJL= zao?YGw03C$0HEXT<#7T4KJ_+XZPZy|@z^74e(W6zuHp2rX(R451(BqGH( zanMaL+x>I$oAko`-hi686~wQmro!=YlXD!s+tfk}(fA3)7F5Azq&V{k?Gy<22ymk} z_bp9|Ryh1Y{4)?@t03xvF;dKY4F67_lA79;W5Z(GqQ`oAe1HA1BtUeJI_v$W?WM-o zu!UDP0#>a%x+A^PA;<=R;ri??kzRWNYR>6lV<%szG}8~@y2d2gi8YYF(V>)Z+--yr z@MhA))d{%!#+`f_*po?J6$4&o5Jf-e_ED&`1Z;92KKT>G?co0p{C!>0*QXQ|6g05o z;|)h%YMMb3PX_`&mi(-qHU_P2kPDwIuK`F0NYOzfZE94(zC30KAo=RV#Dsj2ab{+U6x(l2G8mW3iB$%U3MKEN@k)eC!*9VFZgfka@4ObUl&b-J zpS|?T4FZ9jq{r~t_V#DU&cFB;#NeMwi9w6@&D>(7!Ic>QYH-LMKfu&1LwBE3S`mmu$K}z371Ncw zg76$E2#LZIi923>oJTk1J$zzkX;F!_%V%YwC<&Mfumz$av*taObNF{&c1NYt^=c^M z$?{KkQ_5r}!S zJ4p#$UEPhHGKnOFMi6jZ98}8=y1m(zh326&83AdyQMnR9Zt3^kuh>SJYF2jAvQTqk z@q*uxhHj`znRhep@)B{jdw$>}HOt0f=;`CNwb>C~X_{LB6E{wEGm4!kaCqDU&y>ZU z!Ckp<9}a--(r&GGRrv+$H zM=60V{5x#KNat1cw|}gr+kdp^IA$<MTIlMqb6@py z>xp+W&`pcyGZz-*ip3*kUo6`ac%k?)|GGkI087&7E(}b3k@W8O`YvSI2a*4M#+5Xu%6X}S!0udz6DIjw227jq(xtw(zYwKhQ0Br>7vNyR0X=OzQy4V z^`XYIpsm8lxDy{cQSuJq;div|y;xmes5rHpniNGkC_9@^D~>|T(0z6oQJ5aL6tY-k z(F6V5SmOyHzX?x2cc9E#*&fz6jNY@If}rio^5={~ef`qk?sa+M^86S#g4XI8hd<;f zc}wWwz*ZMoB}mQXsjX zog(|S1y$G-K9sgVE1T8d%g2M=PghA%r16MhG7|u>Ehgw zYVchfkeQie3~QTvIz!m`erIvH^%J(r2CF-ry>Ctr?LM$P`Z>coii;b>Lq8lUbL{In zpU{<%mOH1^pDIe^(##dxiXxw28+`}bf{ju8zB2ej=^AGhfe{rY_(Luys*%V}P5KO% z{Za%Jb$kPeZU0N6TjXa*ankrvOd=D}9wG7JvDemo1%1Q!2IKo`*HW{_rYjlGT#-9G zUdx-lg#P#%mr`_XwsAe|8(2ijM666F8Y#YogKki){TU4sd2R%Qff&xW%~u6X-=Sio zJKJ9BYJ_lJC~a^f!^5}wFV)GMtx8wt#`KZm!h7&NSGLXH4CRDIg0aEP$a+v^&nw); zb^eGcgn#$0de{euwSem9JhEzf^$BlAV*y%2434zY>v;z?WvaTiex`It*MQ_B--T{@3ldE+7J)F1Oj+GUihi!ZGC82RiYyT zcf0huX4rST>ZK)*FmGQeZd0A@^(jnp$<~dkq$tq8|I_^iu6HDhTDoSPHbsxUex(5=UVl)kBUYA5U$;~HCQY?{bnfUjZ aiAvWX>Rz}>3n+Z!L2plAkEcI`UHcPMDIz2Q diff --git a/src/main/resources/assets/hbm/textures/items/dnt_sword.png b/src/main/resources/assets/hbm/textures/items/dnt_sword.png index fb74fb890dd24121f0d27bdd824b8769d347ca09..6a2fbb9fe1e17ed173b875a6329119dc1beb4a50 100644 GIT binary patch delta 967 zcmV;&133JU1ndWpGk*i4Nkl2@cxgP{sn?~GniKeFOwGbv6_1YzEdp zf|?nSB#GGMB*%x&)6(X}-{d8kFl%q1+x#+5craI_q4n&Q1 zK$0Y;#&2`(lgk7wF|DCi+JmiROcTqrG1FPndX|~H->~G~+|qAv*+9AZ zVtS6gcP`-ZHPPU0LREBBC50xZP-UIz@zE{AVH*ZKp{U5GV!U$XJWVYjn%mlOvT1U* zLB_VQ4V(DX4el@A+LqOd2FlG{eVSMO5e_s2cz>ooKw48Vbd9vGk=9k_{=B|zIBeld zC`l4`Zhp(v@av2gO6)t(h?$mIbWHL&lWfLBj{V5W^6xu(qbd%NQzqzr`2?NIt2C5W zkPU@G-lE{zxH$uL_7_UUu^qq86$S{4?n6(b40#s)oZO40uA(hkw{!ua{2`!RfC*W1;sg zoMH*L=wK^jh}Eg8;hVA+J{Sp$E3X|DgOTvRXJK);bwE(pD;{_MuEM`MF|-C=&c^HN zvq|G%BrGDK9%f{TYcsLk*SsO?mT)i<7C?P39o{oIJTwp%gAv%v=4%obZ}fjI9t^Sj p&$wdB@U9nzL@kzVOZh+H{{W|E?!lne4i5kT002ovPDHLkV1gu3=w<)_ delta 487 zcmVyfwlU9?i}B05W3N9XN^m$RNnf6pA3yeuV>akn0(NEqJPnBQ>)cd@5{`9l#Nz)#6{7e4^# z^?LZepLnid%Rs5T^($N{#ryL;@HWDnx`DK}eQtZ%2o4q+h$au$IIMac9HwX>ExGUe z6TxAM2I9%1V1K{}4u5Fir{p1ADP;_YKQ!=La-|ggexE`2$p{V;G+>f^QaDV|fbHa= z#x{^u@=#+R$SS$9fwW1+7TmzVH$42l0c&sr1A&RPdK0D8@Qf{Zs)1mJ3*_~cwa ztrAH*S7^6f;k7Hdc+DVbOd~%c&lS49zL6Uoh7AbqxsYe_h=N^9V8Z?y8=F{KX(hHz dxtsV8>L(i`k*1ihlrjJS002ovPDHLkV1l)+?A8DP diff --git a/src/main/resources/assets/hbm/textures/items/dont_they_know.png b/src/main/resources/assets/hbm/textures/items/dont_they_know.png deleted file mode 100644 index b906a88b515251e06e870ec532d687798517b1fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 827 zcmV-B1H}A^P)Sj?Sh$c-SK_0wV0+UB`JrYfoT=BKK4S!FcaEK94C&$FhWj!z-4{g6*w{&p&Cg zy;;Kp-FApAg=$4Ji7l%uny{i!hbJ>0{WC%<2rGguOJ4S48j<0r?{~Pnx5~y^z^k_@ zx%E7GKIZ6jL^Xgg5X`R+-x4n}L=;v)DR2n8-H0^zob?i(_h)F)bT%WD61p2zjDBBf z_I6h&tz|sRh^iHqnd9b-2&F*_>}=KOZd3`3LU8Qu)=^4uuB2id>Ux@!WDa8#-+j4> z(Ta3w=?_!V+|yh!v>E}mP+^_N7+9nwS#IA8PF~EgwnS^;dc5T051S0%rCd*Pvb7>3hy1@ zFqMkt>G>ECJm8%0x}Wg%{SLqX@rE?9?BCm@9%*jfsMA@mqr62cg(!~>b@P{HW)TDt zLA+-$T9Rd!Z$9gA@c4?87gPF!jJ$yHETg+#MJd61;eTU(hYdL5kput$002ovPDHLk FV1j;)fUp1n diff --git a/src/main/resources/assets/hbm/textures/items/ingot_uzh.png b/src/main/resources/assets/hbm/textures/items/ingot_uzh.png new file mode 100644 index 0000000000000000000000000000000000000000..9c1bdf70206e006dcb97bf8756b692bec49f7c3b GIT binary patch literal 368 zcmV-$0gwKPP)k$W$oZS_*}N_=Psm+mv+55C^%}euQ?_cY4o(=Q#)dO)R?>TXrp8+#Bm4)yw-8 z0AAm|czV3j+>#&(+TJMvFz9!eB*rR8`u?2U%;mI5Nes)b#nt0WMsldZLBFf7&PvLa zJ>4CrK^TUl07i01_4E+WZ6keO!$}Z87>48vCaq@YM=>nn@7RYBu%$^X1k^ zJ@;;mV$qI4Xo<3`R~Mn#uk>(mbR7#JFgG`lFjxAF~%x`{mrMbh~I O0000