From 39801c72b6ea7b3737570754f891400354a95bb7 Mon Sep 17 00:00:00 2001 From: Boblet Date: Mon, 18 Oct 2021 16:28:31 +0200 Subject: [PATCH] fixed crash on start, updated textures, more hazards --- .../java/com/hbm/hazard/HazardRegistry.java | 14 ++++++++++++++ .../java/com/hbm/inventory/OreDictManager.java | 3 ++- .../com/hbm/main/ModEventHandlerClient.java | 2 +- .../hbm/render/block/ct/RenderBlocksCT.java | 17 ++++++----------- .../assets/hbm/textures/items/alloy_shovel.png | Bin 273 -> 793 bytes .../hbm/textures/items/coal_infernal.png | Bin 466 -> 616 bytes .../assets/hbm/textures/items/egg_balefire.png | Bin 548 -> 757 bytes .../hbm/textures/items/egg_balefire_shard.png | Bin 277 -> 596 bytes .../assets/hbm/textures/items/radaway.png | Bin 338 -> 489 bytes .../hbm/textures/items/radaway_flush.png | Bin 321 -> 488 bytes .../hbm/textures/items/radaway_strong.png | Bin 322 -> 475 bytes .../assets/hbm/textures/items/singularity.png | Bin 365 -> 790 bytes .../hbm/textures/items/singularity_2.png | Bin 331 -> 753 bytes .../hbm/textures/items/singularity_3.png | Bin 319 -> 710 bytes .../hbm/textures/items/singularity_4.png | Bin 302 -> 735 bytes .../hbm/textures/items/singularity_5.png | Bin 339 -> 794 bytes .../hbm/textures/items/singularity_alt.png | Bin 348 -> 770 bytes .../hbm/textures/items/singularity_spark.png | Bin 382 -> 808 bytes .../textures/items/singularity_spark_alt.png | Bin 460 -> 793 bytes .../hbm/textures/items/singularity_special.png | Bin 255 -> 812 bytes 20 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 299aec66e..bffdcac72 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -3,9 +3,11 @@ package com.hbm.hazard; import static com.hbm.blocks.ModBlocks.*; import static com.hbm.items.ModItems.*; +import com.hbm.blocks.ModBlocks; import com.hbm.hazard.modifier.*; import com.hbm.hazard.transformer.HazardTransformerRadiationNBT; import com.hbm.hazard.type.*; +import com.hbm.items.ModItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -157,6 +159,12 @@ public class HazardRegistry { HazardSystem.register(nuclear_waste_tiny, makeData(RADIATION, wst * nugget)); HazardSystem.register(nuclear_waste_vitrified, makeData(RADIATION, wstv * ingot)); HazardSystem.register(nuclear_waste_vitrified_tiny, makeData(RADIATION, wstv * nugget)); + HazardSystem.register(block_waste, makeData(RADIATION, wst * block)); + HazardSystem.register(block_waste_painted, makeData(RADIATION, wst * block)); + HazardSystem.register(block_waste_vitrified, makeData(RADIATION, wstv * block)); + HazardSystem.register(ancient_scrap, makeData(RADIATION, 150F)); + HazardSystem.register(block_corium, makeData(RADIATION, 150F)); + HazardSystem.register(block_corium_cobble, makeData(RADIATION, 150F)); HazardSystem.register(waste_uranium, makeData(RADIATION, 15F)); HazardSystem.register(waste_thorium, makeData(RADIATION, 10F)); @@ -250,6 +258,12 @@ public class HazardRegistry { registerRBMKPellet(rbmk_pellet_mep, purg * billet, purg * billet * 100); registerRBMKPellet(rbmk_pellet_hep239, pu239 * billet, pu239 * billet * 100); registerRBMKPellet(rbmk_pellet_hep241, pu241 * billet, pu241 * billet * 100); + + HazardSystem.register(powder_yellowcake, makeData(RADIATION, yc * powder)); + HazardSystem.register(block_yellowcake, makeData(RADIATION, yc * block * powder_mult)); + HazardSystem.register(ModItems.fallout, makeData(RADIATION, fo * powder)); + HazardSystem.register(ModBlocks.fallout, makeData(RADIATION, fo * powder * 2)); + HazardSystem.register(ModBlocks.block_fallout, makeData(RADIATION, yc * block * powder_mult)); //TODO } diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 8132b130f..812d4a903 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -63,7 +63,8 @@ public class OreDictManager { new DictFrame("Gold198", "Au198") .rad(HazardRegistry.au198).hot(5) .nugget(nugget_au198) .billet(billet_au198) .ingot(ingot_au198) .dust(powder_au198); new DictFrame("Schrabidium") .rad(HazardRegistry.sa326).blinding(3F) .nugget(nugget_schrabidium) .billet(billet_schrabidium) .ingot(ingot_schrabidium) .dust(powder_schrabidium) .plate(plate_schrabidium) .block(block_schrabidium) .ore(ore_schrabidium, ore_gneiss_schrabidium, ore_nether_schrabidium); new DictFrame("Solinium") .rad(HazardRegistry.sa327).blinding(3F) .nugget(nugget_solinium) .billet(billet_solinium) .ingot(ingot_solinium) .block(block_solinium); - new DictFrame("Schrabidate") .rad(HazardRegistry.sb) .ingot(ingot_schrabidate) .dust(powder_schrabidate) .block(block_schrabidate); + new DictFrame("Schrabidate") .rad(HazardRegistry.sb).blinding(1F) .ingot(ingot_schrabidate) .dust(powder_schrabidate) .block(block_schrabidate); + new DictFrame("Schraranium") .rad(HazardRegistry.sr).blinding(1F) .ingot(ingot_schraranium) .block(block_schraranium); /* * STABLE diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index 0eb821966..ba5abe21a 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -408,7 +408,7 @@ public class ModEventHandlerClient { EntityPlayer player = MainRegistry.proxy.me(); Minecraft mc = Minecraft.getMinecraft(); - if(player != null) { + if(player != null && mc.theWorld != null) { int i = MathHelper.floor_double(player.posX); int j = MathHelper.floor_double(player.posY); int k = MathHelper.floor_double(player.posZ); diff --git a/src/main/java/com/hbm/render/block/ct/RenderBlocksCT.java b/src/main/java/com/hbm/render/block/ct/RenderBlocksCT.java index e1553bde4..2cd8f8b62 100644 --- a/src/main/java/com/hbm/render/block/ct/RenderBlocksCT.java +++ b/src/main/java/com/hbm/render/block/ct/RenderBlocksCT.java @@ -40,14 +40,9 @@ public class RenderBlocksCT extends RenderBlocks { private void initSideInfo() { - if(!this.enableAO || true) + /*if(!this.enableAO) return; - /*this.tl = new VertInfo(this.colorRedTopLeft, this.colorGreenTopLeft, this.colorBlueTopLeft, this.brightnessTopLeft); - this.tr = new VertInfo(this.colorRedTopRight, this.colorGreenTopRight, this.colorBlueTopRight, this.brightnessTopRight); - this.bl = new VertInfo(this.colorRedBottomLeft, this.colorGreenBottomLeft, this.colorBlueBottomLeft, this.brightnessBottomLeft); - this.br = new VertInfo(this.colorRedBottomRight, this.colorGreenBottomRight, this.colorBlueBottomRight, this.brightnessBottomRight);*/ - this.tl = new VertInfo(this.colorRedTopLeft, this.colorGreenTopLeft, this.colorBlueTopLeft, this.brightnessTopLeft); this.tr = new VertInfo(this.colorRedTopRight, this.colorGreenTopRight, this.colorBlueTopRight, this.brightnessTopRight); this.bl = new VertInfo(this.colorRedBottomLeft, this.colorGreenBottomLeft, this.colorBlueBottomLeft, this.brightnessBottomLeft); @@ -58,7 +53,7 @@ public class RenderBlocksCT extends RenderBlocks { this.cl = VertInfo.avg(tl, bl); this.cr = VertInfo.avg(tr, br); - this.cc = VertInfo.avg(tl, tr, bl, br); + this.cc = VertInfo.avg(tl, tr, bl, br);*/ } @Override @@ -201,12 +196,12 @@ public class RenderBlocksCT extends RenderBlocks { drawSubFace(fcc, this.cc, fcr, this.cr, fbc, this.bc, fbr, this.br, ibr); } - /// ORDER: GOD IS DEAD /// + /// ORDER: LEXICAL /// private void drawSubFace(double[] ftl, VertInfo ntl, double[] ftr, VertInfo ntr, double[] fbl, VertInfo nbl, double[] fbr, VertInfo nbr, IIcon icon) { boolean debugColor = false; - /// ORDER: I DON'T FUCKING KNOW AT THIS POINT /// + /// ORDER: ROTATIONAL /// if(debugColor) tess.setColorOpaque_F(1F, 1F, 0F); drawVert(ftr, icon.getMaxU(), icon.getMinV(), ntr); if(debugColor) tess.setColorOpaque_F(1F, 0F, 0F); @@ -223,10 +218,10 @@ public class RenderBlocksCT extends RenderBlocks { private void drawVert(double x, double y, double z, double u, double v, VertInfo info) { - if(this.enableAO && false) { + /*if(this.enableAO) { tess.setColorOpaque_F(info.red, info.green, info.blue); tess.setBrightness(info.brightness); - } + }*/ tess.addVertexWithUV(x, y, z, u, v); } diff --git a/src/main/resources/assets/hbm/textures/items/alloy_shovel.png b/src/main/resources/assets/hbm/textures/items/alloy_shovel.png index 85e14f6362478301b6330ea4fdbc8eac4c8e9db1..e46f9147493ea369234dfca8474b1bf862d0ac64 100644 GIT binary patch delta 752 zcmV0+|MoB#}WBe*()%L_t(I%bk;3NEA^R$Ny($ot#X(7MVvc7%@?{@PG7!mx5zj=>Kb(S@wkmntS2q6vsw$U}AP8duVpgDu zF#)ljD7v19QNFkw$`mK8B!m9N!cg4A&tN|?DIFy~6u1j9**zI< z*$q>$a4U2bfz&5EN6OB_H`~iT&Rb3cXSApgnMhL{DwQhpXo0tka;3bHL9=nWTnL3i iBSUBl9OJCO1lJ!$NpC67PAOIZ0000oD$5y zaB1HKhBt4Zf}{dZGtvKhbun!x3V<|srmO$gkmIIIGl-8(GtQ_0X_lAZWH@l)EyImR zUrCEHber)343kN<8Lj|5WSgP{7lVVL5X1cKPl$FlJROju83TZvkL>UN|Nj%jcx?hH czz-N00KGzZ5KtPGzyJUM07*qoM6N<$f`4;bSpWb4 diff --git a/src/main/resources/assets/hbm/textures/items/coal_infernal.png b/src/main/resources/assets/hbm/textures/items/coal_infernal.png index 9e2f93243a7e11a3ceb9c89863a835b7d272ca61..0cc03a7416693460c4f945b5c6838652c39e3f7b 100644 GIT binary patch delta 591 zcmV-V0hB!3BTNLh0L01FZT01FZU(%pXi0006SNklzZSHZ(pF8ne?=v=1<@)Xgs+BUOTAkU7TG#uA zT@L~^Uk#ah0-h<5b5>ccRghUB)2+DDSHtMc__8Lge~H-Wf@7@Ht&q@4=9JBV4rn*N z1rc5a3P@$nrz;v)i+byagw5u<)g%m=NppR|M53Q&`uge dS?kX~?+4oWu=cK`@qhpT002ovPDHLkV1jGyB$xmI delta 440 zcmV;p0Z0Dm1kwYLB!2{RLP=Bz2nYy#2xN!=00D_fL_t(Ijm?t1iW6ZJhM&pF|HqIF z$v62(Kx|hQ5!qX?$Q1-HL0I-a?3HbTSXoD`+$t1VO;3_kDOo4mlR#WVj2-0T;u&e);B*Zyz6U^C9H$*(JSR zk6NvUbB@=)cOm&~BBIVYoO7JN9B^>_9q&E$dY##9MzvZcO;hIcIrn!`*uiGAAxRQA zP*$rIi^YQFa(~IMFHcF+l=XTIP)Mp*I$p|A|QVLxsale;OE=N zBuP>*XIaMeyCdQ!=iK}V34%Qr_0x%3Yc+}@b<{jXsgxIFbvgCCn_Sl zCp{UWBBIt>)w8j-+if+*s4+&vFw}0htDR1#+`O$*$T45o7^8#1K=o{_+t)5LmkxAa i_{w_#UhL8SbKL?byrdq_RWn@x0000$P<(RZ*M}96=N=S6>AE7;?XeKI@B!58mhdCZZttP_Pz@B&`F+ zv`M2)o18Rf*lw@TT#I$XUaYT)rM|UcsKGRW}bIt}v-AF}7KX__L z9KBk?Hf!u)3V)3VgUS?!)CR18V}FL3{A*Yk1KQ67iY&y=hRAIXbfK#o7RWP9s5eA z6cv$_-Y58;(rUX)Dmj5E!5(Y0L|MxBbd@zmGkLmUAAd`=Ik)EonktCNpc_rpO%>O7 zaNN&mqQob6nvd-zvepQ7YAk+j;(I>3vb)JgPvZH{&=_=X9xTyYci28qc8B-{|e9XmHKRF z(v-g$={4JKr8q&!evMEh% z6Cr(FI)qqvRqCHtl-9d0AD*ttT@YJujeL`i`VRwfV;;(`VHFj`_HfgK8 z_wKppxK%?E5PG(I&$%ByUpN=`S#DJ0ZtI*`m_)TmEbCl4^M7*aY&7ihe(SOo>qQE4 zik0e<{N_1=$J4`X z2DK`wZIIY&)PIy>W1VX&^LrM124-0zW`SK|nuz5wJc+%-w1Da_RKH@TsCEY<_|PHc z2iOeGjL6C)_L(RgMnV@to=9qBWE$+-Uq9mX`q+a?lrKxc8`2#J4#^HuO;1m6a)sP+Z{L4PvD;UivqgpkF;CL#eRQ&^fq z(=L|g2>uJ`UxU8&y!mv>4xNr593w~;^?8s2KHUIc#(ajY<_^n?FWgW7z|!M+OMIJ& z##zi8;@jY>^j_r<{lM~KtMARo&vbod!9+jdw2adlH!eOJIlHg=1N&G5xT(a5f&c&j N07*qoLu550@MVMB!3BTNLh0L01FZT01FZU(%pXi00068NklOxd zsmp!5YU=wwJu}$mwpLKr!2|c#b=}X!4gUzSJJIE`5x?l;=zl34&Do7hb5UF=Q~L6Q z*(b|;2pl^DyF+mNs-Mir31UMQp-7bR=p+~J9h3gBeP6*2g7_sLW1|^HZw-;qbRr}f zXR=+pemjZB?U&CUOpAR9gi;?o7v%JnUUcm%F>Wfk?cSt6N%&5LYJF8cfB0#uU~3Pn zP!Dwx4Lg;JL4Pj;Dl4%tw+K8UL^?c1Ea>a_LYqL3I=L~CA~X=7$5p^ZK#dyI*f!1W z(b^k@Qx(on#AOG8(`#qlsN?VHM^nQsHdvGM>Ro6Xm>dk^bhxQmD~$9FV-vD-1BYg# zY1XJUm$1to@{Jj0DpM@imfB6auCdYhPE$09xzA!+@_+YtuoIi=i9Rov(qTAFMj-5f6c3w_r$t}#0oh#6+wnQ;k{WC$eRp<5lEX9(+ zyAO*PwKO_wD|IpZ_#2k_mnPa&hb0A-k|D|;4HjRlBTdPF!%qu=wxL0M=&=9*002ov JPDHLkV1mXO5K{mE delta 249 zcmVwdin4EB^s}sdHKz}$pC+^we%S3C*lAm zrXLHCUjQrD<_l*mo_%kOR0u#e;h2Kq!RrYEEDT=Uf-dLvcyc2wrAu*VBy0t=8k0*a zGKT*Kt_VsRlmeV6jLUoVHDK}R(3w1xsYB}>ptIgNkv9;zf%XUy3nf)hXS{&qXJLM= zk+uXYcQ})TG8K#(o5=Npnw^H69tOcT{tvwY%qLco3LhI100000NkvXXu0mjfiWp@{ diff --git a/src/main/resources/assets/hbm/textures/items/radaway.png b/src/main/resources/assets/hbm/textures/items/radaway.png index 2eb1484f02406e90017f684a8bdc7595e01b17c3..746686c9c5157d7a9ccdd34b519fec2fe590279f 100644 GIT binary patch delta 463 zcmV;=0Wkj30_g*gB!3BTNLh0L01FZT01FZU(%pXi0004-NklqHu(FTAtzgjh!L6q|g13xzd!v{7Q1}2+WtOl{b7(uSq|5cTh89HYy0xJ-e zFEq_zHovKM>d2B#sF!~OSA+lcz+4Botxnk!=K~Z8U9{6 z#_<2sTLxAYZ3dpduQ6N;cfswucNvb%y279qRmZ@=@Rfl%a0bI4s2uD5W(FpHVFreO ze{ma7TT#mJb4?4F{qN^5Fg<&6ADB+ft!4NPr2qWgj9~y1GDnCH;x$I74^wlCz!+xG z|9}5+y8sNNwST}AGtk(7i&7a_#UvP*q!q!2fWQx+!`Sc|zzpGj`0}5DiTNJ`)5jMK zOn06${5yJuy{m#9mBVM3mDi{@JOUYm?qY9s~EVHlotX007t@lql`j+D-rf002ovPDHLk FV1k2O(=h-5 delta 311 zcmV-70m%O81JVMJB!2{RLP=Bz2nYy#2xN!=009X}L_t(Ijm1*2N&`U z5wuH_QpjhdT@Wm^zN-bn!rEpU|KN%=f&79^u(e5-6gfC|rU*ofD~`1}56tc2na0=b z@|bz=&F%pI4do)&@?rP6LbezW2d(U<@

u80T7O`QnHlJc=cx>=d=d;ye2QR0K;XxB1_m~~1~5UmAKv|EU}FBq!1Uq; zkbchakKrtXgiSod$4@*AqWHY<>j%W|Uq3T4ym|4Dfm5xTLDGCS!`Bbr8NNKcz#yuh zi;)gcT=4S#O9tnp07h6`uUN4TEFKY2$MEg(0tR+jJVz-Jrit~-Dh4hIC5AtLfRaBS zGO&EV$uMJs2GEcotjU>?P#yq*=GJb8bsLW|G7L%p00}pgK@UBVtN;K207*qoM6N<$ Eg0dCPWdHyG delta 294 zcmV+>0onfO1Hl52B!2{RLP=Bz2nYy#2xN!=008(&L_t(Ijm1(s3c^4XoCFCe?4peb zT3Fbo5WUJ)c9zK*yut&okPCQ;Knlewg`hAit6YR}a@&vUfxg;r-AfiVWg7&zw$!_Xwt8$9AiQG_4}Ktyn=-mkgP359AZy3}<#B0nTSfU;7{t8P z8Q6U^7{tW682G2}Wca<{5QfX(2B<2lGUQpBgB84-yo-VR(|RT#+!7fqzwkmmy10gW)$+`UlWxHoOL~KpgY|XcZIC7fdg{Ffcv;%<%8*Tn5>A zLxzt$>qUK85(~XB7%ak rCTB)Mc>n~OyE_=x9o^5!Fem{4j(LsUF!QjR00000NkvXXu0mjfpB~gc delta 295 zcmV+?0oeZA1HuB3B!2{RLP=Bz2nYy#2xN!=008+(L_t(Ijm1(iZi7G&93n@eI4KQu zDN?w|6Y>B*fRgL{fCzrz*6u8=@&-QQh98)Y6cmWt0>l;9U7CPobEi0NJk6a(v$L~z z3p^Tui~MG7uep|ce7wId^s8&4R-+YZ0sv4#Al4d62)z6nzkfyI!sN*pO$jld9ERQz z772nN@D{b)|7|c~eLT+huIs@2J)Rvp?+8*#NGYL|LZ0V7ncHBBUlawhECUfCGUhge zX-*;nGlPh{-2u-VM8*KS9XJf<&au`Q99rihl~rTcpWFF2B4aQdzMPBXMXg3#R*gNS tsV%E!v6(mHoFF9k74v3e?=JoiegI^m-W$)uIp;YC@B)TmAb*XKQdU+rNnxr;d zM2E*y;n{ce?B*bSs2r!s(K%{TcG2FQDPDzqRt`ZyL6mv?6cwDPL0F(18m$eYKo$|w z0Bnhs!EGp8cGj-Ps-A1QWhI&sKZER;{sJZ zu3IIrZh5Ev-hUx*lOdQBawvR|fsX#?sQVQIXY)LECCd;T>ww5#fUpe`y#4qZ7PGO) z#VhvpC|Nh6sPYZq_yLZK$Hb>RROU*Mst{vb#lt^91pg2QV`?YDHdjEWRk(Re0wfTy z*q)St&e}#uqpEQ*CKe?f!H9_Ub6EmJx{MHnSRnEf!GB@rL5t&Xe}LSnP{z?rvd-Hm z?_3)VwsB-JI>;MLGj{6xYNRkp4$0+lo?4JtET)vhh16L;OWc&*E7@vVq@HF2C8jpe z`Aa3#P~S)_%l;KuS_#Re)YYJOJ7Jx((d_SKCQmdrV4+tPT9R+=C9sLq`CUy;r;{Qh zBguCq8Gj$&aIiuj*vyO2jqn&y+964^Lj8?{EY%++)hY}R-$In+5boS4hk;i^qtP&) zMly_-ff#~by8w&H?kX1HVRj$d%+p9o7vt(>1K9ORxNuT|zR_lMcXzMqgJP4(ShPPe z4ZHWnVczV7eryrGybwJ~9a?%dXsy-ZT23DBJ$F3@t!@JC?d=Sf!(RajSs`xcmq2mk zihH2Gyqv|zpar3E0)&S$m|x(antB9PYYR*!(?0?pp*=eep#1I&7tIrJl#KFDpCOq{_TO>-1Fl+zlH%Q{O8@`>07*qoM6N<$g7t)C-2eap delta 338 zcmV-Y0j>U)2JHfnB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF)*zP3cvsW0NqJM zK~y+TrIE1>!Y~j;-GUeZiFAmPiV}%}0aDS@(57MqD42kbDSxP#fi)Q9@RRtKopTTp z#Z#2a{TJUknAu-ci_kQU<@CP`S5RPkxY?>b*<#b#bh#T86)!Y&*O%?jPiv3&BpA=u z7Dn^fJ#i8jzC7%UAUH`OAPAC3kitA8PC$W~`72101fMV`0qvv^&|CvS4JW8IK}`xy zz_D~h%`8E_SW95sLLiBjq?ski7Yhn|LA;`TVG`tv<*KU!NRk0TKMaKcXaII1foAT9 kp?JwrU??c6#ow{;2Bo`8F{)Wxc>n+a07*qoM6N<$g8ia}ZvX%Q diff --git a/src/main/resources/assets/hbm/textures/items/singularity_2.png b/src/main/resources/assets/hbm/textures/items/singularity_2.png index 610a975db40972dd61eee21f34958effdc86d5f8..be5b273d35c1c0b6e8487dda51421a89d8af6af3 100644 GIT binary patch delta 712 zcmV;(0yq830`UcqB#|@}e*&XPL_t(I%cWA^OH*MOe!jD_bIx$n&9-Wga}!fJ&L7*Mw>N_4R$9 zYideYSA>xe^#MhuNRw}n;-=SQ`dETi^u5&mlJ-y2^}3*p)wxyWSVC`-gbzqYrr z5?+Q8-9UFwe=qEIJ6^we%TbZe&Q8cSn@tpC+2q*wAL#48A>?_t5W<(wpP2SCtX3;- z_Vz(%WUhW)6_dG*j*fyXE-qqZWCVs`umGW6Mo{-0t7DV>^}KBU7#_rx6+vXmDH1OyM@B>EXN uK?q~M#5ixnU)(7#52>iA5NnDCXSM&H(<4L(vW!~*0000-K}|sb0I`n?{9y%=As2rD8FWQhbW?9;ba!ELWdLwtX>N2b zZe?^JG%heMF)*zP3cvsW0LV#1K~y+TrI9fXgfI*Q)2F6G;tiCPDe36wQt|&U_?Ti( zN$f}`T`@u!?+`o5%>E)Q!n&^3GJY4Xpul;aR!XtsIBehdsi=FQq1I~mecN?iU%|F* zwk&^(<(!?wg`ek{3ewv?N;&~SkVFE7d4dyAU}pXbl1QL1CjsrG6VM!iAi@cvCWxfq z1RP68)XWmJiv`B*1d?b;npuK&v7oRMa7FFHBxo1QRfhtQWF{EH&a(3}nc0000%Z9B#|@}e*$<(L_t(I%cWCGXj4%TJ@>u5B$%XWwOKSVHr1F^TaXr{ z#TG&Q+ad))bm5||1aV{c*|i8p+!S|$x`^T~#ZRda>`swxtfeSQT<9t-#KdZwzI2=! z(%OA5Om6O-J7>~c+N(9B;6sgLmr+NR&2?Rp0I%0;1_lPU2w3t{tJRRrW??hvDKz03_TwzV=tBS@ ze&T@7WEZN(cf2N$bk5JB1`v{up2@-S- zyOo)MdaBhbzasqLp&f!B2bsw_pI6z|m_ajaB>Dcq;6>Ekbv%7Hi;wuL$hPQ0njw>D zA)7|AM`@Sg>b}f74-gaSV>tfmp_cOV{0+pvywsXR51vpcq%&P%vAjVA6Nq7oA^H(S zCucqo+l%!e_1>MpVpQ3a9gQ@{}8;wR){wS472nK@+pwXiRhqx)jEF|_$1i3I`yRiOgxbo~R<6M!0Wxx1*N00000NkvXXu0mjf DelAGN delta 272 zcmV+r0q_3C1-}B2Bn<>-K}|sb0I`n?{9y%=As2rD8FWQhbW?9;ba!ELWdLwtX>N2b zZe?^JG%heMF)*zP3cvsW0K7>=K~y+TrIDcyLNN?Q-v{6^GiWRpi$vmZ{QobEd&EuJ zwM$44Cok)E&s)1=&iNN@5yluZvhJHwaNwb>ySRy~*oo4D18% zO#(|iB=>AV94t6o1Uyk3m<4gLJasDoOLl@a3`qbS0A^x=dtSqk77+(_LDLq0XC7Yy WkNOh8mb&i%0000s%|r& zuCx$OlIvOoC%U?@oX_J!Hpjen5zInviMu%%L@*G5DS{2dl%sS%g({U3m6(6`3)3-bJuUkmXu^N3A@+p z<(bxMdsxb^f1vMFFBTV<(Aw6DU@(OCb{%KV_Sbc&Y**`hF*Y^^%*@On7K^b{Rc#d2 zH5$5lg>K)vNiXMK(AzijRLC!j_Z*$u>Mw?#AlsDl=LZDfyL8v{L+x z#Jl%6KTt+vlOM0=U*XZ?C%g-?bcs!;(~tv@69CUsER-chk^VnF4QJbD?33p4cz6q? ckOw}$07kMjfY_vSTL1t607*qoM6N<$f+X)wN&o-= delta 255 zcmV-K}|sb0I`n?{9y%=As2rD8FWQhbW?9;ba!ELWdLwtX>N2b zZe?^JG%heMF)*zP3cvsW0INwvK~y+Tt&gz^1R)FsZ7eJ-EGz^q{Qr;4-4h-pF$)KK z#el2M#7!ddif|LmIYr~o$+baY?=5Ss1J+L=^WnuY#=(cQ6UvZ!@6uX3V9k(^m;hx+ zwN_^-r5v!v9wS#kPscRMIp+f-IPQ30002ovPDHLk FV1hFmWdr~K diff --git a/src/main/resources/assets/hbm/textures/items/singularity_5.png b/src/main/resources/assets/hbm/textures/items/singularity_5.png index 922a3ab869d9add9a1a89df9d1f164bb26e7f2fa..a1370d3ddfe9d521bd685d31251419f971e4d4d9 100644 GIT binary patch delta 770 zcmV+d1O5Ed0-6SpB!3BTNLh0L04^f{04^f|c%?sf0008aNkly)q11FqHHBK{ zOw3HoB4gIb+l}rz-XwEoB@0(gFIX>Pc$ZhT5@9$5?j~u0%qZ+9F0$`os!T8DG zt5QH6p+xho+bB4h4Th1r&ZwiKgG5oJ7w50hhq5PBBR@cm0cx5oEho144zay`WMesM zzF)Bcuw`|pFMop{5%`M(=O)9U;sR6+>7nRX;CD|oRJ#+g6rqCD#~0x;8R}YeU>Eoz zhp*UujTEwIMg6_!=z|H-oHw+(A%y3pK%P|xQLl%muMZ@FGT4VlP#KhqEOWWjw*nwW zDn)EkGTKMGP_4{H#0~}lz4h>lRIdC9C^8ZYfdTOJ_J4vX2r$vCBkHWfSqdFHm_gP> zEA?nAi0kR2C6*;u5~ikzef^eB1f@`vTD|@jB$vzSM)Db&)^(C#vA8rZ^K&%YrKh%p zLMl0Zh1zvGVi@KxU}crYo~4<#PUlZp=jVvVzOPzETKM#tCMs)bP+dp~*iOUm`pIs$ zQ)p-?xqmy0bO3_g{NUyx#q#_-#BW9jP0d(L-3#uG0X`{d&_6QZ(${B53yVW}egTF> z8^*`SCF_k;HrotxTx}B;2s{rGY#7pLF*&mh@{E0$&5J=2qePZwKe~*g7#JAX&_pVAMA+vSvHZgX4{-_RmIjOuPQu*S3VUr%Iu1W5#ZR*t27^I@)%4dy9v%!z z@-O0CdWLhLrk~bgVZ;b&R173rJ;B)o+_jkSs=FIJ&;J8h2knWA$K&fa0rM1mITpgy zG>kLTxcpLwQOks6vx7;hurSKW&L)*g_1|&+0|nlLWphB6IsgCw07*qoM6N<$f~$>a Ak^lez delta 312 zcmV-80muHD2GatNB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m+b01m+cxRGn^0000P zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@JGD8Gw>;M1&&`Cr=R5(wik--hZFbqX| zUfc3E zP~bVw_LwHSmzGuRrM*#+0arEva4;3bulUcNqT}h3_$=i06URDGuL4VFCGPYL6H{!$A&KtMo81L;Kq*t0000< KMNUMnLSTaQQhY}M diff --git a/src/main/resources/assets/hbm/textures/items/singularity_alt.png b/src/main/resources/assets/hbm/textures/items/singularity_alt.png index 25ba8d0dc4f39b050e26c6ca614f5d2ee88b4d4f..ae6ae1923f650120cb9c62466c5524c5ca0ec9fd 100644 GIT binary patch delta 746 zcmVN_*l3@x9CC_N;Dxp zA{wLOBd8QApp;T7EhT--wLo}DNc>j!-rRG(lk=Sq7ARGyQh&8MWR^2uX0CFff8yT< zyJnZBUd$HfHq!c1B3TMQW54Jhe9ch!(>#ni>nuxrW$ZRjk{n22M2G0JEC!P?62cPo!BWmMEvak>6D zfggeos-(`BgQ5uTrzBTD_tLwsk#VI7(?QRRdn6O1lYa`-+*~Y6;pLSZJP8F^Uy)5i znK1z#uRW@u$XJ9?;HH1z6~d8GTI8MaKzt2i<=KgaQ`|n-M1Ak@oWYONTsPgEZazaw zM$!Bk50)>UA&B*KlD0$Pk}AUeLj;FMd7PRATbWVb>535e8D~df3HzHaB5aa$M*dU| zL@GHdgMaOw^!pU&*#G7Q}nz~a^9wsc0wYNz^}B@S95@HpTbD2Z(b6GVHk4VniVu%Zsz0H z@0ku!RAVi>VjjM^b9mqRoV(Ae2!uN3tig1yO=HuP@pv4Ex(YqF94XUet2(~43vVn* z#PHyBkI`y9;=_yQ^9g3}gxl~@ykrZe%R_eD!WkW;ZLE!O@;8x@KZ5@(sq4$6W^+nS cXbZ0MU(?zER+-L3iU0rr07*qoM6N<$f?vsH-2eap delta 321 zcmV-H0lxl%2HXOWB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m=DQw?J>&H-J4s3Y7fZH87UmC&kinKT(%@0oE!k=;&3T7K8F#-mON~%D^ zd={L51LjkFhfuIi)BOq*;MBIr8bml%x%%MdCqo5KNe+TIc?8I|9 TSwZ1s00000NkvXXu0mjfQjc{G diff --git a/src/main/resources/assets/hbm/textures/items/singularity_spark.png b/src/main/resources/assets/hbm/textures/items/singularity_spark.png index d3083e756f7222d62b81f8ab12cc859cf87513eb..c2e97f9a6b41311d4b3165fa79abee2aee87f329 100644 GIT binary patch delta 785 zcmV+s1Md9(0;mR%B!3BTNLh0L01m2g6Ila;L4~`qNK3_ ziWIaKg_6D&>BoERyUu$=`~lp_OlERt&YW}S3~<^YBCD&aihn>L0LB;;MX^#0j3g$J zIhSP_f*@G=+1c5XbJ9Pc`T2QdvssvjpfmLO2GOLnphi`sOW(0uN>hRI;6Q9-WaNZ^ zU=Et5VQy}YF9f>ky^h;~QFufjewTN#UPz!`@*v`kqFFfuUDIiKc^QR5;lG5%#YH#- zCtY?7(jD&@-G8bdrB*pa$1(&Gxs0>UbJX83L|&VZxD*P7LP(`jV6|EeJv}|BY#TJz zc@K_yC#tfBH#@J9+*?DToQFXMxMJ8v1&XAgq!&>|l`SkRfW_l+L?RK2I0o?W<~U+E zu37YQ1r=)c0H5QlSWLdeR%zo{GZP>&89Hg`?d@fvVSgA{Sy`FpG|?68MnjVy(f)n} zgF#&A=)iC!hE^qn-1h>~+71lfYE-kp_V@Q^#Ldl3R4SEejVh=d=oknO!sT|M!QTL< z%gH4vXlo6j&C>xbr(<3HYRNH!Kk1C9>$+LUX~wA)jU%KtGZ^X{MxDzAn{4Bo_(p-j zE-3JeL4T;fRHTYY3qTab8PPNbj~Q-}X@}s#Hcx)~umZ2shvvp+>n=%_AlgOz+}eeU zJXpxEwtbYi|z}@hDbccG7*-PWayLlu^Uzj~0 zBauizibkWzWHQI5;s|TyRcfD^j2&xYZWs{KxBDdp8J|R4(IId|ebap;Q*sh=5-V~P zHsmfHx(sD(Z*gHj1t|q702@}k^JWEZxofm#1vJ@NKtR+;t_kFPvv)k3&i6dACMG8V zV9%GEfrxlZHC+22)iE$r)nG&V%+(%#^&v*v)dftjiXo3eE**fENT7pn!AwJ}vI zWy_0ta2`_QQy$8gfRKQQE**A)LR#*=mHU4$Vw`s z=t3pC+Saz0T(x$c%^h`SzRuWc*rR9oapvLs{^$I^?|cjsSbx@UVtkv%nJW+xY?8?& zR8<9I46-cSaXgBVgE`3l|4*Zcvzybw{!`6yxWz$9aAJ;UKJsNBOfnG3gb~j~&_A4l znYJo<+*!^A!Npn}*<=sjR@H9ac&%o^CYT9^l<^DQdK`U&J@8E`!c?z{HM>{AG|e_q z6kF}&v6DG9=YP(&P~)ysv}@r3TJ70D({qaHuML4jZsX|w1~U3h3cl+kMN!5qIk*yW zfr0Wx6|jndTVL-XKQA9z^-vshYuaW%loe}%!VNPEI6k-;B?3cJ&i)qyjZ((o!!0M zkuHpSF!^`+`X%`Ne$*fAM)jWM$Wy#%tUH6sc~y`gBa_zA`7{8<@3d29a^C$DNLzRK zlU^SS$IyP`4a%en=;i<}-Z&2}n8BRlx#;an;CjKUyLf!_UM)}Y@mqAT>=SO{9Or!T zsJXLMqYx$XEEKp4G1)yCZrKe}uy8AM6@kEhv5;MNv#}5d zZgFSsoS8FoF8tCAK$6VNk^$$Ol6T+tQ}HOr#vM`OmR}>FM}J74kO4QY83QE?W>5j@ zcE^BsUU?>@&pR)S2pAD^tuvB^r^Z`uS(krWnaKBAXRO*zir!T6LEY}y)Eq7Aa-g-? zKO*2t$E@35a^$l^bk1qZuTf+kfCH`3vM!sNqiPMFxTnM-ISK&GP~^rn@qOQ>Bcy;H z0X+abYjUDpJb!C)u6?T3m`Eu_;d9zwr)rH9NS;#aL^k~eFyKGKm~)>us@C9K`?Rdf ziFP@(HUL99*;br$s^F=DCrPT{X`8zCIF%$_(2*q7xYf5?7!f9>U5NdM){eI`zT%9K zR&9qId2$q3;1799EV0Zi3vu#9Aw}|hbZs8oB{LLb;42{=j@$<2av3wTNU?DTzxhnr cY5veY0CrW%VzV>|tN;K207*qoM6N<$f{&EO{Qv*} diff --git a/src/main/resources/assets/hbm/textures/items/singularity_special.png b/src/main/resources/assets/hbm/textures/items/singularity_special.png index 7ff724e9d2f8d7295384b30e589e5fe59c273e35..423f4544cb6037764c8b5fa44c9a3799ca6db506 100644 GIT binary patch delta 789 zcmV+w1M2+$0jvg)B!3BTNLh0L01mzzr-LYpTHft;ulKD7&CShPQY|joU&^t-0z*GmI5+u|y-)qjNV97~ zdc7WfeSQB6#9}cxolZ!CnTLz-FgPpo$;V}ucSKm%9pu#46^{8L%*{NfbO@}kuSYl> z{wLt|dKGbz4u9)CK6@GB^mLS)uYYD*%M{HW6U?Y;=Fnh>lYw8fTTW0Jg${=UM7qr1Bs z@caGR+%A)cTk`w3``Beh7nb?v^*dUuR&L#v%cf2*w}0Ji;ekVLUaasjLsvz`FXrXt z0hN`NQ0Ll}5@1Gt8*K%}^!bJJQbL={75>FO_ZE)7!gR!I%AIy7^X-kJ8oQ>tgC=!fn(0|p|)&e~}J#e{P>l79^Z?LIro}Td~ zdM0A*8j(3Oo8b3}RXS4Zl(*R9;>9lh8RO_h d8okQX*8}xWkO}c-191QV002ovPDHLkV1lcLVsroi