From a4d4aa7deb6c7fc2b63fc0586866e607348e47f0 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Mon, 15 Jul 2019 14:42:44 +0200 Subject: [PATCH] cans cans cans, config for template blacklist --- assets/hbm/lang/de_DE.lang | 37 ++++ assets/hbm/lang/en_US.lang | 37 ++++ .../hbm/textures/blocks/crate_can_bottom.png | Bin 0 -> 556 bytes assets/hbm/textures/blocks/crate_can_side.png | Bin 0 -> 795 bytes assets/hbm/textures/blocks/crate_can_top.png | Bin 0 -> 779 bytes assets/hbm/textures/items/can_key.png | Bin 0 -> 192 bytes assets/hbm/textures/items/canned_asbestos.png | Bin 0 -> 388 bytes assets/hbm/textures/items/canned_ass.png | Bin 0 -> 378 bytes assets/hbm/textures/items/canned_bark.png | Bin 0 -> 434 bytes assets/hbm/textures/items/canned_beef.png | Bin 0 -> 441 bytes assets/hbm/textures/items/canned_bhole.png | Bin 0 -> 350 bytes assets/hbm/textures/items/canned_cheese.png | Bin 0 -> 355 bytes assets/hbm/textures/items/canned_chinese.png | Bin 0 -> 360 bytes assets/hbm/textures/items/canned_diesel.png | Bin 0 -> 340 bytes assets/hbm/textures/items/canned_fist.png | Bin 0 -> 353 bytes assets/hbm/textures/items/canned_fried.png | Bin 0 -> 526 bytes assets/hbm/textures/items/canned_hotdogs.png | Bin 0 -> 437 bytes assets/hbm/textures/items/canned_jizz.png | Bin 0 -> 336 bytes assets/hbm/textures/items/canned_kerosene.png | Bin 0 -> 341 bytes .../hbm/textures/items/canned_leftovers.png | Bin 0 -> 405 bytes assets/hbm/textures/items/canned_milk.png | Bin 0 -> 341 bytes assets/hbm/textures/items/canned_mystery.png | Bin 0 -> 547 bytes assets/hbm/textures/items/canned_napalm.png | Bin 0 -> 336 bytes assets/hbm/textures/items/canned_oil.png | Bin 0 -> 329 bytes assets/hbm/textures/items/canned_pashtet.png | Bin 0 -> 349 bytes assets/hbm/textures/items/canned_pizza.png | Bin 0 -> 440 bytes .../hbm/textures/items/canned_recursion.png | Bin 0 -> 363 bytes assets/hbm/textures/items/canned_spam.png | Bin 0 -> 667 bytes assets/hbm/textures/items/canned_stew.png | Bin 0 -> 508 bytes assets/hbm/textures/items/canned_tomato.png | Bin 0 -> 316 bytes assets/hbm/textures/items/canned_tube.png | Bin 0 -> 387 bytes assets/hbm/textures/items/canned_tuna.png | Bin 0 -> 389 bytes assets/hbm/textures/items/canned_yogurt.png | Bin 0 -> 331 bytes com/hbm/blocks/ModBlocks.java | 8 +- com/hbm/blocks/generic/BlockCanCrate.java | 108 +++++++++++ com/hbm/blocks/generic/BlockCrate.java | 1 - com/hbm/blocks/machine/SoyuzLauncher.java | 22 +++ com/hbm/handler/BobmazonOfferFactory.java | 4 +- com/hbm/inventory/MachineRecipes.java | 4 +- com/hbm/items/ModItems.java | 94 ++++++++++ com/hbm/items/food/ItemEnergy.java | 24 ++- com/hbm/items/food/ItemLemon.java | 172 +++++++++++++++++- com/hbm/lib/RefStrings.java | 2 +- com/hbm/main/MainRegistry.java | 45 +++-- com/hbm/packet/ItemBobmazonPacket.java | 2 +- com/hbm/packet/ItemFolderPacket.java | 29 +++ com/hbm/render/misc/SoyuzLauncherPronter.java | 20 +- .../tileentity/bomb/TileEntityTurretBase.java | 5 +- 48 files changed, 578 insertions(+), 36 deletions(-) create mode 100644 assets/hbm/textures/blocks/crate_can_bottom.png create mode 100644 assets/hbm/textures/blocks/crate_can_side.png create mode 100644 assets/hbm/textures/blocks/crate_can_top.png create mode 100644 assets/hbm/textures/items/can_key.png create mode 100644 assets/hbm/textures/items/canned_asbestos.png create mode 100644 assets/hbm/textures/items/canned_ass.png create mode 100644 assets/hbm/textures/items/canned_bark.png create mode 100644 assets/hbm/textures/items/canned_beef.png create mode 100644 assets/hbm/textures/items/canned_bhole.png create mode 100644 assets/hbm/textures/items/canned_cheese.png create mode 100644 assets/hbm/textures/items/canned_chinese.png create mode 100644 assets/hbm/textures/items/canned_diesel.png create mode 100644 assets/hbm/textures/items/canned_fist.png create mode 100644 assets/hbm/textures/items/canned_fried.png create mode 100644 assets/hbm/textures/items/canned_hotdogs.png create mode 100644 assets/hbm/textures/items/canned_jizz.png create mode 100644 assets/hbm/textures/items/canned_kerosene.png create mode 100644 assets/hbm/textures/items/canned_leftovers.png create mode 100644 assets/hbm/textures/items/canned_milk.png create mode 100644 assets/hbm/textures/items/canned_mystery.png create mode 100644 assets/hbm/textures/items/canned_napalm.png create mode 100644 assets/hbm/textures/items/canned_oil.png create mode 100644 assets/hbm/textures/items/canned_pashtet.png create mode 100644 assets/hbm/textures/items/canned_pizza.png create mode 100644 assets/hbm/textures/items/canned_recursion.png create mode 100644 assets/hbm/textures/items/canned_spam.png create mode 100644 assets/hbm/textures/items/canned_stew.png create mode 100644 assets/hbm/textures/items/canned_tomato.png create mode 100644 assets/hbm/textures/items/canned_tube.png create mode 100644 assets/hbm/textures/items/canned_tuna.png create mode 100644 assets/hbm/textures/items/canned_yogurt.png create mode 100644 com/hbm/blocks/generic/BlockCanCrate.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index c61e2d681..8e43c5506 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -331,6 +331,7 @@ tile.crate_weapon.name=Waffenkiste tile.crate_lead.name=Gefahrenstoffkiste tile.crate_metal.name=Maschinenkiste tile.crate_red.name=Rote Kiste +tile.crate_can.name=Konservenkiste tile.marker_structure.name=Multiblock-Strukturvorlage tile.struct_launcher.name=Startrampe-Komponentenblock @@ -656,6 +657,8 @@ item.nugget_dineutronium.name=Dineutroniumnugget item.ingot_starmetal.name=Sternenmetallbarren item.ingot_saturnite.name=Saturnitbarren item.plate_saturnite.name=Saturnitplatte +item.ingot_fiberglass.name=Fiberglasstafel +item.ingot_asbestos.name=Asbestplatte item.solid_fuel.name=Festbrennstoff item.rocket_fuel.name=Festbrennstoff (Raketentreibstoff) @@ -757,6 +760,8 @@ tile.block_verticium.name=Verticiumblock tile.block_desh.name=Verstärketer Deshblock tile.block_yellowcake.name=Yellowcakeblock tile.block_starmetal.name=Sternenmetallblock +tile.block_fiberglass.name=Fiberglasrolle +tile.block_asbestos.name=Asbestblock tile.ore_aluminium.name=Aluminiumerz tile.ore_copper.name=Kupfererz @@ -810,6 +815,7 @@ tile.deco_aluminium.name=Aluminium-Dekoblock tile.deco_steel.name=Stahl-Dekoblock tile.deco_lead.name=Blei-Dekoblock tile.deco_beryllium.name=Beryllium-Dekoblock +tile.deco_asbestos.name=Asbestdach tile.hazmat.name=Strahlenschutzstoff-Block @@ -1330,6 +1336,7 @@ item.loops.name=Lüüps item.loop_stew.name=Informatiker-Frühstück item.fooditem.name=lebensmittel item.twinkie.name=Twinkie +item.twinkie.name=Sandwich mit Fernsehrauschen garniert tile.frozen_grass.name=Gefrorenes Gras tile.frozen_dirt.name=Gefrorene Erde @@ -2087,6 +2094,8 @@ item.can_redbomb.name='Red Bomb' Energy-Drink item.can_mrsugar.name='Dr. Sugar' Softdrink item.can_overcharge.name=Overcharge Delirium XT item.can_luna.name=Black Mesa Luna - Dark Cola +item.can_bepis.name=Bepis +item.can_breen.name=Dr>Breens Private Reserve item.bottle_empty.name=Leere bombenförmige Glasflasche item.bottle_nuka.name=Nuka-Cola Flasche item.bottle_cherry.name=Nuka-Cherry Flasche @@ -2109,6 +2118,34 @@ item.cap_fritz.name=Fritz-Kola Kronkorken item.cap_sunset.name=Sunset Sarsaparilla Kronkorken item.cap_star.name=Sunset Sarsaparilla Sternkronkorken item.ring_pull.name=Dosenring +item.canned_beef.name=Konservendose (Rindfleisch) +item.canned_tuna.name=Konservendose (Tunfisch) +item.canned_mystery.name=Konservendose (Mysteriöses Fleisch) +item.canned_pashtet.name=Паштет +item.canned_cheese.name=Konservendose (Schmelzkäse) +item.canned_jizz.name=Konservendose (FlimFlam Industries Hengstmilch™) +item.canned_milk.name=Konservendose (Kondensmilch) +item.canned_ass.name=Konservendose (Esel) +item.canned_pizza.name=Konservendose (Salamipizza) +item.canned_tube.name=Tube (Astronautenessen) +item.canned_tomato.name=Konservendose (Tomatensuppe) +item.canned_asbestos.name=Konservendose (Asbestdämmung) +item.canned_bhole.name=Konservendose (Schwarzes Loch) +item.canned_hotdogs.name=Konservendose (Hotdogs) +item.canned_leftovers.name=Konservendose (Reste) +item.canned_yogurt.name=Konservendose (Jogurt) +item.canned_stew.name=Konservendose ("Pilzsuppe") +item.canned_chinese.name=Konservendose (Chinesisch) +item.canned_oil.name=Konservendose (Motoröl) +item.canned_fist.name=Konservendose (Faust) +item.canned_spam.name=Konservendose (Spam) +item.canned_fried.name=Konservendose (Fried Chicken) +item.canned_napalm.name=Konservendose (Napalm) +item.canned_diesel.name=Konservendose (Diesel) +item.canned_kerosene.name=Konservendose (Kerosin) +item.canned_recursion.name=Konservendose (Rekursion) +item.canned_bark.name=Konservendose (Geräucherte Kiefernrinde) +item.can_key.name=Dosenschlüssel item.canteen_13.name=Vault 13 Kantine item.canteen_vodka.name=Stylischer Flachmann diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 882e21cd3..3d1fb033b 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -331,6 +331,7 @@ tile.crate_weapon.name=Weapon Crate tile.crate_lead.name=Hazmat Crate tile.crate_metal.name=Machine Crate tile.crate_red.name=Red Crate +tile.crate_can.name=Conserve Crate tile.marker_structure.name=Multiblock Structure Marker tile.struct_launcher.name=Launch Pad Component Block @@ -656,6 +657,8 @@ item.nugget_dineutronium.name=Dineutronium Nugget item.ingot_starmetal.name=Starmetal Ingot item.ingot_saturnite.name=Saturnite Ingot item.plate_saturnite.name=Saturnite Plate +item.ingot_fiberglass.name=Fiberglass Bar +item.ingot_asbestos.name=Asbestos Sheet item.solid_fuel.name=Solid Fuel item.rocket_fuel.name=Solid Fuel (Rocket Propellant) @@ -757,6 +760,8 @@ tile.block_verticium.name=Block of Verticium tile.block_desh.name=Reinforced Block of Desh tile.block_yellowcake.name=Block of Yellowcake tile.block_starmetal.name=Block of Starmetal +tile.block_fiberglass.name=Roll of Fiberglass +tile.block_asbestos.name=Block of Asbestos tile.ore_aluminium.name=Aluminium Ore tile.ore_copper.name=Copper Ore @@ -810,6 +815,7 @@ tile.deco_aluminium.name=Aluminium Deco Block tile.deco_steel.name=Steel Deco Block tile.deco_lead.name=Lead Deco Block tile.deco_beryllium.name=Beryllium Deco Block +tile.deco_asbestos.name=Asbestos Roof tile.hazmat.name=Hazmat Cloth Block @@ -1330,6 +1336,7 @@ item.loops.name=Lööps item.loop_stew.name=IT Breakfast item.fooditem.name=food item item.twinkie.name=Twinkie +item.static_sandwich.name=Sandwich Garnished with TV Static tile.frozen_grass.name=Frozen Grass tile.frozen_dirt.name=Frozen Dirt @@ -2087,6 +2094,8 @@ item.can_redbomb.name='Red Bomb' Energy Drink item.can_mrsugar.name='Dr. Sugar' Soft Drink item.can_overcharge.name=Overcharge Delirium XT item.can_luna.name=Black Mesa Luna - Dark Cola +item.can_bepis.name=Bepis +item.can_breen.name=Dr>Breens Private Reserve item.bottle_empty.name=Empty Bomb-Shaped Bottle item.bottle_nuka.name=Bottle of Nuka Cola item.bottle_cherry.name=Bottle of Nuka Cherry @@ -2109,6 +2118,34 @@ item.cap_fritz.name=Fritz Cola Bottle Cap item.cap_sunset.name=Sunset Sarsaparilla Bottle Cap item.cap_star.name=Sunset Sarsaparilla Star Cap item.ring_pull.name=Ring Pull +item.canned_beef.name=Canned Beef +item.canned_tuna.name=Canned Tuna +item.canned_mystery.name=Canned Mystery Meat +item.canned_pashtet.name=Паштет +item.canned_cheese.name=Canned Melted Cheese +item.canned_jizz.name=FlimFlam Industries Canned Stallion Milk™ +item.canned_milk.name=Canned Evaporated Milk +item.canned_ass.name=Canned Ass +item.canned_pizza.name=Canned Pepperoni Pizza +item.canned_tube.name=Astronaut Food Tube +item.canned_tomato.name=Canned Tomato Soup +item.canned_asbestos.name=Canned Asbestos +item.canned_bhole.name=Canned Black Hole +item.canned_hotdogs.name=Canned Hotdogs +item.canned_leftovers.name=Leftover Conserve +item.canned_yogurt.name=Canned Yogurt +item.canned_stew.name=Canned "Mushroom Stew" +item.canned_chinese.name=Canned Chinese Food +item.canned_oil.name=Canned Engine Oil +item.canned_fist.name=Canned Fist +item.canned_spam.name=Canned Spam +item.canned_fried.name=Canned Fried Chicken +item.canned_napalm.name=Canned Napalm +item.canned_diesel.name=Canned Diesel +item.canned_kerosene.name=Canned Kerosene +item.canned_recursion.name=Canned Recursion +item.canned_bark.name=Canned Pine Bark Jerky +item.can_key.name=Winding Key item.canteen_13.name=Vault 13 Canteen item.canteen_vodka.name=Stylish Flask diff --git a/assets/hbm/textures/blocks/crate_can_bottom.png b/assets/hbm/textures/blocks/crate_can_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..46302b16d40369614c0121eaa878549f8f38d34a GIT binary patch literal 556 zcmV+{0@MA8P))V00NA>Q3<53&W7<#m&;Z=J!+y;I zP-{9mfH3upGPmxql41OTe>G(t{-E>XHGi{rZ{AX~iSfedLs--}gM!rv*aV+Jc3V(S{!k_o`8mt7U1Ti)mDwsJ49@$P zjK&kCqUAMlOL@FTE%U*|3StG8FtCG2F=%;B6*;klfea#qnL`E5>-`swNzgseQp|z?0000Na>Iw5hRzO5F5(tUoWY3lb5<6BP z!~r-$5aI%?vtR=R4M`v%0-7M9%n#FU+ue4#T*V@z+~B?M=@Y+w^F_*yp<1s=DY4mX zST2`TRfThozVGR}4r?vWIl8W+?|Y0f>`W#o?>&!)+k7xr)J=m@iu3ae073`|A@Dws zQjZWB&N<4W;8B0fo&Fh08^hwo5BzZjLkNg0V+aAQHEA5N&QUcjS(f3$NYieKF>+`s zyvb2Np8m?+pDzd@@X_K!@;oQTNQ{v@&ym;P@mYUHjFDj&u+}mR19_fvdNM~m`0C>X z8Cq-Vx*^YV)^$x;6bJ!IDY~wwEDK_cH%gxAbb{8J?D+7I^Xa=xcS_3ABBdn6$kl4a zs&3FaXEu8c=L}M27^68jxW(V<4yALbs;+s%UvshAQnxL}7-rKcN-2a8v~5d_k;P(0 zjEP~0oS$EElvk{yMm_%hFHTOcki$SRj)V|i<@zLli{0H_LI||(eNswDDUnhFaPQWA z#M5uTOxvzQDaB^fQB^BMCeT__I7jb2DJG`7Q?}dfOYbbhT1(qBWY!q|6mMd*W^XZL zKA*9_Tp}|`N-%~9WQ1WrW*JIKoH0DZCg&? zTOyu({dsCOTS5pJV-P~zwC}LS5XO-hBPk_PO023i&RLAsltn@2oa4E9hoghnamFBp zpss5Wg1T+Fy!wwYjtF2Vg-cZ7JVR@} zdSzq0LA9v(>iG*!&(6?Vdz1j6n!N9LESDR)zB3GYkV-Ym`!?X-YI6 zj|m}Qt)=gK`o5=aTS5p3Ay7)KX6GCsgcTdsTB5%1iK1w!fPhI2e()qo!t28W9^AiA z2m{VpymxGEZnA&$hOX-Eak- z(VLtg!P;YRY-h6i|HC)FzrUXz5E9a|Ing07Q1BdoUtdCtbiunDC;z+q&rSOA@v}NJ zyR~(onRjQG5sSOK!KMY?8#Zkcyz=Mwcl{mQkr(Fv1Tq%IFkC)-=)i#k1-~ApvIW=1 z?oc^XQo?)UVG)SW#+D%=b9>4E`pbgyi*ni+?Pu%qgw=@)CI*OX7I!`PvU|Q{U%XIy zhi6vmj^f`c%#V-XPr*-XehGm%2X=M26r<s*Pq;Z#Iyzs%d$6I$e-W>=+Ll zTia5JtVjtUuy9E;G%$E_n02Ooncu6D=y2M^VH76~poE|YX% z74K|`LriLiR8^-cGN!Isd*Z->g!2Xe|JAk~o?y_dzU;ENInW@5rAN9pz536i($Kdq e%K@^I$LtJu4lS>+WAdq|Sd4Bg^cwuWfaixo7h5N z3!y{m@mv>M2-;C6)$!!$V*cTdcJjWyx}xu|;L1}70NCh809+<(b)u@jWc&so3o28k z-0}~Ad%j;9$a;(`%v~G+@V0ZpYds>6eYR(pbiLR6Ebbr+3S=M8nbzSv6@Em3BmZjL zw%Nh=N4+%g9DWr88h#Vmo#6KR-3Y4s*hxG+JGOur&=aVpQB7jv(aQZr0rqwe;~co5 YKdabvwfRG_!vFvP07*qoM6N<$g7t=^+yDRo literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_bark.png b/assets/hbm/textures/items/canned_bark.png new file mode 100644 index 0000000000000000000000000000000000000000..b9bc61e311418847fcd1b86984b3a3b1b0f64481 GIT binary patch literal 434 zcmV;j0ZsmiP)^=3h^d6}%D-T?_+;hGk&N=rS1sAK8E0&ZJ zAp}xN0E7@s&(0|Qu{{shxx6KW;I3MA^cWiMPy*h*~zP_Ne=fNxmfU(7SinaC`V-d`Ra&<-d(8t2Pyi=@FTY<{+R@ED>9c0x&TZ1|W5M)gyd)dPYj=3>5S&Q)chLg5M|c==gAOncP7A c_FZV(C;yI>uTCdBRsaA107*qoM6N<$f{)a&3jhEB literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_beef.png b/assets/hbm/textures/items/canned_beef.png new file mode 100644 index 0000000000000000000000000000000000000000..d2fa7692e6a54ac54332df0066d41bdf20ff43a1 GIT binary patch literal 441 zcmV;q0Y?6bP)z&JzSFtq`@P?L&bjx(KcR@AQPm9* zcRC$ZRh6-Ts;Y7wPbL&;(5UK0?e3nz`vC8vcdnCzejo8av!1?Dh07HLQa)Z`* zt3xD){;m|HU18F$Fj_PMKtbD;W&jIsAsI^pJE27*-0Dvx)o{Y)0~BcAmi>bd-+0)V5# jV}n27?BZ0Jt(pVhCa#W~4b7F$00000NkvXXu0mjfEak- z(VLtg!P;YRY-h6i|HC)FzrUXz5E9a|Ing07Q1BdoUtdCtbiunDC;z+q&rSOA@v}NJ zyR~(onRjQG5sSOK!KMY?8#Zkcyz=Mwcl{mQkr(Fv1Tq%IFkC)-=)i#k1-~ApvIW=1 z?oc^XQo?)UVG)SW#+D%=VUY6YyN0mZsWgcj7r#z>$aI*;MM7rIPcglh;`wJE$mSkh zkiPB=(1Zg8FQ3G=t@Z9V%!#THIjk_n;Y;`Svzopr0NiAiZvX%Q literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_cheese.png b/assets/hbm/textures/items/canned_cheese.png new file mode 100644 index 0000000000000000000000000000000000000000..7d4a8144921251fac1e8352963aee4a5d1df75fa GIT binary patch literal 355 zcmV-p0i6DcP)FG4@f9AdM&++*XNsT?7$uF_nmXT`yDR)V`*4%jn`H? z08mOHrDP|&yO0|xhQfyLlTM{{J?A(mr8qh%7#eF{-0XA!_#BVPtYvg>I-LMu3t^Zf zW(}$}4_gRqA+#twImf{kg6D28eub8|9e7U%0308>djHTIz}vpYJgUyXqzE}3S zd-yUYofR7Zy!Af}gXAnJy?zgz0#Gg`Nlfa@WB7gv6!blk!C+LO`LY!e4n`IHUOAG1 z@q(M%YYPYfq;!G2&LPa;m!lE;kuJ`!f(7P(j~^w1XHUK2AkF{)002ovPDHLkV1n+x BjPL*e literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_chinese.png b/assets/hbm/textures/items/canned_chinese.png new file mode 100644 index 0000000000000000000000000000000000000000..2cbb6683080cb765ed3ba42ac0c461b81979cef4 GIT binary patch literal 360 zcmV-u0hj)XP)At56otQ(SWBiX(j-fG4uV5zmqPs)1)&J;{RySewT05H zf5S=K9jjze9sUlrhCtH?>qOLci!W|KQvj)N0Us}zV9Q1P_={* zLiO!#M^gs#(IoqtPDyqn5}F2qZ82`vDVj>i1X81((CZI) zxPSch(-Pk&0WN{N!!q^y10c7F&rdHIf57|4n|6At1bzU(J#(kKK>e2h0000z39Tix zmONj1PiQSW-7ayGI_Rbb?NLO$j{B!4=nMci2Q{`wQ4;{LH;(w|Y&+1?%aVE>;I)*i z093n^TY~pD?;Pq1es1|cfTM@(*QRo>yM;JO=}*53&lksD5L@J9^c?(yU!velv mB;AYao2dB~e4x6@M%5=swQTX73&5`c0000Eak- z(VLvGK)~RT#PhznfB2K{@2{Wl7#Jvcu8q;v)z!k@!m3Fy@4(Jv_5bs&>Kh+^o_?NZ zkIf#Jn>tzt&I`!M9z1dAz<~oBvJR`U1=q&11v1v{@O{B>H*~pvoLj}i8&{tEpDpJl z@H|uF!{qvd2~%ywA2G49v9<9mUaung;f-!f+QGFCjJe{yB&u&Dm?~5r4F}4qu|*gA zwjEYq@BHHKb;)OL1<5N?4?Sg?@$5xHbc~mTgv5fz9}mtg{m+yB>|tmJqt7G>k&rI} zjVE4D@SgPVe7r*Axg$U~eaLz4aw*6C60?7&Q~$KdDF>`~dax;L7rS`zaCf)_I%wF> wxwnDyA=o)xn_m6rQEBK~7v^?o6)b9Fw7V{UHx3vIVCg!04E%f5C8xG literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_fried.png b/assets/hbm/textures/items/canned_fried.png new file mode 100644 index 0000000000000000000000000000000000000000..b4e716fca1c6ebb350ea0355e9336b5f14bc6270 GIT binary patch literal 526 zcmV+p0`dKcP)7+L|#N~I!xc7q@e3SNQcA8 zgeNcGTLAVg;08YVYK0M+-O&zF7-C$3Ye}T?X*F~jY-v!!Y_8q_d6DBO7f(5KTBD?- zT^G24hp{>=t%+kFTS{hEi)~;!Um%qrU#&?;1Ja!l>CP_cFl3mdU}+Az9SUObGd!N&GH5}K4P9pN|F$3-ToNx5Ffc&@h%=uT62Epa-eES5O2i_t9y`}=rdgtjcIwxg+A`tC0wK7D+| zAc|j2$XcFnwqAp2z?*N5!lM`==k1t250AIJe*9JqyZM7u?Yf?BuU5?m*mTW zFbwFmq-lx`aOV?0yn1GI503J%g<+kSM8g4nQ!^MQR7DABUcCKuXYZftH%KM+AQNJA~!(4lk&MHIMoVdCTxBxQm&*j=8dO+gQS@cX^@zTe+_@B84t%`qx) zThh7!x~}8(dYPG5hUVIw2C$&2j60pCKj8PH>pIccx&`AH1Q*L?06tnRJZ_H}YqviE zkR{1NBJ>lSAc`DLPFsH3yz8|V=}d54I5lyW3IMX9FsfGJ_~nUCqhb1Et|@|w5Ar2TzGVjK zW(`%V5Q_%ccz2Txg^9VQ$cDlM6(6crA>FKvo&ms7^BLj%jjA$hl2vOBl9v}GfyaS- zn~d__E`lfmSXwZw7*G5zV?C8dU0SgL>!~!wc)}*5Z4Eak- z(VLtg!79S+79;e$Z|gtZ1U>V(ClbVpwpuxfYq4~FbnuQZDAF~7yl+FKj_`o^U zQwI((Tx8f>_jIaO7w%WgR6LFOQdaQ zHN3OGe*VJpm%<{g28CY?4s;yr+Vtu_56=XHgan5r%n=eLC0if$x#h4OWZ31lijg7i XL%L_njAy%mLB!zc>gTe~DWM4fLx6p( literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_kerosene.png b/assets/hbm/textures/items/canned_kerosene.png new file mode 100644 index 0000000000000000000000000000000000000000..29999c383bc804b060dc3cc8992beec11377c934 GIT binary patch literal 341 zcmV-b0jmCqP)f+B)_I$IG^2ZC+7 z^nwJ0Bky1!5dz`^tX46Cd4ODTR=eDv4GNZiu&~TG^UW}P1Am0)3eG3fTx*SpptS}- zL^wE#YWbzWsobMkK1|frV2*C5pD^(s~ zx%#Y6P{j3NhsD>zxrZwJpHu#iK$z_Ox~Q02GLql+Snhso?$-8r-+n6@sdNjsH{BdI n8_D>hf7h$uf=j51Vxhq|6iR6JLm0;@00000NkvXXu0mjfQZSS3 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_leftovers.png b/assets/hbm/textures/items/canned_leftovers.png new file mode 100644 index 0000000000000000000000000000000000000000..8f81ca192a3a185f14d3dbe1c2dd0c160c41c71c GIT binary patch literal 405 zcmV;G0c!quDRRz}ym~D!b>@M@90KjZh1i-Zd@?y$ZRe*4J z17MG=i}Pa2Y*WOw0+X931>+lm*Siz)Vv1`8li~QL8D*Q9{1v#fei{lp5<*7$hqM*vbv zJkO(eRN6TkD=Onlx66Jeqw9h1Bcq+vZ*v02vLh$}Mu&*#0b)u)o9suRDQ@y`}16*AP6bi?V6_C##0B~P_Hg3AD zoB%MLej9*2EK-IfrIJVf7hpa)Of-CjGdrN!Y9ohfUOVHMQPsDDWISWzq2>S)paZ1B nq=NK2qhJbQev**vt~-;Row+k}uf>uL*0!GNoZ@}X%Xts{FLTzscyu=c z7-Puu3H|;GF-GdTBF0EnRcvf*G8~>DB0PTi&MW}WAKr<>@rW2BS(ec>4PDnEA~a2d zs?xSCUDsi)#afFK;mNB#BWGKUnVa#o$61HL5V`;nh+xGcMi3*kZOhu)0003fiX0Ik zgh1Q16sHA|NQeQk!mOGRVpz<()>^#xWKJmCK$@li?62Me4(0%W@$PL#ZOSz0 zBBEt!0LW~|*nN(x&^$?k=gd>U9?hQ`eKU&hMEpDEXNItI>D zMaQVK=YR*cJ+e84q`#y8cd)}M@ejOfiZ|49J z!KCv@iz26Imx#xavYg_aV>X*{f3QxTPxv|<{r!ngZ(fbPUJql;;*j2ZLd*;)7_cC=tQDV&I4j6p;IFvigB z9X0rCf#;{OGsf^bovNqB)*>RDU-g47Y|2UDys+KgQw^$W8I1gGT0WU(IkC0G)>2hV zb;Z_l5JjX}-YlU!!KKGT04~l>@jU=SA7<|#b^a}(`%-Jy3_ANjbjWSgS4+72OaPdF z6AX4$;$jSoFV$odt?iV5Wbjb@UbVsvuaIUr4C+MZ@lw^z2L&R+OdBMCo9m&2?Sphb iN}7K`Gup(e(BlW>!*Aqrf}qv_0000A!&Ar5uCC0o8ihY0mMltQ5h&fN-b6383~ZbIkI zA{4~A;vf~G5Gefs_ccsK;t=liqEQFI9~`{@eh(b?9^6`1StFUp8Gw`$*L8V#Y#g0E zC@SM*Hlt?Sy596Wq?Ek0TZYFfntv7x09I*A{l2by>-9eXjt~ZE}T?hywq)2NcqzZzy z5N!PcA%%^V*jt5&Mi7EsnytLXB1jtJA(tZAHJi(&(b5MCJ2UUS*&PP{@oP9qg_nn? z2tX-?l#-p@!a{B=sfG9LHf!m$$rpVer4)yiV@u=Ai#y#e0H31~ZpJmWF#H0*6T&iC znKih%y~7g%PY5H@r|A25Lh#&swO+hB8&tLeu6vXFQMqLPugx{5kz@c+%MbW=H@TV$ zbjMnL0Kof)&9@A~?GsQf08aPTNe$oT{pn{9fToFKGYDjr$6+oe3}lrK`^#t0xV&(H v2tbxgu<^48dInRDLE<8v)z6~^=6{bdJ-=bTmTs-J00000NkvXXu0mjfwAYe@ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_pizza.png b/assets/hbm/textures/items/canned_pizza.png new file mode 100644 index 0000000000000000000000000000000000000000..e8817bb8110ac1fa940f13d62616a67ae5e5b84e GIT binary patch literal 440 zcmV;p0Z0CcP)a1}0W(JBzB2D(Fw3L_0P3W8B8=(fnYI9lqnIy2|IFYkQc9Dx$Ysl#uhPN&nT zs%q8-s;ZjL({o_~KrqBdC#UEI9l1@W9=bekrsu+fSl9GFNC2^&I70(Lx;$<(suSmD zX=fLf!RY=TN!zf|bYg!$y1!=`0E}s=hN2rMZW?%7nrn)Rp1fJ>x4%-+-n0(@Jk12S zo9wADa=m!XTKcQe5*o(;>EpWTlBbyfh2k6jL}e5l88e$xQYB zZD6N;afx?L!?mzL(dXu2ew@df9FkNyE>#m3V%vP&XSu!FMe1zDcaSZ0bN?IUC;G`h zpCblj^k5&|$xO9?WthA0wH7VA1?QQ7b&akUFJdIh;7CX?f92Uo6#E+0+DL6DZY2O% iSzi670XDbR1%MxVyM`nSXSm@20000Az}p%T(XdP}zZ3JxjQuMmPDNWmrKLx|v9DE$!P zD4j~k>Qof0Ac#00jzZ`p#ad__;+?&=u?T`M1n%DV_j~TWKY{-ar>gL9dshG`rI1px zf6&^fT}x`?^=QOyy>9aDAV4X_(MiYhIIHHH@fd*j*^GwQFtz#o0{~wL3sPGK42CJb z5conElm6O4fG-61k55*|JIj+Wnv$iZ;P@~y``2)->GdlB0C7?_b$L-5^oly4=eB+g zunO81m4N9awC3(!_DjIxie}RTAkW`$@wNlpS_dds%2F3t=n8RCj$U6{)que;HK!jZ z&vr+X5T(@5*VyZK9iRY^G6KGzvcASIjfu*C;q3Ih*Z}|g_yjg`Z4)2DTTuW2002ov JPDHLkV1m^?pwR#T literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_spam.png b/assets/hbm/textures/items/canned_spam.png new file mode 100644 index 0000000000000000000000000000000000000000..1d15ca472d274c413c59e00ec0b3fa6ea9ce676b GIT binary patch literal 667 zcmV;M0%ZM(P)TCO_#3JQcfQPi)I;F=!HYjLhvG_8YoB* zK}20f9}*E1Vpj%5w}nI~fmlh3NkK?zr6pK)(J?hKwdFiI&pwW)i`>B!!k(-5|M9-> z^Sr!|iDkU+?$HymEXzoeWW)(bl4P7Ks{$qfQzE&ye*k4(!Rc_a9%Q7tsH_T@gmwM? z2P^a%t7Y|l7{rj!)t0MwysZAO&Sm~aO3J^PEQyPI&0i746mDH= zCp+CtfiH~Rt$|5ogSV8qp;tg0x7Wv_u$?mh3JCz3B?(Pir23c$!~r`wdy6?2c!AYs z1z^j*67(cH1&4MSOpGDMZ4Tm^07S{m^8;~4`#Pz6aG06?PO^6_G5+>Bf)=H3XzK4F z0>snOvBp)xlMfkg{zYh@m=s3&-Y78JTFmFR0J9&1#G>u!9?#kW<}^2B4K8AnuUQID zp$6wrW=F6@9GJBzvFW=gAsDUCCiAI#t%MVsBKT@L(6Y)<(~b~S^9YOO{CE~Z*>;r3 z?z8CmCrMSah-Em|GI$(}@UGB-^I9#zPeG=Y1;k`4p(LGP?H&B3UM5E-Xqz$9>l-Ar zy1@NYrFh0P#+9GAiX?v?n$Rh9%lcUe9Sk8n2@KiFXtIvs5pO}n$tmi zHWgoQE??$#gs@8Y@CZtU6R}?-c}B%0*tlHTKu?iKe&IorvC24*ubq1ONa002ovPDHLkV1md% BFCqW{ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_stew.png b/assets/hbm/textures/items/canned_stew.png new file mode 100644 index 0000000000000000000000000000000000000000..c9db0ce583dc604c95255d2327eb208620c42f2a GIT binary patch literal 508 zcmV1wg+YAVH85j64^x*0uk{rIs~yp4WeU6 z2M-oPL|wWF89{$Q&>!GnjCFE~;KhqsW;6>jqeFTaD(=U#J$v>%9iEh}`E&|;-@fn9 z=l%M8;QN99Ey1g>{5In>vDhtsqAz-ZoAH@*dppeB)@!FI{~!~4ig^fPkLxG)W{`KH z+`Il*@C4*H)6R?jTW6tGox*OXUvVcjeU|gJHZA4WNo>zDRJewD=z5L=whewACRgUz z-1*oBZUbn1W`E7$7kx!`3m>4xmteN02YxfVysQad3~3io)0Y5#9Mw>Ob9@ zUx7=$26k7|8vvk|g8*C+8$^8${vZq#VgSg7N<*uA1I$p3s#b9)S^<1k*YBXj#Of4U zMMJRLXZl+oVoAn`Q~^-RD*B1e@OGTYQ7@rVm_Rc?BlMRIQdbwKDF%k>LPSdvdicZvNF{Gz yWAp9%E|>cUNN3*w@a*}#_a&YOI@O=Sf2Los!jNe?&##LB0000baSXBO zO-_(t6=8NuIkz)e{r}+`-{0R)4+sfq*(@m`At53vD*5jI{__GdvIjd74}et2+m?1| zM6W%2MxtlU8A*_$hzqKbkvBhN{rme{oJ&5B;mphzTpJi?M2Rr_#qT+juxfqx<@+bz zTo%_q%-hg@Fev)=|LMAKIc}XhaNxj#>OTU`UmhNwktk62S82{(x0j60Z(f!2M83Q) z+4AqBLCE~e?Wbd%FCAt{&M5n~;D%6mdKI;Vst E02O6^-~a#s literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_tube.png b/assets/hbm/textures/items/canned_tube.png new file mode 100644 index 0000000000000000000000000000000000000000..f1ebc86371404f05d379343b1a4d719c7c691ed1 GIT binary patch literal 387 zcmV-}0et?6P)habAm{%{Xba>04d6mvayI!oN?gT2qC5L51}rqX53|W7~FU z|3^UW>QYsX4tXpev$MK9)Z#}#REv^KrH~(eq~re1pmI`F=FK&D1Cj}yt+fp6iwgk@ zEeznuE`2E(3_O<7E6AQCD#Z8(@0}++*8vng>y`Q0Ii~c z==%5uZL{%Ri%0~NLeql#h8o_F literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/canned_tuna.png b/assets/hbm/textures/items/canned_tuna.png new file mode 100644 index 0000000000000000000000000000000000000000..ec5b5d9da6de38e74cf44f15f9037c8456be8474 GIT binary patch literal 389 zcmV;00eb$4P)BC-wz3cfFZSOmM@4mn9_r7-={KN7{x6yPxu9QMb zX}AX|rCH|+dCLTJ8%_7A)#7tJW;GgJ>g0`Nl3XEg*+C&3jx01g&crmdgEbvzvQz`l zV*|8%efD;DjOe8Y4gPm&_xis94{8hOn_*83!oNTB`~(0rU-tn>g$5iSjJbb|lFh`> zS|fx&2tm0v0^sFq6PWRk7mx}Kj5z!dWHT{i)LNsp<}kf7H){g!&bH?SAq2&GoN{f1 z`}Rz|Go@IMQ}0YkSVR0C8=zFFa(;5;yKREgh(gLV0Bh?Ccn9K0nMNr^sZs@eKk@S7 j%HEak- z(VLtgk#V5I`_Y|^lmAOfNJzZ9zyJJ#6)R38q@?zR>b5EPJid3hUDD#l&4-V!rKRzF ze}6xnqp#25;^B^UKVPg2<^ciwx_>DTo<3|n{rBJB?nWSR^a>FdJR6NpTGB@jM1!_gHi2}*NaRB{nb{Ey!rDsJTyzV+UCnMKc3q-#_B7l zv$Bs&zDZfhRwE+=gFopB2?+rqUy>6N98^*xOq{MBU_7@cATaE&eD}jE> items = new ArrayList(); + items.add(ModItems.canned_beef); + items.add(ModItems.canned_tuna); + items.add(ModItems.canned_mystery); + items.add(ModItems.canned_pashtet); + items.add(ModItems.canned_cheese); + items.add(ModItems.canned_jizz); + items.add(ModItems.canned_milk); + items.add(ModItems.canned_ass); + items.add(ModItems.canned_pizza); + items.add(ModItems.canned_tomato); + items.add(ModItems.canned_tube); + items.add(ModItems.canned_asbestos); + items.add(ModItems.canned_bhole); + items.add(ModItems.canned_hotdogs); + items.add(ModItems.canned_leftovers); + items.add(ModItems.canned_yogurt); + items.add(ModItems.canned_stew); + items.add(ModItems.canned_chinese); + items.add(ModItems.canned_oil); + items.add(ModItems.canned_fist); + items.add(ModItems.canned_spam); + items.add(ModItems.canned_fried); + items.add(ModItems.canned_napalm); + items.add(ModItems.canned_diesel); + items.add(ModItems.canned_kerosene); + items.add(ModItems.canned_recursion); + items.add(ModItems.canned_bark); + items.add(ModItems.can_smart); + items.add(ModItems.can_creature); + items.add(ModItems.can_redbomb); + items.add(ModItems.can_mrsugar); + items.add(ModItems.can_overcharge); + items.add(ModItems.can_luna); + items.add(ModItems.can_breen); + items.add(ModItems.can_bepis); + + return items.get(rand.nextInt(items.size())); + } + + @Override + public int quantityDropped(Random rand) { + + return 5 + rand.nextInt(4); + } + +} diff --git a/com/hbm/blocks/generic/BlockCrate.java b/com/hbm/blocks/generic/BlockCrate.java index 89f10173e..ba486c7b9 100644 --- a/com/hbm/blocks/generic/BlockCrate.java +++ b/com/hbm/blocks/generic/BlockCrate.java @@ -34,7 +34,6 @@ public class BlockCrate extends BlockFalling { return null; } - @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) { if(player.getHeldItem() != null && player.getHeldItem().getItem().equals(ModItems.crowbar)) diff --git a/com/hbm/blocks/machine/SoyuzLauncher.java b/com/hbm/blocks/machine/SoyuzLauncher.java index 64868b999..fe1ed1736 100644 --- a/com/hbm/blocks/machine/SoyuzLauncher.java +++ b/com/hbm/blocks/machine/SoyuzLauncher.java @@ -1,9 +1,13 @@ package com.hbm.blocks.machine; +import com.hbm.blocks.ModBlocks; +import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntitySoyuzLauncher; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -32,5 +36,23 @@ public class SoyuzLauncher extends BlockContainer { public boolean renderAsNormalBlock() { return false; } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + if(world.isRemote) + { + return true; + } else if(!player.isSneaking()) + { + TileEntitySoyuzLauncher entity = (TileEntitySoyuzLauncher) world.getTileEntity(x, y, z); + if(entity != null) + { + FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_soyuz_launcher, world, x, y, z); + } + return true; + } else { + return false; + } + } } diff --git a/com/hbm/handler/BobmazonOfferFactory.java b/com/hbm/handler/BobmazonOfferFactory.java index 6811347f8..f9f17707c 100644 --- a/com/hbm/handler/BobmazonOfferFactory.java +++ b/com/hbm/handler/BobmazonOfferFactory.java @@ -133,7 +133,8 @@ public class BobmazonOfferFactory { weapons.add(new Offer(new ItemStack(ModItems.ammo_20gauge_flechette, 6), Requirement.OIL, 22)); weapons.add(new Offer(new ItemStack(ModItems.grenade_if_generic, 3), Requirement.CHEMICS, 15)); weapons.add(new Offer(new ItemStack(ModItems.grenade_if_he, 3), Requirement.CHEMICS, 25)); - + + tools.add(new Offer(new ItemStack(ModBlocks.crate_can, 1), Requirement.STEEL, 20)); tools.add(new Offer(new ItemStack(ModBlocks.machine_keyforge), Requirement.STEEL, 10)); tools.add(new Offer(new ItemStack(ModBlocks.machine_telelinker), Requirement.CHEMICS, 35)); tools.add(new Offer(new ItemStack(ModBlocks.machine_satlinker), Requirement.CHEMICS, 50)); @@ -189,6 +190,7 @@ public class BobmazonOfferFactory { special.add(new Offer(new ItemStack(ModItems.loot_10, 1), Requirement.STEEL, 5)); special.add(new Offer(new ItemStack(ModItems.loot_15, 1), Requirement.STEEL, 5)); special.add(new Offer(new ItemStack(ModItems.loot_misc, 1), Requirement.STEEL, 5)); + special.add(new Offer(new ItemStack(ModBlocks.crate_can, 1), Requirement.STEEL, 2)); } public static List getOffers(ItemStack stack) { diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index ae447bc4d..98a9b6537 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -5177,10 +5177,10 @@ public class MachineRecipes { input[0] = new FluidStack(600, FluidType.PETROLEUM); break; case SF_BIOGAS: - input[0] = new FluidStack(400, FluidType.BIOGAS); + input[0] = new FluidStack(3500, FluidType.BIOGAS); break; case SF_BIOFUEL: - input[0] = new FluidStack(300, FluidType.BIOFUEL); + input[0] = new FluidStack(1500, FluidType.BIOFUEL); break; case POLYMER: input[0] = new FluidStack(600, FluidType.PETROLEUM); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 8a3bffc82..e8354b14a 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -614,6 +614,8 @@ public class ModItems { public static Item can_mrsugar; public static Item can_overcharge; public static Item can_luna; + public static Item can_bepis; + public static Item can_breen; public static Item bottle_empty; public static Item bottle_nuka; public static Item bottle_cherry; @@ -636,6 +638,34 @@ public class ModItems { public static Item cap_sunset; public static Item cap_star; public static Item ring_pull; + public static Item canned_beef; + public static Item canned_tuna; + public static Item canned_mystery; + public static Item canned_pashtet; + public static Item canned_cheese; + public static Item canned_jizz; + public static Item canned_milk; + public static Item canned_ass; + public static Item canned_pizza; + public static Item canned_tube; + public static Item canned_tomato; + public static Item canned_asbestos; + public static Item canned_bhole; + public static Item canned_hotdogs; + public static Item canned_leftovers; + public static Item canned_yogurt; + public static Item canned_stew; + public static Item canned_chinese; + public static Item canned_oil; + public static Item canned_fist; + public static Item canned_spam; + public static Item canned_fried; + public static Item canned_napalm; + public static Item canned_diesel; + public static Item canned_kerosene; + public static Item canned_recursion; + public static Item canned_bark; + public static Item can_key; public static Item rod_empty; public static Item rod_uranium; @@ -2288,6 +2318,8 @@ public class ModItems { can_mrsugar = new ItemEnergy().setUnlocalizedName("can_mrsugar").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_mrsugar"); can_overcharge = new ItemEnergy().setUnlocalizedName("can_overcharge").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_overcharge"); can_luna = new ItemEnergy().setUnlocalizedName("can_luna").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_luna"); + can_bepis = new ItemEnergy().setUnlocalizedName("can_bepis").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_bepis");; + can_breen = new ItemEnergy().setUnlocalizedName("can_breen").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_breen"); bottle_empty = new Item().setUnlocalizedName("bottle_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle_empty"); bottle_nuka = new ItemEnergy().setUnlocalizedName("bottle_nuka").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle_nuka"); bottle_cherry = new ItemEnergy().setUnlocalizedName("bottle_cherry").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle_cherry"); @@ -2311,6 +2343,36 @@ public class ModItems { cap_star = new Item().setUnlocalizedName("cap_star").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_star"); ring_pull = new Item().setUnlocalizedName("ring_pull").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":ring_pull"); + canned_beef = new ItemLemon(8, 5, false).setUnlocalizedName("canned_beef").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_beef"); + canned_tuna = new ItemLemon(4, 5, false).setUnlocalizedName("canned_tuna").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_tuna"); + canned_mystery = new ItemLemon(6, 5, false).setUnlocalizedName("canned_mystery").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_mystery"); + canned_pashtet = new ItemLemon(4, 5, false).setUnlocalizedName("canned_pashtet").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_pashtet"); + canned_cheese = new ItemLemon(3, 5, false).setUnlocalizedName("canned_cheese").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_cheese"); + canned_jizz = new ItemLemon(15, 5, false).setUnlocalizedName("canned_jizz").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_jizz"); + canned_milk = new ItemLemon(5, 5, false).setUnlocalizedName("canned_milk").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_milk"); + canned_ass = new ItemLemon(6, 5, false).setUnlocalizedName("canned_ass").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_ass"); + canned_pizza = new ItemLemon(8, 5, false).setUnlocalizedName("canned_pizza").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_pizza"); + canned_tube = new ItemLemon(2, 5, false).setUnlocalizedName("canned_tube").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_tube"); + canned_tomato = new ItemLemon(4, 5, false).setUnlocalizedName("canned_tomato").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_tomato"); + canned_asbestos = new ItemLemon(7, 5, false).setUnlocalizedName("canned_asbestos").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_asbestos"); + canned_bhole = new ItemLemon(10, 5, false).setUnlocalizedName("canned_bhole").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_bhole"); + canned_hotdogs = new ItemLemon(5, 5, false).setUnlocalizedName("canned_hotdogs").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_hotdogs"); + canned_leftovers = new ItemLemon(1, 5, false).setUnlocalizedName("canned_leftovers").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_leftovers"); + canned_yogurt = new ItemLemon(3, 5, false).setUnlocalizedName("canned_yogurt").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_yogurt"); + canned_stew = new ItemLemon(5, 5, false).setUnlocalizedName("canned_stew").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_stew"); + canned_chinese = new ItemLemon(6, 5, false).setUnlocalizedName("canned_chinese").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_chinese"); + canned_oil = new ItemLemon(3, 5, false).setUnlocalizedName("canned_oil").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_oil"); + canned_fist = new ItemLemon(6, 5, false).setUnlocalizedName("canned_fist").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_fist"); + canned_spam = new ItemLemon(8, 5, false).setUnlocalizedName("canned_spam").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_spam"); + canned_fried = new ItemLemon(10, 5, false).setUnlocalizedName("canned_fried").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_fried"); + canned_napalm = new ItemLemon(6, 5, false).setUnlocalizedName("canned_napalm").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_napalm"); + canned_diesel = new ItemLemon(6, 5, false).setUnlocalizedName("canned_diesel").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_diesel"); + canned_kerosene = new ItemLemon(6, 5, false).setUnlocalizedName("canned_kerosene").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_kerosene"); + canned_recursion = new ItemLemon(1, 5, false).setUnlocalizedName("canned_recursion").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_recursion"); + canned_bark = new ItemLemon(2, 5, false).setUnlocalizedName("canned_bark").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_bark"); + can_key = new Item().setUnlocalizedName("can_key").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_key"); + + recycled_ground = new Item().setUnlocalizedName("recycled_ground").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_ground"); recycled_rock = new Item().setUnlocalizedName("recycled_rock").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_rock"); recycled_metal = new Item().setUnlocalizedName("recycled_metal").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_metal"); @@ -4865,6 +4927,8 @@ public class ModItems { GameRegistry.registerItem(can_mrsugar, can_mrsugar.getUnlocalizedName()); GameRegistry.registerItem(can_overcharge, can_overcharge.getUnlocalizedName()); GameRegistry.registerItem(can_luna, can_luna.getUnlocalizedName()); + GameRegistry.registerItem(can_bepis, can_bepis.getUnlocalizedName()); + GameRegistry.registerItem(can_breen, can_breen.getUnlocalizedName()); //Cola GameRegistry.registerItem(bottle_empty, bottle_empty.getUnlocalizedName()); @@ -4881,6 +4945,35 @@ public class ModItems { GameRegistry.registerItem(bottle2_sunset, bottle2_sunset.getUnlocalizedName()); GameRegistry.registerItem(bottle_opener, bottle_opener.getUnlocalizedName()); + //Canned Food + GameRegistry.registerItem(canned_beef, canned_beef.getUnlocalizedName()); + GameRegistry.registerItem(canned_tuna, canned_tuna.getUnlocalizedName()); + GameRegistry.registerItem(canned_mystery, canned_mystery.getUnlocalizedName()); + GameRegistry.registerItem(canned_pashtet, canned_pashtet.getUnlocalizedName()); + GameRegistry.registerItem(canned_cheese, canned_cheese.getUnlocalizedName()); + GameRegistry.registerItem(canned_jizz, canned_jizz.getUnlocalizedName()); + GameRegistry.registerItem(canned_milk, canned_milk.getUnlocalizedName()); + GameRegistry.registerItem(canned_ass, canned_ass.getUnlocalizedName()); + GameRegistry.registerItem(canned_pizza, canned_pizza.getUnlocalizedName()); + GameRegistry.registerItem(canned_tube, canned_tube.getUnlocalizedName()); + GameRegistry.registerItem(canned_tomato, canned_tomato.getUnlocalizedName()); + GameRegistry.registerItem(canned_asbestos, canned_asbestos.getUnlocalizedName()); + GameRegistry.registerItem(canned_bhole, canned_bhole.getUnlocalizedName()); + GameRegistry.registerItem(canned_hotdogs, canned_hotdogs.getUnlocalizedName()); + GameRegistry.registerItem(canned_leftovers, canned_leftovers.getUnlocalizedName()); + GameRegistry.registerItem(canned_yogurt, canned_yogurt.getUnlocalizedName()); + GameRegistry.registerItem(canned_stew, canned_stew.getUnlocalizedName()); + GameRegistry.registerItem(canned_chinese, canned_chinese.getUnlocalizedName()); + GameRegistry.registerItem(canned_oil, canned_oil.getUnlocalizedName()); + GameRegistry.registerItem(canned_fist, canned_fist.getUnlocalizedName()); + GameRegistry.registerItem(canned_spam, canned_spam.getUnlocalizedName()); + GameRegistry.registerItem(canned_fried, canned_fried.getUnlocalizedName()); + GameRegistry.registerItem(canned_napalm, canned_napalm.getUnlocalizedName()); + GameRegistry.registerItem(canned_diesel, canned_diesel.getUnlocalizedName()); + GameRegistry.registerItem(canned_kerosene, canned_kerosene.getUnlocalizedName()); + GameRegistry.registerItem(canned_recursion, canned_recursion.getUnlocalizedName()); + GameRegistry.registerItem(canned_bark, canned_bark.getUnlocalizedName()); + //Money GameRegistry.registerItem(cap_nuka, cap_nuka.getUnlocalizedName()); GameRegistry.registerItem(cap_quantum, cap_quantum.getUnlocalizedName()); @@ -4891,6 +4984,7 @@ public class ModItems { GameRegistry.registerItem(cap_sunset, cap_sunset.getUnlocalizedName()); GameRegistry.registerItem(cap_star, cap_star.getUnlocalizedName()); GameRegistry.registerItem(ring_pull, ring_pull.getUnlocalizedName()); + GameRegistry.registerItem(can_key, can_key.getUnlocalizedName()); //Chaos GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName()); diff --git a/com/hbm/items/food/ItemEnergy.java b/com/hbm/items/food/ItemEnergy.java index 895ffa599..da324d425 100644 --- a/com/hbm/items/food/ItemEnergy.java +++ b/com/hbm/items/food/ItemEnergy.java @@ -66,6 +66,15 @@ public class ItemEnergy extends Item { player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 30 * 20, 1)); player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 30 * 20, 2)); } + if(this == ModItems.can_bepis) + { + player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 30 * 20, 3)); + player.addPotionEffect(new PotionEffect(Potion.resistance.id, 30 * 20, 3)); + } + if(this == ModItems.can_breen) + { + player.addPotionEffect(new PotionEffect(Potion.confusion.id, 30 * 20, 0)); + } if(this == ModItems.chocolate_milk) { ExplosionLarge.explode(world, player.posX, player.posY, player.posZ, 50, true, false, false); @@ -153,7 +162,8 @@ public class ItemEnergy extends Item { { if(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || - this == ModItems.can_smart || this == ModItems.can_luna) { + this == ModItems.can_smart || this == ModItems.can_luna || + this == ModItems.can_bepis || this == ModItems.can_breen) { player.inventory.addItemStackToInventory(new ItemStack(ModItems.ring_pull)); if (stack.stackSize <= 0) { @@ -260,7 +270,8 @@ public class ItemEnergy extends Item { if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart || this == ModItems.chocolate_milk || - this == ModItems.can_luna)) + this == ModItems.can_luna || this == ModItems.can_bepis || + this == ModItems.can_breen)) if(!p_77659_3_.inventory.hasItem(ModItems.bottle_opener)) return p_77659_1_; @@ -297,6 +308,15 @@ public class ItemEnergy extends Item { { list.add("Contains actual selenium and star metal. Tastes like night."); } + if(this == ModItems.can_bepis) + { + list.add("beppp"); + } + if(this == ModItems.can_breen) + { + list.add("Don't drink the water. They put something in it, to make you forget."); + list.add("I don't even know how I got here."); + } if(this == ModItems.chocolate_milk) { list.add("Regular chocolate milk. Safe to drink."); diff --git a/com/hbm/items/food/ItemLemon.java b/com/hbm/items/food/ItemLemon.java index aeeb6094d..656a015f0 100644 --- a/com/hbm/items/food/ItemLemon.java +++ b/com/hbm/items/food/ItemLemon.java @@ -2,10 +2,12 @@ package com.hbm.items.food; import java.util.List; +import com.hbm.entity.effect.EntityVortex; import com.hbm.items.ModItems; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -69,6 +71,132 @@ public class ItemLemon extends ItemFood { if(this == ModItems.twinkie) { list.add("Expired 600 years ago!"); } + + if(this == ModItems.canned_beef) { + list.add("A few centuries ago, a cow died for this."); + } + + if(this == ModItems.canned_tuna) { + list.add("I can't tell if that's actually tuna or dried cement."); + } + + if(this == ModItems.canned_mystery) { + list.add("What's inside? Only one way to find out!"); + } + + if(this == ModItems.canned_pashtet) { + list.add("услуги перевода недоступны!"); + } + + if(this == ModItems.canned_cheese) { + list.add("Is it cheese? Is it rubber cement? Who knows, who cares."); + } + + if(this == ModItems.canned_milk) { + list.add("Milk 2: More solid than ever before!"); + } + + if(this == ModItems.canned_ass) { + list.add("100% quality donkey meat!*"); + } + + if(this == ModItems.canned_pizza) { + list.add("A crime against humanity."); + } + + if(this == ModItems.canned_tube) { + list.add("Tasty mush."); + } + + if(this == ModItems.canned_tomato) { + list.add("Who wants some thick red paste?"); + } + + if(this == ModItems.canned_asbestos) { + list.add("TASTE the asbestosis!"); + } + + if(this == ModItems.canned_bhole) { + list.add("Singularity is yum yum in my tum tum!"); + } + + if(this == ModItems.canned_jizz) { + list.add("Wait wh-"); + } + + if(this == ModItems.canned_hotdogs) { + list.add("Not to be confused with cool cats."); + } + + if(this == ModItems.canned_leftovers) { + list.add("ur 2 slow"); + } + + if(this == ModItems.canned_yogurt) { + list.add("Probably spoiled, but whatever."); + } + + if(this == ModItems.canned_stew) { + list.add("..."); + } + + if(this == ModItems.canned_chinese) { + list.add("In China, Chineese food is just called food."); + } + + if(this == ModItems.canned_oil) { + list.add("It makes motors go, so why not humans?"); + } + + if(this == ModItems.canned_fist) { + list.add("Yowser!"); + } + + if(this == ModItems.canned_spam) { + list.add("The three-and-a-half-minute sketch is set in the fictional Green Midget Cafe in Bromley."); + list.add("An argument develops between the waitress, who recites a menu in which nearly"); + list.add("every dish contains Spam, and Mrs. Bun, who does not like Spam. She asks for a"); + list.add("dish without Spam, much to the amazement of her Spam-loving husband. The waitress"); + list.add("responds to this request with disgust. Mr. Bun offers to take her Spam instead,"); + list.add("and asks for a dish containing a lot of Spam and baked beans. The waitress says"); + list.add("no since they are out of baked beans; when Mr. Bun asks for a substitution of Spam,"); + list.add("the waitress again responds with disgust. At several points, a group of Vikings in"); + list.add("the restaurant interrupts conversation by loudly singing about Spam."); + list.add("The irate waitress orders them to shut up, but they resume singing more loudly."); + list.add("A Hungarian tourist comes to the counter, trying to order by using a wholly"); + list.add("inaccurate Hungarian/English phrasebook (a reference to a previous sketch)."); + list.add("He is rapidly escorted away by a police constable. The sketch abruptly cuts to a"); + list.add("historian in a television studio talking about the origin of the Vikings in the café."); + list.add("As he goes on, he begins to increasingly insert the word \"Spam\" into every"); + list.add("sentence, and the backdrop is raised to reveal the restaurant set behind."); + list.add("The historian joins the Vikings in their song, and Mr. and Mrs. Bun are lifted by"); + list.add("wires out of the scene while the singing continues. In the original televised performance,"); + list.add("the closing credits begin to scroll with the singing still audible in the background."); + } + + if(this == ModItems.canned_fried) { + list.add("Even the can is deep fried!"); + } + + if(this == ModItems.canned_napalm) { + list.add("I love the smell of old memes in the morning!"); + } + + if(this == ModItems.canned_diesel) { + list.add("I'm slowly running out of jokes for these."); + } + + if(this == ModItems.canned_kerosene) { + list.add("Just imagine a witty line here."); + } + + if(this == ModItems.canned_recursion) { + list.add("Canned Recursion"); + } + + if(this == ModItems.canned_bark) { + list.add("Extra cronchy!"); + } } @@ -91,15 +219,55 @@ public class ItemLemon extends ItemFood { player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 60 * 20, 1)); player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 20 * 20, 2)); } + + if(this == ModItems.canned_beef || + this == ModItems.canned_tuna || + this == ModItems.canned_mystery || + this == ModItems.canned_pashtet || + this == ModItems.canned_cheese || + this == ModItems.canned_jizz || + this == ModItems.canned_milk || + this == ModItems.canned_ass || + this == ModItems.canned_pizza || + this == ModItems.canned_tomato || + this == ModItems.canned_asbestos || + this == ModItems.canned_bhole || + this == ModItems.canned_hotdogs || + this == ModItems.canned_yogurt || + this == ModItems.canned_stew || + this == ModItems.canned_chinese || + this == ModItems.canned_oil || + this == ModItems.canned_fist || + this == ModItems.canned_spam || + this == ModItems.canned_fried || + this == ModItems.canned_napalm || + this == ModItems.canned_diesel || + this == ModItems.canned_kerosene || + this == ModItems.canned_recursion || + this == ModItems.canned_bark) + player.inventory.addItemStackToInventory(new ItemStack(ModItems.can_key)); + + if(this == ModItems.canned_recursion && world.rand.nextInt(10) > 0) + player.inventory.addItemStackToInventory(new ItemStack(ModItems.canned_recursion)); } - public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_) + public ItemStack onEaten(ItemStack stack, World worldObj, EntityPlayer player) { - ItemStack sta = super.onEaten(p_77654_1_, p_77654_2_, p_77654_3_); + ItemStack sta = super.onEaten(stack, worldObj, player); if(this == ModItems.loop_stew) return new ItemStack(Items.bowl); + + + if (this == ModItems.canned_bhole && !worldObj.isRemote) { + EntityVortex vortex = new EntityVortex(worldObj, 0.5F); + vortex.posX = player.posX; + vortex.posY = player.posY; + vortex.posZ = player.posZ; + worldObj.spawnEntityInWorld(vortex); + } + return sta; } diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 8c6ef3280..3983a0857 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3182)"; + public static final String VERSION = "1.0.27 BETA (3200)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index a63ff4c42..5114f629b 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -38,6 +38,7 @@ import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.Mod.Metadata; import cpw.mods.fml.common.ModMetadata; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Random; @@ -533,6 +534,7 @@ public class MainRegistry GameRegistry.registerTileEntity(TileEntityMultiblock.class, "tileentity_multi_core"); GameRegistry.registerTileEntity(TileEntityChlorineSeal.class, "tileentity_chlorine_seal"); GameRegistry.registerTileEntity(TileEntityCableSwitch.class, "tileentity_he_switch"); + GameRegistry.registerTileEntity(TileEntitySoyuzLauncher.class, "tileentity_soyuz_launcher"); EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true); EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true); @@ -1496,6 +1498,8 @@ public class MainRegistry proxy.registerMissileItems(); } + public static List templateBlacklist = new ArrayList(); + @EventHandler public void preInit(FMLPreInitializationEvent event) { @@ -1745,24 +1749,15 @@ public class MainRegistry ciwsHitrate = propRadarAltitude.getInt(); final String CATEGORY_POTION = "08_potion_effects"; - Property propTaintID = config.get(CATEGORY_POTION, "8.00_taintPotionID", 62); - propTaintID.comment = "What potion ID the taint effect will have"; - taintID = propTaintID.getInt(); - Property propRadiationID = config.get(CATEGORY_POTION, "8.01_radiationPotionID", 63); - propRadiationID.comment = "What potion ID the radiation effect will have"; - radiationID = propRadiationID.getInt(); - Property propBangID = config.get(CATEGORY_POTION, "8.02_bangPotionID", 64); - propBangID.comment = "What potion ID the B93 timebomb effect will have"; - bangID = propBangID.getInt(); - Property propMutationID = config.get(CATEGORY_POTION, "8.03_mutationPotionID", 65); - propMutationID.comment = "What potion ID the taint mutation effect will have"; - mutationID = propMutationID.getInt(); - Property propRadxID = config.get(CATEGORY_POTION, "8.04_radxPotionID", 66); - propRadxID.comment = "What potion ID the Rad-X effect will have"; - radxID = propRadxID.getInt(); - Property propLeadID = config.get(CATEGORY_POTION, "8.05_leadPotionID", 67); - propLeadID.comment = "What potion ID the lead poisoning effect will have"; - leadID = propLeadID.getInt(); + taintID = createConfigInt(config, CATEGORY_POTION, "8.00_taintPotionID", "What potion ID the taint effect will have", 62); + radiationID = createConfigInt(config, CATEGORY_POTION, "8.01_radiationPotionID", "What potion ID the radiation effect will have", 63); + bangID = createConfigInt(config, CATEGORY_POTION, "8.02_bangPotionID", "What potion ID the B93 timebomb effect will have", 64); + mutationID = createConfigInt(config, CATEGORY_POTION, "8.03_mutationPotionID", "What potion ID the taint mutation effect will have", 65); + radxID = createConfigInt(config, CATEGORY_POTION, "8.04_radxPotionID", "What potion ID the Rad-X effect will have", 66); + leadID = createConfigInt(config, CATEGORY_POTION, "8.05_leadPotionID", "What potion ID the lead poisoning effect will have", 67); + + final String CATEGORY_MACHINE = "09_machines"; + templateBlacklist = Arrays.asList(createConfigStringList(config, CATEGORY_MACHINE, "9.00_templateBlacklist", "Which machine templates should be prohibited from being created (args: enum names)")); config.save(); @@ -1801,4 +1796,18 @@ public class MainRegistry return value; } + + private static int createConfigInt(Configuration config, String category, String name, String comment, int def) { + + Property prop = config.get(category, name, def); + prop.comment = comment; + return prop.getInt(); + } + + private static String[] createConfigStringList(Configuration config, String category, String name, String comment) { + + Property prop = config.get(category, name, new String[] { "PLACEHOLDER" } ); + prop.comment = comment; + return prop.getStringList(); + } } diff --git a/com/hbm/packet/ItemBobmazonPacket.java b/com/hbm/packet/ItemBobmazonPacket.java index 479bb5ffb..d81f1b355 100644 --- a/com/hbm/packet/ItemBobmazonPacket.java +++ b/com/hbm/packet/ItemBobmazonPacket.java @@ -121,7 +121,7 @@ public class ItemBobmazonPacket implements IMessage { } } else { - p.addChatMessage(new ChatComponentText("[BOBMAZON] Requirements not met!")); + p.addChatMessage(new ChatComponentText("[BOBMAZON] Achievement requirement not met!")); } return null; diff --git a/com/hbm/packet/ItemFolderPacket.java b/com/hbm/packet/ItemFolderPacket.java index 54fa7e4f5..a7c29d739 100644 --- a/com/hbm/packet/ItemFolderPacket.java +++ b/com/hbm/packet/ItemFolderPacket.java @@ -2,11 +2,15 @@ package com.hbm.packet; import java.util.List; +import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.items.ModItems; import com.hbm.items.tool.ItemAssemblyTemplate; +import com.hbm.items.tool.ItemAssemblyTemplate.EnumAssemblyTemplate; import com.hbm.items.tool.ItemCassette; import com.hbm.items.tool.ItemChemistryTemplate; +import com.hbm.items.tool.ItemChemistryTemplate.EnumChemistryTemplate; import com.hbm.items.tool.ItemFluidIdentifier; +import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineAssembler; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -19,6 +23,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; public class ItemFolderPacket implements IMessage { @@ -63,6 +68,14 @@ public class ItemFolderPacket implements IMessage { } if(stack.getItem() instanceof ItemFluidIdentifier) { + + FluidType enumeration = FluidType.getEnum(m.meta); + + if(MainRegistry.templateBlacklist.contains(enumeration.getName())) { + p.addChatMessage(new ChatComponentText("This item appears to be blacklisted.")); + return null; + } + if(p.inventory.hasItem(ModItems.plate_iron) && p.inventory.hasItem(Items.dye)) { p.inventory.consumeInventoryItem(ModItems.plate_iron); p.inventory.consumeInventoryItem(Items.dye); @@ -71,6 +84,14 @@ public class ItemFolderPacket implements IMessage { } } if(stack.getItem() instanceof ItemAssemblyTemplate) { + + EnumAssemblyTemplate enumeration = EnumAssemblyTemplate.getEnum(m.meta); + + if(MainRegistry.templateBlacklist.contains(enumeration.getName())) { + p.addChatMessage(new ChatComponentText("This item appears to be blacklisted.")); + return null; + } + if(p.inventory.hasItem(Items.paper) && p.inventory.hasItem(Items.dye)) { p.inventory.consumeInventoryItem(Items.paper); p.inventory.consumeInventoryItem(Items.dye); @@ -79,6 +100,14 @@ public class ItemFolderPacket implements IMessage { } } if(stack.getItem() instanceof ItemChemistryTemplate) { + + EnumChemistryTemplate enumeration = EnumChemistryTemplate.getEnum(m.meta); + + if(MainRegistry.templateBlacklist.contains(enumeration.getName())) { + p.addChatMessage(new ChatComponentText("This item appears to be blacklisted.")); + return null; + } + if(p.inventory.hasItem(Items.paper) && p.inventory.hasItem(Items.dye)) { p.inventory.consumeInventoryItem(Items.paper); p.inventory.consumeInventoryItem(Items.dye); diff --git a/com/hbm/render/misc/SoyuzLauncherPronter.java b/com/hbm/render/misc/SoyuzLauncherPronter.java index 6c55f2b1f..8ddd9396b 100644 --- a/com/hbm/render/misc/SoyuzLauncherPronter.java +++ b/com/hbm/render/misc/SoyuzLauncherPronter.java @@ -11,6 +11,8 @@ public class SoyuzLauncherPronter { public static void prontLauncher() { + + int rot = 0;//(int) (System.currentTimeMillis() / 20 % 45); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_CULL_FACE); @@ -25,14 +27,24 @@ public class SoyuzLauncherPronter { tex.bindTexture(ResourceManager.soyuz_launcher_tower_base_tex); ResourceManager.soyuz_launcher_tower_base.renderAll(); - tex.bindTexture(ResourceManager.soyuz_launcher_tower_tex); - ResourceManager.soyuz_launcher_tower.renderAll(); + GL11.glPushMatrix(); + tex.bindTexture(ResourceManager.soyuz_launcher_tower_tex); + GL11.glTranslated(0, 5.5, 5.5); + GL11.glRotated(rot, 1, 0, 0); + GL11.glTranslated(0, -5.5, -5.5); + ResourceManager.soyuz_launcher_tower.renderAll(); + GL11.glPopMatrix(); tex.bindTexture(ResourceManager.soyuz_launcher_support_base_tex); ResourceManager.soyuz_launcher_support_base.renderAll(); - tex.bindTexture(ResourceManager.soyuz_launcher_support_tex); - ResourceManager.soyuz_launcher_support.renderAll(); + GL11.glPushMatrix(); + tex.bindTexture(ResourceManager.soyuz_launcher_support_tex); + GL11.glTranslated(0, 5.5, -6.5); + GL11.glRotated(rot, -1, 0, 0); + GL11.glTranslated(0, -5.5, 6.5); + ResourceManager.soyuz_launcher_support.renderAll(); + GL11.glPopMatrix(); GL11.glPopMatrix(); } diff --git a/com/hbm/tileentity/bomb/TileEntityTurretBase.java b/com/hbm/tileentity/bomb/TileEntityTurretBase.java index b10d32dde..976aff93f 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretBase.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretBase.java @@ -6,6 +6,7 @@ import java.util.List; import com.hbm.blocks.bomb.TurretBase; import com.hbm.entity.logic.EntityBomber; import com.hbm.entity.missile.EntityMissileBaseAdvanced; +import com.hbm.entity.missile.EntityMissileCustom; import com.hbm.items.tool.ItemTurretBiometry; import com.hbm.lib.Library; import com.hbm.packet.LoopedSoundPacket; @@ -103,10 +104,10 @@ public abstract class TileEntityTurretBase extends TileEntity { } private boolean isInSight(Entity e) { - if(!(e instanceof EntityLivingBase) && !(e instanceof EntityMissileBaseAdvanced) && !(e instanceof EntityBomber)) + if(!(e instanceof EntityLivingBase) && !(e instanceof EntityMissileBaseAdvanced) && !(e instanceof EntityBomber) && !(e instanceof EntityMissileCustom)) return false; - if(this instanceof TileEntityTurretCIWS && !(e instanceof EntityMissileBaseAdvanced) && !(e instanceof EntityBomber)) + if(this instanceof TileEntityTurretCIWS && !(e instanceof EntityMissileBaseAdvanced) && !(e instanceof EntityBomber) && !(e instanceof EntityMissileCustom)) return false; if(e instanceof EntityPlayer && players.contains((((EntityPlayer)e).getUniqueID().toString())))