From 81d52b9cf61ad9fc2b0781f9a4a3080f58292224 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sat, 13 Aug 2016 15:52:00 +0200 Subject: [PATCH] Clips and dust --- assets/hbm/lang/de_DE.lang | 35 +++- assets/hbm/lang/en_US.lang | 35 +++- assets/hbm/textures/blocks/crate.png | Bin 0 -> 365 bytes assets/hbm/textures/blocks/flame_war.png | Bin 365 -> 389 bytes .../blocks/machine_shredder_bottom.png | Bin 0 -> 384 bytes .../blocks/machine_shredder_front.png | Bin 0 -> 334 bytes .../textures/blocks/machine_shredder_side.png | Bin 0 -> 327 bytes .../textures/blocks/machine_shredder_top.png | Bin 0 -> 317 bytes assets/hbm/textures/gui/gui_shredder.png | Bin 3460 -> 3449 bytes .../hbm/textures/items/blades_aluminium.png | Bin 0 -> 289 bytes .../textures/items/blades_combine_steel.png | Bin 0 -> 304 bytes assets/hbm/textures/items/blades_gold.png | Bin 0 -> 294 bytes assets/hbm/textures/items/blades_iron.png | Bin 0 -> 292 bytes .../hbm/textures/items/blades_schrabidium.png | Bin 0 -> 298 bytes assets/hbm/textures/items/clip_osipr.png | Bin 0 -> 308 bytes assets/hbm/textures/items/clip_revolver.png | Bin 0 -> 314 bytes .../hbm/textures/items/clip_revolver_gold.png | Bin 0 -> 258 bytes .../hbm/textures/items/clip_revolver_iron.png | Bin 0 -> 306 bytes .../items/clip_revolver_schrabidium.png | Bin 0 -> 306 bytes assets/hbm/textures/items/clip_rpg.png | Bin 0 -> 312 bytes assets/hbm/textures/items/clip_xvl1456.png | Bin 0 -> 327 bytes assets/hbm/textures/items/dust.png | Bin 0 -> 416 bytes .../hbm/textures/items/powder_aluminium.png | Bin 0 -> 243 bytes .../hbm/textures/items/powder_beryllium.png | Bin 0 -> 271 bytes assets/hbm/textures/items/powder_coal.png | Bin 0 -> 260 bytes assets/hbm/textures/items/powder_copper.png | Bin 0 -> 262 bytes assets/hbm/textures/items/powder_diamond.png | Bin 0 -> 274 bytes assets/hbm/textures/items/powder_gold.png | Bin 0 -> 260 bytes assets/hbm/textures/items/powder_iron.png | Bin 0 -> 253 bytes assets/hbm/textures/items/powder_titanium.png | Bin 0 -> 248 bytes assets/hbm/textures/items/powder_tungsten.png | Bin 0 -> 252 bytes assets/hbm/textures/items/powder_uranium.png | Bin 0 -> 253 bytes com/hbm/blocks/Crate.java | 166 ++++++++++++++++++ com/hbm/blocks/MachineShredder.java | 8 +- com/hbm/blocks/ModBlocks.java | 7 + .../TileEntityMachineElectricFurnace.java | 8 +- com/hbm/blocks/TileEntityMachineShredder.java | 58 ++++-- com/hbm/entity/EntityCombineBall.java | 11 ++ com/hbm/gui/ContainerMachineShredder.java | 25 ++- com/hbm/gui/GUIMachineShredder.java | 41 ++++- com/hbm/gui/MachineRecipes.java | 21 ++- com/hbm/handler/FuelHandler.java | 23 +++ com/hbm/items/ArmorT45.java | 3 +- com/hbm/items/ItemClip.java | 90 ++++++++++ com/hbm/items/ItemCustomLore.java | 5 + com/hbm/items/ModItems.java | 96 ++++++++-- com/hbm/main/MainRegistry.java | 21 ++- 47 files changed, 606 insertions(+), 47 deletions(-) create mode 100644 assets/hbm/textures/blocks/crate.png create mode 100644 assets/hbm/textures/blocks/machine_shredder_bottom.png create mode 100644 assets/hbm/textures/blocks/machine_shredder_front.png create mode 100644 assets/hbm/textures/blocks/machine_shredder_side.png create mode 100644 assets/hbm/textures/blocks/machine_shredder_top.png create mode 100644 assets/hbm/textures/items/blades_aluminium.png create mode 100644 assets/hbm/textures/items/blades_combine_steel.png create mode 100644 assets/hbm/textures/items/blades_gold.png create mode 100644 assets/hbm/textures/items/blades_iron.png create mode 100644 assets/hbm/textures/items/blades_schrabidium.png create mode 100644 assets/hbm/textures/items/clip_osipr.png create mode 100644 assets/hbm/textures/items/clip_revolver.png create mode 100644 assets/hbm/textures/items/clip_revolver_gold.png create mode 100644 assets/hbm/textures/items/clip_revolver_iron.png create mode 100644 assets/hbm/textures/items/clip_revolver_schrabidium.png create mode 100644 assets/hbm/textures/items/clip_rpg.png create mode 100644 assets/hbm/textures/items/clip_xvl1456.png create mode 100644 assets/hbm/textures/items/dust.png create mode 100644 assets/hbm/textures/items/powder_aluminium.png create mode 100644 assets/hbm/textures/items/powder_beryllium.png create mode 100644 assets/hbm/textures/items/powder_coal.png create mode 100644 assets/hbm/textures/items/powder_copper.png create mode 100644 assets/hbm/textures/items/powder_diamond.png create mode 100644 assets/hbm/textures/items/powder_gold.png create mode 100644 assets/hbm/textures/items/powder_iron.png create mode 100644 assets/hbm/textures/items/powder_titanium.png create mode 100644 assets/hbm/textures/items/powder_tungsten.png create mode 100644 assets/hbm/textures/items/powder_uranium.png create mode 100644 com/hbm/blocks/Crate.java create mode 100644 com/hbm/handler/FuelHandler.java create mode 100644 com/hbm/items/ItemClip.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 32c64a20d..eb650e81b 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -79,6 +79,8 @@ tile.therm_exo.name=Exothermische Bombe tile.crashed_bomb.name=Blindgänger +tile.crate.name=Vorratskiste + tile.machine_difurnace_off.name=Legierungshochofen tile.machine_difurnace_on.name=Legierungshochofen container.diFurnace=Legierungshochofen @@ -116,6 +118,8 @@ tile.machine_schrabidium_transmutator.name=Schrabidium-Transmutationsgerät container.machine_schrabidium_transmutator=Schrabidium-Transmutationsgerät tile.machine_diesel.name=Dieselgenerator container.machineDiesel=Dieselgenerator +tile.machine_shredder.name=Shredder +container.machineShredder=Shredder tile.factory_titanium_hull.name=Einfache Fabrikshülle tile.factory_titanium_furnace.name=Einfache Fabrikzugriffsluke @@ -275,6 +279,15 @@ tile.ore_lead.name=Bleierz item.powder_lead.name=Bleistaub item.powder_neptunium.name=Neptuniumstaub item.powder_schrabidium.name=Schrabidiumstaub +item.powder_iron.name=Eisenstaub +item.powder_gold.name=Goldstaub +item.powder_aluminium.name=Aluminiumstaub +item.powder_beryllium.name=Berylliumstaub +item.powder_copper.name=Kupferstaub +item.powder_titanium.name=Titanstaub +item.powder_tungsten.name=Wolframstaub +item.powder_uranium.name=Uranstaub +item.dust.name=Staub item.battery_generic.name=Batterie item.battery_advanced.name=Fortgeschrittene Batterie @@ -413,6 +426,7 @@ tile.waste_planks.name=Verkohlte Holzbretter item.trinitite.name=Trinitit item.nuclear_waste.name=Atommüll +item.scrap.name=Schrott item.ingot_uranium_fuel.name=Urankernbrennstoffbarren item.ingot_plutonium_fuel.name=Plutoniumkernbrennstoffbarren @@ -517,6 +531,14 @@ item.gun_xvl1456_ammo.name=Kiste mit erschöpftem Uran-235 item.gun_osipr_ammo.name=Dunker Energiepuls-Plug item.gun_osipr_ammo2.name=Combine Ball +item.clip_revolver_iron.name=Box voll Eisenkugeln +item.clip_revolver.name=.357 Magnum Patronen +item.clip_revolver_gold.name=Schatulle mit goldenen Patronen +item.clip_revolver_schrabidium.name=Schrabidium-Muntionsbehälter +item.clip_rpg.name=Raketenbehälter +item.clip_xvl1456.name=Große Isotopenbox +item.clip_osipr.name=AR2 Magazin + tile.block_schrabidium.name=Schrabidiumblock item.plate_gold.name=Goldplatte @@ -583,6 +605,7 @@ item.schrabidium_shovel.name=Schrabidiumschaufel item.schrabidium_hoe.name=Schrabidiumfeldhacke item.chainsaw.name=Kettensäge +item.crowbar.name=Mk.V Kistenöffnungsapparat "Brechstange" item.mask_of_infamy.name=Maske der Schande @@ -651,6 +674,7 @@ item.thruster_large.name=Großes Raketentriebwerk item.wand_k.name=Konstruktions-Zauberstab item.wand_s.name=Struktur-Zauberstab +item.wand_d.name=Debug-Zauberstab item.steel_helmet.name=Stahlhelm item.steel_plate.name=Stahlbrustpanzer @@ -733,4 +757,13 @@ item.can_empty.name=Leere Dose item.can_smart.name='Smart' Energy-Drink item.can_creature.name='Creature' Energy-Drink item.can_redbomb.name='Red Bomb' Energy-Drink -item.can_mrsugar.name='Dr. Sugar' Softdrink \ No newline at end of file +item.can_mrsugar.name='Dr. Sugar' Softdrink + +item.blades_aluminium.name=Aluminiumsägeblatt +item.blades_gold.name=Goldenes Sägeblatt +item.blades_iron.name=Eisensägeblatt +item.blades_steel.name=Stahlsägeblatt +item.blades_titanium.name=Titansägeblatt +item.blades_advanced_alloy.name=Fortgeschrittenes Sägeblatt +item.blades_combine_steel.name=CMB-Sägeblatt +item.blades_schrabidium.name=Schrabidiumsägeblatt \ No newline at end of file diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 00bb3d49c..081351e09 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -79,6 +79,8 @@ tile.therm_exo.name=Exothermic Bomb tile.crashed_bomb.name=Dud +tile.crate.name=Supply Crate + tile.machine_difurnace_off.name=Alloy Furnace tile.machine_difurnace_on.name=Alloy Furnace container.diFurnace=Alloy Furnace @@ -116,6 +118,8 @@ tile.machine_schrabidium_transmutator.name=Schrabidium Transmutation Device container.machine_schrabidium_transmutator=Schrabidium Transmutation Device tile.machine_diesel.name=Diesel Generator container.machineDiesel=Diesel Generator +tile.machine_shredder.name=Shredder +container.machineShredder=Shredder tile.factory_titanium_hull.name=Basic Factory Casing tile.factory_titanium_furnace.name=Basic Factory Access Hatch @@ -275,6 +279,15 @@ tile.ore_lead.name=Lead Ore item.powder_lead.name=Lead Powder item.powder_neptunium.name=Neptunium Powder item.powder_schrabidium.name=Schrabidium Powder +item.powder_iron.name=Iron Powder +item.powder_gold.name=Gold Powder +item.powder_aluminium.name=Aluminium Powder +item.powder_beryllium.name=Beryllium Powder +item.powder_copper.name=Copper Powder +item.powder_titanium.name=Titanium Powder +item.powder_tungsten.name=Tungsten Powder +item.powder_uranium.name=Uranium Powder +item.dust.name=Dust item.battery_generic.name=Battery item.battery_advanced.name=Advanced Battery @@ -413,6 +426,7 @@ tile.waste_planks.name=Charred Wooden Planks item.trinitite.name=Trinitite item.nuclear_waste.name=Nuclear Waste +item.scrap.name=Scrap item.ingot_uranium_fuel.name=Ingot of Uranium Fuel item.ingot_plutonium_fuel.name=Ingot of Plutonium Fuel @@ -517,6 +531,14 @@ item.gun_xvl1456_ammo.name=Depleted Uranium-235 Box item.gun_osipr_ammo.name=Dark Energy Pulse Plug item.gun_osipr_ammo2.name=Combine Ball +item.clip_revolver_iron.name=Box of Iron Rounds +item.clip_revolver.name=Box of .357 Rounds +item.clip_revolver_gold.name=Small Coffer of Golden Bullets +item.clip_revolver_schrabidium.name=Schrabidium Ammo Container +item.clip_rpg.name=Rocket Container +item.clip_xvl1456.name=Large Isotope Box +item.clip_osipr.name=AR2 Magazine + tile.block_schrabidium.name=Block of Schrabidium item.plate_gold.name=Gold Plate @@ -583,6 +605,7 @@ item.schrabidium_shovel.name=Schrabidium Shovel item.schrabidium_hoe.name=Schrabidium Hoe item.chainsaw.name=Chainsaw +item.crowbar.name=Mk.V Crate Opening Device "Crowbar" item.mask_of_infamy.name=Mask of Infamy @@ -651,6 +674,7 @@ item.thruster_large.name=Large Thruster item.wand_k.name=Construction Wand item.wand_s.name=Structure Wand +item.wand_d.name=Debug Wand item.steel_helmet.name=Steel Helmet item.steel_plate.name=Steel Chestplate @@ -733,4 +757,13 @@ item.can_empty.name=Empty Can item.can_smart.name='Smart' Energy Drink item.can_creature.name='Creature' Energy Drink item.can_redbomb.name='Red Bomb' Energy Drink -item.can_mrsugar.name='Dr. Sugar' Soft Drink \ No newline at end of file +item.can_mrsugar.name='Dr. Sugar' Soft Drink + +item.blades_aluminium.name=Aluminium Shredder Blades +item.blades_gold.name=Golden Shredder Blades +item.blades_iron.name=Iron Shredder Blades +item.blades_steel.name=Steel Shredder Blades +item.blades_titanium.name=Titanium Shredder Blades +item.blades_advanced_alloy.name=Advanced Shredder Blades +item.blades_combine_steel.name=CMB Shredder Blades +item.blades_schrabidium.name=Schrabidium Shredder Blades \ No newline at end of file diff --git a/assets/hbm/textures/blocks/crate.png b/assets/hbm/textures/blocks/crate.png new file mode 100644 index 0000000000000000000000000000000000000000..aa552c60508c412237e903e850c4473884cbc018 GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hV3?s>X6hFJKgUfdnXY$($D@NMS_R|{n&1qJ10tl|zH&(vgsWcEM1y>szF zbP0 Hl+XkKLrRdh literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/flame_war.png b/assets/hbm/textures/blocks/flame_war.png index aa552c60508c412237e903e850c4473884cbc018..8485b918592c03094ae4e80e42f809b882419bd4 100644 GIT binary patch delta 341 zcmV-b0jmD(0)+#RB#|)~f5HF&4#EKyC`y0;000?uMObuGZ)S9NVRB^vaA9d~bS`dX zbRaY?FfK7LtqKaj00033NklD02q-<8-F(ZjAP#b z007=eL_t(IPi4`&Q3Ej)h2iaq$VE6KA|N0mrUe&3NaiLSQXIeL+qt8`GsoJa^SF|C zkNfTV`}6Vjeu>}#hpflmL)8S{`^M&+GsI002ovPDHLkV1nIAf-e97 diff --git a/assets/hbm/textures/blocks/machine_shredder_bottom.png b/assets/hbm/textures/blocks/machine_shredder_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..e918f6ab3048b725b1087a662bf2945fed5aed4f GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$iavO{IEGmG=T0!pV=@$RsbzGL?sD;(Fv01e8gIITWmcC<)C3N%iEYga ze3R1cKkto{c>7QG{QQmk&Hu(2hOkU;Fl1K^n0wgWwSbdjo$*Jdwd*57J)9OG)X!-`+WFb@9S^a(sasZ!>LImYtp|vFumWl!n{iC;m~mI{CE6 zu{92V{SNThDXcu__F@}De$1_&T+V>w3pU?ZG&;E0>zBu-6-;uc4KvjX!a^APQ?Iu_ Z!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(P>W? z#}Etu)`@#1n+woOT2?u4<1E7mo;+IJaj3y~W_^>gTe~DWM4fp_Ga4 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/machine_shredder_side.png b/assets/hbm/textures/blocks/machine_shredder_side.png new file mode 100644 index 0000000000000000000000000000000000000000..9988a564862bd9b02e542c49c4a341d59af54536 GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(GgD< z#}Etu)``|ahZT5SH2?185bc$YH!=5^Ims;d+|yQfu{R%8q$KT^h)yc3sMifQX5KV0 zb?E}F&#PxiPM8_UX3J%}?4{-T{d+|}?0WKP(~as4a<#e=OUr_mPvm&}dtdJCume86 z+8@4j1bKO|rd{`txezIv?4o6$>>zw0HY_2|7XGebk@Fpmdc|??)6=;S}{G`=S^<^^BM-J&lX$7 Tf3e;L`iH^O)z4*}Q$iB}N-lWO literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/machine_shredder_top.png b/assets/hbm/textures/blocks/machine_shredder_top.png new file mode 100644 index 0000000000000000000000000000000000000000..7bba157a64a62726ee146363af2d8f737376a9b5 GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$igtOr zIEGmGPn~EjbXbAMCH7Y_Hy0O|l$72q=_N~+_|7g)ovS*D$-?;Jnq1Crk%!{s=C61^ zVGie^XC1;j*1lfxdz<53r3b9y+*a$BFjyy?w0ypoUr}NGZ@o=EnyE}jB!az^FIyF; zT)8&4xK57!ieavbSnz`6D0Zg19!wm}=PTRxGxoLo%2HvfSvl_^yTbbXcuzjtJ{Rq~ zTs`Rm^Gk(){3^V1h3nvA<&7I|huv8!)xchLa&BXcSM2()tOrC`=c@Te%?A2{!PC{x JWt~$(6986RZ%P0F literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/gui/gui_shredder.png b/assets/hbm/textures/gui/gui_shredder.png index 28d3593fff5a70cd32d10321d472947c62da32f4..34e2e4ea5a7e2bf08a1829fb865e15ace8e09a82 100644 GIT binary patch delta 2023 zcmb7@ZCDdm8iq5;AR%HT5sWUd52%Z+$IpHx1ndet7t?NCyi;55(&0JDcm(DTi(UV2m(2K>|f=8Lg=3;G7 z_v)I@lde8e?3u?!?c8Jg`ftP}5~71oN}^MW^*>2_P5si|HDN@PI`7&{%PZ%t+`*s- zrX5GHB3PZ;Kuj7-{X4PyLKgIDx>u=EWw2i!D|mQhacY>vb~;C)b7xGD3>K$*G{!{w zIiI5_iAi;=G^^U;4HKfHw#e5Hs#JGEa)pLeZfKs`4m>0i2IfK~Qr`-1p2 zwQKyYjt-uD^uDsX#AurM_}p3l5Ga40e4Khuv^-B^1-0GQHWB3(LH`+83~i#^4(pS) z*w_%)LB?^jrDZRqp;d6#R5C>R^WpbCtxK#*fI>MD(O*(~Di3;>QCO$$h(@xSKLR4= zIZmC9M&*y7W-l~k$o?X_qKL+)68h?aDr>e9Lxrf~|?#_Dj|lAjVw;&+taMaiPvKY*zO1YcPsN zVo_MH;JR&aS2T48u9zUpi7{*n&{J7i8lfrXcIS zaDbLIGpzWaR~w7&aXNQG&Ee8HJlu*S9kH)4jKtOPr4|k!n81bN4-bGp4xa|LO326Fb5YQh zL@G~a4>qDbkX0GeMe%tJpHQ9~&*PHE)?axs$G^JYNL;_0^3PwbeQ&x}=EiTfNoIbV z$L#%id}`VBJdQZM$*Fp41F}n}3)eh+y1Zp8*w}EwDv+$Oyp$cgw){&mD|0?%`{4t$x60W#yUyMIL_(OhAO1$s}T;|TD1}(iH zxLxe%QK{cmwk*<@&l5uL?S}aV{bI5HQFvq{;*S~G&*fxrcuLUaUX=|J-dcXfv3(TV z*h^3cdA)UPvX@H3Zk|@-;C?&IO1{a#F2u7ha(lh z`vhTfO|$0dVLUbH%_v|$F3G}`N(GPsLTP3H^d0hI3nl$Szke$DdA*!g%=Nu$} OUtDxj)MZ{)#s2^-=Xa_A delta 2049 zcmbVL`$H2~7M_`%XcB28fglv3U`!>Emw*TaHHZ+<7@>()X?VCI=oTyx5DLf)sDLa5 zgtWY(Kq(+?r7Bb@DvqsPLd#oQ78+>~8VV{#MM27AZ%F$O?ELc0x%Zy$JNKOLzIpqM zOdKzh zt$pj;Gts;>s=N0i8ON!6ON3-32-b7O8NS;y?n^R{4DP;V4K*(@|Kw<4MH>63%0Q}Rz* zRdwG@@T>gRN%pAfuwOC(IMc4In_#-5$$wrh;1X3|F31V!=Lc%o8NVk;q_hm_`Z|bsxh1&ztx{>soe)fF4b=0&5ByI1!S* z^_tQoR{LLt`XSxOpw#stT=ZXhzf|`-{q^HBxUmzt1;6fW3fd@ymD4*tL#r^KwYr>} z6Q`qjGOB8j!eb<=0N03wAZ@4%UNI^I6+8R}dpvbtYR-!0sj0T@oy}mnR@ACeWmB_H z!O#P674dKIXv=5CZ%0Vz1-KCQ;GGx7=jmrD7%DeE?F392&j&I)6w0k|Lte!0d8+$8ElFuzR`hbC zhTNf;HH}Rm&yC^{yMfop*h1VcXU@0?S{Q{uiVKVuaVfBkz>#PxcKIRw!cTVL+$-%a zz0K@|fI?9Rg8W!F(5W5pDz{8e-xffmB4bWR7*4t6t?eKAZ<}(enc}vhw>AlAE*~TA zYdB(;_>wv4NM(?H(nM^o1H8nv&MrFuD?jFvCatFe*;$!b)gFQmNbcL=SlnFN*gb2K~j8*?;bFizUqcet96FwCid-X74Kf%nkvFTSIbd2SJcqxNuo>2VVx zYIpV~%A_uas2s8SCb7R1NSXo3*Ga?%+2ZYS2J6xf4W2WmA;_>PSRNMQt5C(=K!zLz zE5^m?WHZbGkar<32Cd4oE(JxY!Xmrwb2M83`&BQ5GO3`RnuKF6xCu+}_eiS4bqkz> zMV}_rzB{UIl5uOfAxN8^_jMA)IMA;Sl9csyCs1a0;#QG%NL{RM+C%sFV)Y(kTz@ae zstb**>K;^eSQ}3!*7gW~%I~d5FtB3}-M3IUoYiJkhV5hM&OsiXcF$?HRj~oBXc`BU zx5^8d&Gf`7@d8jnu{8XymVDg2V}^tksM_H;9d9`FUuGpo%z{weRJSq;-u4uE=s*JixZ z9^*}SZP0K*A)6_-7lu8~n!)?Xh2Q5H6I(4^usgBa10=~8PjxH6G8KqQp>3(N4_Rd4 zIWxcM!>dPek={ta=Q%d}i96q9?!Kqr&F}ki86q3WY ze%NyG&E42H+4hN@WxeY)?*Z-e1%jB!HKDIQ_nF(=LkFZmfOH7OtW8rz0H3G^ zYP~Ee#!{BqDgawEwW`Uga7BpR59EkJPB}?KOr&V@j?;CQ!M^JbWInt;)bsVSQYug? zBdhx4N$DesJo$6iKb2g2q)qS11}NAoCCcuWL!(?=>q~3}o?xR!*d?=k6Lz%Rl{pv5 z(A@-trf@l{`tPoZ0UsAhD@4_LBTS)c{aXN_cP#)L1L)r$h}Z_;EyMg?P^+5K@)!6T zB7G;-lw_F!fMqZc&So#mHk&wS%=o<{(^AoS2{`Zt^n@>!R+wT(Nywr>-fP)4sMq>s z2`@W?prawOHt2>Jl=S8VN>T%e42z)#(6!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(L7HV z#}EturG1T@EQTB`>%W#vkh<*g@B4`pTK7H|9Gb9V_p7bn>s+Htp3S+x{C($-5~r)j zBm%?ZvOV88pZm{eth(8QS%l}{hHG3kj7yHRCtO&dzS*NQztmaQBevy%gxvOv;T85Q zbF^NG{pzan6uP(~JY;j0fc*20B;jN4cBP2S;JklIpy=YPubXz}g|3%%csyMqX0p`O hb1|9S|2MDaU$={SqW=q@NT5p@JYD@<);T3K0RZZ-ZF~R# literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/blades_combine_steel.png b/assets/hbm/textures/items/blades_combine_steel.png new file mode 100644 index 0000000000000000000000000000000000000000..f6e964f423a2748ad3a717aea9851d0ea2cbdbc4 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(OORz z#}Etur2)5j4;yf#wB}u4HHuzx?%Llu40bhc*H;DE`?XawboLtlYf_O+JOBIQtYpzc zFXr4_{Ns)Eb=P<2Kg&93ycXq)7d38Bk#i3e-5JASZVJhNf{ wjXT?ysnsWO-9OW<&d!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(PB>* z#}Etur4#S+HW+ZU$R1iMb5hc(lU!QPI4LE4B%asxEIW z%2q3%->Ps;Q8~{%FY6$W&Vokgj2UmGV;!7?+F$J4D%s+)eO03D3prt)i&<*-zF%ii zd$3X=pYf+vR?`XTk6k%wvJne-CjPUNlHb?pwE1zgWs9Z6RL-*%MaCD_zL?5m3g}!0Pgg&ebxsLQ0PdA(k^lez literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/blades_iron.png b/assets/hbm/textures/items/blades_iron.png new file mode 100644 index 0000000000000000000000000000000000000000..4b159379d78c9adc5883aee9ccb64e07230e0937 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(Lzrb z#}EturF|E9j~H+`?+!6L(KA!`_LFn!wkZO(p|6eyGu>!=J?C@RwwGrt_xsxme|*{U zs@HJQ`d!~9-EjVLzxw}yCHrT)ayhJ#Ivl0_fpr2G|G@VurfAy z?(|FXK}g_sgYT>vlR6ytE}HeS`-g>4;VSmB>#BGoechI`&*!{m4w|>|V)B~4$3Vw2c)I$ztaD0e0synkas2=Q literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/blades_schrabidium.png b/assets/hbm/textures/items/blades_schrabidium.png new file mode 100644 index 0000000000000000000000000000000000000000..59753bef8355a14ef359d818c1672423c1201c7d GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(Q;20 z#}EturGB@0j~H;A_A&Q2f6+5nSA5M3sVCNt8v2-yPJl;dD#fS=HIjj~O?mp%ouAyNzkzj??>YXfzCb54c)I$ztaD0e0swjuYlQ#+ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/clip_osipr.png b/assets/hbm/textures/items/clip_osipr.png new file mode 100644 index 0000000000000000000000000000000000000000..203f928ae8a0f31e32d80a8036ff532127246918 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$ik5h~IEGmGFYVtg+H4@eqW`s;Z;pjhv6o-5UIW{U1G*PkLg$pX{)pIq zETM_f@RCfzyE-n-eg##-)dedzT=^{=^{nE&fNpTb`GUI+$BSJ~nfAD6*>u&adT(p1 zv8g$H>!9#|9*>8ck3TBQIUwXW|35=`j_7l*iBDuEa!VxNJA6~&*@n1<$wI9EKc`x% x)a>r_6tS==c~*N`@wVYbqxSttN>A(V++&rVTk-Ug5FgOJ44$rjF6*2UngGXta8v*Q literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/clip_revolver.png b/assets/hbm/textures/items/clip_revolver.png new file mode 100644 index 0000000000000000000000000000000000000000..f2d1235a25621a93d61438ad5afd69fbbeb4d2a4 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$idK2LIEGmGFP(6Z_mBaPtF4oW>%>hg;%td57RAr*rAD;qMl@>nCmcNqTu z$gixtAf?c>gst+lB8$C4kN*j&(zw}cL3Z8bKP0`?A^7f;?e(cZS2K9J`njxgN@xNA D?|F2f literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/clip_revolver_gold.png b/assets/hbm/textures/items/clip_revolver_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..ceb691e347d415fa58d94fb334cdab59f4471501 GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$ii$j4978Ppm-b!cZ7|?)nc4K$UgjX{orAS2j?7Vf=;dl3=e6#5_R%wS zj)(b7-Z&iQJHKF6*}I^k9P@j=OjG`BViM9y;O<$0#LT=By}Z;C1rt33 zJwt=FTwDi$iWYggIEGmGFYQ^#*X$tR@{>PA+u>S+hUxNIQcX%bmhEpl@<@B*pG(`S zPsU73w%if6CnYcMo2ttf@hr*asAC%{rW~D_cm0j@^u+>t63HE`Let)I#wIXs(r21= zp>^F_jy>~^DeYdSr_=xY=qAkr8(k)^Vfk}#apf7^8ja5;bLOaM91v)K;Sj)}@R9$1 x?JnI1lO`(3=QK4fUc<6~(KN#qPYX4EGO+#X-SA0Rj34M)22WQ%mvv4FO#o$BaYFzA literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/clip_revolver_schrabidium.png b/assets/hbm/textures/items/clip_revolver_schrabidium.png new file mode 100644 index 0000000000000000000000000000000000000000..6957b328f7083c0ae92621f40b4619713cca4ee5 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$iWYggIEGmGFP-4X*Py_|Vkx}u$;sLFAK%^e|HT;}n3=oLTV;`)*@l#I zC+UtC(=Vjlo^-x);l%>4l^Vx1vK%jD%=Fi;y6bo$<+M2Wb{1I!83}Q&+iH&XUA><< zCJ44gHhtRhe!2*ctO1vXvd`VhO4^j=ebwhfv#onboFyt=akR{0BLD!t^fc4 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/clip_rpg.png b/assets/hbm/textures/items/clip_rpg.png new file mode 100644 index 0000000000000000000000000000000000000000..804ae9d38424668eefd35f4c0420b7ca634bfffe GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$idJ~KIEGmGFP*rN_ppM1tL9{l*%tx=0u5VlUwLU9750HmZ0#LT=By}Z;C1rt33 zJwt=FTwDi$ine>YIEGmGFP*ee@UQ}p>&&LEu1QKF3zIshV%E+;~Q>APCQaDOY?I$yNccJ{_3^2gIZ)` zdcIweeM_&%@joS_cGl5c@)w%$83arUcaydKIbjdumJ zm`t^~8lGv}q|M&We}i$WUO>-&<9pKQIr@4oiZEmdDg-V%6E9om$RpQ&MS92E+C?&d S&aVY}fx*+&&t;ucLK6TG$aoh3 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/dust.png b/assets/hbm/textures/items/dust.png new file mode 100644 index 0000000000000000000000000000000000000000..8dcb2cf6e444088a1afccb480dc1f67637b03c4d GIT binary patch literal 416 zcmV;R0bl-!P)N2bZe?^J zG%heMF)*zP3cvsW0Ub$1K~y+TW1t-HL1{_>69XrN!NCZjp@4~j4a!0XtPBi1sA@4l zPHyb~^z_jGP%deps5J5a#*OpA7?&aZB0NwQ8USfHduJC|^Xv_M|0hpw{2v<;0X9TX z2IzETzyySFzzfj~vl)h`_cehHfw_c(O$e+U17On(!XVAdS9YNof&pNfR~?=SrWY-m z0HzNfTo2X=!X53|n1--0LuioT=1tS!8j&%~fZAG!0ST%8sIFiUWCa@ll7!icY(Q6M zGu#jm#_NsFi7o#ZEu99|czDM`u&v!4kU(6$ZTERKUz(9MHf91Eiz_2mA~KG6q(_zyJW)0qEM`z*Ths0000< KMNUMnLSTZN0-Y!T literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/powder_aluminium.png b/assets/hbm/textures/items/powder_aluminium.png new file mode 100644 index 0000000000000000000000000000000000000000..35742891fadbbed7c12874f98d5e6d542caceea7 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$iV8ek z978Pp@Ah5fJfOhC8f)8~%F=#9XP2<4M@g6G0_|q-boFyt=akR{0Bqe={Qv*} literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/powder_beryllium.png b/assets/hbm/textures/items/powder_beryllium.png new file mode 100644 index 0000000000000000000000000000000000000000..77e0df52d2bb2c3c35caa0d92ce023b1081be9ea GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$ih4X< z978Pp?@l<)+n^xe;;D0BnodJAYeYM1Ko9E$Alds&Q0*qOQjCqo$(9c@w+r7nZ+iZ6 z>*+EdmSmev?TRcxR>c-Ae{XHuDxai&nqim1)(s5z^mkrWZsERqEF}G@5AQ5rlUT=W z*36461)c}YHZttwa%f6uH5E1g@9?OR^`w>l`Fl$b6nsdwEN6E4yKj4l)HZLRyBIuO L{an^LB{Ts5=#5>o literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/powder_coal.png b/assets/hbm/textures/items/powder_coal.png new file mode 100644 index 0000000000000000000000000000000000000000..fc507721aa2d6298349194d206500d37c66ae651 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P_o1|q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&(L5k7Z*@9L!+mQ zV~B?vcz}E4%gD^9dG_%oQv!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$ikdxL z978Pp?@rjw+h8EzynbmSS6U*|5hDYk+Xev-S|fHTv8-Eo;8O6E{@SoN&tIJpnv&}y zvHhizOjBa~uben`@8Tt$^L02XM1zdA6Kob<&E*hZ#T%0T)Q5MLuSu+1f6tZ-wt~)s z<{udsNi~Qt8D(pk{C9ZN$S-82e}0~-^Nk-H&+vJiX{}9l*9Urtfx*+&&t;ucLK6U$ C6IYV} literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/powder_diamond.png b/assets/hbm/textures/items/powder_diamond.png new file mode 100644 index 0000000000000000000000000000000000000000..230258c618f7358575761dae53decb6ecf17ab6b GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P_o1|q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&(L5k7Z*@9L%*ks zV~B-+vc$87<98m|b2#r@!Z_iW>-~Anh9}z^Ok)0gm0Yv)`RT>~xq_uT%~@`yNw7&e zOi{dHa+qhrx^ry1xt1#`aL(B5DDk93fLEw_C&PO0gl&gSl#*w-P0;=z#W0B_)1i!W z6Qe=TRR)0uNv1;vXAPnqCGsT>FnBO-ax~x(Zr4)gNs#im=8=8?=%Bayw_j~~5qJUU OGzL#sKbLh*2~7Zha9TzH literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/powder_gold.png b/assets/hbm/textures/items/powder_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..8f9a1525e441396a538026a5f737e9d200fb2efb GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$iW)s# z978Pp?@l<#+n^x8^8WnfvK6P*-W=MtW%}i>d95xkKYkQU?(H~J5Lh>Fic4UeI72EU}ZMd=8o&O!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$imE(a z978Pp@Ae(!JfI-Jl6&fy&cQ65lX*PKd_OLz)O|W}K&a>3z1I1{$vG)9=N;B;{U$SA zfuTrq>C-v)r=OY3%evkxY!j>I(tTIAwQvU{mF|1MwtcomY+;{L^c}H+PKMP?n{^nx uJ2nM#=A=G67?bkHexB{(0-ZV^4)JS-uh`A@#Ag6q!QkoY=d#Wzp$P!L6<3J> literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/powder_titanium.png b/assets/hbm/textures/items/powder_titanium.png new file mode 100644 index 0000000000000000000000000000000000000000..6502fba8701db076a85a8516439d2eb16b7cdcb7 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$ib_3Q z978Pp@AjSKJ)pqDa<`syU6b0K25B#oj;R4GEOwPCOKJ<=-1t^}=daS+3bvzX)>uvp zVBl0riofLljx~BxU}RH}*WE0whm7-5FR-2VO}pILm9tUgg9oDq4oXUC~oUI|fR oH7{Jd-re3_9%7+a*K?DX|BP&hW0>q?paU2@UHx3vIVCg!0APVsEdT%j literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/powder_tungsten.png b/assets/hbm/textures/items/powder_tungsten.png new file mode 100644 index 0000000000000000000000000000000000000000..65bb0342b4113ab54ed6ee37483f764feece636a GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$iYh%_ z978Pp?@l<)+n^xAva(5P$K}Rb_1-fKeGV}S=*i7VN&a!hF6oD*;W4LIMf^uz+sw_wercF>)y9cwlyuCG%tryzcG=MeL>3s@tT8QRQO-gKlsoIM-wV7UX0O&F{hxR0UFFU#AApWv@O1TaS?83{1OOkwSO@?B literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/powder_uranium.png b/assets/hbm/textures/items/powder_uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..833a87b09e518e3ee3a98a1ec31879694f02f56e GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$imE(a z978Pp@AhrvJ)j_PBx343Mu{fY8PiU1c#BMEQFGOqtHiYL|A*qFp5C6vk{w&G&3i1w z;-I&5%bd@@Csl4*_#pJ8*EWTvSGM1pR>0`B=A8JQ2W7&`wa*2nbl+yu6HEwAn8upG u8Ca&(xK_tzMt9Hu-d`T*3I list = new ArrayList(); + + switch(rand.nextInt(23)) { + case 0: + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.clip_revolver_iron); + break; + case 1: + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.syringe_metal_stimpak); + list.add(ModItems.syringe_metal_stimpak); + break; + case 2: + list.add(ModItems.clip_revolver); + list.add(ModItems.syringe_metal_stimpak); + break; + case 3: + list.add(ModItems.clip_osipr); + list.add(ModItems.syringe_metal_stimpak); + break; + case 4: + list.add(ModItems.clip_osipr); + list.add(ModItems.clip_osipr); + list.add(ModItems.syringe_metal_stimpak); + break; + case 5: + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.clip_revolver); + break; + case 6: + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.clip_revolver); + break; + case 7: + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.clip_osipr); + break; + case 8: + list.add(ModItems.clip_revolver_gold); + list.add(ModItems.syringe_metal_stimpak); + break; + case 9: + list.add(ModItems.clip_revolver_gold); + list.add(ModItems.clip_revolver_gold); + list.add(ModItems.syringe_metal_stimpak); + break; + case 10: + list.add(ModItems.clip_revolver_schrabidium); + break; + case 11: + list.add(ModItems.clip_xvl1456); + break; + case 12: + list.add(ModItems.clip_xvl1456); + list.add(ModItems.clip_xvl1456); + break; + case 13: + list.add(ModItems.clip_xvl1456); + list.add(ModItems.syringe_metal_stimpak); + break; + case 14: + list.add(ModItems.clip_osipr); + list.add(ModItems.clip_osipr); + list.add(ModItems.syringe_metal_stimpak); + break; + case 15: + list.add(ModItems.clip_osipr); + list.add(ModItems.syringe_metal_stimpak); + list.add(ModItems.syringe_metal_stimpak); + break; + case 16: + list.add(ModItems.clip_revolver_gold); + list.add(ModItems.clip_revolver_gold); + break; + case 17: + list.add(ModItems.clip_rpg); + list.add(ModItems.clip_rpg); + break; + case 18: + list.add(ModItems.clip_rpg); + list.add(ModItems.syringe_metal_stimpak); + break; + case 19: + list.add(ModItems.clip_rpg); + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.syringe_metal_stimpak); + case 20: + list.add(ModItems.clip_rpg); + list.add(ModItems.clip_revolver); + list.add(ModItems.syringe_metal_stimpak); + break; + case 21: + list.add(ModItems.syringe_metal_stimpak); + list.add(ModItems.syringe_metal_stimpak); + break; + case 22: + list.add(ModItems.syringe_metal_stimpak); + list.add(ModItems.syringe_metal_stimpak); + list.add(ModItems.syringe_metal_stimpak); + break; + } + + for(Item stack : list) { + float f = rand.nextFloat() * 0.8F + 0.1F; + float f1 = rand.nextFloat() * 0.8F + 0.1F; + float f2 = rand.nextFloat() * 0.8F + 0.1F; + EntityItem entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(stack)); + + float f3 = 0.05F; + entityitem.motionX = (float)rand.nextGaussian() * f3; + entityitem.motionY = (float)rand.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float)rand.nextGaussian() * f3; + if(!world.isRemote) + world.spawnEntityInWorld(entityitem); + } + } +} diff --git a/com/hbm/blocks/MachineShredder.java b/com/hbm/blocks/MachineShredder.java index 89f375b7a..7e5a98b75 100644 --- a/com/hbm/blocks/MachineShredder.java +++ b/com/hbm/blocks/MachineShredder.java @@ -35,10 +35,10 @@ public class MachineShredder extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_bottom"); - this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_top"); - this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_side"); - this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_front"); + this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_bottom"); + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_top"); + this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_side"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_front"); } @Override diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 8d3db5c18..ea9a81e50 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -113,6 +113,8 @@ public class ModBlocks { public static Block red_barrel; public static Block yellow_barrel; public static Block crashed_balefire; + + public static Block crate; public static Block nuke_gadget; public static final int guiID_nuke_gadget = 3; @@ -482,6 +484,8 @@ public class ModBlocks { launch_pad_mirv = new LaunchPad(Material.iron).setBlockName("launch_pad_mirv").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); book_guide = new Guide(Material.iron).setBlockName("book_guide").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke); + + crate = new Crate(Material.iron).setBlockName("crate").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":crate"); machine_schrabidium_transmutator = new MachineSchrabidiumTransmutator(Material.iron).setBlockName("machine_schrabidium_transmutator").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock); @@ -696,6 +700,9 @@ public class ModBlocks { //Guide GameRegistry.registerBlock(book_guide, book_guide.getUnlocalizedName()); + //Crate + GameRegistry.registerBlock(crate, crate.getUnlocalizedName()); + //ElB GameRegistry.registerBlock(statue_elb, statue_elb.getUnlocalizedName()); GameRegistry.registerBlock(statue_elb_g, statue_elb_g.getUnlocalizedName()); diff --git a/com/hbm/blocks/TileEntityMachineElectricFurnace.java b/com/hbm/blocks/TileEntityMachineElectricFurnace.java index 958264812..f64aee638 100644 --- a/com/hbm/blocks/TileEntityMachineElectricFurnace.java +++ b/com/hbm/blocks/TileEntityMachineElectricFurnace.java @@ -217,8 +217,8 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid { return false; } - //ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]); - ItemStack itemStack = MachineRecipes.getShredderResult(this.slots[1]); + ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]); + //ItemStack itemStack = MachineRecipes.getShredderResult(this.slots[1]); if(itemStack == null) { return false; @@ -242,8 +242,8 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid private void processItem() { if(canProcess()) { - //ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]); - ItemStack itemStack = MachineRecipes.getShredderResult(this.slots[1]); + ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]); + //ItemStack itemStack = MachineRecipes.getShredderResult(this.slots[1]); if(slots[2] == null) { diff --git a/com/hbm/blocks/TileEntityMachineShredder.java b/com/hbm/blocks/TileEntityMachineShredder.java index 28b07e30a..ee239cbe0 100644 --- a/com/hbm/blocks/TileEntityMachineShredder.java +++ b/com/hbm/blocks/TileEntityMachineShredder.java @@ -34,9 +34,9 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven public static final int maxPower = 10000; public static final int processingSpeed = 60; - private static final int[] slots_top = new int[] {0}; - private static final int[] slots_bottom = new int[] {1, 2}; - private static final int[] slots_side = new int[] {2}; + private static final int[] slots_top = new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8}; + private static final int[] slots_bottom = new int[] {9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}; + private static final int[] slots_side = new int[] {27, 28, 29}; private String customName; @@ -77,7 +77,7 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven @Override public String getInventoryName() { - return this.hasCustomInventoryName() ? this.customName : "container.machineDiesel"; + return this.hasCustomInventoryName() ? this.customName : "container.machineShredder"; } @Override @@ -113,10 +113,9 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven @Override public boolean isItemValidForSlot(int i, ItemStack stack) { if(i == 0) - if(stack.getItem() == ModItems.canister_fuel || stack.getItem() == Item.getItemFromBlock(ModBlocks.red_barrel)) return true; if(i == 2) - if(stack.getItem() instanceof ItemBattery) + if(stack.getItem() instanceof ItemBattery || stack.getItem() instanceof ItemBlades) return true; return false; @@ -195,11 +194,10 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven @Override public boolean canExtractItem(int i, ItemStack itemStack, int j) { - if(i == 1) - if(itemStack.getItem() == ModItems.canister_empty || itemStack.getItem() == ModItems.tank_steel) + if(i >= 9 && i <= 28) return true; - if(i == 2) - if(itemStack.getItemDamage() == 0) + if(i >= 27 && i <= 29) + if(itemStack.getItemDamage() == itemStack.getMaxDamage()) return true; return false; @@ -239,6 +237,12 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven this.processItem(); flag1 = true; } + if(soundCycle == 0) + this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "minecart.base", 1.0F, 0.75F); + soundCycle++; + + if(soundCycle >= 50) + soundCycle = 0; }else{ progress = 0; } @@ -438,4 +442,38 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven public int getMaxPower() { return this.maxPower; } + + public int getGearLeft() { + + if(slots[27] != null && slots[27].getItem() instanceof ItemBlades) + { + if(slots[27].getItemDamage() < slots[27].getItem().getMaxDamage()/2) + { + return 1; + } else if(slots[27].getItemDamage() != slots[27].getItem().getMaxDamage()) { + return 2; + } else { + return 3; + } + } + + return 0; + } + + public int getGearRight() { + + if(slots[28] != null && slots[28].getItem() instanceof ItemBlades) + { + if(slots[28].getItemDamage() < slots[28].getItem().getMaxDamage()/2) + { + return 1; + } else if(slots[28].getItemDamage() != slots[28].getItem().getMaxDamage()) { + return 2; + } else { + return 3; + } + } + + return 0; + } } diff --git a/com/hbm/entity/EntityCombineBall.java b/com/hbm/entity/EntityCombineBall.java index fc8ca7c44..11298d57b 100644 --- a/com/hbm/entity/EntityCombineBall.java +++ b/com/hbm/entity/EntityCombineBall.java @@ -569,4 +569,15 @@ public class EntityCombineBall extends Entity implements IProjectile byte b0 = this.dataWatcher.getWatchableObjectByte(16); return (b0 & 1) != 0; } + + @Override + @SideOnly(Side.CLIENT) + public int getBrightnessForRender(float p_70070_1_) { + return super.getBrightnessForRender(p_70070_1_); + } + + @Override + public float getBrightness(float p_70013_1_) { + return super.getBrightness(p_70013_1_); + } } \ No newline at end of file diff --git a/com/hbm/gui/ContainerMachineShredder.java b/com/hbm/gui/ContainerMachineShredder.java index edac45170..237945c81 100644 --- a/com/hbm/gui/ContainerMachineShredder.java +++ b/com/hbm/gui/ContainerMachineShredder.java @@ -14,6 +14,7 @@ public class ContainerMachineShredder extends Container { private TileEntityMachineShredder diFurnace; private int power; + private int progress; public ContainerMachineShredder(InventoryPlayer invPlayer, TileEntityMachineShredder tedf) { power = 0; @@ -69,6 +70,7 @@ public class ContainerMachineShredder extends Container { public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); crafting.sendProgressBarUpdate(this, 0, this.diFurnace.power); + crafting.sendProgressBarUpdate(this, 1, this.diFurnace.progress); } @Override @@ -82,16 +84,17 @@ public class ContainerMachineShredder extends Container { ItemStack var5 = var4.getStack(); var3 = var5.copy(); - if (par2 <= 2) { - if (!this.mergeItemStack(var5, 3, this.inventorySlots.size(), true)) + if (par2 <= 29) { + if (!this.mergeItemStack(var5, 30, this.inventorySlots.size(), true)) { return null; } } - else if (!this.mergeItemStack(var5, 0, 1, false)) + else { - if (!this.mergeItemStack(var5, 2, 3, false)) - return null; + if (!this.mergeItemStack(var5, 0, 9, false)) + if (!this.mergeItemStack(var5, 27, 30, false)) + return null; } if (var5.stackSize == 0) @@ -124,9 +127,15 @@ public class ContainerMachineShredder extends Container { { par1.sendProgressBarUpdate(this, 0, this.diFurnace.power); } + + if(this.progress != this.diFurnace.progress) + { + par1.sendProgressBarUpdate(this, 1, this.diFurnace.progress); + } } - + this.power = this.diFurnace.power; + this.progress = this.diFurnace.progress; } @Override @@ -135,5 +144,9 @@ public class ContainerMachineShredder extends Container { { diFurnace.power = j; } + if(i == 1) + { + diFurnace.progress = j; + } } } diff --git a/com/hbm/gui/GUIMachineShredder.java b/com/hbm/gui/GUIMachineShredder.java index 11a54e4c1..6710f66ed 100644 --- a/com/hbm/gui/GUIMachineShredder.java +++ b/com/hbm/gui/GUIMachineShredder.java @@ -40,8 +40,45 @@ public class GUIMachineShredder extends GuiContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); - //drawTexturedModalRect(guiLeft + 152, guiTop + 69 - i, 176, 52 - i, 16, i); + int i = diFurnace.getPowerScaled(88); + drawTexturedModalRect(guiLeft + 8, guiTop + 106 - i, 176, 160 - i, 16, i); } + + if(diFurnace.getGearLeft() != 0) + { + int i = diFurnace.getGearLeft(); + if(i == 1) + { + drawTexturedModalRect(guiLeft + 43, guiTop + 71, 176, 0, 18, 18); + } + if(i == 2) + { + drawTexturedModalRect(guiLeft + 43, guiTop + 71, 176, 18, 18, 18); + } + if(i == 3) + { + drawTexturedModalRect(guiLeft + 43, guiTop + 71, 176, 36, 18, 18); + } + } + + if(diFurnace.getGearRight() != 0) + { + int i = diFurnace.getGearRight(); + if(i == 1) + { + drawTexturedModalRect(guiLeft + 79, guiTop + 71, 194, 0, 18, 18); + } + if(i == 2) + { + drawTexturedModalRect(guiLeft + 79, guiTop + 71, 194, 18, 18, 18); + } + if(i == 3) + { + drawTexturedModalRect(guiLeft + 79, guiTop + 71, 194, 36, 18, 18); + } + } + + int j1 = diFurnace.getDiFurnaceProgressScaled(34); + drawTexturedModalRect(guiLeft + 63, guiTop + 89, 176, 54, j1 + 1, 18); } } diff --git a/com/hbm/gui/MachineRecipes.java b/com/hbm/gui/MachineRecipes.java index 6755d013f..e7fac99c3 100644 --- a/com/hbm/gui/MachineRecipes.java +++ b/com/hbm/gui/MachineRecipes.java @@ -600,7 +600,7 @@ public class MachineRecipes { setRecipe(theWholeThing.get(i).item, new ItemStack(ModItems.scrap)); } } else if (s.length() > 4 && s.substring(0, 4).equals("dust")) { - setRecipe(theWholeThing.get(i).item, theWholeThing.get(i).item); + setRecipe(theWholeThing.get(i).item, new ItemStack(ModItems.dust)); } else { setRecipe(theWholeThing.get(i).item, new ItemStack(ModItems.scrap)); } @@ -640,6 +640,21 @@ public class MachineRecipes { recipes.add(recipe); } + public void overridePreSetRecipe(ItemStack inp, ItemStack outp) { + for(int i = 0; i < recipes.size(); i++) + { + if(recipes.get(i) != null && + recipes.get(i).input != null && + recipes.get(i).input.getItem() != null && + recipes.get(i).output != null && + inp != null && + inp.getItem() != null && + outp != null && + recipes.get(i).input.getItem().equals(inp.getItem())) + recipes.get(i).output = outp; + } + } + public void PrintRecipes() { /*for(int i = 0; i < recipes.size(); i++) { System.out.println("Recipe #" + i + ", " + recipes.get(i).input + " - " + recipes.get(i).output); @@ -656,7 +671,7 @@ public class MachineRecipes { }*/ - /*for (int j = 0; j < recipes.size(); j++) { + for (int j = 0; j < recipes.size(); j++) { if (recipes.get(j) != null && recipes.get(j).input != null && recipes.get(j).output != null && recipes.get(j).input.getItem() != null && recipes.get(j).output.getItem() != null) System.out.println(recipes.get(j).input + " | " + recipes.get(j).output); @@ -664,7 +679,7 @@ public class MachineRecipes { System.out.println(recipes.get(j)); } - System.out.println("TWT: " + theWholeThing.size() + ", REC: " + recipes.size());*/ + System.out.println("TWT: " + theWholeThing.size() + ", REC: " + recipes.size()); } } diff --git a/com/hbm/handler/FuelHandler.java b/com/hbm/handler/FuelHandler.java new file mode 100644 index 000000000..0a313a78c --- /dev/null +++ b/com/hbm/handler/FuelHandler.java @@ -0,0 +1,23 @@ +package com.hbm.handler; + +import com.hbm.items.ModItems; + +import cpw.mods.fml.common.IFuelHandler; +import net.minecraft.item.ItemStack; + +public class FuelHandler implements IFuelHandler { + + @Override + public int getBurnTime(ItemStack fuel) { + + if(fuel.getItem().equals(ModItems.canister_fuel)) + return 32000; + if(fuel.getItem().equals(ModItems.scrap)) + return 4000; + if(fuel.getItem().equals(ModItems.powder_fire)) + return 20000; + + return 0; + } + +} diff --git a/com/hbm/items/ArmorT45.java b/com/hbm/items/ArmorT45.java index 50d0e0dfe..080db607d 100644 --- a/com/hbm/items/ArmorT45.java +++ b/com/hbm/items/ArmorT45.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.item.ItemArmor; @@ -137,7 +138,7 @@ public class ArmorT45 extends ItemArmor implements ISpecialArmor { if(source.isExplosion()) return new ArmorProperties(1, 1, MathHelper.floor_double(10)); } - return new ArmorProperties(1, 1, MathHelper.floor_double(3)); + return new ArmorProperties(1, 1, MathHelper.floor_double(15)); } @Override diff --git a/com/hbm/items/ItemClip.java b/com/hbm/items/ItemClip.java new file mode 100644 index 000000000..ffef4713f --- /dev/null +++ b/com/hbm/items/ItemClip.java @@ -0,0 +1,90 @@ +package com.hbm.items; + +import com.hbm.blocks.ModBlocks; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; + +public class ItemClip extends Item { + + public ItemClip() + { + this.setMaxDamage(1); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + stack.stackSize--; + if(stack.stackSize <= 0) + stack.damageItem(5, player); + + if(this == ModItems.clip_revolver_iron) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_iron_ammo, 20))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_revolver_iron_ammo, 20), false); + } + } + + if(this == ModItems.clip_revolver) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_ammo, 12))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_revolver_ammo, 12), false); + } + } + + if(this == ModItems.clip_revolver_gold) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_gold_ammo, 4))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_revolver_gold_ammo, 4), false); + } + } + + if(this == ModItems.clip_revolver_schrabidium) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_schrabidium_ammo, 2))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_revolver_schrabidium_ammo, 2), false); + } + } + + if(this == ModItems.clip_rpg) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 3))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_rpg_ammo, 3), false); + } + } + + if(this == ModItems.clip_osipr) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_osipr_ammo, 30))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_osipr_ammo, 30), false); + } + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_osipr_ammo2, 1))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_osipr_ammo2, 1), false); + } + } + + if(this == ModItems.clip_xvl1456) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_xvl1456_ammo, 60))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_xvl1456_ammo, 60), false); + } + } + + return stack; + + } +} diff --git a/com/hbm/items/ItemCustomLore.java b/com/hbm/items/ItemCustomLore.java index d0d4dbf0e..a194398f3 100644 --- a/com/hbm/items/ItemCustomLore.java +++ b/com/hbm/items/ItemCustomLore.java @@ -320,6 +320,11 @@ public class ItemCustomLore extends Item { list.add("Not actual cake, but great"); list.add("universal fusion fuel!"); } + + if(this == ModItems.dust) + { + list.add("I hate dust!"); + } } @Override diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 0cb53621b..14b99dcc3 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -101,6 +101,16 @@ public class ModItems { public static Item powder_lead; public static Item powder_neptunium; public static Item powder_schrabidium; + + public static Item powder_aluminium; + public static Item powder_beryllium; + public static Item powder_copper; + public static Item powder_gold; + public static Item powder_iron; + public static Item powder_titanium; + public static Item powder_tungsten; + public static Item powder_uranium; + public static Item dust; public static Item coil_copper; public static Item coil_copper_torus; @@ -179,9 +189,14 @@ public class ModItems { public static Item chopper_blades; public static Item combine_scrap; + public static Item blades_gold; + public static Item blades_aluminium; + public static Item blades_iron; public static Item blades_steel; public static Item blades_titanium; public static Item blades_advanced_alloy; + public static Item blades_combine_steel; + public static Item blades_schrabidium; public static Item pellet_rtg; public static Item tritium_deuterium_cake; @@ -542,6 +557,14 @@ public class ModItems { public static Item missile_kit; public static Item t45_kit; public static Item euphemium_kit; + + public static Item clip_revolver_iron; + public static Item clip_revolver; + public static Item clip_revolver_gold; + public static Item clip_revolver_schrabidium; + public static Item clip_rpg; + public static Item clip_osipr; + public static Item clip_xvl1456; public static Item igniter; public static Item detonator; @@ -656,6 +679,15 @@ public class ModItems { powder_lead = new Item().setUnlocalizedName("powder_lead").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lead"); powder_neptunium = new Item().setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neptunium"); powder_schrabidium = new ItemCustomLore().setUnlocalizedName("powder_schrabidium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_schrabidium"); + powder_aluminium = new Item().setUnlocalizedName("powder_aluminium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_aluminium"); + powder_beryllium = new Item().setUnlocalizedName("powder_beryllium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_beryllium"); + powder_copper = new Item().setUnlocalizedName("powder_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_copper"); + powder_gold = new Item().setUnlocalizedName("powder_gold").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_gold"); + powder_iron = new Item().setUnlocalizedName("powder_iron").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_iron"); + powder_titanium = new Item().setUnlocalizedName("powder_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_titanium"); + powder_tungsten = new Item().setUnlocalizedName("powder_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_tungsten"); + powder_uranium = new Item().setUnlocalizedName("powder_uranium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_uranium"); + dust = new ItemCustomLore().setUnlocalizedName("dust").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":dust"); coil_copper = new Item().setUnlocalizedName("coil_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper"); coil_copper_torus = new Item().setUnlocalizedName("coil_copper_torus").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper_torus"); @@ -751,9 +783,14 @@ public class ModItems { inf_sulfur = new Item().setUnlocalizedName("inf_sulfur").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_sulfur"); inf_diesel = new Item().setUnlocalizedName("inf_diesel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_diesel"); - blades_steel = new ItemBlades(12000).setUnlocalizedName("blades_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_steel"); - blades_titanium = new ItemBlades(42000).setUnlocalizedName("blades_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_titanium"); - blades_advanced_alloy = new ItemBlades(72000).setUnlocalizedName("blades_advanced_alloy").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_advanced_alloy"); + blades_aluminium = new ItemBlades(1 * 1200).setUnlocalizedName("blades_aluminium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_aluminium"); + blades_gold = new ItemBlades(5 * 1200).setUnlocalizedName("blades_gold").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_gold"); + blades_iron = new ItemBlades(10 * 1200).setUnlocalizedName("blades_iron").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_iron"); + blades_steel = new ItemBlades(20 * 1200).setUnlocalizedName("blades_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_steel"); + blades_titanium = new ItemBlades(35 * 1200).setUnlocalizedName("blades_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_titanium"); + blades_advanced_alloy = new ItemBlades(50 * 1200).setUnlocalizedName("blades_advanced_alloy").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_advanced_alloy"); + blades_combine_steel = new ItemBlades(90 * 1200).setUnlocalizedName("blades_combine_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_combine_steel"); + blades_schrabidium = new ItemBlades(120 * 1200).setUnlocalizedName("blades_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_schrabidium"); canister_empty = new ItemCustomLore().setUnlocalizedName("canister_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":canister_empty"); canister_fuel = new ItemCustomLore().setUnlocalizedName("canister_fuel").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_fuel"); @@ -1004,6 +1041,14 @@ public class ModItems { missile_kit = new ItemStarterKit().setUnlocalizedName("missile_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_kit"); t45_kit = new ItemStarterKit().setUnlocalizedName("t45_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":t45_kit"); euphemium_kit = new ItemStarterKit().setUnlocalizedName("euphemium_kit").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":code"); + + clip_revolver_iron = new ItemClip().setUnlocalizedName("clip_revolver_iron").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_iron"); + clip_revolver = new ItemClip().setUnlocalizedName("clip_revolver").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver"); + clip_revolver_gold = new ItemClip().setUnlocalizedName("clip_revolver_gold").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_gold"); + clip_revolver_schrabidium = new ItemClip().setUnlocalizedName("clip_revolver_schrabidium").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_schrabidium"); + clip_rpg = new ItemClip().setUnlocalizedName("clip_rpg").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_rpg"); + clip_osipr = new ItemClip().setUnlocalizedName("clip_osipr").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_osipr"); + clip_xvl1456 = new ItemClip().setUnlocalizedName("clip_xvl1456").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_xvl1456"); ingot_euphemium = new ItemCustomLore().setUnlocalizedName("ingot_euphemium").setTextureName(RefStrings.MODID + ":ingot_euphemium"); nugget_euphemium = new ItemCustomLore().setUnlocalizedName("nugget_euphemium").setTextureName(RefStrings.MODID + ":nugget_euphemium"); @@ -1167,9 +1212,18 @@ public class ModItems { GameRegistry.registerItem(sulfur, sulfur.getUnlocalizedName()); GameRegistry.registerItem(niter, niter.getUnlocalizedName()); GameRegistry.registerItem(fluorite, fluorite.getUnlocalizedName()); - GameRegistry.registerItem(powder_lead, powder_lead.getUnlocalizedName()); + GameRegistry.registerItem(powder_iron, powder_iron.getUnlocalizedName()); + GameRegistry.registerItem(powder_gold, powder_gold.getUnlocalizedName()); + GameRegistry.registerItem(powder_uranium, powder_uranium.getUnlocalizedName()); GameRegistry.registerItem(powder_neptunium, powder_neptunium.getUnlocalizedName()); + GameRegistry.registerItem(powder_titanium, powder_titanium.getUnlocalizedName()); + GameRegistry.registerItem(powder_copper, powder_copper.getUnlocalizedName()); + GameRegistry.registerItem(powder_tungsten, powder_tungsten.getUnlocalizedName()); + GameRegistry.registerItem(powder_aluminium, powder_aluminium.getUnlocalizedName()); + GameRegistry.registerItem(powder_lead, powder_lead.getUnlocalizedName()); + GameRegistry.registerItem(powder_beryllium, powder_beryllium.getUnlocalizedName()); GameRegistry.registerItem(powder_schrabidium, powder_schrabidium.getUnlocalizedName()); + GameRegistry.registerItem(dust, dust.getUnlocalizedName()); //Powders GameRegistry.registerItem(powder_fire, powder_fire.getUnlocalizedName()); @@ -1356,9 +1410,14 @@ public class ModItems { GameRegistry.registerItem(titanium_filter, titanium_filter.getUnlocalizedName()); //Shredder Blades + GameRegistry.registerItem(blades_aluminium, blades_aluminium.getUnlocalizedName()); + GameRegistry.registerItem(blades_gold, blades_gold.getUnlocalizedName()); + GameRegistry.registerItem(blades_iron, blades_iron.getUnlocalizedName()); GameRegistry.registerItem(blades_steel, blades_steel.getUnlocalizedName()); GameRegistry.registerItem(blades_titanium, blades_titanium.getUnlocalizedName()); GameRegistry.registerItem(blades_advanced_alloy, blades_advanced_alloy.getUnlocalizedName()); + GameRegistry.registerItem(blades_combine_steel, blades_combine_steel.getUnlocalizedName()); + GameRegistry.registerItem(blades_schrabidium, blades_schrabidium.getUnlocalizedName()); //Fuelrods GameRegistry.registerItem(rod_empty, rod_empty.getUnlocalizedName()); @@ -1484,25 +1543,36 @@ public class ModItems { //Guns GameRegistry.registerItem(gun_revolver_iron, gun_revolver_iron.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_iron_ammo, gun_revolver_iron_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver, gun_revolver.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_ammo, gun_revolver_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_gold, gun_revolver_gold.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_gold_ammo, gun_revolver_gold_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_schrabidium, gun_revolver_schrabidium.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_schrabidium_ammo, gun_revolver_schrabidium_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_cursed, gun_revolver_cursed.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_cursed_ammo, gun_revolver_cursed_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_rpg, gun_rpg.getUnlocalizedName()); - GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_fatman, gun_fatman.getUnlocalizedName()); - GameRegistry.registerItem(gun_fatman_ammo, gun_fatman_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_xvl1456, gun_xvl1456.getUnlocalizedName()); - GameRegistry.registerItem(gun_xvl1456_ammo, gun_xvl1456_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr, gun_osipr.getUnlocalizedName()); + GameRegistry.registerItem(gun_zomg, gun_zomg.getUnlocalizedName()); + + //Ammo + GameRegistry.registerItem(gun_revolver_iron_ammo, gun_revolver_iron_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_ammo, gun_revolver_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_gold_ammo, gun_revolver_gold_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_schrabidium_ammo, gun_revolver_schrabidium_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_cursed_ammo, gun_revolver_cursed_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_fatman_ammo, gun_fatman_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_xvl1456_ammo, gun_xvl1456_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr_ammo, gun_osipr_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr_ammo2, gun_osipr_ammo2.getUnlocalizedName()); - GameRegistry.registerItem(gun_zomg, gun_zomg.getUnlocalizedName()); + + //Clips + GameRegistry.registerItem(clip_revolver_iron, clip_revolver_iron.getUnlocalizedName()); + GameRegistry.registerItem(clip_revolver, clip_revolver.getUnlocalizedName()); + GameRegistry.registerItem(clip_revolver_gold, clip_revolver_gold.getUnlocalizedName()); + GameRegistry.registerItem(clip_revolver_schrabidium, clip_revolver_schrabidium.getUnlocalizedName()); + GameRegistry.registerItem(clip_rpg, clip_rpg.getUnlocalizedName()); + GameRegistry.registerItem(clip_xvl1456, clip_xvl1456.getUnlocalizedName()); + GameRegistry.registerItem(clip_osipr, clip_osipr.getUnlocalizedName()); //Grenades GameRegistry.registerItem(grenade_generic, grenade_generic.getUnlocalizedName()); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 26e47a629..6e9350b0a 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -2,6 +2,8 @@ package com.hbm.main; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; @@ -119,6 +121,7 @@ import com.hbm.entity.EntitySchrab; import com.hbm.entity.EntityTestMissile; import com.hbm.gui.MachineRecipes; import com.hbm.gui.MachineRecipes.ShredderRecipe; +import com.hbm.handler.FuelHandler; import com.hbm.items.ModItems; import com.hbm.lib.HbmWorld; import com.hbm.lib.Library; @@ -223,6 +226,7 @@ public class MainRegistry CraftingManager.mainRegistry(); proxy.registerRenderInfo(); HbmWorld.mainRegistry(); + GameRegistry.registerFuelHandler(new FuelHandler()); Library.superuser.add("192af5d7-ed0f-48d8-bd89-9d41af8524f8"); @@ -400,6 +404,14 @@ public class MainRegistry OreDictionary.registerOre("plateIron", ModItems.plate_iron); OreDictionary.registerOre("plateGold", ModItems.plate_gold); OreDictionary.registerOre("plateAdvanced", ModItems.plate_advanced_alloy); + OreDictionary.registerOre("dustIron", ModItems.powder_iron); + OreDictionary.registerOre("dustGold", ModItems.powder_gold); + OreDictionary.registerOre("dustUranium", ModItems.powder_uranium); + OreDictionary.registerOre("dustTitanium", ModItems.powder_titanium); + OreDictionary.registerOre("dustTungsten", ModItems.powder_tungsten); + OreDictionary.registerOre("dustCopper", ModItems.powder_copper); + OreDictionary.registerOre("dustBeryllium", ModItems.powder_beryllium); + OreDictionary.registerOre("dustAluminum", ModItems.powder_aluminium); OreDictionary.registerOre("oreUranium", ModBlocks.ore_uranium); OreDictionary.registerOre("oreTitanium", ModBlocks.ore_titanium); @@ -412,6 +424,7 @@ public class MainRegistry OreDictionary.registerOre("oreAluminum", ModBlocks.ore_aluminium); OreDictionary.registerOre("oreFluorite", ModBlocks.ore_fluorite); OreDictionary.registerOre("oreLead", ModBlocks.ore_lead); + OreDictionary.registerOre("oreBeryllium", ModBlocks.ore_beryllium); OreDictionary.registerOre("blockUranium", ModBlocks.block_uranium); OreDictionary.registerOre("blockTitanium", ModBlocks.block_titanium); @@ -424,6 +437,7 @@ public class MainRegistry OreDictionary.registerOre("blockFluorite", ModBlocks.block_fluorite); OreDictionary.registerOre("blockSteel", ModBlocks.block_steel); OreDictionary.registerOre("blockLead", ModBlocks.block_lead); + OreDictionary.registerOre("blockBeryllium", ModBlocks.block_beryllium); } @EventHandler @@ -434,9 +448,12 @@ public class MainRegistry recipes.registerEverythingImSrs(); recipes.addRecipes(); + + recipes.overridePreSetRecipe(new ItemStack(ModItems.scrap), new ItemStack(ModItems.dust)); + recipes.overridePreSetRecipe(new ItemStack(ModItems.dust), new ItemStack(ModItems.dust)); + recipes.overridePreSetRecipe(new ItemStack(Blocks.glowstone), new ItemStack(Items.glowstone_dust, 4)); - //if(MainRegistry.enableDebugMode) - recipes.PrintRecipes(); + recipes.PrintRecipes(); } @EventHandler