From 971f2def75a69c2eda75927612fba6d25a52136b Mon Sep 17 00:00:00 2001 From: HbmMods Date: Tue, 18 Dec 2018 00:07:18 +0100 Subject: [PATCH] new reactor textures, LR and control gui, new ammo recipes --- assets/hbm/lang/de_DE.lang | 21 +++++ assets/hbm/lang/en_US.lang | 1 + .../textures/blocks/machine_centrifuge.png | Bin 258 -> 259 bytes .../hbm/textures/blocks/machine_gascent.png | Bin 259 -> 260 bytes .../textures/blocks/reactor_control_base.png | Bin 0 -> 417 bytes .../textures/blocks/reactor_control_side.png | Bin 440 -> 483 bytes .../blocks/reactor_control_side_alt.png | Bin 0 -> 497 bytes .../textures/blocks/reactor_control_top.png | Bin 405 -> 609 bytes .../blocks/reactor_control_top_alt.png | Bin 0 -> 515 bytes .../textures/blocks/reactor_element_base.png | Bin 0 -> 422 bytes .../textures/blocks/reactor_element_side.png | Bin 435 -> 485 bytes .../blocks/reactor_element_side_alt.png | Bin 0 -> 566 bytes .../textures/blocks/reactor_element_top.png | Bin 421 -> 526 bytes .../blocks/reactor_element_top_alt.png | Bin 0 -> 492 bytes .../hbm/textures/gui/gui_reactor_control.png | Bin 0 -> 3596 bytes .../gui/gui_reactor_large_experimental.png | Bin 0 -> 3168 bytes com/hbm/blocks/machine/MachineRTG.java | 21 ----- com/hbm/creativetabs/MachineTab.java | 2 +- com/hbm/inventory/MachineRecipes.java | 6 ++ com/hbm/items/ModItems.java | 3 + com/hbm/main/CraftingManager.java | 83 +++++++++++++----- com/hbm/packet/TEMissilePacket.java | 18 ++-- 22 files changed, 104 insertions(+), 51 deletions(-) create mode 100644 assets/hbm/textures/blocks/reactor_control_base.png create mode 100644 assets/hbm/textures/blocks/reactor_control_side_alt.png create mode 100644 assets/hbm/textures/blocks/reactor_control_top_alt.png create mode 100644 assets/hbm/textures/blocks/reactor_element_base.png create mode 100644 assets/hbm/textures/blocks/reactor_element_side_alt.png create mode 100644 assets/hbm/textures/blocks/reactor_element_top_alt.png create mode 100644 assets/hbm/textures/gui/gui_reactor_control.png create mode 100644 assets/hbm/textures/gui/gui_reactor_large_experimental.png diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 735cd63a6..8522d7765 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -624,6 +624,27 @@ item.mechanism_rifle_2.name=Fortgeschrittener Gewehmechanismus item.mechanism_launcher_1.name=Werfermechanismus item.mechanism_launcher_2.name=Fortgeschrittener Werfermechanismus item.mechanism_special.name=High-Tech Waffenmechanismus +item.primer_357.name=.357 Magnum-Zündhütchen (x16) +item.primer_44.name=.44 Magnum-Zündhütchen (x16) +item.primer_9.name=Kleinkaliber-Zündhütchen (x24) +item.primer_50.name=Großkaliber-Zündhütchen (x8) +item.primer_buckshot.name=Schrot-Zündhütchen (x8) +item.casing_357.name=.357 Magnum-Hülse (x16) +item.casing_44.name=.44 Magnum-Hülse (x16) +item.casing_9.name=Kleinkaliberhülse (x24) +item.casing_50.name=Großkaliberhülse (x8) +item.casing_buckshot.name=Schrothülse (x8) +item.assembly_iron.name=Eisenpatronensatz +item.assembly_steel.name=Bleipatronensatz +item.assembly_lead.name=Glaspatronensatz +item.assembly_gold.name=Goldpatronensatz +item.assembly_schrabidium.name=Schrabidiumpatronensatz +item.assembly_nightmare.name=Nightmare-Patronensatz +item.assembly_pip.name=Verdorbener .44er Patronensatz +item.assembly_nopip.name=.44er Patronensatz +item.assembly_smg.name=9mm Patronensatz +item.assembly_uzi.name=.22LR Patronensatz +item.assembly_calamity.name=.50 BMG Patronensatz item.piston_selenium.name=Sternmotorenkolben diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 320bebdd4..27f8634dc 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -642,6 +642,7 @@ item.assembly_steel.name=Lead Bullet Assembly item.assembly_lead.name=Glass Bullet Assembly item.assembly_gold.name=Gold Bullet Assembly item.assembly_schrabidium.name=Schrabidium Bullet Assembly +item.assembly_nightmare.name=Nightmare Bullet Assembly item.assembly_pip.name=Tainted Bullet Assembly item.assembly_nopip.name=.44 Magnum Assembly item.assembly_smg.name=9mm Assembly diff --git a/assets/hbm/textures/blocks/machine_centrifuge.png b/assets/hbm/textures/blocks/machine_centrifuge.png index 9bbd7b39719d326d69b213413c5f24bd330b8975..0321518d84deb06ebec8ff5b647b709e6db46d84 100644 GIT binary patch delta 215 zcmV;|04V>00)qmOG=I8DL_t(Ijn$C74T4Y&{|`y?YYES8irwr>$-TJ*K-N6fiVWHHC0vhd{B14FDw)AU!N#8INuw< z2gm33;j;q(g3b2rwNdEjWBv&pr)$dbl1{D24H|2yjbgt$Og(c{cHUXC R&m#Z;002ovPDHLkV1nzPUuggU delta 214 zcmV;{04e{20)hgNG=I5CL_t(Ijn$Ab4uU`sMW4n*A{~vCcm)%$Km~W=C|g+CT3K0| zcnTX58?vx01twTQ0uBTV3t#mznf>{*@GGJyYQivVhCXB=4U;5kvMfVuO%MdMu9W)N zUrGT*QDBV0THAApl{EByAIEWUUAN~FVuP|QF~*SRdCzADd{4t~0{-h0#RjL;13Xy6 zJ*9I{^8x@i+g<0i)l|>N{1aMk*O>Dqo?4L`yedO&HT%PH^6_W@Fj{%Y8$`i%a3LPD QB>(^b07*qoM6N<$f?<4F{{R30 diff --git a/assets/hbm/textures/blocks/machine_gascent.png b/assets/hbm/textures/blocks/machine_gascent.png index 2608b023aa87d826ebe2aab5cd094814ac514c27..66c54fea505ead4fff32516f8927848e8b5f7e27 100644 GIT binary patch delta 216 zcmV;}04M*00)zsPG=IBEL_t(Ijn$Al4uU`wMUO_2NVKt`WHnUm!8N!8I$VSWYj7zh zY(X0n0t^!p62`_)z&8d93r}_O^5)K+fnO0tkqN`l41LH%8pd&K@;s*~3W6Zu;c1$_ z?N6nEs;W>*p|$S0#7r9czK`p=c%IjD39&(4*C?eZ%d+RA15v)=Hv#|kiDHB7c)puM zc6#~f0D$#k^YpfBxay0zCqBW@0dQ~<_9V7D>20)qmOG=I8DL_t(Ijn$Gd4uUWkMxVw+5*9W(I52tzC&R+TK|F$kLyyuE zcn6Q*4cv%R1%6m@Fp_|+!GXayz5Hpver*bKk>`1rWmz}&F$>pFYu#CEDa(>1NqD<4 z=41WR6;RhTB0}4?19!1<4V6*^K|mOW19#zU&@>GqLRD1*pHLj|3-bj0*CRR`6gmcC z)<6NhgP9fpuwmP~V7YOfeg$}a`_n$&R;is0|0O3F;A#lZNt|V R$ddp7002ovPDHLkV1mpSS;+tZ diff --git a/assets/hbm/textures/blocks/reactor_control_base.png b/assets/hbm/textures/blocks/reactor_control_base.png new file mode 100644 index 0000000000000000000000000000000000000000..cf5e55144bcb7690e55f9fbc3016f5fb9ad18d55 GIT binary patch literal 417 zcmV;S0bc%zP)#2AS&5<q&u4PZi$?%!ZTZeQF9@H{ zC%4-TKaL{+UDx59!+Vd2kaNa+4?qZEF+5EZkH-T5ug$~Zz%UF<)5N;I-!A~;IO3cm z=S)iJXQB2JLMTHa1lqO*pznJCVvHDLNGTOXg&^mQ+R^I!9`AkW#~3&23c)~^~i zAf-gpG>e{dZc9-6Re9@F>S2x9uR)rEs#@0uui*c-ubws5`p??8%GkCo)>^E!<$Ipz zg&I{<-^9X#h#(@o-){g;rxWl?LnBsYdrsS^!Ap}03PuYWr;Ol#@7no9F zzuy-%^`X`G;6;S4>$u$RQ#ek4F$uma|RMV1GWJBZQE>1OQ`<#vz1E z@NhU_wOYXr!vFwSuh)n%qN*y?b&bC7RdhC+q3?SD!1a1X(=^!acK2qE7))2Y_)LQB{>%m}n__0xF`KkLB0`K2%&ZfL zF={M06*JNdAuuznwfYe=Yd-{wK;}S5%#5NaGE79;WM;-Vj-L)hAhqSaM+iZ22mzPN zMe$@Z(Z(C;J~Qj%oXc=omRU}=mziP3YS(pmeEbF?LQMz()9DoV_upZR(e-_JxXbJV zfMsUv_j_zM8+<+6?KZ=*|EXg;3| delta 425 zcmV;a0apIw1Goc_8Gix*005AYXf^-<00d`2O+f$vv5yP-7m+@Pl|9M@ps#yF|gOCC|G(og#HAIg;`M zYKI5pfKdc>U4O#{CH(+O1goWap1Jk8LCN%Bm$K+IO%VxEUM~0QRB|MLx|HY7=kuNF zie#6xLnrGJ8-reUOU52*Q-U?QI36ZN5qSOMmrn5Ov+eJ2Xk T+)u!a00000NkvXXu0mjfRbI7> diff --git a/assets/hbm/textures/blocks/reactor_control_side_alt.png b/assets/hbm/textures/blocks/reactor_control_side_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..20d8225885dcf020db53a665379a3aee60a9c819 GIT binary patch literal 497 zcmVJktEXW+ZmIU3AVNgrF=-%CbaCi4cMqBPoOsSZfhN+%c(?V!Pb} zP!t7|$>eVH^?K#2I2;a0?>)mX@bvVH5CV^n-*UqLFlmgT?|YO|7-MkG<>bV?_gPJ1 zr_%{*EmCVu(=@!jy#UZO4MkB9W8`@J3BYtZ&Fks(0l;#(L~D%%aL(mQecxvVxSxIkeVz?{Ur%W27w0%)IycG7~e#V2nXlRmEnr;duO!6aGe*r6(K7g4P0q*&(FI)55sV0;a?^%mkWL0=iZO~jajmgm~#$mEyZH7V7*>*KA&;U(KJo| z5>raCTCLDpXEvYDsjBK`!CFgQ*H~+@)@B8Xja4NE5MxB96Jv~78bDc=nT^|Vyi(300000NkvXXu0mjfg}~zz literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/reactor_control_top.png b/assets/hbm/textures/blocks/reactor_control_top.png index 97c2cd38cb5417fd0783b7f2d1b9448b82371aea..bb7d99c144223c0ac04b15b6a11a64c8111ffebe 100644 GIT binary patch delta 595 zcmV-Z0<8U&1K|Xa8Gi-<001BJ|6u?C00eVFNmK|32nc)#WQYI&0vJg|K~y-6Ws^%w zBS92}ze-mXNn5585V9X;mE9~xh5;7_2`K&v|7JEF@PRSnOmLimK*WVB!9?iI@`+MYSwE|!`9O8K%Qc5b73ght@DJ4oNthKzoy#WwK5!Gsy zr>CcnOL9i7HP_dF=ya~A)oOU2N3Zulr*nn179j+emjk-pTZ}Qpar_}+TaPh@X0r)^ zQp({tj)|hk;eRa4oE%4BjN$nBfc1Kf)*9dUX}5nOr6f&L%H=YLhu=SLmG0PvU^1C7 zpU;V+2x~2`udhs}Qvj^B%w{uYvl&V$eBa*~ohM2uE-ro(1bsZuW4Tpc(zeT*>x z+}#Zcfj2!`{3Qtbjv!4_WSXY`dEj{-Ns>4mMG;a;hm}$r3HiM5?d@@T`i1p+ zO&rHqYfL#g`AQguWLbvq`?Om7#BuBhoQcoR&x}SRKF8zZV*zi=&CQgn)r!Gj;1)k` h&{`M1b{K{Q!guq)`}@R-gV6v0002ovPDHLkV1lhc6wLqt delta 389 zcmV;00eb%71eF7j8Gix*005AYXf^-<00d`2O+f$vv5yPVWII z!!Xo!FXi{+gypE|x{hVjG`4N44%@at$-1tH$dM3U{|XEnNjFgk;N9rZ^nFhy1bRr@ zwuna3zVEd4d4BSr>7q~>ZRxj)tMYeB)MIpv=(o6{*pnVh{ jLnr)Uh=>6DPlOOZ5I7txY9WUL00000NkvXXu0mjfuYIE{ diff --git a/assets/hbm/textures/blocks/reactor_control_top_alt.png b/assets/hbm/textures/blocks/reactor_control_top_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..bd53b0db81099c88e421ef9c2ece0cb2e85b2444 GIT binary patch literal 515 zcmV+e0{s1nP)g2b5QZNocB&{iAj-#KFJ1LeDN_Fh|Nn$k^^il$t`Mz& zLd=jvTD%7~*&x*Yn42Gs?RnpsQM1|1iwH_7j4>Ev&|0IE!h25>N-3OkD5Wl#?)7?P zSq4B51cYIDak;80K8vTPCv;ucoK7e5e1(Yc`1rL=_!p*&qM$5Gno73YMVs8PqFA=o zG;FoXan7NwwG4+t27?ny3B%!#APDf@b9)OQL{S7l6h&AIRkda?7+|eM1Bl3{I{y~> za5!8&;JwEfbHTc1dhbz6Q4|G1k|d1BW0uQ;JYQk0B~4S}IA*cf^8Eb$SLqgOEpKna z%gY*TExle3t(4+$IJD+e)%wcBKQX=E?o&l01IZJTP{h#$6Gxct_Lqu3E3q*wb`zZj%7+zmD zhzJi4Unt8GfcN(!BEsF>2oXW|`+X*p2}R+_vJ7K>w`;ShTf>@RIv&H8#c_=G-s7BO zI!&mmHQn85SU0-Ndw*W0`Fwt5p!dEVsP1+)QsBJKKLH{G`ev1RvJU_N002ovPDHLk FV1l4z<_7=( literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/reactor_element_base.png b/assets/hbm/textures/blocks/reactor_element_base.png new file mode 100644 index 0000000000000000000000000000000000000000..51471804aed2281854630663062187ebdbd2bbb1 GIT binary patch literal 422 zcmV;X0a^ZuP)*OLqbFYJFsd;*Iq62|+S6oFzE*2&gJKXF>=7h)DJFJkNZ8ec$h_*mWJZ+l`!aA)3IlEC5W? zLj3Ec9)K7l&N-H4DIJwJa?Y3?L*Ms=5K2A9$QG4A+qOGG zN{Oavs+w7=1Ptr;wy6Mk@5`O4B3qKB092DVZ24lOd7gJ<^K7xMzif4Hiig7i?>*l8 za$YY_&bf%JJF6_HDyqsb3;-ODN8p}@MQj{9%X)EAO6A-%P07DxF2XpDWe%!}*i?;R z$Di?-eeQB^LN3!fjKyCH7zpIw>8iPPI@Hyl+3W%p~3x3LoZ10-YIIIV0o QC;$Ke07*qoM6N<$f=f}i1poj5 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/reactor_element_side.png b/assets/hbm/textures/blocks/reactor_element_side.png index f234f8c230bfd9c617f420174f08bdcc92e80358..8ebff9842dc75d635e6d1f55a65ac824533811f7 100644 GIT binary patch delta 470 zcmV;{0V)2o1LXsd8Gi-<001BJ|6u?C00eVFNmK|32nc)#WQYI&0h~!hK~y-6g_ALF z6G0G#zwzz~TM9oQMUZIL^r4FoT~g&l2@(YrF|HB`QPZSJ5DfPMVoA++^Wb?_UUjM#EM6i)1ihm+(WDyZml^i0%EqAbYwhO-d{|LTI>&s5@SX;h*<>o4$Pc9sk*SFJo z3BHTm51jyun(xy7`l`6%s*1$VVqJf@&Uic~Ns>bShltoXjzl>XA3@UUqOaGh$@YVz*pc5|vL3_mY+!%} zNQ?MEE0JN_whsdXfea|U8SLQ(DshUUu(KUxWP_A(gzB}D_y|n(qcKR|xHY*r+a)sK zz}<0E;zPUW5;sU5d-9Hce0RI_7bJ8rW*-;}4JL?DA01630`Ff?N__&xD-FnuXD~0eUo7J0E)Fqupm zZc!9OX__(^3>XXse13j%a&p4Q#|OjVkSxo{vW!lr!)mocYt7r+8~uKte!owerbGb7 z7_7BeYuRizIOmwnW>i&0RaGpPOSIO65cZ~u%Cf{5!~Oj|+p{r-%galgb2#TXKR>4| zOT713YnjjI=jdLq$JyB#@9*y@rSRUPwWizcvR<#T)-s(=IXXIOx`q%))08Ah z&>})vmRww1v_|vZQ&kn-djPJluMcnG`}@1KgD0@Lqxc_xgkjsoO7-2ynl+dwTKT756wH(b&XOAV+=aWGDf2jbzKueKqM852!Em1j03Sk2tC2m>BP(C z1>3eQ0MEak2_c}h1|Xm1j7B2>_S=0DGsdv^w&1Wo0HC9y_nuG(E`KgmWyNy2Om5a% z5VoU1N;F z7(;VyaL#qR(SPr|NdoySr&t%Aqw8Fvd-f&k_2Qm-0;AE0)9HkBF2#$B8xDt*Wtoyi zVj_b5jLsO71U_Pm^?BaLp~LQgh+vE%gg`#a8IQ*R9QQ}G);Q;|)-uhf$w2oM&(QvD zIsZPhTCIAQ$Nh6~hN`T1`2LVSNdj7Hy!Q#C)|%;bN_duKgb)B|ng;JZ#+sDC#->s# zafa^d)^**T(^~4cy4Onr5y}1Ho?=~ev4fzs?)WzicVF)))Iz8Gix*005AYXf^-<00d`2O+f$vv5yP#0(%k?B(gDAA_#oGXJ}A@F0>Yto`0I@u9^ZZ2m-?}Ow)86 zCk(?hO|vXx6;Ru@{d9smT2)n#9pgAo(=^XBD|r14zVBsmY0wGc0!G|S=NrMbihE5WE zk*a~WcU^}?=6`VmP>ZD-*|zOrX7H8L3hhdNpca8N(2?Z=+@tUCI zb|Xdee<@*1Lr!L}5%53b6Ay&Q3i$s8rfGfxHGKGP(+`A=2LJ#707*qoM6N<$g2Mxz Au>b%7 diff --git a/assets/hbm/textures/blocks/reactor_element_top_alt.png b/assets/hbm/textures/blocks/reactor_element_top_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..773251de395422bd737f4c3036271a1fce41283d GIT binary patch literal 492 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�`(|O$IsU~V7)=ut~@ba$O>9))#&Zj@ne;j>;yri04 zR<=vQ?TOQwfr9L&LBbh$vx{2o)XeZPQ&ZE)N}a27CA~`l+_{3~Nyh%5_tdy9Z}Jk! zU~Z%rihF_p7DiBDmkNNQHUKsMJuNk#gMtud(rM9j00gA8Kqsmr%=Q>)%UI_8yhWMz zFUHuq>m6Ao?dQ;pZ9AZSGcyht3>UsdDe-R0l)a+s>%2Dl*tY5UNzSja5Q7~%tT6pu zW&Tr~p$xoHZ$^H;x!n*gDDYkcy=h^7!4i@|7YXs@T@bKdic?%OC z)w-IRnyEPf-e8X3tDdJ9R=M0TaNdjW#8nvcrY||?lN{o+>*QMWlelM*h3|rD>SfhY z`1z+X^G|UV#k^^I9w3_?DKSeJ%=)R>U1~hrN7)xFE7{8K*!&>eEIU! z7iR8P!M!XVs6!enZM3}ldJZ>)gjKiK8wv&-JHqhN2=_(*C+$XM&4Yvd&DW>9!v^9g zho_nfG$P!_StjtcRuq&_+b~i2%F@S9v@m@3Bd*|ej1O1$ zEJdv&C3pE`$$241dI88>^wG6f%xskN-V^*va(H=LAwe{ciy#2B;0v4+$v~r&P0fl3 zy}mmq!>+IO7H`6&4n>-)t;O<|2AFU`x&3NNn~z{`zH4tMI=;^gB(;XKx3swhzFi(J zC_<3}$KBmH5HXZ}twReSrC%?8IX3NpVZN=-6;722Y=5}1%zPkGG;aSYDXb1jWY48u zOACBybf#zlOj)0!DxsAUwe%reY!Cb@wa=6udOxG7?&C? zSWe@6kqWgr@Au_C3*FU_J;*F8CuVPdtG<$(gJa)lXH<@E3UiHsqbMKF0uSSTlEWt5nm7sRwY1OtkH zF<6xRYS@2{w6O(F`Wzx8iiThz$=dFFW{-#*>Q{Frjkcs|_jrzKpdDx+7ykzH1FdfI za8K`^e=#c7%%+QwFr0DTI+M0m+l?Ez^TxY=&fC$~oGj!px>2BQz}1YCmKHW|2#GS~ z!9X9wwh)|b5YVh+-ML`sp(FT^Uu%-n-{NNq>UX171+-mq{^}+EWN0n^?OiA!pmnqN zU>wK}?13Vf%|CLVJIa#AQ^!}mbHZhm#)}sQJPMW8B(nWnb*PkTS{($}=(hC^weH6U z@b+3a(7FEEi6J?cg7!k-=*-^}L}Mf2q;k<8s z-r4kEHZ0nq39&ohc0)vWKX zDLX6~%5e3Hb81NnKvH#8NV+|so25asZTkbo`QnAi_8?1azN}oG*6mYG54IBDRCM}m z5X{2|dne_qK@ubwxdM(nR8`tf0;+gyzqVc5ST27|={D3*s+nPOUINQvcV9g(h1qO# z9fNtnS;LgCElp0ob?a7gvMUIvy{Jh#E+OVVh?oNbNKp`T;@?j*>98Y@j&YPa7ZT*^ zTHIyBp_RwXwUUSLtBb`$4ktZq<|Z>}WIRObpE~?YxXfwDZ}hpY`k2TCm$!AjBFW{{ml{1u5|!C+NpR=6OqtAI+~g< zt(!pu2|YbMUM3O&7i2BWr_2q9PwJ6o$xF%-2OmVI$su1^ZPom9*FjrE^4BQ!jG6`p zMH!t}MGvT;@s@hUB6rSXd5)4$>#WnHqVMhC)n$fkw}AsZR{EPhHRc{FZgRFd+Z3uZ z{mJn{$26aXHjXtARZ@eV3+alP@R%#g-(XqA5>)qL ztSH()aOr%AUkvJHgF9QF|EYt;?}G1}>U|OHdVAy61ECL!R_r!bwwU6BxP<=z5LcfC literal 0 HcmV?d00001 diff --git a/com/hbm/blocks/machine/MachineRTG.java b/com/hbm/blocks/machine/MachineRTG.java index 8dfce9bc1..b2278523e 100644 --- a/com/hbm/blocks/machine/MachineRTG.java +++ b/com/hbm/blocks/machine/MachineRTG.java @@ -41,28 +41,7 @@ public class MachineRTG extends BlockContainer { @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - String s; - //if(this == ModBlocks.machine_rtg_blue) - // s = "blue"; - /*else*/ if(this == ModBlocks.machine_rtg_cyan) - s = "cyan"; - //else if(this == ModBlocks.machine_rtg_green) - // s = "green"; - else if(this == ModBlocks.machine_rtg_grey) - s = "grey"; - //else if(this == ModBlocks.machine_rtg_orange) - // s = "orange"; - //else if(this == ModBlocks.machine_rtg_purple) - // s = "purple"; - //else if(this == ModBlocks.machine_rtg_red) - // s = "red"; - //else if(this == ModBlocks.machine_rtg_yellow) - // s = "yellow"; - else - s = "null"; - this.iconTop = iconRegister.registerIcon(RefStrings.MODID + (":machine_rtg_top")); - //this.iconFront = iconRegister.registerIcon(RefStrings.MODID + (":reactor_front")); this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + (":red_wire_coated")); this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_rtg_furnace_base_alt"); } diff --git a/com/hbm/creativetabs/MachineTab.java b/com/hbm/creativetabs/MachineTab.java index 5805affb1..c97c8c3f6 100644 --- a/com/hbm/creativetabs/MachineTab.java +++ b/com/hbm/creativetabs/MachineTab.java @@ -18,7 +18,7 @@ public class MachineTab extends CreativeTabs { if(ModBlocks.machine_generator != null) { - return Item.getItemFromBlock(ModBlocks.machine_generator); + return Item.getItemFromBlock(ModBlocks.machine_rtg_grey); } return Items.iron_pickaxe; diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index f9f12c6fc..6e48c60a4 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -639,6 +639,8 @@ public class MachineRecipes { return new ItemStack(ModItems.gun_revolver_gold_ammo); if(input.getItem() == ModItems.assembly_schrabidium) return new ItemStack(ModItems.gun_revolver_schrabidium_ammo); + if(input.getItem() == ModItems.assembly_nightmare) + return new ItemStack(ModItems.gun_revolver_nightmare_ammo); if(mODE(input, "ingotSteel")) return new ItemStack(ModItems.gun_revolver_cursed_ammo); @@ -658,6 +660,8 @@ public class MachineRecipes { return new ItemStack(ModItems.gun_mp40_ammo); if(input.getItem() == ModItems.assembly_uzi) return new ItemStack(ModItems.gun_uzi_ammo); + if(mODE(input, "ingotGold")) + return new ItemStack(ModItems.gun_mp_ammo); } if(stamp.getItem() == ModItems.stamp_50) { @@ -731,12 +735,14 @@ public class MachineRecipes { recipes.put(new Object[] { i_stamps_357, new ItemStack(ModItems.assembly_gold) }, getPressResultNN(i_stamps_357.get(0).getItem(), ModItems.assembly_gold)); recipes.put(new Object[] { i_stamps_357, new ItemStack(ModItems.assembly_schrabidium) }, getPressResultNN(i_stamps_357.get(0).getItem(), ModItems.assembly_schrabidium)); recipes.put(new Object[] { i_stamps_357, new ItemStack(ModItems.ingot_steel) }, getPressResultNN(i_stamps_357.get(0).getItem(), ModItems.ingot_steel)); + recipes.put(new Object[] { i_stamps_357, new ItemStack(ModItems.assembly_nightmare) }, getPressResultNN(i_stamps_357.get(0).getItem(), ModItems.assembly_nightmare)); recipes.put(new Object[] { i_stamps_44, new ItemStack(ModItems.assembly_nopip) }, getPressResultNN(i_stamps_44.get(0).getItem(), ModItems.assembly_nopip)); recipes.put(new Object[] { i_stamps_44, new ItemStack(ModItems.assembly_pip) }, getPressResultNN(i_stamps_44.get(0).getItem(), ModItems.assembly_pip)); recipes.put(new Object[] { i_stamps_9, new ItemStack(ModItems.assembly_smg) }, getPressResultNN(i_stamps_9.get(0).getItem(), ModItems.assembly_smg)); recipes.put(new Object[] { i_stamps_9, new ItemStack(ModItems.assembly_uzi) }, getPressResultNN(i_stamps_9.get(0).getItem(), ModItems.assembly_uzi)); + recipes.put(new Object[] { i_stamps_9, new ItemStack(Items.gold_ingot) }, getPressResultNN(i_stamps_9.get(0).getItem(), Items.gold_ingot)); recipes.put(new Object[] { i_stamps_50, new ItemStack(ModItems.assembly_calamity) }, getPressResultNN(i_stamps_50.get(0).getItem(), ModItems.assembly_calamity)); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 472bd607c..e81db3c72 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -303,6 +303,7 @@ public class ModItems { public static Item assembly_lead; public static Item assembly_gold; public static Item assembly_schrabidium; + public static Item assembly_nightmare; public static Item assembly_pip; public static Item assembly_nopip; public static Item assembly_smg; @@ -1767,6 +1768,7 @@ public class ModItems { assembly_lead = new Item().setUnlocalizedName("assembly_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_lead"); assembly_gold = new Item().setUnlocalizedName("assembly_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_gold"); assembly_schrabidium = new Item().setUnlocalizedName("assembly_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_schrabidium"); + assembly_nightmare = new Item().setUnlocalizedName("assembly_nightmare").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_nightmare"); assembly_pip = new Item().setUnlocalizedName("assembly_pip").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_pip"); assembly_nopip = new Item().setUnlocalizedName("assembly_nopip").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_nopip"); assembly_smg = new Item().setUnlocalizedName("assembly_smg").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":assembly_smg"); @@ -3167,6 +3169,7 @@ public class ModItems { GameRegistry.registerItem(assembly_lead, assembly_lead.getUnlocalizedName()); GameRegistry.registerItem(assembly_gold, assembly_gold.getUnlocalizedName()); GameRegistry.registerItem(assembly_schrabidium, assembly_schrabidium.getUnlocalizedName()); + GameRegistry.registerItem(assembly_nightmare, assembly_nightmare.getUnlocalizedName()); GameRegistry.registerItem(assembly_pip, assembly_pip.getUnlocalizedName()); GameRegistry.registerItem(assembly_nopip, assembly_nopip.getUnlocalizedName()); GameRegistry.registerItem(assembly_smg, assembly_smg.getUnlocalizedName()); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 61d117d6e..3fbc339ae 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -677,7 +677,9 @@ public class CraftingManager { //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.brick_concrete), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.stone }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.concrete), 8), new Object[] { "SGS", "GWG", "SGS", 'S', Blocks.sand, 'G', Blocks.gravel, 'W', Items.water_bucket }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.concrete), 8), new Object[] { "GSG", "SWS", "GSG", 'S', Blocks.sand, 'G', Blocks.gravel, 'W', Items.water_bucket }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete), 4), new Object[] { " C ", "CBC", " C ", 'C', ModBlocks.concrete, 'B', Items.clay_ball }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_obsidian), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian }); //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick), 4), new Object[] { "PPP", "PIP", "PPP", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel }); //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick_reinforced), 8), new Object[] { "TBT", "BCB", "TBT", 'T', ModBlocks.block_magnetized_tungsten, 'B', ModBlocks.brick_concrete, 'C', ModBlocks.cmb_brick }); @@ -702,31 +704,36 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.seal_frame, 2), new Object[] { "SSS", "WRW", "III", 'S', ModBlocks.steel_roof, 'W', ModItems.wire_aluminium, 'R', "dustRedstone", 'I', "ingotSteel" })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.seal_controller, 1), new Object[] { "SSS", "RCR", "III", 'S', ModBlocks.steel_roof, 'C', ModItems.ingot_red_copper, 'R', "dustRedstone", 'I', "ingotSteel" })); - + + reg2(); + } + + public static void reg2() { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg, 1), new Object[] { "SSW", " MW", 'S', "plateSteel", 'W', "plateIron", 'M', ModItems.mechanism_launcher_1 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg_ammo, 8), new Object[] { "SI ", "ITI", " I ", 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt), 'I', "plateIron", 'M', ModItems.mechanism_launcher_2 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_stinger, 1), new Object[] { "SSW", "CMW", 'S', "plateSteel", 'W', "plateTitanium", 'C', ModItems.circuit_red_copper, 'M', ModItems.mechanism_launcher_2 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_stinger_ammo, 4), new Object[] { "SS ", "STI", " IR", 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt), 'I', "plateAluminum", 'R', "dustRedstone" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver, 1), new Object[] { "SSM", " RW", 'S', "plateSteel", 'W', "plankWood", 'R', ModItems.wire_aluminium, 'M', ModItems.mechanism_revolver_1 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_saturnite, 1), new Object[] { "SSM", " RW", 'S', "plateSaturnite", 'W', "plankWood", 'R', ModItems.wire_tungsten, 'M', ModItems.mechanism_revolver_2 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_ammo, 16), new Object[] { "L", "S", "G", 'L', "plateLead", 'S', "plateSteel", 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_ammo, 16), new Object[] { "L", "S", "G", 'L', "plateLead", 'S', "plateSteel", 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_iron, 1), new Object[] { "SSM", " RW", 'S', "plateIron", 'W', "plankWood", 'R', ModItems.wire_aluminium, 'M', ModItems.mechanism_revolver_1 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_iron_ammo, 16), new Object[] { "L", "S", "G", 'L', "plateIron", 'S', "plateCopper", 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_iron_ammo, 16), new Object[] { "L", "S", "G", 'L', "plateIron", 'S', "plateCopper", 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_gold, 1), new Object[] { "SSM", " RW", 'S', "plateGold", 'W', "ingotGold", 'R', ModItems.wire_gold, 'M', ModItems.mechanism_revolver_1 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_gold_ammo, 16), new Object[] { "L", "L", "S", 'L', ModItems.plate_gold, 'S', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_gold_ammo, 16), new Object[] { "L", "L", "S", 'L', ModItems.plate_gold, 'S', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_lead, 1), new Object[] { "SSM", " RW", 'S', "plateLead", 'W', "ingotTungsten", 'R', ModItems.wire_tungsten, 'M', ModItems.mechanism_revolver_2 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_lead_ammo, 16), new Object[] { "L", "S", "G", 'L', "paneGlass", 'S', ModItems.ingot_u235, 'G', Items.gunpowder })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_lead_ammo, 16), new Object[] { "L", "S", "G", 'L', "paneGlass", 'S', ModItems.ingot_pu239, 'G', Items.gunpowder })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_lead_ammo, 16), new Object[] { "L", "S", "G", 'L', "paneGlass", 'S', ModItems.nuclear_waste, 'G', Items.gunpowder })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_lead_ammo, 16), new Object[] { "L", "S", "G", 'L', "paneGlass", 'S', ModItems.trinitite, 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_lead_ammo, 16), new Object[] { "L", "S", "G", 'L', "paneGlass", 'S', ModItems.ingot_u235, 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_lead_ammo, 16), new Object[] { "L", "S", "G", 'L', "paneGlass", 'S', ModItems.ingot_pu239, 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_lead_ammo, 16), new Object[] { "L", "S", "G", 'L', "paneGlass", 'S', ModItems.nuclear_waste, 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_lead_ammo, 16), new Object[] { "L", "S", "G", 'L', "paneGlass", 'S', ModItems.trinitite, 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_schrabidium, 1), new Object[] { "SSM", " RW", 'S', ModBlocks.block_schrabidium, 'W', "ingotTungsten", 'R', ModItems.wire_schrabidium, 'M', ModItems.mechanism_special })); - GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_schrabidium_ammo, 16), new Object[] { "L", "N", "S", 'L', ModItems.plate_schrabidium, 'S', Items.gunpowder, 'N', Items.nether_star }); + //GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_schrabidium_ammo, 16), new Object[] { "L", "N", "S", 'L', ModItems.plate_schrabidium, 'S', Items.gunpowder, 'N', Items.nether_star }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_cursed, 1), new Object[] { "TTM", "SRI", 'S', "plateSteel", 'I', "ingotSteel", 'R', ModItems.wire_red_copper, 'T', "plateTitanium", 'M', ModItems.mechanism_revolver_2 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_cursed_ammo, 32), new Object[] { "L", "L", 'L', "plateSteel", 'S', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_cursed_ammo, 32), new Object[] { "L", "L", 'L', "plateSteel", 'S', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_nightmare, 1), new Object[] { "SEM", " RW", 'S', "plateSteel", 'W', "plankWood", 'R', ModItems.wire_aluminium, 'E', ModItems.powder_power, 'M', ModItems.mechanism_revolver_2 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_nightmare_ammo, 16), new Object[] { "L", "S", "G", 'L', "plateDenseLead", 'S', "plateSteel", 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_nightmare_ammo, 16), new Object[] { "L", "S", "G", 'L', "plateDenseLead", 'S', "plateSteel", 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_nightmare2, 1), new Object[] { "SSM", "RRW", 'S', "plateDenseLead", 'W', "ingotTungsten", 'R', ModItems.wire_gold, 'M', ModItems.mechanism_special })); - GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_nightmare2_ammo, 6), new Object[] { "L", "S", "G", 'L', ModItems.powder_power, 'S', ModItems.plate_polymer, 'G', Items.gunpowder }); + //GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_nightmare2_ammo, 6), new Object[] { "L", "S", "G", 'L', ModItems.powder_power, 'S', ModItems.plate_polymer, 'G', Items.gunpowder }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_fatman, 1), new Object[] { "SSI", "IIM", "WPH", 'S', "plateSteel", 'I', "ingotSteel", 'W', ModItems.wire_aluminium, 'H', ModItems.hull_small_steel, 'P', Item.getItemFromBlock(Blocks.piston), 'M', ModItems.mechanism_launcher_2 })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_fatman_ammo, 2), new Object[] { " S ", "SPS", "ITI", 'S', "plateSteel", 'P', ModItems.ingot_pu239, 'T', Item.getItemFromBlock(Blocks.tnt), 'I', "plateIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mirv, 1), new Object[] { "LLL", "WFW", "SSS", 'S', "plateSteel", 'L', "plateLead", 'W', ModItems.wire_gold, 'F', ModItems.gun_fatman })); @@ -735,9 +742,9 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bf, 1), new Object[] { "LLL", "WFW", "SSS", 'S', ModItems.plate_paa, 'L', "plateDenseLead", 'W', ModItems.wire_advanced_alloy, 'F', ModItems.gun_mirv })); GameRegistry.addRecipe(new ItemStack(ModItems.gun_bf_ammo, 1), new Object[] { "AEA", "SHS", "AEA", 'H', ModItems.hull_small_steel, 'A', ModItems.cell_antimatter, 'S', ModItems.cell_anti_schrabidium, 'E', ModItems.powder_power }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp40, 1), new Object[] { "IIM", " SW", " S ", 'S', "plateSteel", 'I', "ingotSteel", 'W', "plankWood", 'M', ModItems.mechanism_rifle_2 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp40_ammo, 16), new Object[] { "L", "P", "G", 'P', "plateCopper", 'L', "plateLead", 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp40_ammo, 16), new Object[] { "L", "P", "G", 'P', "plateCopper", 'L', "plateLead", 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_uboinik, 1), new Object[] { "IIM", "SPW", 'P', "plateSteel", 'I', "ingotSteel", 'W', "plankWood", 'S', Items.stick, 'M', ModItems.mechanism_revolver_2 })); - GameRegistry.addRecipe(new ItemStack(ModItems.gun_uboinik_ammo, 6), new Object[] { "P", "S", "G", 'P', ModItems.pellet_buckshot, 'S', ModItems.plate_polymer, 'G', Items.gunpowder }); + //GameRegistry.addRecipe(new ItemStack(ModItems.gun_uboinik_ammo, 6), new Object[] { "P", "S", "G", 'P', ModItems.pellet_buckshot, 'S', ModItems.plate_polymer, 'G', Items.gunpowder }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_xvl1456, 1), new Object[] { "PBB", "ACC", "PRY", 'P', "plateSteel", 'R', ModItems.redcoil_capacitor, 'A', ModItems.coil_advanced_alloy, 'B', ModItems.battery_generic, 'C', ModItems.coil_advanced_torus, 'Y', ModItems.mechanism_special })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_xvl1456_ammo, 64), new Object[] { "SSS", "SRS", "SSS", 'S', "plateSteel", 'R', ModItems.rod_quad_uranium_fuel_depleted })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_xvl1456_ammo, 32), new Object[] { " S ", "SRS", " S ", 'S', "plateSteel", 'R', ModItems.rod_dual_uranium_fuel_depleted })); @@ -758,11 +765,11 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_cryolator_ammo, 16), new Object[] { " F ", "SFS", " F ", 'S', "plateSteel", 'F', ModItems.powder_ice })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_zomg, 1), new Object[] { "PRR", "CCS", "PXX", 'P', ModItems.plate_paa, 'R', "plateDenseLead", 'S', ModItems.singularity_counter_resonant, 'X', ModItems.crystal_xen, 'C', ModItems.coil_magnetized_tungsten})); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp, 1), new Object[] { "EEE", "SSM", "III", 'E', ModItems.ingot_euphemium, 'S', "plateSteel", 'I', "ingotSteel", 'M', ModItems.mechanism_rifle_2 })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp_ammo, 32), new Object[] { "G", "C", 'G', "plateGold", 'C', "plateCopper", 'S', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp_ammo, 32), new Object[] { "G", "C", 'G', "plateGold", 'C', "plateCopper", 'S', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_emp, 1), new Object[] { "CPG", "CMF", "CPI", 'C', ModItems.coil_copper, 'P', "plateLead", 'G', ModItems.circuit_gold, 'M', ModItems.magnetron, 'I', "ingotTungsten", 'F', ModItems.mechanism_special })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_emp_ammo, 8), new Object[] { "IGI", "IPI", "IPI", 'G', "plateGold", 'I', "plateIron", 'P', ModItems.powder_power })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_jack, 1), new Object[] { "WW ", "TSD", " TT", 'W', "ingotWeidanium", 'T', ModItems.toothpicks, 'S', ModItems.gun_uboinik, 'D', ModItems.ducttape })); - GameRegistry.addShapedRecipe(new ItemStack(ModItems.gun_jack_ammo, 3), new Object[] { "PP", "II", "GG", 'G', Items.gunpowder, 'P', ModItems.pellet_buckshot, 'I', ModItems.plate_polymer }); + //GameRegistry.addShapedRecipe(new ItemStack(ModItems.gun_jack_ammo, 3), new Object[] { "PP", "II", "GG", 'G', Items.gunpowder, 'P', ModItems.pellet_buckshot, 'I', ModItems.plate_polymer }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.gun_jack_ammo, 1), new Object[] { ModItems.gun_uboinik_ammo, ModItems.gun_uboinik_ammo, ModItems.gun_uboinik_ammo, ModItems.gun_uboinik_ammo }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_euthanasia, 1), new Object[] { "TDT", "AAS", " T ", 'A', "ingotAustralium", 'T', ModItems.toothpicks, 'S', ModItems.gun_mp40, 'D', ModItems.ducttape })); GameRegistry.addShapedRecipe(new ItemStack(ModItems.gun_euthanasia_ammo, 12), new Object[] { "P", "S", "N", 'P', ModItems.powder_poison, 'N', ModItems.niter, 'S', ModItems.syringe_metal_empty }); @@ -775,11 +782,11 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_defabricator_ammo, 16), new Object[] { "PCP", "DDD", "PCP", 'P', "plateSteel", 'C', ModItems.coil_copper, 'D', "dustLithium" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_lever_action, 1), new Object[] { "PPI", "SWD", 'P', "plateIron", 'I', ModItems.mechanism_rifle_1, 'S', Items.stick, 'D', "plankWood", 'W', ModItems.wire_aluminium })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_lever_action_dark, 1), new Object[] { "PPI", "SWD", 'P', "plateSteel", 'I', ModItems.mechanism_rifle_1, 'S', Items.stick, 'D', "plankWood", 'W', ModItems.wire_aluminium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_lever_action_ammo, 6), new Object[] { "P", "S", "G", 'P', ModItems.pellet_buckshot, 'S', "plateCopper", 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_lever_action_ammo, 6), new Object[] { "P", "S", "G", 'P', ModItems.pellet_buckshot, 'S', "plateCopper", 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action, 1), new Object[] { "PPI", "SWD", 'P', "plateSteel", 'I', ModItems.mechanism_rifle_1, 'S', Items.stick, 'D', "plankWood", 'W', ModItems.wire_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action_green, 1), new Object[] { "PPI", "SWD", 'P', "plateIron", 'I', ModItems.mechanism_rifle_1, 'S', Items.stick, 'D', "plankWood", 'W', ModItems.wire_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action_saturnite, 1), new Object[] { "PPI", "SWD", 'P', "plateSaturnite", 'I', ModItems.mechanism_rifle_1, 'S', Items.stick, 'D', "plankWood", 'W', ModItems.wire_tungsten })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action_ammo, 2), new Object[] { "P", "S", "G", 'P', "nuggetLead", 'S', ModItems.plate_polymer, 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action_ammo, 2), new Object[] { "P", "S", "G", 'P', "nuggetLead", 'S', ModItems.plate_polymer, 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_b92, 1), new Object[] { "SSS", " EP", 'P', "ingotPolymer", 'S', ModItems.ingot_starmetal, 'E', ModItems.powder_spark_mix })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_b92_ammo, 1), new Object[] { "PSP", "ESE", "PSP", 'P', "plateSteel", 'S', ModItems.ingot_starmetal, 'E', ModItems.powder_spark_mix })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.weaponized_starblaster_cell, 1), new Object[] { new ItemStack(ModItems.fluid_tank_full, 1, FluidType.ACID.getID()), GunB92Cell.getFullCell(), ModItems.wire_copper }); @@ -787,7 +794,39 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_uzi_silencer, 1), new Object[] { "P ", " P ", " U", 'P', "ingotPolymer", 'U', ModItems.gun_uzi })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_uzi_saturnite, 1), new Object[] { "SMS", " PB", " P ", 'S', "ingotSaturnite", 'M', ModItems.mechanism_rifle_2, 'P', "plateSaturnite", 'B', ModItems.bolt_tungsten })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_uzi_saturnite_silencer, 1), new Object[] { "P ", " P ", " U", 'P', "ingotPolymer", 'U', ModItems.gun_uzi_saturnite })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_uzi_ammo, 16), new Object[] { "L", "P", "G", 'P', "plateIron", 'L', "plateSteel", 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_uzi_ammo, 16), new Object[] { "L", "P", "G", 'P', "plateIron", 'L', "plateSteel", 'G', Items.gunpowder })); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_iron, 16), new Object[] { " I", "GC", " P", 'I', "ingotIron", 'G', Items.gunpowder, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_steel, 16), new Object[] { " I", "GC", " P", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_gold, 16), new Object[] { " I", "GC", " P", 'I', "ingotGold", 'G', Items.gunpowder, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_schrabidium, 16), new Object[] { " I ", "GCN", " P ", 'I', "ingotSchrabidium", 'G', Items.gunpowder, 'C', ModItems.casing_357, 'P', ModItems.primer_357, 'N', Items.nether_star })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_nightmare, 16), new Object[] { " I", "GC", " P", 'I', "ingotTungsten", 'G', Items.gunpowder, 'C', ModItems.casing_357, 'P', ModItems.primer_357 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_smg, 24), new Object[] { " I", "GC", " P", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_9, 'P', ModItems.primer_9 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_uzi, 24), new Object[] { " I", "GC", " P", 'I', "ingotIron", 'G', Items.gunpowder, 'C', ModItems.casing_9, 'P', ModItems.primer_9 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_nopip, 16), new Object[] { " I", "GC", " P", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_44, 'P', ModItems.primer_44 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_pip, 16), new Object[] { " I ", "GCM", " P ", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_44, 'P', ModItems.primer_44, 'M', ModItems.powder_magic })); + GameRegistry.addRecipe(new ItemStack(ModItems.gun_uboinik_ammo, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', Items.gunpowder, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_lever_action_ammo, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', Items.gunpowder, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action_ammo, 8), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); + GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_nightmare2_ammo, 8), new Object[] { "I", "C", "P", 'I', ModItems.powder_power, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_calamity, 8), new Object[] { " I ", "GCG", " P ", 'I', "ingotLead", 'G', Items.gunpowder, 'C', ModItems.casing_50, 'P', ModItems.primer_50 })); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.casing_357, 1), new Object[] { " P ", " ", "P P", 'P', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.casing_44, 1), new Object[] { "P", " ", "P", 'P', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.casing_9, 1), new Object[] { "P", "P", 'P', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.casing_50, 1), new Object[] { " P ", " P ", "PPP", 'P', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.casing_buckshot, 1), new Object[] { "P P", "PPP", 'P', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.casing_357, 1), new Object[] { " P ", " ", "P P", 'P', "plateIron" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.casing_44, 1), new Object[] { "P", " ", "P", 'P', "plateIron" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.casing_9, 1), new Object[] { "P", "P", 'P', "plateIron" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.casing_50, 1), new Object[] { " P ", " P ", "PPP", 'P', "plateIron" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.casing_buckshot, 1), new Object[] { "P P", "PPP", 'P', "plateIron" })); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.primer_357, 1), new Object[] { "R", "P", 'P', "plateIron", 'R', "dustRedstone" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.primer_44, 1), new Object[] { "P", "R", 'P', "plateIron", 'R', "dustRedstone" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.primer_9, 1), new Object[] { "R", "P", 'P', "plateAluminum", 'R', "dustRedstone" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.primer_50, 1), new Object[] { "P", "R", 'P', "plateAluminum", 'R', "dustRedstone" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.primer_buckshot, 1), new Object[] { "R", "P", 'P', "plateCopper", 'R', "dustRedstone" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_light_ammo, 1), new Object[] { " L ", "IGI", "ICI", 'L', "plateLead", 'I', "plateIron", 'C', "plateCopper", 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_heavy_ammo, 1), new Object[] { "LGC", "LGC", "LGC", 'L', "plateLead", 'C', "plateCopper", 'G', Items.gunpowder })); @@ -1265,7 +1304,7 @@ public class CraftingManager { //Temporary Crappy Recipes GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_pip, 1), new Object[] { " G ", "SSP", " TI", 'G', "paneGlass", 'S', "plateSteel", 'P', ModItems.mechanism_revolver_2, 'T', ModItems.wire_tungsten, 'I', "ingotPolymer" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_pip_ammo, 1), new Object[] { "S", "G", "C", 'S', "plateSteel", 'G', Items.gunpowder, 'C', "plateCopper" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_pip_ammo, 1), new Object[] { "S", "G", "C", 'S', "plateSteel", 'G', Items.gunpowder, 'C', "plateCopper" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_dineutronium, 4), new Object[] { "PIP", "IDI", "PIP", 'P', ModItems.powder_spark_mix, 'I', "ingotDineutronium", 'D', "ingotDesh" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_desh, 4), new Object[] { "PIP", "IDI", "PIP", 'P', ModItems.powder_polymer, 'I', "ingotDesh", 'D', "ingotDuraSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.piston_selenium, 1), new Object[] { "SSS", "STS", " D ", 'S', "plateSteel", 'T', "ingotTungsten", 'D', ModItems.bolt_dura_steel })); @@ -1334,7 +1373,7 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.loop_stew), new Object[] { ModItems.loops, ModItems.can_smart, Items.bowl }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_calamity, 1), new Object[] { " PI", "BBM", " PI", 'P', "plateIron", 'B', ModItems.pipes_steel, 'M', ModItems.mechanism_rifle_1, 'I', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_calamity_dual, 1), new Object[] { "BBM", " PI", "BBM", 'P', "plateIron", 'B', ModItems.pipes_steel, 'M', ModItems.mechanism_rifle_1, 'I', "ingotSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_calamity_ammo, 8), new Object[] { "S", "C", "G", 'S', "plateSteel", 'C', "plateCopper", 'G', Items.gunpowder })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_calamity_ammo, 8), new Object[] { "S", "C", "G", 'S', "plateSteel", 'C', "plateCopper", 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.analyzer, 1), new Object[] { " S ", "SGS", " S ", 'S', "plateSteel", 'G', "paneGlassColorless" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.custom_fall, 1), new Object[] { "IIP", "CHW", "IIP", 'I', ModItems.plate_polymer, 'P', "plateSaturnite", 'C', ModItems.circuit_red_copper, 'H', ModItems.hull_small_steel, 'W', ModItems.coil_copper })); diff --git a/com/hbm/packet/TEMissilePacket.java b/com/hbm/packet/TEMissilePacket.java index 280343379..e6861a355 100644 --- a/com/hbm/packet/TEMissilePacket.java +++ b/com/hbm/packet/TEMissilePacket.java @@ -102,13 +102,17 @@ public class TEMissilePacket implements IMessage { @Override public IMessage onMessage(TEMissilePacket m, MessageContext ctx) { - TileEntity te = Minecraft.getMinecraft().theWorld.getTileEntity(m.x, m.y, m.z); - - if (te != null && te instanceof TileEntityLaunchPad) { - - TileEntityLaunchPad gen = (TileEntityLaunchPad)te; - gen.state = m.type; - } + + try { + TileEntity te = Minecraft.getMinecraft().theWorld.getTileEntity(m.x, m.y, m.z); + + if (te != null && te instanceof TileEntityLaunchPad) { + + TileEntityLaunchPad gen = (TileEntityLaunchPad)te; + gen.state = m.type; + } + } catch(Exception e) { } + return null; } }