From 470217d93979138a715183413a293f61364e358a Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 25 Jan 2021 21:30:07 +0100 Subject: [PATCH] peas, beans, orbs --- src/main/java/assets/hbm/lang/de_DE.lang | 3 + src/main/java/assets/hbm/lang/en_US.lang | 3 + .../hbm/textures/items/demon_core_base.png | Bin 0 -> 372 bytes .../hbm/textures/items/demon_core_closed.png | Bin 0 -> 724 bytes .../items/demon_core_closed.png.mcmeta | 5 + .../items/demon_core_closed_still.png | Bin 0 -> 444 bytes .../hbm/textures/items/demon_core_open.png | Bin 0 -> 498 bytes .../hbm/textures/items/ingot_chainsteel.png | Bin 0 -> 416 bytes .../java/assets/hbm/textures/items/peas.png | Bin 0 -> 221 bytes .../models/weapons/bolter_digamma.png | Bin 0 -> 2316 bytes .../com/hbm/crafting/ConsumableRecipes.java | 3 + .../java/com/hbm/crafting/WeaponRecipes.java | 2 + .../com/hbm/entity/mob/EntityQuackos.java | 185 +++++++++++------- src/main/java/com/hbm/items/ModItems.java | 16 ++ .../java/com/hbm/items/armor/ArmorFSB.java | 2 +- .../java/com/hbm/items/armor/ItemModPads.java | 2 +- .../java/com/hbm/items/food/ItemLemon.java | 4 + .../com/hbm/items/special/ItemDemonCore.java | 36 ++++ src/main/java/com/hbm/main/ClientProxy.java | 1 + .../java/com/hbm/main/ResourceManager.java | 1 + .../item/weapon/ItemRenderWeaponBolter.java | 6 +- 21 files changed, 190 insertions(+), 79 deletions(-) create mode 100644 src/main/java/assets/hbm/textures/items/demon_core_base.png create mode 100644 src/main/java/assets/hbm/textures/items/demon_core_closed.png create mode 100644 src/main/java/assets/hbm/textures/items/demon_core_closed.png.mcmeta create mode 100644 src/main/java/assets/hbm/textures/items/demon_core_closed_still.png create mode 100644 src/main/java/assets/hbm/textures/items/demon_core_open.png create mode 100644 src/main/java/assets/hbm/textures/items/ingot_chainsteel.png create mode 100644 src/main/java/assets/hbm/textures/items/peas.png create mode 100644 src/main/java/assets/hbm/textures/models/weapons/bolter_digamma.png create mode 100644 src/main/java/com/hbm/items/special/ItemDemonCore.java diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index 53fd2f79a..a01abcc04 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -914,6 +914,8 @@ item.custom_tnt.name=AB - Sprengladung item.cyclotron_tower.name=Zyklotronenturm item.definitelyfood.name=GarantiertKeinDreck-Marken Feldration item.defuser.name=High-Tech Bombenentschärfungsgerät +item.demon_core_closed.name=Bedeckter Dämonenkern +item.demon_core_open.name=Gehobener Dämonenkern item.desh_axe.name=Arbeitslegierungsaxt item.desh_hoe.name=Arbeitslegierungsfeldhacke item.desh_pickaxe.name=Arbeitslegierungsspitzhacke @@ -1604,6 +1606,7 @@ item.particle_lead.name=Bleiionenkapsel item.particle_muon.name=Myonenkapsel item.particle_sparkticle.name=Sparktikelkapsel item.particle_strange.name=Strange-Quark-Kapsel +item.peas.name=Erbsen item.pedestal_steel.name=Stahlsockel item.pellet_advanced.name=Fortgeschrittenes Watzaufwertugspellet item.pellet_antimatter.name=Antimateriencluster diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 502845f83..d5fe9d48a 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -914,6 +914,8 @@ item.custom_tnt.name=Custom Nuke Explosive Charge item.cyclotron_tower.name=Cyclotron Tower item.definitelyfood.name=TotallyNotDirt-Brand MRE item.defuser.name=High-Tech Bomb Defusing Device +item.demon_core_closed.name=Closed Demon Core +item.demon_core_open.name=Suspended Demon Core item.desh_axe.name=Worker's Alloy Axe item.desh_hoe.name=Worker's Alloy Hoe item.desh_pickaxe.name=Worker's Alloy Pickaxe @@ -1604,6 +1606,7 @@ item.particle_lead.name=Lead Ion Capsule item.particle_muon.name=Muon Capsule item.particle_sparkticle.name=Sparkticle Capsule item.particle_strange.name=Strange Quark Capsule +item.peas.name=Peas item.pedestal_steel.name=Steel Pedestal item.pellet_advanced.name=Advanced Watz Performance Improver item.pellet_antimatter.name=Antimatter Cluster diff --git a/src/main/java/assets/hbm/textures/items/demon_core_base.png b/src/main/java/assets/hbm/textures/items/demon_core_base.png new file mode 100644 index 0000000000000000000000000000000000000000..0f6eb7a10bb9c28c037e74291f87c57ca50fd52b GIT binary patch literal 372 zcmV-)0gL{LP)<)7ieC^G}2pa+FeDH5VAq6nf# zA)>b)(zo8~A?PteB`T@ND71%OEQm1*$;>&?txd(OUH8Xr*v#?H#N@JYW?%Xm}dKOG}PAt zNDm$j81iy0Qsy%AJ1e%SJ9zl`B@Oj;$qC!)?E_3re<2==r47CnSK@Sy;&hEtTV=yy z-Jq%>i^5`%4`hi>xf(#pp2JLde7x>U9%a5fA;iC9 z`Dq466Glss<`$O2Ap)LpgjhV4Q(dIvCr(M*tL*@oi>xYfBqZXV_Csiq!KVWTO#^_o zqa6~!E=MKf9-m?x$*M}Rrhy#C+S^o*>B+OfoNNDW=seJQkTRGp-;LAteqB6RtlE!? z2Zy?@OSZBS67PnyDl2(lIoO70CcxXuqiEcjmuF`LKHK-c@ALbfkMH}SMhVp#+neiJ z`FeD6)^he&Q8)Vh&3HsF068T?T9Pe6LZ!LfSgD+nA+dkR^2(~=vssx#!7!m<*b)*Q z8enl@PWuJ;uhNpt<*j6_>#U+*-&|P6*A?mR0?>AL_XJzDq4HW~y*1EcP7pgv(%%s% zHT-|a2e`X`;??2!0i@d^BvZ#6pPbRz?#C^9OuOi&cO}Q^d5WSa^3vG{#DA`_cWF)Y zd7E$~_9!+sn#`)I0^m>-wBa!%Im5})ykH~%uz$Yc{Blx=j!^G%nE>@VD4!=QKVVls zjGpNs4NcEz4L!X8I9+ZNq>z8-@i~k8_KHMoL$Cw@L?@;+fN&^4>OO7MKZ>Pel$$L9 mx(3I`OrPmsD_(WBCVc~nb&JdTYpX;60000OqnS?3%%#PH;tifghhn;xmnv;&v3@H9avyR z4iRf@2jKeV(xs$ouK;9r56GO4V5m3LE3H2c{u3{`XRhvYu3EKI9pLS~z}tJlSKZKb zg25og!Y&_yL9*$TROM~*0=@O7#;7Zo0G1XP%%;XDVG;S$KET7{6I(~UWYZ}LAh5K! zU`87R<R&lNDd}qNe%^*i4oSpn}8#mrEs=x{Cl{bY$4H otUA@KF}&ak0xyvjen2a}00OkNd%rL)VgLXD07*qoM6N<$f;ti0SO5S3 literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/ingot_chainsteel.png b/src/main/java/assets/hbm/textures/items/ingot_chainsteel.png new file mode 100644 index 0000000000000000000000000000000000000000..6307a340bb2838705287372dbfb344586da39c87 GIT binary patch literal 416 zcmV;R0bl-!P);XL2z(tik?FV4uu%eB+}B7Xdyn12A_c> zjgm=|Nj`%H5ds}V!@)64AH&K0X%H{}Rcjp__Xl2Y4i5M?Bc9B;crxcU@5OIuxj#BN zg;EOR@fgi&(Yvj{D!RyIp_GDB3iJ8guan8dN5m#NOQjJCg%AV*f*{x#P)cDsouXMS z3K37{+~sv1qtVF2)c_HBm`EJ^mzGMmFvfrZpxf=DP{^ZRZ$L`9He<0vk1CaW7-OKd zhLjTTgTW%e%&65KkT4%H=ySGng4f z1Z%C2EU|O$E5OXqTEiHFUat>pEv&UL#y|++_fkr{wcGx6oz9cs*Ov#ew}0TG(I~Xm z0I-Got=1Y^{dRvizq)bZa2SzD1hd%;AH(6dXlGynF#wk_9}GdlA1)q)d-f~!B=_!-NiAHU~V zfh6}X2D8?>ptU^)%;KW)iASEfT6Da=`m;aJ`Y1yRu?f RcQVj@44$rjF6*2UngH~;RZIW? literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/models/weapons/bolter_digamma.png b/src/main/java/assets/hbm/textures/models/weapons/bolter_digamma.png new file mode 100644 index 0000000000000000000000000000000000000000..75f234d43a95a95ab55dd8166f19ccdb75ab2233 GIT binary patch literal 2316 zcmV+n3G?=eP)Pi)*o6vn@G?A`4qAxmisDj}3B5>gMP3PLIeZipKPt`R3B zj+ASJ3KyjIScw}e?%a?#ajAqFRYjcWg-WfqY1B69CXlSxYkSumHnVYNJ>#)GM7*~z`#SiKU2^C(j(d%FEJsMTsh`}X^Nyt(@3_1 zuLR+nqlF7^SB)y+l2|cq5VUagIaBA%jnyl`*|TR+uh)h4cN}M;)P!#`ye&`B$n}%* z_2av^b?F1<_Oyk8z898&nR2Jo=^%;4@gU-n|CjK|ltcUb`>0l{Li@U|8@tb}2=?{k zyVJgf?7~@=CA6>Sd08%{6}K*ZFm>@t;Sw-yvBG5XDwBo=VaKEhL3z^Hkmr=qp0~1~ zvk1b7684sP`y>%gnm3R}s9AAFk`Q*=8-~e@!)QeEFB~#S&AD*Q@#Am@J3Bj37ngZS zEujmfirQ!XioB-C?h7?!o~$H4O5tXdxv45;^$pGnO7HsO#fvIWKS7$fN!7iut|hCj zlPX-e)PHH@E1FJ_d?3~=635ZU#vx6(sPVM8V{{n6RCy0k=jM%Y$K_crJtx612pq?O zZQJN}y8wVjqk+Z6Mbztce7E+#^lR!?RjQm0p{$K_90&D!9ky+w-|r&`0yG*8)a!LP zjsrlhV~~e)LU%H&7)TXGnQ*pk!?tZaeE1Lm5Cj1_osO!@axnwWoSp4#jU-)#;xC@+85dz(-B=PPMaJG4_l<2EL5bSq^V5;EzKrAkos@n}WwHTRx=y}YxDeM@rCgiF}kJ_Gu zIE&L}&IwDDEYO)oeydIolO{gg+`eDA{rthialan4D_ch|=MU;pl7D>ZuS5&9d zY;NDL++15fCF=F|7FSR$;+*d>%oD4@?Kuktic}oXc#6`rPG4Y zg3<5<v=Ql_n#JXLlE&Lg^C((93UjyzApFyRgd zSTZbF6=PhzsZ7rcZJZOCEL#?{P~;uQU2ktyqJnHzx+vN>C-Vxc=Y-dz64%=T%&El{ zfzsk~#v2ZW_q7bRUCpI%yfA|}6{^xj=nmt`<*&@{xBisUiXs!~=QM?=Jn>Uob^?MG&M9EEA)M91c$U>nCmt!Y;8ON!=1~b z%u5`nO&h0b1iWe1#(%)cJV#aOd7+iX$rexbplO0MpSwhG5M`JJ&Zl{ zmHZ{{HTmVkkG1TT(DiK{7W9PRzaGV}0rUONU+E{r9(o>he9dasN!muHYU60Jrukwc z2?u1=1m8UU8yC*4;QVVVxNv?20AN}CZ1OxGo&5uxeYFY8GO_;A=eT^Kjl-^k<;Bsr zhc17zDK%db3&#^?S{>Fht==>jP_0@xbEb~PMgss)t@5+Ubw|PxTCEmZKYR|O*261H zXHL>3c7A96eq6&aaqf-L_jUH3xf7mN-1e;d(NplUUe8=IkApTwl$f=!DUetATM#KO@*=gLBL+{Sndll#YQm%U%s^Z33G*Y(ir_0c`* zjkZ_$7VWyH3&+OB1`hUi@!wGoL0`?fWm?5?I^g?*W8oZhj~9z`z4$hc=HTTn4!aJ9 zeX;NBg*`?QO5rGce}KO0q385*)E!xzWpPXwfaeWP{cg2d`1XtUaAfx}=tX;rls^zG zEGz`3X~Hy3SeAvAiis7&LesFYQaS$j_;=H&mcr2t20lF3#b|Zgkzl6D7tZ$w6Z;&z z+(ozN!taTFUoR=8a1;v*Cah`|^?DtRW3N)g;#~K{x!Bm)K-2gWrrpOHtx{#CjN?q$V>Foq71;N$EoqSqz9LMl^mu~1&WfmjVnqV7sbptCq*Ys2oU}~ zm2jXWJKwe+TZk|MlO2J5J9NWzGp%-o)7+Dp{)5b`SLwc3p0dV5RiR0LK?kz3CRvAn2KXdUZG+KQyx mW$!0?9v-rmqGxq^W#xaHsaJ|QyF=#y0000