From 71e98189978c5add936e94ab767ef1f315e98f53 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Wed, 13 Mar 2019 21:21:53 +0100 Subject: [PATCH] rebalanced assembly machine plate recipe, removed ticking from d.grass --- assets/hbm/lang/de_DE.lang | 2 + assets/hbm/lang/en_US.lang | 2 + assets/hbm/textures/gui/bobmazon.png | Bin 0 -> 20713 bytes assets/hbm/textures/gui/gui_bobmazon.png | Bin 0 -> 3765 bytes com/hbm/blocks/ModBlocks.java | 4 +- com/hbm/blocks/generic/WasteEarth.java | 8 ++-- com/hbm/entity/effect/EntityFalloutRain.java | 12 +++--- com/hbm/inventory/MachineRecipes.java | 42 +++++++++---------- com/hbm/lib/Library.java | 24 +++++------ com/hbm/main/CraftingManager.java | 2 + 10 files changed, 51 insertions(+), 45 deletions(-) create mode 100644 assets/hbm/textures/gui/bobmazon.png create mode 100644 assets/hbm/textures/gui/gui_bobmazon.png diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 250e0deca..522ace673 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -96,6 +96,7 @@ chem.CC_HEATING=Fortgeschrittene Kohleverflüssigung chem.CC_HEAVY=Einfache Kohleverflüssigung chem.CC_NAPHTHA=Naphtha-Kohleverflüssigung chem.ASPHALT=Asphaltherstellung +chem.CONCRETE=Betonherstellung chem.COOLANT=Kühlflüssigkeit mischen chem.CRYOGEL=Kryogel mischen chem.DESH=Deshherstellung @@ -768,6 +769,7 @@ tile.reinforced_light.name=Verstärkter Glowstone tile.reinforced_lamp_off.name=Verstärkte Lampe tile.reinforced_lamp_on.name=Verstärkte Lampe +tile.reinforced_stone.name=Verdichteter Stein tile.concrete_smooth.name=Beton tile.concrete.name=Betonfliese tile.brick_concrete.name=Betonziegel diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index ee0aef15b..e969bda49 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -96,6 +96,7 @@ chem.CC_HEATING=Advanced Coal Liquefaction chem.CC_HEAVY=Basic Coal Liquefaction chem.CC_NAPHTHA=Naphtha Coal Liquefaction chem.ASPHALT=Asphalt Production +chem.CONCRETE=Concrete Production chem.COOLANT=Coolant Mixing chem.CRYOGEL=Cryogel Mixing chem.DESH=Desh Production @@ -768,6 +769,7 @@ tile.reinforced_light.name=Reinforced Glowstone tile.reinforced_lamp_off.name=Reinforced Lamp tile.reinforced_lamp_on.name=Reinforced Lamp +tile.reinforced_stone.name=Dense Stone tile.concrete_smooth.name=Concrete tile.concrete.name=Concrete Tile tile.brick_concrete.name=Concrete Bricks diff --git a/assets/hbm/textures/gui/bobmazon.png b/assets/hbm/textures/gui/bobmazon.png new file mode 100644 index 0000000000000000000000000000000000000000..6afde6289127a26b0e7601a96373d89a0ad6a170 GIT binary patch literal 20713 zcmdqJ^;2Bm6E-+NfCLQ?TtkpRaECz>TxSUG&fpSca0u|h-QC?~a18;1LvVL@ciYML zt*zQ$_7B*-RWPTDx%al8(@%F3q6m`0L?b~1005XW(&9=001_2^ef<^%{=3*J#sdEF z#!*y8N2^PUwc?eZ_`H~(7=q9DEh-{LbV#@GKXvaQ(w2>(_;YrFox@ul&jHw2`S zNo~*|uYeJVRT52&+L{~dSj@=Z`np1kcM8hJvL9CyhK5MF{Y_w(0fPY@{|piG3y`mo zZtn7c*oX4;0={cI$xFvw#4CFIZl(QV##hcII9SpLIbL8e|L( zTJGqflc~u4tQMB5*n62Cx5-CJ90(zD|28|-R9dPW%7oqTkORyb>Qq*&`{>`#_UKYA zaHWcO7CX6rQ~skh9Tk`{+D;DDE>eh16_2Uf2yU_wf$UkTsm6b7R@@uduC?2#-B(vC zS>mj<%^#6})fJ={Sn_afKXGO$a`Y+c?ihr`Y0-Qy-f2kdu-em7Q%R zezB0-#B+N__LAUu-oH{VI9fo@sE&)0S0;?dscE_f2vlpg6t z4t>Ox*|J*gEGA8@EPE%xa)pl;aN^1GC`p&$_Azdxvv9-X31Mki#K_C9YI9CVz!OaH zIP@7Wtx8uU_HoD7C)mZ+|9V87ORaT`b!2ZOTh!=je0@CxJ+5{|J(f5)Q&5#qKXJ)E7&gIaZbAO}>e($dlg zQPsbX3_$RTTac1tT!_Zeiv|x51Y);8m(E};^s^6;jAXmjDQ zUnK$EMe~vfY<~FFbYj1=h_jjSLxw~7BEn(m)xvX|k&-3x2d`kzcPvoa?!hkkg;^%JZz|=MM2UH`V3oE~56u1rF~_yWiz5 zZ|al2eFHjwZ0l>KsT@xi=VHvq^@))9@VQlgV1WtvOy`>6YTd zqZpw<3l_ql3!W*i#wDfGxJY9P9s37FXPZ^*sjUuTa`KmxewBx$(r;*&P$sO!vr#|h zIroLy+LgcUQI2Y-lO4H^#{S@krgtM_VQb|JRX_GAURzsW_xA@5x?e?peoAY6$Q#Kh z)7NUxUmrt2?QA(>NPgp0FDMQ^Zi!6z!rPeOa8^S;N})5;WWD``oVzmYjoPfu$_WM+ zORJ%(*`!2BFZwVY4pe` zIGDz6gx%(gS|_aT} z%Zl$7H?W9Et}vw5wxD+WpmiViQ+nm0AgSu8*zLEf-!(3ieQs-Ei*v8tt;WiOTE&?6 zZ@=WSVg7uB%?T@YXPyq+>hohr5t8H21q&R(-M95w?Vd8n`b&atgEOUH+I$WNx6@Mn zZzcz)3-JvAwWMu%?h@MCcej@dJi+`SeicI}7FD%AT}SeTmnV4Z+uB;cD;+ClOWs^e z)#3LP!FSKF!8Z6FksJ&rd9llwzz&NsX$9E4hT+@-4v=O%e^CHE=3lHF-P*Pa=EUs4k^+T)bTU#G5k4;J; zLH=RTwioricH+v+Mv|}vl%Z<9S|2#x<+^;GL753!mA@iktwc z-dU*5+>uUjBha6D$fv!Q+cRoXX|=#@P3LBTcIagSw>rZT%2eLO^I_f8hwzEVVLG?kW+)edWkXVw3{9MP+O>dnez^;T)(PuJS{l%rwE>5A*l z>tQ2u;lDVd~3axy>sm zE=XVfC4EN*BQVucHz~g3qwg&bR7d@EgW&o@&~b>WLRN`0>j?w-44fwJHkj>cqSm9! z@Tl=EpTq35-cHTNy%>gu_l+cf2*oN6WS7k>y>I33S}Wan(p|i4eo`%iN7M0;&Bw+0 z0_$!vvgQL|rTL(pw;5HAFa*j2^X<^my0O3HzXmOg9SK6@-cDr@5Gm-B#6Q2jRY|-*?Uim-(G+3C1O$~&8^zstoT?$Gs{sCJ)b^mqBjV+wA(@tV6M%@ zC@tkF*mqy}8-e&E{nwAS48oqDpF^i(M^`etJ}S&O5sd>2gyC;+0uidKuH_8xIOWihh%zP)R7(hRos)OyTXz zpCowZRLgv?54Kf|+(fRTnm-`Jnq9Gtvda)z0}g2ZF5wW(K946+KPdX7`FyQZ-_?46 zZEbh)G`8VoO7~sW>d-4iLC8bWB(LwtTB9t#LyHMiYH3;OqTilPvH!z1ht5Rg3rA{a zcyO?55v;KO(li}m$oK>h)|XWWr(J8=rp1*r8VaYR0Et`#F!uh;t_7QRP-1lPG4&AyQI} zKf38o6HbGKq{#J??)hIgL!4Q(s9HH4wkmG)&BMS#RHXT-8JKcJKZjFfQ%Y(`rRZ~K z3ryQxTC&)|h!bziS~bHvk1t2^J>*f3m|F+F^NNp4|JRkfmW zp(#(>41cwhj7iUV(RJ45KGdq=y?6-uB985YtaPpbK~1=5o0XI6mX)&1{g^<^cTe$U zxN?2uP4Hfm$(+4eHCCTi6%1#S=9k+R7>KHUEUlS37bDOiLx1CoE7AE0YC?aX^JJcD zyqVwm}&J7pQM$ifc)y&k^T4&8)@GtAFb};R(u%$yJE7!X@wGftPyiOW1B( zy;LB1&2%3BroQzj^z@>R>p@G>nyl6;2=#c#c^N(RK-whd1q_uSo$g1oiHFscKlq+qEhK%7q1gG#klfSMj`6MAc-&=sVl5UD@`Z~8mE853 zo5<8Yo$#4Y^GGY;xxPyg7B<(^)B|mw(tUj+5H4cH7YcLqxAg2`CE|gPD8~9qp$|aO z<2s5+>#o2_G29V%ZC6@yHz*^?qXKn|n_w03c!rPPu8r-hZMO@@+??@$KH3kY^F>ax}l2ZbgZ|+H3R!#>OJ);f1G(&V$31 zIGHdvF{x=@o+rV*HMI{h$93@~Cut}p0Rq1#nqdz=zboR#;mv|2jChOC9*#mu>4UNK z_nJ}{7KTc7LDSo<^XecpO@~a;#H9hxP*w!|z* zDCTg5uZF9-{E`yphE!Te_rfD6=>3hUs-1I@&b8G?Mptf#oZEK&?|otO7s-~>lxyux zsS=FS)8Pi!B3h0-Wp|Sy-d0JaRmcx9De-)opsb^llqXkTiR$CGF9&gLOuMI!SlUg^ zJCH&`#ZOfVH?~jWv-U@Rxh&b@;(^pfe>^Ie+MKO*Av3%`VZS`cF|Sv?5UwO9;4i6b zzJFey#}rnPjktcY?+&c6=~muPgNWQwQBPp^LG$}oZ&yf!y6l`i>3Y(Q5!`_{%Kk- zmarnQLIcPj`{bNeoN94qxK+RRt8mO_kAmNw#UGoRx;=W2V!mZRICEg>x|}sMeX_C2 zpPqNKy0F%Oz9wRlMmyooErZ~02z6U2a}W?KBWxx ztmr(Jhszsqc1Qb(A$@lWnY+Uo_&M%Ax9EKiRI3_#0re=J@z}QohNTiwF149f`I^5} zy3KwU`ySh^&3cg8ug_UEb{e{d)lnK}EPGD6A4bIk2->H9deeuO23FrW9oVoV5=*!%kh z(?8#(EqH&o$%8`Jr}tb}za955H zH~+=tyr!Whu5Z+(Hq1;o%=ta~cw9=C?_Nsnx1)|EAjb!0VL^v)siveSrT%RgARz*; z>%Jgjy`}Aej>Dk1gU#{{1u2CH!DU{}rbt!675&#NRp{u0{vFzBnQ4xAkb5H*d7^JlluD}CDR@fVA!`Ng5&Cu_aF@4bSI>V=Zt zs)H~Yh?s&@rUIwN70cWkDDMefwQ9Y02lwa9Q5GX#I*%Z*Oz9u-nixeOq2lq9q+Ab5 z3(9OSzHzXoyqKDinAmP1k@fZyOQbc(!j7k=904g>w?7g~pF}x)U8&KyKjvjUm~})pr zop$&;d7o3^FGcskxbDMxgs91ow0vvThnm$QrMjxysgQKNT7|G$Jh9mxuF#sW{upyS zqIQHB*C1ua4TAwe1%+)}qc}O7IvwhiqTH;%Xgoi6lt&Ko)S?g&YQgAzKRzV+=gB=@@_u)hAE?#!=zsEZ`es#+b`7K zfF|_9wVUaBUcn?0(@s^GRbBJ7`jCps;JFh|as$(l^}z zR?pmjddy+~;D~tI+Ip2cwX{3NWsBcCbJg*PhMU~+V|7@O8`uRJST<_f;34JhxoIxy z6|UMeuZWu$CH}$aQu6EBeVNe4y1Y@s*Mi$=rAb`>C@lK;Ai3qp%&5)`gPW@#eQN_( zXBrQvBsh~^Zwi%zB~A^wR(}Qu^JN;(@H)|oq|5Za;%1O_8k!Wpwq;hN&DwhI>et&n zU)uBqD(HGR-D0M52=bgiOEbCY)6sVp*fz4M%M@e{Xm9=GRv4EI#rhp)o2hMnt-s|J zVZ%E$7qa|-&rCs16zr`AxmqQtcLWktWr&OC%VT1Kc3$)u(%9mA6luh&*xu2}cEwV< zYe=FWA*x{UhxVY|Cbdq>)BN}n=cODHOaso--rC`9%)E6KLx>qyw(wWl9RD(;*K}0-n8G5j<#|%3=RcH?Z_!J7lcXRCn%PRgRF}cP1ePl3E?Yg&IjAQI zMrlqsx8F^!^RILVb>72Ix{V+OWK*J%tBaOK&dU zsr1rdGG``BGy0g|T19TnP5Bc`UP9c!(*jBO`n2k<`pn$492bWr9H7>LA~YXUiYe(b zycmv5&79qflJpn%`Gqg+VsXaz@&^Us<(wiKHY*q?v)qx5%=rj!&8qa^Fj8y8wmFx` z%b{xIpru!o?_uVH%$NQ>S790s{VfoqSViQ zxsB^-*g|nKCRc=WZ#D-`VzDyE=*baIOUeUhwWu#NWb@wS**h8)55!0Z>KWmN-!>tF zRvf}Q8QZH8)gtNWVAf-M$-b#$b|%lI5?}@41eNfOqN8Eo^ccAdI#i+!*O<-n2NQSH zwjpIW7EztHo)a(We%HKmew4s8CNFxN9w-5q@Ar=!&dP;zNaSV%(VSlLdZy=Xj_V2; zOZ5_$VbwWGbhIKiYKQZ#iSs&+X^XEVp^ydn&dWKlS4o^7fFXHE5+$jOuPDR*MG{dwz(Yh_Y!k*8W9`? zsMA+I%$^<=wG8R``Z`sFj)A=@cD#iDWd=l@i`csn5HvWQnltb&px3a1jMX7AV}i#8 zeT!O!g#(@zE|$;K>pU>4sf&;9Si20Lhv3k+lzBn525At4;=u9tLu2!b69c=N&t40H zC!een1-PneA1y72<0EP87$1EdQ)3Ml4Q7H(rwCI5(~-qgb9d6GP+@)N=d3%HmD)Otvd60lj)^OE)9m@5%fpR5n?-uC!#QuQb%*^Wq`#yiTvl1$kH75; zxu9Eek5LX>Y!=%LnQCDocm|OeVq=_Mj*8N@10^3!i5=81n1gt!6q!aT^cEIyo8tCc zqCz^#;JaxSaUcyfoUmH0V;XAiICqw@3(Prr46#{E0#saw*O#nbgYoi0Gtq%428eBa zF`)x-%EJ>DqxW|fJIDDqEMHsL4~2SYlQz4{CG#BwZp)PdZA4t;k{tIDZAx$%bex!0 z)*WPYl$AK;TlZgo!nbHzT6&KOS^+2fMhsm;x6MjZj;hoe=kl(*TMaV4NW$J|8rkbu znwfXGM7YQwY2J!{egB4a>{2gtS4XgKkv|jWD2~|o1F`)v+P;+(EAmZH#S~_SPz1j!#ur5vJb#4$FN!#Tl)J^$Rj6+pz%?nIUzKX@R3hPvyNxNYTe77x4^X z?v3ndvftPP`@7iZ@TI9*`vWXyT4~;;FWUg~@1P;UPJ?D!wczKul-ym8!J(~0VI5B< z(q?N<)b0A~-ae!3T)52lo3FG@y##KA3wb3S)Vw21+cb@9d+m%NIF8)qnvYUmBNrvM{q!MrSSy(7v@X@*I^C5U~F ztl_Oh7r+Dh?)WlAdL@TfG0K+yI;?=|7!C)FXt{{hd;SX=`z&DSceI8`LWnr9J z)_mHk+HzKB6p6fa0Rt=B=7<@DjZO9FPb72o+l8` z34}DqVD~LP;etVQm}U3uz3B{0K=!GpCQ<81WdduZGU=WK5ADf)6$gE0<_MDrYKYl) z!H5qLMi8?aqPJM9g9fU5VL6PiyXj0jJ>6HXL3u3|_Xw0=TL`;jp50Xhq@yh1EHz?* zpYzK!Xkx24@R}$QPQwjGcN_op>9{I)Azs??KvT1zDuIpauz)|Klxmn~7p8(~V|@vg z>N~QK#Jgq2=BmVa*;>nZpWV+h7z)bHc}zjp%(CfJe4gvC#U&*jO@quFsjJwne;iL* zZYX)1nvhZgrj(nzIzp5k-9xgVdC<{e(fUcngkYT$<{3jRqMsTOIfNQQ)N5`lyo*`e zZwAJ!Uur99oXX&@<}M4*Rlbuy*dR$w_(`D{@c2n zRQ64NU|?$2owZKT{JaX<_^gw)cEqz06o)$$8^e=FDG)}X2sG;wtyfm(mXrU1gz>e! zk4;65*O_c=#2sBMl5n}a0cT3pW&*cL3m(jLm7Qhdei_7YvNpM;XIu)$J-~x#ep+)o z`Ri2hZCEI&S|N_Upp8 z9c1)r&=-0AKo>)R5x)Q|O<-f^Y&B^!qa4)8&UHyB-8sgFp|&{f;OE7jA*v+^e;EUD zU}0K2st8`7tXgwSjR2_j{y?j9RqL?%L#svtu~}o#qSnbJdd~@_x%bg=N6b}Yor6~t z+`J$;3l>Chkp^&w3R?#e5>q(xAF>MeIrer!yrK+=Xy>fFI*2F$JwK@Xm@}27!^}YX z0rOpZ#*p+at71DlkNiKqlqOJ?grHp==i^l?C&wTTbPJQM^_BBDm_Wj@Bt^X=LAeUh zxf?g^2?6Q-;kp|T2CQk;6-*X-;>3{i>cTX-p$YF+xVRZUECWbvlCKLbCh`bva$1;u z5mVj>5Y3TG+}6`nL&29IR#R~nRh^bmnA}LMq<2;TAGTzUV~X)$h|&2^k~t6gG_{R- zrx5eQXk1Ant*e|pqjbe1aFM*s;1D14k%ea8TFTQ` z<3Zg6=wm*=yaS# z3REqp5cIKMrhh25vqcyA<**!tyWeTUR=70Awsn*Z9YwUHKf*wIU$*Xw+I^otp!v$w zP5LzwHt1(WO&z(ZQNhaQG_65)orM|q!1$FN?*CGY6M<%Oz&ph&Yr&UCSL$*aMg7$WPT4D}5QoElxsfb*Yi(xZmwzftDcO~h z`qM!^P|OO8Y)^ih`KNo~FynQEB^NZ%)d8cwcyNcZ@1`RDA6@-pE1c?Gxa|R#(vE#D zEN6f{g2?&pHwzYe%-3u(9lFTDr_U=NJHJkL&A#I)eho4o%)%GB1c zUxbpI0YT2zf(>xIqsqpz%sY6S8kKwIbrw&US(v%#Q56K_oL7bk6v2z zQ<^l%Kq))-Viu1Ie<^NEhQ#D)CdL;=0@sbM^Vq2Q8`4y=mStEH6zU0WFoC|B!NaTmBm@4>~QaR7H>FiFpj)xL!9SPJK3%6HT>E z_M{BpNYiA6UEw^AP`+Ui($&}C6h&e4XU%`J3E4$2H?QT`4?_9M4#jc&W4^j4LmYt% zH-0?0K$%p5T^#UE6RbW*)A`sRv+tyNf~1}0jV$hy%SQ~qXXboxK*Qv;NNaSnK_oQ5 zEt75=S?MX&`r@{2BbgJbHtvOQ01{tOCvE$0`q29m@ZwA~GWn(bGGv9BqnL5|Q7`YXFV}K`9B&xUEPp5Xy*aEjB1p51fZi>i}N;!8% z-Z@@3OHdJ0oa?1QNx&c{j@SC1hSXK|l*}s%X5q8HU+d1S0zZcNFYqH-O@pej;L7a| zQ_3*kSbb;b*jSsISHA6dxGS)$G}=D~v(Tk!R9*^FD9^oEJF?w>&r@SE*e{8lrqNq= z1y``PU(vxQmdFu{>G|=TQwdY!pAzNwF|KL4du&zD{A)Dqb4%`4($tXF?HEDszq~{u zeYjzDjs6SGK=?7jfSl;3HMlN7T&-1j*niEw0>ZuPAWSIEo#v)%IMuOiEE4;@_M>2vJ2lBlEvn9<%p4 z-VybVMY-Kpe!OHNkn?T5BX7Cd|50(~mUZp<4)aNU^Knp3NWLOn*^6;y)&%-MC0SlK z%(d~Bswl)KNnAXAuk^aw{UH(DZakBIYN6_?kDQD@YH{0i_pI^XM67ZYEjNdAt2xL% za0yq_D0KAXtg_{Kk#w22TKm>e5z=()S5y8X0E@$1cTY&9#r^lyaZ$mL zH0;}|NBo}otHF_6Xu@m=oNGUPD|(H9f-2MPzL?3=CorcL!IH0-#&MaJG=w5)w^f6T@E^DwI6BImc;B~2Q2;W+P033^NcXWZj6*+<7THAJG@+VTc{;IJ(z z!K+ncln%wxE2-K-B~P5@k(4e+<9`nJDRLb2gKRAAT0Av4*hN6pIdf=^`2Zqs|9H4~ zK>35CZRT*GtLTC5auyb>goO(jH5f#oDjOOOXX| z#Ur3lO|A(#TUqG{rm?Qe+sJf1JX9ZBS?4l*h}sGD-Z1DtUm2)7cOf9g;V-UaxcZ{q zJX*eX)Szg5{aP)Mm-{}YrFW2bAOUWBP`O!0Ye^~|2jCm!!k*~0vQoRN=cUr#1p@1P zd8>pwVknMj>Jg~`e-6p!kx?S5-WoE(-6-H@R6hfCPp7#fO|w0# zu`GJOAGvk4(TK?Pftj76Gjw{;V06-6!!hC5G5q&&Vnyjb?3zX3rwrStyhtguM)nX@ zj(<)7?f$#Pmv%@bb&`EJiI~^u1EW7%3EcToCeCquJalpvnX3A)uR?Q0dP~xSl@w$( z#*U#WT%2*L^}Zf&I1r(~lJ7vRaoVF2SN6`uq|EZgQ|>EYfNI;3%2i<7H+i0ozZ08d zAcElWhB!gDv_-oT=L-*5NMo29S-nRC9H=$Arj(C}T!~Q(|0uaGTl6m$RuWkn`c1D? zv{mi!b@tTor`sgvf4vN``M96%(70a|Xw6@Z5!juH;w6Pm0PnQV{AL5vD61~BqL()Y z7MqS9BDHR5nX*_G{g{hfp#M=AHy4DG5w|i_PSA8m=hH~NvVG4U8Ac5CJxCm#NfO2K z=7uGU_biqr)-zdouz$vZ6~$d_on0%}c0uHNYm1NI8y2(fXwl^#6t(qy`$P3Z!QY1E z8^>s;Z%^kN@?Y#&A~h5S%w*Acd`g*Vyh3!vQwkqYz!6_i(zf*$2mLs?X;$!6_wvH@ z)f!7cSodktJ=5_`n(%aU?si7D_=q(w4K*_XImwt_FO%N9iamUfNwhSHyYHLpg?)GS zIL!M9?6d7FB8Ru{83U7epSv5wI7OUzP^m{B7l!7`lIk1o?9A>VbRsJ*_tLT+friqK zIZ(vmw@A_O&QQ#(J)L^b?E0Bo^2c=SeH_=I&Xb=Oh+z zK8F=iJ~tP2#`-Emc`2FREJ(|o^ciw0a8dsq@ZL)!kalJL9S`$k?_gvqy^EW|r1E`D z$rEd+ZP?};TVdXswjtfcl{+A|)J?9VYg7!eca95_M{`GiAv`}oJkoP(aM5OR4f>?9 z`a`u^ubBfcY?%^FM=4hT8{5YBGAV*5x2+@l^L@Lwl$7PA0+Y<&jb$7rHbT}zj<{(< z6vRzFTUwi6mF3_^kS>RhrM(xLKGaH7?VL!KYr_wtr;w+a1Vb(_P;659f2C6)AAxR# z^|D@#U%sxHL`57Lqzv(B8J)%C{C8o`V3edvd!zc(f+#@Tg-gG)X64(L6l8p_^}_8h zt5*?N-gf33ZW-m1PfANYmnY^$N5Ou1F)|i zQLRA#emriooR#pM#V4=1a9Gd$h@!=Xd)StB**75t$VFem-R7;nBzC2gq?2j4|%D9qMdkGHo#!)NT$v!oFxi!kO*WN4~y=)${d zD|`XKz{K3wSF;k+Uc1z#rPPhha~j!(z}i<+h}0`PQOuA-vbJ~a>u&c8ewH;nbB=Fe z){8E6^(`H2ec%9Z3W>d@)Gck8U#b2y8aO{kHO3@YM@B~Dz#av*y&U|pyDKB@{FWb+ zKJ;2fH6#>Ts$kv{L%ZRcxvSeog+i0ozHHm*BFovfpM2wzOxFC7niPqQ^-+b<0r2}B z)OVeWagKWm^mAWz3((UqFO(IHE_Cp#Kcx#l;p{on3(K`o1=!z~BR#GQ2VR zro!C2Zz!&e$tE#EGQ>A?ECO<^J~C<|wO0nfFdvwk)3~`X$U9t^;Gu~g*+M+cO$UMb7o z%iBiqgXL-NdD{y}Q#;{P`?J?Lm|@$xZVO{D-1gblN2O!&NFEy4f%Z%GBZt$axNk#h zM&DA&2U0SA`hxHA!NE@a%5yibyKvmFKf&;T7GAAJlrOqKp>pToOi_AmIi}n;eP7+or7yf;dh73|(5DnT*2rU7jKK)I_FOYTmwH+kgKzrC22x{?KPYs< zt$+2p;g!3^K)i!T?RTWIAL*52fCC{WNv_bvs^4&Q0YSKU1BFV<=m2}*IE#X~G?DCp z--pY%&B#a#mXtO3m-9VPnLT))U=vnE+8nZybuGVR$5!N}<}?^?^SnMYK73oR$wb19 z^uP$vc86?jcZ?qupzlO7@ZOBAtWO0T+{}I!Q*%W2Qm)Cd0fiiMu_q(IC3(YW4aimU zWQ1LUKD)DUt}HtKHt}spj-EPV7+>!=8PDS+=^arJpH}_^ugj+luA19YTox!9nGYqk z_Hl?boFIRIBOV_d@Y+R=qe^a5GWx=&?o52f?#?wclz=ZW=?rZe)~*Al!0b69Hg&l3 zE~?A`#6vKp93BoQUs6(2N#++|(9*BErlXe7_&G(N*|pRrqa)8qe_{+(IV@+db}Ob! ze`II;3C@)B6NSEiZ5^ij>V0s-DKPwO>1lsR7!702fR#N>?wVXgdZgNm`n-MZQ$f|=vY+`Ya13LVoh(={>n z`8_zihCOjLtT7wKdo3ZHpbr3x)eYaF3z0UmP%4yw(=vwS;ZZ?C@#`Rfj63w^D+_BNKHLWJ;gy{W;g`M1?)TU{-dOvVSy;*86Md(+Za6es1pFQP3SR5nI1TPST?b$qsA^c7xP&QVew2GDTg zza|J4ExS5>q9ko;v=UQaROE6oyU&cah)*H8>rK4YW$v!|{fur|S&&njGVqcGZ#tD* z{w023R%_9G7#|fSwA8qtA;fzPPEXV`u!4`TAPmaML<#?y=GTGVPUatK&Ds&Z- ziAk#MLC-lmvMtG))&G<;ciOUiD4)T^K& zNqtQcHJI}Gc~@D3t!t5u^6K2cd0WF7R;QRgGFw2-_Qv>nWtH9B-*ywe*bYsGeT8h< z`MEhSue6nUN8{5w8JT&aWUDvKq#i=X(K;$5qrbdad=Vvj0T8&%V(lUHzYyv9{8);b zW-Gmk#lGY_@NX*+fX(^GH8-o!yeb*@L`HVwZi#BTJ+H1sjaNKyqA_;jS z@iIER5D{JnygN@t1hIZ#tC53;ig;<2LqupdLRM)xFUnea39oXh5SiY$Egxc{ynZ2i zn|^RB5J?bH!sjyqSSWfnoVu}?z%^*hrMxT|Zv<0yh%OGi#Vz|G2|XUg zlAcK~%m`pa0IF7R7R(e|ww(>i!0MyGYOPR??QxIUZKJ&VCibPcR3N86-~~R3mM~_z zIt<~cGI6*d)uJ7(*rIKm+Dd(g8Sj4eWi@bq14!e z0irG+v-GouAglc*msJccHIo$g)&Jas`YgA5-RXGOp%wcFKlx*u$4G6x3^nBr|7gQ= z6iG{>s;a4u>ejkwM>Rv%Sj8A*g4NXFA}!T)=dRoDzlHxZDEV&=^8e+k{@Fz9kd}e; zzdx%0GC#e{ga5*?z2YfKp-T1h_kge47WT?W6#v1$pb{K*lM@!s8fWO45`NBU@zjGQ zFn*K{F!*6*uiVWbw-=u_J3ev<&b!`+eLjBQZwS=`0Mz{b-x`k3bBcR(KsnkWg#8`Q zot=$gC(j3tSJN84Mv!e3K$uielmJ#mk=X3iWNKd8-X4^)-tKi5d^L&JC-SW?ErAm7 zQ#Axa5BL?UOZ6xuH7*3ig15YZPV*ctzbrE?r5fRd?Tmk?HaN7`kCAQ5d3$t|Vuywg6$CjH@PTJOxTd4H1UHLB% ze+EdbNo(Nb<69k=k9;3-np%%=a-I9O-rS?%j?H`wQgkVCcmvQVW&`+2Yz9jTZ0x^g z7r8~=%|AUUrUs7wBgFv#W8g%)&XwhdtPsg2D!!#Q0@)tYLslAZw!~g_5 zQR12YR{Lu<%B5IV+1=KH^Mm71P=U@J6wOR^FfmUE@G}5Da;xz-RcPv|>NVE~`RIcI zzT;;FvE8SP(R*c)=MYtSz~>4}dR0mtIaE9C&KkSqn~b4&`NT}JY|@WK!Uze@Zz+Zh5~O2+#m$gdGSgfhp&20*yN@7ouSO zV%+kbh=4gEIh}HZoy}aYz1%FXWN)=W9!VIN`w7hH#MtXfgJBWj=kh6h{qDY%vRf*nln3CfBidh-mrRy7 zy(1jdc#v(JcJjuVwLK^?H3Jp!Ga-dTgdm%!6?ojH0y@l}oXL_r1nbHcC6*}wT-9m7 zF`O^5X5}97GwtL#jU%IGF4b`qfM3IKlR@4M_1_B>600+7Uaa_`G=kLk7pe1==(%G> z;(FVbGJ8UZS9I+7_WiL-7rN6orNaFAdwJAD5%`=hWM6$A08BlE6N~#r@hF#YKNrX| zPL2{|2w?#v6vOXVrxaDss!1QM9;_?(lMFaJ{s8(C51)Jj0KRmSzSmInjLKeo^+bGb9+9(w>>?>zzyx|&0(Ph6xvY)J_)$bk=S6QswBmUy)8t#ol=R$ApdWBHOnc8u}*q1Nc+ z9`c;zmxFxm94UD+oREM*I!&OW0|4)X|NUQpBToQh7k}A)`mV6d7`Iz-$&$_H6E@)IeD?lQyBfwleITG9g^I;nARAa~iQvyCUFSkqNP={z+|Ow6he9c46EakYuno5Y+L8GUDvgX@ONx}3$*ekt7oTacM{yf6P1SN&0v zbmyU2_kJ6AHI&r1XG%~505Bq~z@yjfN#2bVSq`lA)kIi%&FgpW&mAl+c2Vz-$Jg_)V3+HB8#h&j&z()79Yk>Nt6*?Pr!PU0 zKV8!jxQpr=rv$^dB8g0KwI5-`p6_v%S0!#mR=`oPK~z9Ct^uiD@nZyIx^co z`cM8H?D8Wu8t}8{p+L*^cHG`J_VnK%xN-fGEj?0kp44jD@5S5iZ5ORen!i8VD?xA{ zJR*bdT_o^m89Kd{QNzr(`s(X@J&O}0F6MUJYRm`p9f~rT$kJA*Mn->=;^^ho572` z@{gIVsiWI`8+uv!v#J>?uuH_xMR{rads2}FQXSQ?9c#D)rcmM5i>0?hE<-3Sy+?xo zH*Nn{FIWB#)&9nhgm7s`5nX$BMXoJww(Q$j%1+tFRtDLZZrtq2&JZz-VI<3B#@2OF z$vVc=xJX%MMpVp@k$gY%PkiT>Gp~7_&*yp0^Sqz;`#ERM=M%H*kB=uMcF>o?;=roL zuJ1RNyFXpT`;O8&R1BsCN7^Glbcck))4DtlWIYb%#u#%wrm^kY9NuW6Ez&?QKj{a$o^h$l?T_Qb zJ8>yHak|&TD*!(aTz|lEY(OwAn$HuLj@|!{kLBK`yZl_}jpOo84q{(flv>=vO9=*% z8gl*AAhS4E-4`=_S;w!YcSY2KXgBIHlZIS}pjAP*ArzfYmOsq!WDQ#SF{W#nh`>pk zKieZI!!iYMYyB4OWL2HR$vE(~m_rh9GnhNbe~nwsja~B;O~l3+oVI$<6l9>-!_1E= zm|%J7j7mKYxH^Y0cv&Q#(3~f(Xch)RSvmDpn@3!8fLO2aOs}kcHCf}Y)a3c{M7z8P zeq}yt&J-W&mwmMyd3*rNrc~jtM#9yTrgE-6lWk+hxw1A%nKnsDg;k3nbA3sCz1JL* ztIlNsVU{`C7ZKcG11Oo#|&Wp(sL?cwK|K3IE%cSJnbvx6HkC;x&=;RFrA^ zcG);P6RifeUW<4AGGvcyhH4|bz68TJ*G#G1oq5xgt=qiN^B;i6)XYYYbbMLuL~P?t zZv{lFw5ylbPwnHWeFQDye7N;Db!-q>MrAgCqz1Z=eg&0-J`crb>Of)}MAQc`So=9#b`~hZIn! zM0^#(?=Gm|aa!iRY#W1gg1*qaiBZvvMt?F*R3uKtqQF za`@rb;TIaS5j>jS`yNor-XL@|B~_||`r50d-YbfQCVp{Wwa~he3=onWp{V~O;<&zE zRsG%e$Rlt%!*NYcm-<95dh!v^>~yNLu3Ugimu%qrT6N7t{~s2r<13M;Y^Pboz=NH| z^~I3d#e}7EtRwqM9FW3Dn!Gr~pK5e*L}s5Tv$#;w7b^TZEc)7Z&AGZ>H4D|B*ovgx zeR0-7M0z@qg?CclrCR`aCBkd+*x+qGHqF-_SxPxtUGRjecj>>p{hZnMo1^c;pH-oy@5;xTnCt8h^A}!UstijsA4Dr~G3~^-8 zxSo(SA&prdw$( zy{gkG#H(1Z&(;UcU!leMcU{1+uKBo5Is>BEKUj@>61 z*6rKwQmA+cI-bsPR+7s)Kz^(HXFr+rD-X_4ua<*K6Gbkj{BBcG`SlD9 zxtqoOB}ot}+bp}(FF?ofBk>V6j>1g@*!;5NX|t|hWn+?aTlbY!ZS3yet5jq9jN@GB8)q^ctajgNc-i%phmmG> z8oRp8I-`1<2)fM#6v67b>6`Kmhv+5AvnqMyts>rA-IAV)#mdu{D@?8u6J?PhU9geR=f!l{M=)9X9{owSPO{@f-FgZfB57Fw0VIJ{7JmYOSM9@#aBW8A1oo2{r@_ z0Tznqfz&!hE*c(<9D3cUY&*Ab3yX7>2`Zvh-4L#V-M`qF`bu4Zm9{026ZBf5z(5T< z@UfKpfe#nwXTHDw;XBw1vk3gu??u?S=O&%S*e~gwkM4d}C!gn0<%;n|PTj+A+>7^J zzB}~#tOU5#CVW!1@9*b1E~im5>4IaB78EJ*EnZ}+T?j()a2_p{5x1Q2W1|bc7pJ^{ zy-(C1fSo%Q{4vXmG1Ne21c7U21Cf{ofOr`IS5;*yD_n>=wsx6WscGR%v>q4?WT3yd zS2I79ShMb_B=qw@-@HXG4k)cgy(TDo%`M1Jikk2$T%PCrsru@9TE-@Ia!r8s^FI&d zm3dC6G#1oiuDpfa)H+vOBD|^#rCSt+=lRiIz0chK<<)s;_(YJA(=>rN4h@Kb`WkVq zy&bD#Z5uvH?o!sKd}U?r+-Y9z0kPsgrtc>hPS;_pvcmBg?*G&Xq=2o zE6g8LV8-&r3mnyqpymo*=s`b_qaY;p(9dbI;B221X!|dzTe+D^PCb>F62%v=rN4^@ z5vNzv`|Oz)`koCgF3jTO=Atf(I8P!@Ll^I<8>Ym*KB+vye>2XR>Y3 zavuM$2e1GGm;1xbQaFgV8WM_q?J!ghYkAZqPeGhUjr{m)7#ybGu_d#Z=WcnGH#@K^-D8^soDsIa~%Br4O{ps2Rtg^)ay#uX`w73zUg{zZ5ircLe5K8|InfQ!LP!xr5;FZA^}w9S5|k$bBqD zd+@AOiJYmpOSU^!q`UH}w!Zq-zb1+*vrVqxr&;-%e$UQ|3b(v8SP=HJ&jy++(VAg& zUc6%RJ@_)Lai+@d{(bjBKcAevv@NdTv)?k7CC(G`RpqNyp*oMtbY>ctjz0>{&qrHN& literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/gui/gui_bobmazon.png b/assets/hbm/textures/gui/gui_bobmazon.png new file mode 100644 index 0000000000000000000000000000000000000000..c84b96bb68fd86e92783712ca319d8fc7e17dc8b GIT binary patch literal 3765 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 0) @@ -217,6 +217,6 @@ public class WasteEarth extends Block { if(this.radIn > 0) world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world)); - } + }*/ } diff --git a/com/hbm/entity/effect/EntityFalloutRain.java b/com/hbm/entity/effect/EntityFalloutRain.java index 28e1b81ed..c6af0d2d8 100644 --- a/com/hbm/entity/effect/EntityFalloutRain.java +++ b/com/hbm/entity/effect/EntityFalloutRain.java @@ -134,7 +134,7 @@ public class EntityFalloutRain extends Entity { return; } else if(b == Blocks.sand) { - if(rand.nextInt(20) == 0) + if(rand.nextInt(60) == 0) worldObj.setBlock(x, y, z, meta == 0 ? ModBlocks.waste_trinitite : ModBlocks.waste_trinitite_red); return; } @@ -150,11 +150,11 @@ public class EntityFalloutRain extends Entity { } else if (b == Blocks.coal_ore) { - int ra = rand.nextInt(10); - if (ra < 3) { + int ra = rand.nextInt(30); + if (ra < 9) { worldObj.setBlock(x, y, z, Blocks.diamond_ore); } - if (ra == 3) { + if (ra == 9) { worldObj.setBlock(x, y, z, Blocks.emerald_ore); } return; @@ -177,13 +177,13 @@ public class EntityFalloutRain extends Entity { } else if (b == ModBlocks.ore_uranium) { - if (rand.nextInt(30) == 0) + if (rand.nextInt(90) == 0) worldObj.setBlock(x, y, z, ModBlocks.ore_schrabidium); return; } else if (b == ModBlocks.ore_nether_uranium) { - if (rand.nextInt(30) == 0) + if (rand.nextInt(90) == 0) worldObj.setBlock(x, y, z, ModBlocks.ore_nether_schrabidium); return; diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index 5adea03b0..0fe875a41 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -593,25 +593,25 @@ public class MachineRecipes { if(stamps_wire.contains(stamp.getItem())) { if(mODE(input, "ingotAluminum")) - return new ItemStack(ModItems.wire_aluminium, 3); + return new ItemStack(ModItems.wire_aluminium, 8); if(mODE(input, "ingotCopper")) - return new ItemStack(ModItems.wire_copper, 3); + return new ItemStack(ModItems.wire_copper, 8); if(mODE(input, "ingotTungsten")) - return new ItemStack(ModItems.wire_tungsten, 3); + return new ItemStack(ModItems.wire_tungsten, 8); if(mODE(input, "ingotRedAlloy")) - return new ItemStack(ModItems.wire_red_copper, 3); + return new ItemStack(ModItems.wire_red_copper, 8); if(mODE(input, "ingotRedstoneAlloy")) - return new ItemStack(ModItems.wire_red_copper, 3); + return new ItemStack(ModItems.wire_red_copper, 8); if(mODE(input, "ingotGold")) - return new ItemStack(ModItems.wire_gold, 3); + return new ItemStack(ModItems.wire_gold, 8); if(mODE(input, "ingotSchrabidium")) - return new ItemStack(ModItems.wire_schrabidium, 3); + return new ItemStack(ModItems.wire_schrabidium, 8); if(mODE(input, "ingotAdvanced")) - return new ItemStack(ModItems.wire_advanced_alloy, 3); + return new ItemStack(ModItems.wire_advanced_alloy, 8); if(mODE(input, "ingotAdvancedAlloy")) - return new ItemStack(ModItems.wire_advanced_alloy, 3); + return new ItemStack(ModItems.wire_advanced_alloy, 8); if(mODE(input, "ingotMagnetizedTungsten")) - return new ItemStack(ModItems.wire_magnetized_tungsten, 3); + return new ItemStack(ModItems.wire_magnetized_tungsten, 8); } if(stamps_circuit.contains(stamp.getItem())) { @@ -2168,37 +2168,37 @@ public class MachineRecipes { switch(ItemAssemblyTemplate.EnumAssemblyTemplate.getEnum(stack.getItemDamage())) { case IRON_PLATE: - list.add(new ItemStack(Items.iron_ingot, 1)); + list.add(new ItemStack(Items.iron_ingot, 3)); break; case GOLD_PLATE: - list.add(new ItemStack(Items.gold_ingot, 1)); + list.add(new ItemStack(Items.gold_ingot, 3)); break; case TITANIUM_PLATE: - list.add(new ItemStack(ModItems.ingot_titanium, 1)); + list.add(new ItemStack(ModItems.ingot_titanium, 3)); break; case ALUMINIUM_PLATE: - list.add(new ItemStack(ModItems.ingot_aluminium, 1)); + list.add(new ItemStack(ModItems.ingot_aluminium, 3)); break; case STEEL_PLATE: - list.add(new ItemStack(ModItems.ingot_steel, 1)); + list.add(new ItemStack(ModItems.ingot_steel, 3)); break; case LEAD_PLATE: - list.add(new ItemStack(ModItems.ingot_lead, 1)); + list.add(new ItemStack(ModItems.ingot_lead, 3)); break; case COPPER_PLATE: - list.add(new ItemStack(ModItems.ingot_copper, 1)); + list.add(new ItemStack(ModItems.ingot_copper, 3)); break; case ADVANCED_PLATE: - list.add(new ItemStack(ModItems.ingot_advanced_alloy, 1)); + list.add(new ItemStack(ModItems.ingot_advanced_alloy, 3)); break; case SCHRABIDIUM_PLATE: - list.add(new ItemStack(ModItems.ingot_schrabidium, 1)); + list.add(new ItemStack(ModItems.ingot_schrabidium, 3)); break; case CMB_PLATE: - list.add(new ItemStack(ModItems.ingot_combine_steel, 1)); + list.add(new ItemStack(ModItems.ingot_combine_steel, 3)); break; case SATURN_PLATE: - list.add(new ItemStack(ModItems.ingot_saturnite, 1)); + list.add(new ItemStack(ModItems.ingot_saturnite, 3)); break; case ALUMINIUM_WIRE: list.add(new ItemStack(ModItems.ingot_aluminium, 1)); diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index b35bf1d34..d8fb6ab44 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -698,41 +698,41 @@ public class Library { } else break; } - if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_desh && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index])) + if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_desh && ItemBattery.getCharge(slots[index]) >= ItemBattery.getMaxChargeStatic(slots[index])) slots[index] = new ItemStack(ModItems.dynosphere_desh_charged); - if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_schrabidium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index])) + if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_schrabidium && ItemBattery.getCharge(slots[index]) >= ItemBattery.getMaxChargeStatic(slots[index])) slots[index] = new ItemStack(ModItems.dynosphere_schrabidium_charged); - if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_euphemium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index])) + if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_euphemium && ItemBattery.getCharge(slots[index]) >= ItemBattery.getMaxChargeStatic(slots[index])) slots[index] = new ItemStack(ModItems.dynosphere_euphemium_charged); - if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_dineutronium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index])) + if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_dineutronium && ItemBattery.getCharge(slots[index]) >= ItemBattery.getMaxChargeStatic(slots[index])) slots[index] = new ItemStack(ModItems.dynosphere_dineutronium_charged); } for(int i = 0; i < 50; i++) - if(power - 1 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_sword && slots[index].getItemDamage() > 0) + if(power - 10 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_sword && slots[index].getItemDamage() > 0) { - power -= 1; + power -= 10; slots[index].setItemDamage(slots[index].getItemDamage() - 1); } else break; for(int i = 0; i < 50; i++) - if(power - 1 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_pickaxe && slots[index].getItemDamage() > 0) + if(power - 10 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_pickaxe && slots[index].getItemDamage() > 0) { - power -= 1; + power -= 10; slots[index].setItemDamage(slots[index].getItemDamage() - 1); } else break; for(int i = 0; i < 50; i++) - if(power - 1 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_axe && slots[index].getItemDamage() > 0) + if(power - 10 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_axe && slots[index].getItemDamage() > 0) { - power -= 1; + power -= 10; slots[index].setItemDamage(slots[index].getItemDamage() - 1); } else break; for(int i = 0; i < 50; i++) - if(power - 1 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_shovel && slots[index].getItemDamage() > 0) + if(power - 10 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_shovel && slots[index].getItemDamage() > 0) { - power -= 1; + power -= 10; slots[index].setItemDamage(slots[index].getItemDamage() - 1); } else break; diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index e454559b9..3738faa14 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -112,6 +112,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_sulfur), 1), new Object[] { "###", "###", "###", '#', ModItems.sulfur }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_titanium), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_titanium }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_tungsten), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_tungsten }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_uranium), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_uranium }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_thorium), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_th232 }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_lead), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_lead }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_trinitite), 1), new Object[] { "###", "###", "###", '#', ModItems.trinitite }); @@ -718,6 +719,7 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_computer), 1), new Object[] { "DTD", "TMT", "DTD", 'D', "dustDiamond", 'T', "dustMagnetizedTungsten", 'M', ModBlocks.block_meteor })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_core), 1), new Object[] { "CMC", "MAM", "CMC", 'C', ModItems.circuit_schrabidium, 'M', ModBlocks.fwatz_computer, 'A', ModBlocks.fwatz_conductor })); + GameRegistry.addRecipe(new ItemStack(ModBlocks.reinforced_stone, 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.cobblestone, 'B', Blocks.stone }); //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.asphalt), 8), new Object[] { "BGB", "GSG", "BGB", 'B', ModItems.canister_bitumen, 'G', Blocks.gravel, 'S', Blocks.sand }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_light), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.fence, 'B', Blocks.brick_block }); //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.concrete_smooth), 8), new Object[] { "SGS", "GWG", "SGS", 'S', Blocks.sand, 'G', Blocks.gravel, 'W', Items.water_bucket });