diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 268d0cdb6..b011fc1b3 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -34,6 +34,8 @@ hbmfluid.acid=Wasserstoffperoxid hbmfluid.watz=Giftiger Schlamm hbmfluid.biogas=Biogas hbmfluid.biofuel=Biodiesel +hbmfluid.sas3=Schrabidiumtrisulfat +hbmfluid.nitan=NITAN© 100 Oktan Supertreibstoff chem.TEST=Test chem.FP_HEAVYOIL=Schwerölverarbeitung @@ -70,11 +72,16 @@ chem.SF_LIGHTOIL=Leichtölverfestigung chem.SF_KEROSENE=Kerosinverfestigung chem.SF_GAS=Erdgasverfestigung chem.SF_PETROLEUM=Petroleumgasverfestigung +chem.SF_BIOGAS=Biogasverfestigung +chem.SF_BIOFUEL=Biodieselverfestigung chem.POLYMER=Polymersynthese chem.DEUTERIUM=Deuteriumextrahierung chem.STEAM=WWasser kochen chem.UF6=Uranhexafluoritproduktion chem.PUF6=Plutoniumhexafluoritproduktion +chem.BP_BIOGAS=Biogasherstellung +chem.BP_BIOFUEL=Biodieselumesterung +chem.SAS3=Schrabidiumtrisulfatherstellung item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep @@ -382,6 +389,8 @@ item.ingot_polymer.name=Polymerbarren item.bolt_dura_steel.name=Schnellarbeitsstahlbolzen item.pipes_steel.name=Stahlrohre item.drill_titanium.name=Titanbohrer +item.bolt_tungsten.name=Wolframbolzen +item.bolt_compound.name=Verstärkte Turbinenwelle item.ingot_australium.name=Australiumbarren item.ingot_weidanium.name=Weidaniumbarren @@ -669,7 +678,7 @@ item.canister_empty.name=Leerer Kanister item.canister_smear.name=Industrieölkanister item.canister_canola.name=Schmiermittelkanister item.canister_oil.name=Rohölkanister -item.canister_fuel.name=Treibstoffkanister +item.canister_fuel.name=Dieselkanister item.canister_kerosene.name=Kerosinkanister item.canister_reoil.name=Kanister voll aufbereitetem Industrieöl item.canister_petroil.name=Gemischkanister @@ -680,9 +689,11 @@ item.canister_bitumen.name=Bitumenkanister item.canister_heatingoil.name=Heizölkanister item.canister_naphtha.name=Mitteldestillatkanister item.canister_lightoil.name=Leichtölkanister +item.canister_biofuel.name=Biodieselkanister item.gas_empty.name=Leerer Gastank item.gas_full.name=Gastank item.gas_petroleum.name=Petroleumgastank +item.gas_biogas.name=Biogastank item.fluid_tank_empty.name=Leere universelle Flüssigkeitszelle item.fluid_tank_full.name=Universelle Flüssigkeitszelle: item.fluid_barrel_empty.name=Leeres Fass @@ -939,6 +950,12 @@ item.gun_hp_ammo.name=Tintenpatrone item.gun_euthanasia_ammo.name=Spritze item.gun_defabricator_ammo.name=Defabrikator-Energiezelle +item.turret_light_ammo.name=Leichte MG Munitionskiste +item.turret_heavy_ammo.name=Schwere MG Munition +item.turret_rocket_ammo.name=Raketengeschütz 2x4 Munition +item.turret_flamer_ammo.name=Flammenwerfergeschütz-Tanks +item.turret_tau_ammo.name=Tauonengeschütz-Uranmunition + item.clip_revolver_iron.name=Box voll Eisenkugeln item.clip_revolver.name=.357 Magnum Patronen item.clip_revolver_gold.name=Schatulle mit goldenen Patronen @@ -1003,6 +1020,8 @@ item.generator_steel.name=Generator item.blade_titanium.name=Titanturbinenschaufel item.turbine_titanium.name=Dampfturbine item.generator_front.name=Generatorfront +item.blade_tungsten.name=Wolframverstärktes Turbinenblatt +item.turbine_tungsten.name=Verstärkte Turbofanblätter item.combine_scrap.name=CMB Schrott item.chopper_head.name=Jagdschrauber Cockpit @@ -1018,6 +1037,7 @@ item.apple_astatine.name=Euphemiumapfel item.ingot_astatine.name=Euphemiumbarren item.nugget_astatine.name=Euphemiumnugget item.rod_quad_astatine.name=Ausgebrannter Schrabidiumvierfachbrennstab +item.plate_euphemium.name=Euphemium-Verbundplatte item.astatine_helmet.name=Euphemiumstiefel item.astatine_plate.name=Euphemiumbrustplatte @@ -1278,6 +1298,7 @@ item.pellet_coolant.name=Kühlcluster item.linker.name=Telelinker item.oil_detector.name=Ölvorkommen-Detektor item.geiger_counter.name=Geigerzähler +item.survey_scanner.name=Tiefenscanner item.thermo_element.name=Thermoelektrisches Element item.limiter.name=Generator-Limiter diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index dbd40bc39..afc7248e8 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -34,6 +34,8 @@ hbmfluid.acid=Hydrogen Peroxide hbmfluid.watz=Poisonous Mud hbmfluid.biogas=Biogas hbmfluid.biofuel=Biofuel +hbmfluid.sas3=Schrabidium Trisulfide +hbmfluid.nitan=NITAN© 100 Octane Super Fuel chem.TEST=Test chem.FP_HEAVYOIL=Heavy Oil Processing @@ -70,11 +72,16 @@ chem.SF_LIGHTOIL=Light Oil Solidification chem.SF_KEROSENE=Kerosene Solidification chem.SF_GAS=Natural Gas Solidification chem.SF_PETROLEUM=Petroleum Gas Solidification +chem.SF_BIOGAS=Biogas Solidification +chem.SF_BIOFUEL=Biofuel Solidification chem.POLYMER=Polymer Synthesis chem.DEUTERIUM=Deuterium Extraction chem.STEAM=Water Boiling chem.UF6=Uranium Hexafluoride Production chem.PUF6=Plutonium Hexafluoride Production +chem.BP_BIOGAS=Biogas Production +chem.BP_BIOFUEL=Biofuel Transesterification +chem.SAS3=Schrabidium Trisulfide Production item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep @@ -382,6 +389,8 @@ item.ingot_polymer.name=Polymer Ingot item.bolt_dura_steel.name=High-Speed Steel Bolt item.pipes_steel.name=Steel Pipes item.drill_titanium.name=Titanium Drill +item.bolt_tungsten.name=Tunsten Bolt +item.bolt_compound.name=Reinforced Turbine Shaft item.ingot_australium.name=Australium Ingot item.ingot_weidanium.name=Weidanium Ingot @@ -669,7 +678,7 @@ item.canister_empty.name=Empty Canister item.canister_smear.name=Industrial Oil Canister item.canister_canola.name=Engine Lubricant item.canister_oil.name=Crude Oil Canister -item.canister_fuel.name=Fuel Canister +item.canister_fuel.name=Diesel Canister item.canister_kerosene.name=Kerosene Canister item.canister_reoil.name=Canister of Reclaimed Industrial Oil item.canister_petroil.name=Petroil Canister @@ -680,9 +689,11 @@ item.canister_bitumen.name=Bitumen Canister item.canister_heatingoil.name=Heating Oil Canister item.canister_naphtha.name=Naphtha Canister item.canister_lightoil.name=Light Oil Canister +item.canister_biofuel.name=Biofuel Canister item.gas_empty.name=Empty Gas Tank item.gas_full.name=Gas Tank item.gas_petroleum.name=Petroleum Gas Tank +item.gas_biogas.name=Biogas Tank item.fluid_tank_empty.name=Empty Universal Fluid Tank item.fluid_tank_full.name=Universal Fluid Tank: item.fluid_barrel_empty.name=Empty Fluid Barrel @@ -939,6 +950,12 @@ item.gun_hp_ammo.name=Ink Cartridge item.gun_euthanasia_ammo.name=Syringe item.gun_defabricator_ammo.name=Defabricator Energy Cell +item.turret_light_ammo.name=Light MG Turret Ammo Box +item.turret_heavy_ammo.name=Heavy MG Turret Ammunition +item.turret_rocket_ammo.name=Rocket Turret 2x4 Ammunition +item.turret_flamer_ammo.name=Flamer Turret Fuel Tanks +item.turret_tau_ammo.name=Tau Turret Uranium Ammo + 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 @@ -1003,6 +1020,8 @@ item.generator_steel.name=Generator Body item.blade_titanium.name=Titanium Blade item.turbine_titanium.name=Titanium Steam Turbine item.generator_front.name=Generator Front +item.blade_tungsten.name=Tungsten Reinforced Blade +item.turbine_tungsten.name=Reinforced Turbofan Blades item.combine_scrap.name=CMB Scrap Metal item.chopper_head.name=Hunter Chopper Cockpit @@ -1018,6 +1037,7 @@ item.apple_astatine.name=Euphemium Apple item.ingot_astatine.name=Euphemium Ingot item.nugget_astatine.name=Euphemium Nugget item.rod_quad_astatine.name=Burned Out Quad Schrabidium Fuel Rod +item.plate_euphemium.name=Euphemium Compound Plate item.astatine_helmet.name=Euphemium Helemt item.astatine_plate.name=Euphemium Chestplate @@ -1278,6 +1298,7 @@ item.pellet_coolant.name=Coolant Cluster item.linker.name=Telelinker item.oil_detector.name=Oil Reservoir Detector item.geiger_counter.name=Geiger Counter +item.survey_scanner.name=Survey Scanner item.thermo_element.name=Thermoelectric Element item.limiter.name=Generator Limiter diff --git a/assets/hbm/models/turret_flamer_gun.obj b/assets/hbm/models/turret_flamer_gun.obj index 61bedf730..2e32208e8 100644 --- a/assets/hbm/models/turret_flamer_gun.obj +++ b/assets/hbm/models/turret_flamer_gun.obj @@ -391,6 +391,772 @@ v 0.050000 0.200000 0.250000 v 0.050000 0.250000 0.150000 v 0.050000 0.200000 -0.150000 v 0.050000 0.250000 -0.150000 +vt 0.605984 0.310453 +vt 0.605984 0.458218 +vt 0.384336 0.458218 +vt 0.605983 0.162688 +vt 0.753748 0.162688 +vt 0.753749 0.310453 +vt 0.384336 0.162689 +vt 0.384336 0.014924 +vt 0.605983 0.014924 +vt 0.236571 0.310454 +vt 0.247653 0.299371 +vt 0.373254 0.299371 +vt 0.014924 0.310454 +vt 0.014924 0.162689 +vt 0.236571 0.162689 +vt 0.384336 0.310454 +vt 0.586653 0.576878 +vt 0.547471 0.616060 +vt 0.458658 0.527248 +vt 0.247653 0.173771 +vt 0.373254 0.173771 +vt 0.458658 0.704873 +vt 0.369845 0.616060 +vt 0.497840 0.744055 +vt 0.330663 0.655243 +vt 0.419476 0.488066 +vt 0.194811 0.804730 +vt 0.028575 0.804730 +vt 0.028575 0.765147 +vt 0.208463 0.601160 +vt 0.194811 0.606815 +vt 0.194811 0.567232 +vt 0.300816 0.640743 +vt 0.208463 0.640743 +vt 0.208463 0.612470 +vt 0.194811 0.646398 +vt 0.028575 0.646398 +vt 0.028575 0.606815 +vt 0.208463 0.770802 +vt 0.208463 0.799075 +vt 0.300816 0.601160 +vt 0.208463 0.572887 +vt 0.028575 0.567232 +vt 0.208463 0.680326 +vt 0.194811 0.685981 +vt 0.300816 0.561577 +vt 0.208463 0.561577 +vt 0.208463 0.533303 +vt 0.194811 0.765147 +vt 0.028575 0.725564 +vt 0.208463 0.521994 +vt 0.194811 0.527649 +vt 0.194811 0.488066 +vt 0.300816 0.521994 +vt 0.208463 0.493720 +vt 0.028575 0.685981 +vt 0.208463 0.691636 +vt 0.208463 0.719909 +vt 0.194811 0.725564 +vt 0.300816 0.770802 +vt 0.014924 0.640743 +vt 0.014924 0.612469 +vt 0.208463 0.759492 +vt 0.208463 0.731219 +vt 0.300816 0.731219 +vt 0.208463 0.652053 +vt 0.300816 0.652053 +vt 0.300816 0.691636 +vt 0.028575 0.527649 +vt 0.028576 0.488066 +vt 0.014924 0.601160 +vt 0.014924 0.572886 +vt 0.014924 0.561577 +vt 0.014924 0.533303 +vt 0.014924 0.521994 +vt 0.014924 0.493720 +vt 0.014924 0.799075 +vt 0.014924 0.770802 +vt 0.014924 0.759492 +vt 0.014924 0.731219 +vt 0.014924 0.719909 +vt 0.014924 0.691636 +vt 0.014924 0.680326 +vt 0.014924 0.652053 +vt 0.820537 0.370734 +vt 0.783596 0.370734 +vt 0.783596 0.342460 +vt 0.215366 0.882843 +vt 0.235359 0.834577 +vt 0.263633 0.902836 +vt 0.820537 0.427281 +vt 0.783596 0.427281 +vt 0.783596 0.399007 +vt 0.820537 0.229366 +vt 0.820537 0.257639 +vt 0.783596 0.257639 +vt 0.820537 0.314187 +vt 0.783596 0.314187 +vt 0.783596 0.285913 +vt 0.820537 0.342460 +vt 0.820537 0.399007 +vt 0.820537 0.201092 +vt 0.783596 0.229366 +vt 0.820537 0.285913 +vt 0.678228 0.910991 +vt 0.681824 0.919498 +vt 0.658226 0.919498 +vt 0.893559 0.657708 +vt 0.893559 0.685981 +vt 0.616500 0.685981 +vt 0.678228 0.937239 +vt 0.678257 0.946475 +vt 0.661727 0.946526 +vt 0.893559 0.714255 +vt 0.958883 0.937969 +vt 0.958883 0.947204 +vt 0.681824 0.947204 +vt 0.893559 0.488066 +vt 0.893559 0.516340 +vt 0.616500 0.516339 +vt 0.958883 0.919498 +vt 0.958883 0.928733 +vt 0.681824 0.928733 +vt 0.893559 0.544613 +vt 0.616500 0.544613 +vt 0.658226 0.928733 +vt 0.893559 0.572887 +vt 0.616500 0.572887 +vt 0.681824 0.937968 +vt 0.893559 0.601160 +vt 0.616500 0.601160 +vt 0.958883 0.910263 +vt 0.893559 0.629434 +vt 0.616500 0.657708 +vt 0.616500 0.629434 +vt 0.661698 0.937291 +vt 0.657653 0.937950 +vt 0.643538 0.936764 +vt 0.636448 0.928733 +vt 0.627213 0.928733 +vt 0.627213 0.919498 +vt 0.656879 0.947153 +vt 0.642765 0.945967 +vt 0.636448 0.919498 +vt 0.643538 0.911467 +vt 0.616500 0.928733 +vt 0.616500 0.919498 +vt 0.636448 0.939446 +vt 0.627213 0.939446 +vt 0.636448 0.948681 +vt 0.627213 0.948681 +vt 0.627213 0.908785 +vt 0.913932 0.035192 +vt 0.928927 0.035192 +vt 0.931225 0.045755 +vt 0.910827 0.056535 +vt 0.911634 0.045755 +vt 0.917372 0.024944 +vt 0.925487 0.024944 +vt 0.932839 0.045755 +vt 0.952430 0.045755 +vt 0.953237 0.056535 +vt 0.938577 0.024944 +vt 0.946692 0.024944 +vt 0.950132 0.035192 +vt 0.935138 0.035192 +vt 0.784403 0.045755 +vt 0.786701 0.035192 +vt 0.801695 0.035192 +vt 0.803994 0.045755 +vt 0.804801 0.056535 +vt 0.790141 0.024944 +vt 0.798256 0.024944 +vt 0.807906 0.035192 +vt 0.822901 0.035192 +vt 0.825199 0.045755 +vt 0.805608 0.045755 +vt 0.826006 0.056535 +vt 0.811346 0.024944 +vt 0.819461 0.024944 +vt 0.826813 0.045755 +vt 0.846404 0.045755 +vt 0.847211 0.056535 +vt 0.832551 0.024944 +vt 0.840666 0.024944 +vt 0.844106 0.035192 +vt 0.829112 0.035192 +vt 0.848018 0.045755 +vt 0.867609 0.045755 +vt 0.853756 0.024944 +vt 0.861871 0.024944 +vt 0.865311 0.035192 +vt 0.850317 0.035192 +vt 0.871522 0.035192 +vt 0.886516 0.035192 +vt 0.888815 0.045755 +vt 0.869224 0.045755 +vt 0.889622 0.056535 +vt 0.874962 0.024944 +vt 0.883077 0.024944 +vt 0.921430 0.014924 +vt 0.942635 0.014924 +vt 0.794198 0.014924 +vt 0.815404 0.014924 +vt 0.836609 0.014924 +vt 0.857814 0.014924 +vt 0.879019 0.014924 +vt 0.892727 0.035192 +vt 0.907721 0.035192 +vt 0.910020 0.045755 +vt 0.896167 0.024944 +vt 0.900224 0.014924 +vt 0.904282 0.024944 +vt 0.953237 0.139653 +vt 0.932032 0.139653 +vt 0.932032 0.056535 +vt 0.910827 0.139653 +vt 0.890429 0.045755 +vt 0.889622 0.139653 +vt 0.868416 0.139653 +vt 0.868416 0.056535 +vt 0.911634 0.150433 +vt 0.931225 0.150433 +vt 0.928927 0.160997 +vt 0.913932 0.160997 +vt 0.925487 0.171245 +vt 0.932839 0.150433 +vt 0.952430 0.150433 +vt 0.950132 0.160997 +vt 0.935138 0.160997 +vt 0.946692 0.171245 +vt 0.790141 0.171245 +vt 0.786701 0.160997 +vt 0.801695 0.160997 +vt 0.783596 0.139653 +vt 0.804801 0.139653 +vt 0.803994 0.150433 +vt 0.784403 0.150433 +vt 0.826006 0.139653 +vt 0.825199 0.150433 +vt 0.807906 0.160997 +vt 0.805608 0.150433 +vt 0.822901 0.160997 +vt 0.819461 0.171245 +vt 0.829112 0.160997 +vt 0.826813 0.150433 +vt 0.846404 0.150433 +vt 0.844106 0.160997 +vt 0.840666 0.171245 +vt 0.847211 0.139653 +vt 0.850317 0.160997 +vt 0.865311 0.160997 +vt 0.861871 0.171245 +vt 0.867609 0.150433 +vt 0.848018 0.150433 +vt 0.871522 0.160997 +vt 0.886516 0.160997 +vt 0.883077 0.171245 +vt 0.888815 0.150433 +vt 0.869224 0.150433 +vt 0.890429 0.150433 +vt 0.910020 0.150433 +vt 0.907721 0.160997 +vt 0.896167 0.171245 +vt 0.892727 0.160997 +vt 0.783596 0.056535 +vt 0.461000 0.794171 +vt 0.475994 0.794171 +vt 0.478293 0.804735 +vt 0.457894 0.815515 +vt 0.458702 0.804735 +vt 0.464440 0.783923 +vt 0.472555 0.783923 +vt 0.479100 0.815515 +vt 0.479907 0.804735 +vt 0.499498 0.804735 +vt 0.485645 0.783923 +vt 0.493760 0.783923 +vt 0.497199 0.794171 +vt 0.482205 0.794171 +vt 0.331470 0.804734 +vt 0.333769 0.794171 +vt 0.348763 0.794171 +vt 0.351061 0.804734 +vt 0.351868 0.815514 +vt 0.337209 0.783922 +vt 0.345323 0.783922 +vt 0.354974 0.794171 +vt 0.369968 0.794171 +vt 0.372267 0.804734 +vt 0.352676 0.804734 +vt 0.373074 0.815514 +vt 0.358414 0.783923 +vt 0.366529 0.783923 +vt 0.373881 0.804734 +vt 0.393472 0.804734 +vt 0.394279 0.815514 +vt 0.379619 0.783923 +vt 0.387734 0.783923 +vt 0.391173 0.794171 +vt 0.376179 0.794171 +vt 0.395086 0.804734 +vt 0.414677 0.804734 +vt 0.397384 0.794171 +vt 0.400824 0.783923 +vt 0.408939 0.783923 +vt 0.412379 0.794171 +vt 0.418590 0.794171 +vt 0.433584 0.794171 +vt 0.435882 0.804734 +vt 0.416291 0.804734 +vt 0.436689 0.815515 +vt 0.422029 0.783923 +vt 0.430144 0.783923 +vt 0.468497 0.773903 +vt 0.489702 0.773903 +vt 0.341266 0.773903 +vt 0.362471 0.773903 +vt 0.383676 0.773903 +vt 0.404882 0.773903 +vt 0.426087 0.773903 +vt 0.439795 0.794171 +vt 0.454789 0.794171 +vt 0.457087 0.804735 +vt 0.443235 0.783923 +vt 0.447292 0.773903 +vt 0.451349 0.783923 +vt 0.500305 0.815515 +vt 0.500305 0.898633 +vt 0.479099 0.898632 +vt 0.457894 0.898632 +vt 0.437496 0.804734 +vt 0.436689 0.898632 +vt 0.415484 0.898632 +vt 0.415484 0.815515 +vt 0.461000 0.919976 +vt 0.458701 0.909413 +vt 0.478292 0.909413 +vt 0.475994 0.919976 +vt 0.472554 0.930224 +vt 0.479906 0.909413 +vt 0.499497 0.909413 +vt 0.497199 0.919976 +vt 0.482205 0.919976 +vt 0.493759 0.930224 +vt 0.333768 0.919975 +vt 0.348763 0.919975 +vt 0.345323 0.930224 +vt 0.331470 0.909412 +vt 0.330663 0.898632 +vt 0.351868 0.898632 +vt 0.351061 0.909412 +vt 0.373073 0.898632 +vt 0.372266 0.909412 +vt 0.352675 0.909412 +vt 0.369968 0.919975 +vt 0.354974 0.919975 +vt 0.366528 0.930224 +vt 0.373881 0.909412 +vt 0.393472 0.909412 +vt 0.391173 0.919975 +vt 0.376179 0.919975 +vt 0.387733 0.930224 +vt 0.394279 0.898632 +vt 0.400824 0.930224 +vt 0.397384 0.919976 +vt 0.412378 0.919976 +vt 0.395086 0.909412 +vt 0.414677 0.909413 +vt 0.418589 0.919976 +vt 0.433584 0.919976 +vt 0.430144 0.930224 +vt 0.435882 0.909413 +vt 0.416291 0.909413 +vt 0.239640 0.947512 +vt 0.231541 0.947006 +vt 0.232233 0.935945 +vt 0.895743 0.409236 +vt 0.903946 0.408532 +vt 0.903250 0.416617 +vt 0.437496 0.909413 +vt 0.457087 0.909413 +vt 0.454789 0.919976 +vt 0.443234 0.930224 +vt 0.439794 0.919976 +vt 0.330663 0.815514 +vt 0.850384 0.290224 +vt 0.850713 0.282116 +vt 0.864672 0.282464 +vt 0.530152 0.806284 +vt 0.545310 0.806592 +vt 0.544113 0.814618 +vt 0.896225 0.368688 +vt 0.896728 0.360589 +vt 0.904896 0.361625 +vt 0.223442 0.946502 +vt 0.215366 0.945701 +vt 0.216371 0.938702 +vt 0.895568 0.401123 +vt 0.906647 0.400880 +vt 0.895718 0.376787 +vt 0.907286 0.369380 +vt 0.897529 0.352514 +vt 0.904529 0.353518 +vt 0.247748 0.947841 +vt 0.239987 0.933554 +vt 0.255863 0.947841 +vt 0.256082 0.933880 +vt 0.263733 0.936583 +vt 0.248055 0.932683 +vt 0.272089 0.947488 +vt 0.271385 0.939285 +vt 0.279470 0.939980 +vt 0.895389 0.384895 +vt 0.909677 0.377134 +vt 0.224478 0.938334 +vt 0.895389 0.393010 +vt 0.909351 0.393229 +vt 0.263976 0.947663 +vt 0.910548 0.385202 +vt 0.865364 0.368728 +vt 0.854285 0.368971 +vt 0.856986 0.361319 +vt 0.895568 0.306452 +vt 0.906647 0.306209 +vt 0.903946 0.313861 +vt 0.530481 0.798176 +vt 0.544440 0.798523 +vt 0.851220 0.274017 +vt 0.862280 0.274709 +vt 0.851723 0.265918 +vt 0.859891 0.266954 +vt 0.530988 0.790077 +vt 0.542048 0.790769 +vt 0.531491 0.781978 +vt 0.539659 0.783014 +vt 0.852524 0.257843 +vt 0.859524 0.258848 +vt 0.532292 0.773903 +vt 0.539292 0.774907 +vt 0.850737 0.314565 +vt 0.858940 0.313861 +vt 0.858245 0.321946 +vt 0.530505 0.830625 +vt 0.538708 0.829921 +vt 0.538013 0.838006 +vt 0.850562 0.306452 +vt 0.861642 0.306209 +vt 0.530330 0.822512 +vt 0.541410 0.822269 +vt 0.850384 0.298339 +vt 0.864346 0.298558 +vt 0.530152 0.814399 +vt 0.865542 0.290532 +vt 0.543971 0.925322 +vt 0.543170 0.933397 +vt 0.536171 0.932392 +vt 0.937729 0.536715 +vt 0.937226 0.544814 +vt 0.929058 0.543778 +vt 0.895389 0.298339 +vt 0.909351 0.298558 +vt 0.865542 0.376841 +vt 0.851581 0.376622 +vt 0.895389 0.290225 +vt 0.910548 0.290532 +vt 0.865542 0.384955 +vt 0.850384 0.384648 +vt 0.895718 0.282116 +vt 0.909677 0.282464 +vt 0.865214 0.393064 +vt 0.851255 0.392716 +vt 0.896225 0.274017 +vt 0.907285 0.274709 +vt 0.896728 0.265918 +vt 0.904896 0.266954 +vt 0.864707 0.401163 +vt 0.853646 0.400471 +vt 0.864203 0.409262 +vt 0.856036 0.408226 +vt 0.897529 0.257843 +vt 0.904529 0.258847 +vt 0.863402 0.417337 +vt 0.856403 0.416332 +vt 0.895743 0.314565 +vt 0.903250 0.321946 +vt 0.865189 0.360615 +vt 0.857682 0.353234 +vt 0.141976 0.953465 +vt 0.133868 0.953136 +vt 0.134215 0.939178 +vt 0.047305 0.953465 +vt 0.047612 0.938307 +vt 0.055638 0.939504 +vt 0.936424 0.552889 +vt 0.929425 0.551884 +vt 0.544957 0.876674 +vt 0.536754 0.877379 +vt 0.537449 0.869294 +vt 0.938211 0.496167 +vt 0.930008 0.496871 +vt 0.930704 0.488786 +vt 0.545132 0.884787 +vt 0.534052 0.885031 +vt 0.938386 0.504280 +vt 0.927307 0.504523 +vt 0.545310 0.892900 +vt 0.531349 0.892682 +vt 0.938564 0.512393 +vt 0.924603 0.512174 +vt 0.545310 0.901015 +vt 0.530152 0.900708 +vt 0.938564 0.520507 +vt 0.923406 0.520200 +vt 0.544981 0.909123 +vt 0.531023 0.908776 +vt 0.938236 0.528616 +vt 0.924277 0.528268 +vt 0.544475 0.917222 +vt 0.533414 0.916530 +vt 0.535804 0.924285 +vt 0.926668 0.536023 +vt 0.890928 0.227737 +vt 0.890701 0.213775 +vt 0.898435 0.216234 +vt 0.914375 0.760316 +vt 0.903295 0.760559 +vt 0.905997 0.752908 +vt 0.039197 0.953136 +vt 0.039544 0.939178 +vt 0.125769 0.952630 +vt 0.126461 0.941569 +vt 0.117670 0.952126 +vt 0.118706 0.943958 +vt 0.031098 0.952630 +vt 0.031790 0.941569 +vt 0.022999 0.952126 +vt 0.024035 0.943959 +vt 0.109594 0.951325 +vt 0.110599 0.944326 +vt 0.014924 0.951325 +vt 0.015928 0.944326 +vt 0.166317 0.953112 +vt 0.165613 0.944909 +vt 0.173698 0.945604 +vt 0.071646 0.953112 +vt 0.070942 0.944909 +vt 0.079027 0.945604 +vt 0.158204 0.953287 +vt 0.157961 0.942207 +vt 0.063533 0.953287 +vt 0.063290 0.942207 +vt 0.150091 0.953465 +vt 0.150309 0.939504 +vt 0.055420 0.953465 +vt 0.142283 0.938307 +vt 0.387411 0.961410 +vt 0.395487 0.962211 +vt 0.394482 0.969211 +vt 0.859256 0.219236 +vt 0.851165 0.219862 +vt 0.850928 0.212795 +vt 0.914553 0.768429 +vt 0.900591 0.768211 +vt 0.882818 0.227996 +vt 0.882641 0.212835 +vt 0.914553 0.776544 +vt 0.899395 0.776237 +vt 0.874703 0.227926 +vt 0.874605 0.213963 +vt 0.914224 0.784652 +vt 0.900265 0.784305 +vt 0.866592 0.227678 +vt 0.866931 0.216601 +vt 0.858481 0.227433 +vt 0.913718 0.792751 +vt 0.902657 0.792059 +vt 0.913214 0.800850 +vt 0.905047 0.799814 +vt 0.850384 0.226890 +vt 0.912413 0.808926 +vt 0.905414 0.807921 +vt 0.907135 0.226866 +vt 0.906169 0.218690 +vt 0.914272 0.219127 +vt 0.914200 0.752203 +vt 0.906692 0.744823 +vt 0.899032 0.227300 +vt 0.457715 0.975230 +vt 0.449607 0.974901 +vt 0.449955 0.960942 +vt 0.931776 0.853931 +vt 0.923668 0.853602 +vt 0.924016 0.839643 +vt 0.907324 0.211686 +vt 0.905194 0.203734 +vt 0.913275 0.203002 +vt 0.338764 0.960425 +vt 0.339468 0.968628 +vt 0.331383 0.967932 +vt 0.899367 0.213280 +vt 0.897187 0.202414 +vt 0.346877 0.960250 +vt 0.347120 0.971329 +vt 0.891411 0.214876 +vt 0.889180 0.201092 +vt 0.354990 0.960071 +vt 0.354772 0.974033 +vt 0.883421 0.216297 +vt 0.881068 0.201320 +vt 0.363105 0.960071 +vt 0.362798 0.975230 +vt 0.875381 0.217394 +vt 0.873278 0.203590 +vt 0.371213 0.960400 +vt 0.370866 0.974359 +vt 0.867318 0.218314 +vt 0.866062 0.207303 +vt 0.858845 0.211013 +vt 0.379312 0.960907 +vt 0.378620 0.971968 +vt 0.386375 0.969578 +vt 0.264056 0.985076 +vt 0.255941 0.985076 +vt 0.255941 0.977688 +vt 0.899073 0.454572 +vt 0.899073 0.447184 +vt 0.907188 0.447184 +vt 0.915569 0.853096 +vt 0.916261 0.842035 +vt 0.907470 0.852592 +vt 0.908506 0.844424 +vt 0.441508 0.974394 +vt 0.442200 0.963334 +vt 0.433409 0.973891 +vt 0.434445 0.965723 +vt 0.899395 0.851791 +vt 0.900399 0.844792 +vt 0.425334 0.973090 +vt 0.426338 0.966090 +vt 0.956117 0.853578 +vt 0.955413 0.845375 +vt 0.963498 0.846070 +vt 0.482056 0.974876 +vt 0.481352 0.966674 +vt 0.489437 0.967369 +vt 0.948004 0.853753 +vt 0.947761 0.842673 +vt 0.473943 0.975052 +vt 0.473700 0.963972 +vt 0.939891 0.853931 +vt 0.940110 0.839970 +vt 0.465830 0.975230 +vt 0.466049 0.961268 +vt 0.932084 0.838773 +vt 0.458023 0.960071 +vt 0.890959 0.454573 +vt 0.890959 0.447184 +vt 0.247826 0.985076 +vt 0.247826 0.977688 +vt 0.882844 0.454573 +vt 0.882844 0.447184 +vt 0.239711 0.985076 +vt 0.239711 0.977688 +vt 0.874729 0.454573 +vt 0.874729 0.447184 +vt 0.231596 0.985076 +vt 0.231596 0.977688 +vt 0.223481 0.985076 +vt 0.223481 0.977688 +vt 0.866614 0.454573 +vt 0.866614 0.447184 +vt 0.858499 0.454573 +vt 0.858499 0.447184 +vt 0.215366 0.985076 +vt 0.215366 0.977688 +vt 0.850384 0.454573 +vt 0.850384 0.447184 +vt 0.272171 0.985076 +vt 0.272171 0.977688 +vt 0.280285 0.977688 +vt 0.907188 0.454572 +vt 0.915303 0.447184 +vt 0.264056 0.977688 +vt 0.674682 0.802285 +vt 0.674682 0.820755 +vt 0.616500 0.820755 +vt 0.811365 0.802285 +vt 0.811365 0.820755 +vt 0.869548 0.802285 +vt 0.869547 0.820755 +vt 0.811365 0.878938 +vt 0.674682 0.744102 +vt 0.056225 0.889989 +vt 0.167049 0.889989 +vt 0.167049 0.908460 +vt 0.167049 0.853048 +vt 0.185519 0.853048 +vt 0.185519 0.889989 +vt 0.056225 0.853048 +vt 0.019284 0.834577 +vt 0.167049 0.834577 +vt 0.014924 0.889989 +vt 0.014924 0.853048 +vt 0.497840 0.488066 +vt 0.586653 0.655243 +vt 0.419476 0.744055 +vt 0.330663 0.576878 +vt 0.300816 0.612470 +vt 0.300816 0.572887 +vt 0.300816 0.533304 +vt 0.300816 0.493721 +vt 0.300816 0.799075 +vt 0.300816 0.759492 +vt 0.300816 0.680326 +vt 0.300816 0.719909 +vt 0.283625 0.854570 +vt 0.283625 0.882843 +vt 0.235359 0.902836 +vt 0.215366 0.854570 +vt 0.263633 0.834577 +vt 0.783596 0.201092 +vt 0.661698 0.910940 +vt 0.616500 0.714255 +vt 0.616500 0.488066 +vt 0.681825 0.910262 +vt 0.657653 0.910280 +vt 0.636448 0.908785 +vt 0.917372 0.171245 +vt 0.938577 0.171245 +vt 0.798256 0.171245 +vt 0.811346 0.171245 +vt 0.832551 0.171245 +vt 0.853756 0.171245 +vt 0.874962 0.171245 +vt 0.904282 0.171245 +vt 0.464439 0.930224 +vt 0.485644 0.930224 +vt 0.337208 0.930224 +vt 0.358413 0.930224 +vt 0.379619 0.930224 +vt 0.408939 0.930224 +vt 0.422029 0.930224 +vt 0.896216 0.417337 +vt 0.451349 0.930224 +vt 0.280190 0.947015 +vt 0.851210 0.322666 +vt 0.530978 0.838726 +vt 0.896216 0.322666 +vt 0.864716 0.352514 +vt 0.544484 0.868573 +vt 0.937738 0.488066 +vt 0.174418 0.952639 +vt 0.079747 0.952638 +vt 0.915217 0.226135 +vt 0.913726 0.744102 +vt 0.915217 0.209802 +vt 0.330663 0.960898 +vt 0.964218 0.853105 +vt 0.490157 0.974403 +vt 0.280285 0.985076 +vt 0.915303 0.454572 +vt 0.616500 0.802285 +vt 0.674682 0.878938 +vt 0.811365 0.744102 +vt 0.019284 0.908460 vn -1.000000 0.000000 0.000000 vn 0.000000 0.000000 -1.000000 vn 1.000000 0.000000 0.000000 @@ -611,717 +1377,715 @@ vn 0.923600 -0.171000 -0.343300 vn 0.923900 0.146400 0.353600 vn 0.382400 0.318400 0.867400 s off -f 4//1 3//1 1//1 -f 8//2 7//2 3//2 -f 6//3 5//3 7//3 -f 1//4 9//4 10//4 -f 3//5 7//5 5//5 -f 8//6 4//6 2//6 -f 11//3 15//3 16//3 -f 5//4 12//4 9//4 -f 2//4 10//4 11//4 -f 6//4 11//4 12//4 -f 14//4 13//4 16//4 -f 10//6 14//6 15//6 -f 9//1 13//1 14//1 -f 12//5 16//5 13//5 -f 37//7 45//7 44//7 -f 22//2 18//2 35//2 -f 19//8 20//8 22//8 -f 17//8 41//8 48//8 -f 30//2 28//2 37//2 -f 21//9 22//9 24//9 -f 18//9 48//9 47//9 -f 34//2 40//2 17//2 -f 23//10 24//10 26//10 -f 38//11 44//11 43//11 -f 26//2 36//2 37//2 -f 25//12 26//12 28//12 -f 40//13 42//13 41//13 -f 34//2 32//2 39//2 -f 28//7 30//7 29//7 -f 41//4 49//4 50//4 -f 24//2 35//2 36//2 -f 30//11 32//11 31//11 -f 22//2 20//2 17//2 -f 34//13 20//13 19//13 -f 32//14 34//14 33//14 -f 39//14 43//14 42//14 -f 30//2 38//2 39//2 -f 35//10 47//10 46//10 -f 36//12 46//12 45//12 -f 50//4 51//4 47//4 -f 51//4 52//4 46//4 -f 52//4 53//4 45//4 -f 45//4 53//4 54//4 -f 54//4 55//4 43//4 -f 55//4 56//4 42//4 -f 56//4 49//4 41//4 -f 55//14 63//14 64//14 -f 55//4 53//4 49//4 -f 53//7 61//7 62//7 -f 52//10 51//10 59//10 -f 49//8 58//8 57//8 -f 56//13 64//13 58//13 -f 54//11 62//11 63//11 -f 53//12 52//12 60//12 -f 51//9 50//9 57//9 -f 65//15 66//15 89//15 -f 68//16 70//16 69//16 -f 86//17 65//17 92//17 -f 69//18 70//18 72//18 -f 88//19 84//19 65//19 -f 72//20 74//20 73//20 -f 83//21 87//21 85//21 -f 74//22 76//22 75//22 -f 85//23 90//23 89//23 -f 76//24 78//24 77//24 -f 86//25 85//25 87//25 -f 78//26 80//26 79//26 -f 84//15 83//15 66//15 -f 82//27 68//27 67//27 -f 80//28 82//28 81//28 -f 86//25 91//25 90//25 -f 90//25 91//25 95//25 -f 96//4 100//4 97//4 -f 92//29 94//29 95//29 -f 90//30 96//30 93//30 -f 89//15 93//15 94//15 -f 100//19 99//19 98//19 -f 96//25 95//25 99//25 -f 95//2 94//2 98//2 -f 93//15 97//15 98//15 -f 102//31 106//31 107//31 -f 104//32 103//32 107//32 -f 102//33 101//33 105//33 -f 107//34 111//34 112//34 -f 105//35 109//35 110//35 -f 106//36 110//36 111//36 -f 111//37 110//37 115//37 -f 111//38 116//38 117//38 -f 109//39 114//39 115//39 -f 115//40 119//40 120//40 -f 116//41 120//41 121//41 -f 114//42 118//42 119//42 -f 120//43 124//43 125//43 -f 118//44 122//44 123//44 -f 119//45 123//45 124//45 -f 125//46 124//46 128//46 -f 122//47 126//47 127//47 -f 124//48 123//48 127//48 -f 127//49 131//49 132//49 -f 128//50 132//50 133//50 -f 126//51 130//51 131//51 -f 101//52 113//52 105//52 -f 105//53 113//53 109//53 -f 109//54 113//54 114//54 -f 114//55 113//55 118//55 -f 118//56 113//56 122//56 -f 122//57 113//57 126//57 -f 126//58 113//58 130//58 -f 131//59 102//59 103//59 -f 130//60 113//60 101//60 -f 112//61 142//61 138//61 -f 108//62 138//62 134//62 -f 132//63 103//63 104//63 -f 131//64 130//64 101//64 -f 162//65 133//65 104//65 -f 162//66 158//66 129//66 -f 135//67 139//67 140//67 -f 136//68 140//68 141//68 -f 135//69 134//69 138//69 -f 139//70 143//70 144//70 -f 140//71 144//71 145//71 -f 139//72 138//72 142//72 -f 145//73 144//73 148//73 -f 142//74 146//74 147//74 -f 144//75 143//75 147//75 -f 146//76 150//76 151//76 -f 148//77 147//77 151//77 -f 148//78 152//78 153//78 -f 152//79 151//79 155//79 -f 152//80 156//80 157//80 -f 150//81 154//81 155//81 -f 156//82 160//82 161//82 -f 154//83 158//83 159//83 -f 156//84 155//84 159//84 -f 160//85 164//85 165//85 -f 158//86 162//86 163//86 -f 159//87 163//87 164//87 -f 163//88 135//88 136//88 -f 165//89 164//89 136//89 -f 162//90 134//90 135//90 -f 129//91 158//91 154//91 -f 125//92 154//92 150//92 -f 150//93 146//93 117//93 -f 146//94 142//94 112//94 -f 167//31 171//31 172//31 -f 169//32 168//32 172//32 -f 167//33 166//33 170//33 -f 173//34 172//34 176//34 -f 170//35 174//35 175//35 -f 171//36 175//36 176//36 -f 176//37 175//37 180//37 -f 176//38 181//38 182//38 -f 174//39 179//39 180//39 -f 180//40 184//40 185//40 -f 181//41 185//41 186//41 -f 179//42 183//42 184//42 -f 185//43 189//43 190//43 -f 183//44 187//44 188//44 -f 184//45 188//45 189//45 -f 190//46 189//46 193//46 -f 188//47 187//47 191//47 -f 189//48 188//48 192//48 -f 192//49 196//49 197//49 -f 193//50 197//50 198//50 -f 191//51 195//51 196//51 -f 166//52 178//52 170//52 -f 170//53 178//53 174//53 -f 174//54 178//54 179//54 -f 179//55 178//55 183//55 -f 183//56 178//56 187//56 -f 187//57 178//57 191//57 -f 191//58 178//58 195//58 -f 196//59 167//59 168//59 -f 195//60 178//60 166//60 -f 177//61 207//61 203//61 -f 173//62 203//62 199//62 -f 198//63 197//63 168//63 -f 196//64 195//64 166//64 -f 227//65 198//65 169//65 -f 227//66 223//66 194//66 -f 201//67 200//67 204//67 -f 201//68 205//68 206//68 -f 199//69 203//69 204//69 -f 204//70 208//70 209//70 -f 205//71 209//71 210//71 -f 203//72 207//72 208//72 -f 209//73 213//73 214//73 -f 208//74 207//74 211//74 -f 209//75 208//75 212//75 -f 211//76 215//76 216//76 -f 212//77 216//77 217//77 -f 213//78 217//78 218//78 -f 216//79 220//79 221//79 -f 217//80 221//80 222//80 -f 215//81 219//81 220//81 -f 222//82 221//82 225//82 -f 220//83 219//83 223//83 -f 221//84 220//84 224//84 -f 225//85 229//85 230//85 -f 223//86 227//86 228//86 -f 224//87 228//87 229//87 -f 165//65 137//65 231//65 -f 214//95 242//95 241//95 -f 228//88 200//88 201//88 -f 230//89 229//89 201//89 -f 227//90 199//90 200//90 -f 194//91 223//91 219//91 -f 190//92 219//92 215//92 -f 215//93 211//93 182//93 -f 211//94 207//94 177//94 -f 237//96 238//96 254//96 -f 245//97 261//97 260//97 -f 202//98 206//98 240//98 -f 141//99 145//99 233//99 -f 218//100 243//100 242//100 -f 230//65 202//65 239//65 -f 206//99 210//99 241//99 -f 161//101 165//101 238//101 -f 157//102 236//102 235//102 -f 161//103 237//103 236//103 -f 149//95 234//95 233//95 -f 226//101 230//101 246//101 -f 137//98 141//98 232//98 -f 222//102 244//102 243//102 -f 153//100 235//100 234//100 -f 226//103 245//103 244//103 -f 259//104 275//104 274//104 -f 251//104 267//104 266//104 -f 245//96 246//96 262//96 -f 238//105 231//105 247//105 -f 231//106 232//106 248//106 -f 246//105 239//105 255//105 -f 239//106 240//106 256//106 -f 232//107 233//107 249//107 -f 240//107 241//107 257//107 -f 234//108 250//108 249//108 -f 242//108 258//108 257//108 -f 235//109 251//109 250//109 -f 243//109 259//109 258//109 -f 236//110 252//110 251//110 -f 244//110 260//110 259//110 -f 237//97 253//97 252//97 -f 264//111 265//111 281//111 -f 271//112 272//112 288//112 -f 252//113 268//113 267//113 -f 260//113 276//113 275//113 -f 253//114 269//114 268//114 -f 261//114 277//114 276//114 -f 253//115 254//115 270//115 -f 261//115 262//115 278//115 -f 254//116 247//116 263//116 -f 247//117 248//117 264//117 -f 262//116 255//116 271//116 -f 255//117 256//117 272//117 -f 248//118 249//118 265//118 -f 256//118 257//118 273//118 -f 250//119 266//119 265//119 -f 258//119 274//119 273//119 -f 285//120 286//120 302//120 -f 293//121 309//121 308//121 -f 272//111 273//111 289//111 -f 266//122 282//122 281//122 -f 274//122 290//122 289//122 -f 267//123 283//123 282//123 -f 275//123 291//123 290//123 -f 268//124 284//124 283//124 -f 276//124 292//124 291//124 -f 269//125 285//125 284//125 -f 277//125 293//125 292//125 -f 269//126 270//126 286//126 -f 277//126 278//126 294//126 -f 270//127 263//127 279//127 -f 263//112 264//112 280//112 -f 278//127 271//127 287//127 -f 300//128 316//128 315//128 -f 307//129 323//129 322//129 -f 293//120 294//120 310//120 -f 286//14 279//14 295//14 -f 279//130 280//130 296//130 -f 294//14 287//14 303//14 -f 287//130 288//130 304//130 -f 280//131 281//131 297//131 -f 288//131 289//131 305//131 -f 282//132 298//132 297//132 -f 290//132 306//132 305//132 -f 283//133 299//133 298//133 -f 291//133 307//133 306//133 -f 284//134 300//134 299//134 -f 292//134 308//134 307//134 -f 285//121 301//121 300//121 -f 320//135 321//135 337//135 -f 312//135 313//135 329//135 -f 308//128 324//128 323//128 -f 301//136 317//136 316//136 -f 309//136 325//136 324//136 -f 301//137 302//137 318//137 -f 309//137 310//137 326//137 -f 302//138 295//138 311//138 -f 295//139 296//139 312//139 -f 310//138 303//138 319//138 -f 303//139 304//139 320//139 -f 296//140 297//140 313//140 -f 304//140 305//140 321//140 -f 298//141 314//141 313//141 -f 306//141 322//141 321//141 -f 299//129 315//129 314//129 -f 341//142 342//142 358//142 -f 333//142 334//142 350//142 -f 314//143 330//143 329//143 -f 322//143 338//143 337//143 -f 315//144 331//144 330//144 -f 323//144 339//144 338//144 -f 316//145 332//145 331//145 -f 324//145 340//145 339//145 -f 317//146 333//146 332//146 -f 325//146 341//146 340//146 -f 317//147 318//147 334//147 -f 325//147 326//147 342//147 -f 318//148 311//148 327//148 -f 311//149 312//149 328//149 -f 326//148 319//148 335//148 -f 319//149 320//149 336//149 -f 347//93 348//93 364//93 -f 355//92 371//92 370//92 -f 334//150 327//150 343//150 -f 327//151 328//151 344//151 -f 342//150 335//150 351//150 -f 335//151 336//151 352//151 -f 328//152 329//152 345//152 -f 336//152 337//152 353//152 -f 330//153 346//153 345//153 -f 338//153 354//153 353//153 -f 331//154 347//154 346//154 -f 339//154 355//154 354//154 -f 332//155 348//155 347//155 -f 340//155 356//155 355//155 -f 333//156 349//156 348//156 -f 341//156 357//156 356//156 -f 355//93 356//93 372//93 -f 348//94 349//94 365//94 -f 356//94 357//94 373//94 -f 350//61 366//61 365//61 -f 358//61 374//61 373//61 -f 343//62 359//62 366//62 -f 343//65 344//65 360//65 -f 358//62 351//62 367//62 -f 352//65 368//65 367//65 -f 344//66 345//66 361//66 -f 352//66 353//66 369//66 -f 346//91 362//91 361//91 -f 354//91 370//91 369//91 -f 346//92 347//92 363//92 -f 378//1 377//1 375//1 -f 382//2 381//2 377//2 -f 380//3 379//3 381//3 -f 377//5 381//5 379//5 -f 382//6 378//6 376//6 -f 384//1 386//1 385//1 -f 390//2 389//2 385//2 -f 388//3 387//3 389//3 -f 384//157 383//157 387//157 -f 385//5 389//5 387//5 -f 390//6 386//6 384//6 -f 2//1 4//1 1//1 -f 4//2 8//2 3//2 -f 8//3 6//3 7//3 -f 2//4 1//4 10//4 -f 1//5 3//5 5//5 -f 6//6 8//6 2//6 -f 12//3 11//3 16//3 -f 1//4 5//4 9//4 -f 6//4 2//4 11//4 -f 5//4 6//4 12//4 -f 15//4 14//4 16//4 -f 11//6 10//6 15//6 -f 10//1 9//1 14//1 -f 9//5 12//5 13//5 -f 38//7 37//7 44//7 -f 24//2 22//2 35//2 -f 21//8 19//8 22//8 -f 18//8 17//8 48//8 -f 38//2 30//2 37//2 -f 23//9 21//9 24//9 -f 35//9 18//9 47//9 -f 20//2 34//2 17//2 -f 25//10 23//10 26//10 -f 39//11 38//11 43//11 -f 28//2 26//2 37//2 -f 27//12 25//12 28//12 -f 17//13 40//13 41//13 -f 40//2 34//2 39//2 -f 27//7 28//7 29//7 -f 48//4 41//4 50//4 -f 26//2 24//2 36//2 -f 29//11 30//11 31//11 -f 18//2 22//2 17//2 -f 33//13 34//13 19//13 -f 31//14 32//14 33//14 -f 40//14 39//14 42//14 -f 32//2 30//2 39//2 -f 36//10 35//10 46//10 -f 37//12 36//12 45//12 -f 48//4 50//4 47//4 -f 47//4 51//4 46//4 -f 46//4 52//4 45//4 -f 44//4 45//4 54//4 -f 44//4 54//4 43//4 -f 43//4 55//4 42//4 -f 42//4 56//4 41//4 -f 56//14 55//14 64//14 -f 51//4 50//4 49//4 -f 49//4 56//4 55//4 -f 55//4 54//4 53//4 -f 53//4 52//4 51//4 -f 51//4 49//4 53//4 -f 54//7 53//7 62//7 -f 60//10 52//10 59//10 -f 50//8 49//8 57//8 -f 49//13 56//13 58//13 -f 55//11 54//11 63//11 -f 61//12 53//12 60//12 -f 59//9 51//9 57//9 -f 92//15 65//15 89//15 -f 67//16 68//16 69//16 -f 91//17 86//17 92//17 -f 71//18 69//18 72//18 -f 86//19 88//19 65//19 -f 71//20 72//20 73//20 -f 66//21 83//21 85//21 -f 73//22 74//22 75//22 -f 66//23 85//23 89//23 -f 75//24 76//24 77//24 -f 88//25 86//25 87//25 -f 77//26 78//26 79//26 -f 65//15 84//15 66//15 -f 81//27 82//27 67//27 -f 79//28 80//28 81//28 -f 85//25 86//25 90//25 -f 96//25 90//25 95//25 -f 93//4 96//4 97//4 -f 91//29 92//29 95//29 -f 89//30 90//30 93//30 -f 92//15 89//15 94//15 -f 97//19 100//19 98//19 -f 100//25 96//25 99//25 -f 99//2 95//2 98//2 -f 94//15 93//15 98//15 -f 103//31 102//31 107//31 -f 108//32 104//32 107//32 -f 106//33 102//33 105//33 -f 108//34 107//34 112//34 -f 106//35 105//35 110//35 -f 107//36 106//36 111//36 -f 116//37 111//37 115//37 -f 112//38 111//38 117//38 -f 110//39 109//39 115//39 -f 116//40 115//40 120//40 -f 117//41 116//41 121//41 -f 115//42 114//42 119//42 -f 121//43 120//43 125//43 -f 119//44 118//44 123//44 -f 120//45 119//45 124//45 -f 129//46 125//46 128//46 -f 123//47 122//47 127//47 -f 128//48 124//48 127//48 -f 128//49 127//49 132//49 -f 129//50 128//50 133//50 -f 127//51 126//51 131//51 -f 132//59 131//59 103//59 -f 108//61 112//61 138//61 -f 104//62 108//62 134//62 -f 133//63 132//63 104//63 -f 102//64 131//64 101//64 -f 134//65 162//65 104//65 -f 133//66 162//66 129//66 -f 136//67 135//67 140//67 -f 137//68 136//68 141//68 -f 139//69 135//69 138//69 -f 140//70 139//70 144//70 -f 141//71 140//71 145//71 -f 143//72 139//72 142//72 -f 149//73 145//73 148//73 -f 143//74 142//74 147//74 -f 148//75 144//75 147//75 -f 147//76 146//76 151//76 -f 152//77 148//77 151//77 -f 149//78 148//78 153//78 -f 156//79 152//79 155//79 -f 153//80 152//80 157//80 -f 151//81 150//81 155//81 -f 157//82 156//82 161//82 -f 155//83 154//83 159//83 -f 160//84 156//84 159//84 -f 161//85 160//85 165//85 -f 159//86 158//86 163//86 -f 160//87 159//87 164//87 -f 164//88 163//88 136//88 -f 137//89 165//89 136//89 -f 163//90 162//90 135//90 -f 125//91 129//91 154//91 -f 121//92 125//92 150//92 -f 121//93 150//93 117//93 -f 117//94 146//94 112//94 -f 168//31 167//31 172//31 -f 173//32 169//32 172//32 -f 171//33 167//33 170//33 -f 177//34 173//34 176//34 -f 171//35 170//35 175//35 -f 172//36 171//36 176//36 -f 181//37 176//37 180//37 -f 177//38 176//38 182//38 -f 175//39 174//39 180//39 -f 181//40 180//40 185//40 -f 182//41 181//41 186//41 -f 180//42 179//42 184//42 -f 186//43 185//43 190//43 -f 184//44 183//44 188//44 -f 185//45 184//45 189//45 -f 194//46 190//46 193//46 -f 192//47 188//47 191//47 -f 193//48 189//48 192//48 -f 193//49 192//49 197//49 -f 194//50 193//50 198//50 -f 192//51 191//51 196//51 -f 197//59 196//59 168//59 -f 173//61 177//61 203//61 -f 169//62 173//62 199//62 -f 169//63 198//63 168//63 -f 167//64 196//64 166//64 -f 199//65 227//65 169//65 -f 198//66 227//66 194//66 -f 205//67 201//67 204//67 -f 202//68 201//68 206//68 -f 200//69 199//69 204//69 -f 205//70 204//70 209//70 -f 206//71 205//71 210//71 -f 204//72 203//72 208//72 -f 210//73 209//73 214//73 -f 212//74 208//74 211//74 -f 213//75 209//75 212//75 -f 212//76 211//76 216//76 -f 213//77 212//77 217//77 -f 214//78 213//78 218//78 -f 217//79 216//79 221//79 -f 218//80 217//80 222//80 -f 216//81 215//81 220//81 -f 226//82 222//82 225//82 -f 224//83 220//83 223//83 -f 225//84 221//84 224//84 -f 226//85 225//85 230//85 -f 224//86 223//86 228//86 -f 225//87 224//87 229//87 -f 238//158 165//158 231//158 -f 210//159 214//159 241//159 -f 229//88 228//88 201//88 -f 202//89 230//89 201//89 -f 228//90 227//90 200//90 -f 190//91 194//91 219//91 -f 186//92 190//92 215//92 -f 186//93 215//93 182//93 -f 182//94 211//94 177//94 -f 253//160 237//160 254//160 -f 244//161 245//161 260//161 -f 239//162 202//162 240//162 -f 232//163 141//163 233//163 -f 214//164 218//164 242//164 -f 246//158 230//158 239//158 -f 240//163 206//163 241//163 -f 237//165 161//165 238//165 -f 153//92 157//92 235//92 -f 157//166 161//166 236//166 -f 145//159 149//159 233//159 -f 245//165 226//165 246//165 -f 231//162 137//162 232//162 -f 218//92 222//92 243//92 -f 149//164 153//164 234//164 -f 222//166 226//166 244//166 -f 258//167 259//167 274//167 -f 250//167 251//167 266//167 -f 261//160 245//160 262//160 -f 254//168 238//168 247//168 -f 247//169 231//169 248//169 -f 262//168 246//168 255//168 -f 255//169 239//169 256//169 -f 248//170 232//170 249//170 -f 256//170 240//170 257//170 -f 233//171 234//171 249//171 -f 241//171 242//171 257//171 -f 234//172 235//172 250//172 -f 242//172 243//172 258//172 -f 235//173 236//173 251//173 -f 243//173 244//173 259//173 -f 236//161 237//161 252//161 -f 280//174 264//174 281//174 -f 287//175 271//175 288//175 -f 251//176 252//176 267//176 -f 259//176 260//176 275//176 -f 252//177 253//177 268//177 -f 260//177 261//177 276//177 -f 269//178 253//178 270//178 -f 277//178 261//178 278//178 -f 270//179 254//179 263//179 -f 263//180 247//180 264//180 -f 278//179 262//179 271//179 -f 271//180 255//180 272//180 -f 264//181 248//181 265//181 -f 272//181 256//181 273//181 -f 249//182 250//182 265//182 -f 257//182 258//182 273//182 -f 301//183 285//183 302//183 -f 292//184 293//184 308//184 -f 288//174 272//174 289//174 -f 265//185 266//185 281//185 -f 273//185 274//185 289//185 -f 266//186 267//186 282//186 -f 274//186 275//186 290//186 -f 267//187 268//187 283//187 -f 275//187 276//187 291//187 -f 268//188 269//188 284//188 -f 276//188 277//188 292//188 -f 285//189 269//189 286//189 -f 293//189 277//189 294//189 -f 286//190 270//190 279//190 -f 279//175 263//175 280//175 -f 294//190 278//190 287//190 -f 299//191 300//191 315//191 -f 306//192 307//192 322//192 -f 309//183 293//183 310//183 -f 302//193 286//193 295//193 -f 295//194 279//194 296//194 -f 310//193 294//193 303//193 -f 303//194 287//194 304//194 -f 296//195 280//195 297//195 -f 304//195 288//195 305//195 -f 281//196 282//196 297//196 -f 289//196 290//196 305//196 -f 282//197 283//197 298//197 -f 290//197 291//197 306//197 -f 283//9 284//9 299//9 -f 291//9 292//9 307//9 -f 284//184 285//184 300//184 -f 336//198 320//198 337//198 -f 328//198 312//198 329//198 -f 307//191 308//191 323//191 -f 300//199 301//199 316//199 -f 308//199 309//199 324//199 -f 317//200 301//200 318//200 -f 325//200 309//200 326//200 -f 318//201 302//201 311//201 -f 311//202 295//202 312//202 -f 326//201 310//201 319//201 -f 319//202 303//202 320//202 -f 312//203 296//203 313//203 -f 320//203 304//203 321//203 -f 297//204 298//204 313//204 -f 305//204 306//204 321//204 -f 298//192 299//192 314//192 -f 357//205 341//205 358//205 -f 349//205 333//205 350//205 -f 313//206 314//206 329//206 -f 321//206 322//206 337//206 -f 314//207 315//207 330//207 -f 322//207 323//207 338//207 -f 315//208 316//208 331//208 -f 323//208 324//208 339//208 -f 316//209 317//209 332//209 -f 324//209 325//209 340//209 -f 333//210 317//210 334//210 -f 341//210 325//210 342//210 -f 334//211 318//211 327//211 -f 327//212 311//212 328//212 -f 342//211 326//211 335//211 -f 335//212 319//212 336//212 -f 363//93 347//93 364//93 -f 354//92 355//92 370//92 -f 350//213 334//213 343//213 -f 343//214 327//214 344//214 -f 358//213 342//213 351//213 -f 351//214 335//214 352//214 -f 344//215 328//215 345//215 -f 352//215 336//215 353//215 -f 329//216 330//216 345//216 -f 337//216 338//216 353//216 -f 330//217 331//217 346//217 -f 338//217 339//217 354//217 -f 331//218 332//218 347//218 -f 339//218 340//218 355//218 -f 332//219 333//219 348//219 -f 340//219 341//219 356//219 -f 371//93 355//93 372//93 -f 364//94 348//94 365//94 -f 372//94 356//94 373//94 -f 349//61 350//61 365//61 -f 357//61 358//61 373//61 -f 350//62 343//62 366//62 -f 359//65 343//65 360//65 -f 374//62 358//62 367//62 -f 351//65 352//65 367//65 -f 360//66 344//66 361//66 -f 368//66 352//66 369//66 -f 345//91 346//91 361//91 -f 353//91 354//91 369//91 -f 362//92 346//92 363//92 -f 376//1 378//1 375//1 -f 378//2 382//2 377//2 -f 382//3 380//3 381//3 -f 375//5 377//5 379//5 -f 380//6 382//6 376//6 -f 383//1 384//1 385//1 -f 386//2 390//2 385//2 -f 390//3 388//3 389//3 -f 388//157 384//157 387//157 -f 383//5 385//5 387//5 -f 388//6 390//6 384//6 +f 4/1/1 3/2/1 1/3/1 +f 8/4/2 7/5/2 3/6/2 +f 6/7/3 5/8/3 7/9/3 +f 1/10/4 9/11/4 10/12/4 +f 3/13/5 7/14/5 5/15/5 +f 8/4/6 4/1/6 2/16/6 +f 11/17/3 15/18/3 16/19/3 +f 5/15/4 12/20/4 9/11/4 +f 2/16/4 10/12/4 11/21/4 +f 6/7/4 11/21/4 12/20/4 +f 14/22/4 13/23/4 16/19/4 +f 10/24/6 14/22/6 15/18/6 +f 9/25/1 13/23/1 14/22/1 +f 12/26/5 16/19/5 13/23/5 +f 37/27/7 45/28/7 44/29/7 +f 22/30/2 18/31/2 35/32/2 +f 19/33/8 20/34/8 22/35/8 +f 17/36/8 41/37/8 48/38/8 +f 30/39/2 28/40/2 37/27/2 +f 21/41/9 22/30/9 24/42/9 +f 18/31/9 48/38/9 47/43/9 +f 34/44/2 40/45/2 17/36/2 +f 23/46/10 24/47/10 26/48/10 +f 38/49/11 44/29/11 43/50/11 +f 26/51/2 36/52/2 37/53/2 +f 25/54/12 26/51/12 28/55/12 +f 40/45/13 42/56/13 41/37/13 +f 34/57/2 32/58/2 39/59/2 +f 28/40/7 30/39/7 29/60/7 +f 41/37/4 49/61/4 50/62/4 +f 24/47/2 35/32/2 36/52/2 +f 30/63/11 32/64/11 31/65/11 +f 22/35/2 20/34/2 17/36/2 +f 34/44/13 20/66/13 19/67/13 +f 32/58/14 34/57/14 33/68/14 +f 39/59/14 43/50/14 42/56/14 +f 30/63/2 38/49/2 39/59/2 +f 35/32/10 47/43/10 46/69/10 +f 36/52/12 46/69/12 45/70/12 +f 50/71/4 51/72/4 47/43/4 +f 51/73/4 52/74/4 46/69/4 +f 52/75/4 53/76/4 45/70/4 +f 45/28/4 53/77/4 54/78/4 +f 54/79/4 55/80/4 43/50/4 +f 55/81/4 56/82/4 42/56/4 +f 56/83/4 49/84/4 41/37/4 +f 55/85/14 63/86/14 64/87/14 +f 55/88/4 53/89/4 49/90/4 +f 53/91/7 61/92/7 62/93/7 +f 52/94/10 51/95/10 59/96/10 +f 49/97/8 58/98/8 57/99/8 +f 56/100/13 64/87/13 58/98/13 +f 54/101/11 62/93/11 63/86/11 +f 53/102/12 52/94/12 60/103/12 +f 51/95/9 50/104/9 57/99/9 +f 65/105/15 66/106/15 89/107/15 +f 68/108/16 70/109/16 69/110/16 +f 86/111/17 65/112/17 92/113/17 +f 69/110/18 70/109/18 72/114/18 +f 88/115/19 84/116/19 65/117/19 +f 72/118/20 74/119/20 73/120/20 +f 83/121/21 87/122/21 85/123/21 +f 74/119/22 76/124/22 75/125/22 +f 85/123/23 90/126/23 89/107/23 +f 76/124/24 78/127/24 77/128/24 +f 86/129/25 85/123/25 87/122/25 +f 78/127/26 80/130/26 79/131/26 +f 84/132/15 83/121/15 66/106/15 +f 82/133/27 68/108/27 67/134/27 +f 80/130/28 82/133/28 81/135/28 +f 86/111/25 91/136/25 90/126/25 +f 90/126/25 91/137/25 95/138/25 +f 96/139/4 100/140/4 97/141/4 +f 92/142/29 94/143/29 95/138/29 +f 90/126/30 96/139/30 93/144/30 +f 89/107/15 93/144/15 94/145/15 +f 100/140/19 99/146/19 98/147/19 +f 96/139/25 95/148/25 99/149/25 +f 95/148/2 94/150/2 98/151/2 +f 93/144/15 97/141/15 98/152/15 +f 102/153/31 106/154/31 107/155/31 +f 104/156/32 103/157/32 107/155/32 +f 102/153/33 101/158/33 105/159/33 +f 107/160/34 111/161/34 112/162/34 +f 105/163/35 109/164/35 110/165/35 +f 106/166/36 110/165/36 111/161/36 +f 111/167/37 110/168/37 115/169/37 +f 111/167/38 116/170/38 117/171/38 +f 109/172/39 114/173/39 115/169/39 +f 115/174/40 119/175/40 120/176/40 +f 116/177/41 120/176/41 121/178/41 +f 114/179/42 118/180/42 119/175/42 +f 120/181/43 124/182/43 125/183/43 +f 118/184/44 122/185/44 123/186/44 +f 119/187/45 123/186/45 124/182/45 +f 125/183/46 124/188/46 128/189/46 +f 122/190/47 126/191/47 127/192/47 +f 124/188/48 123/193/48 127/192/48 +f 127/194/49 131/195/49 132/196/49 +f 128/197/50 132/196/50 133/198/50 +f 126/199/51 130/200/51 131/195/51 +f 101/158/52 113/201/52 105/159/52 +f 105/163/53 113/202/53 109/164/53 +f 109/172/54 113/203/54 114/173/54 +f 114/179/55 113/204/55 118/180/55 +f 118/184/56 113/205/56 122/185/56 +f 122/190/57 113/206/57 126/191/57 +f 126/199/58 113/207/58 130/200/58 +f 131/208/59 102/209/59 103/210/59 +f 130/211/60 113/212/60 101/213/60 +f 112/162/61 142/214/61 138/215/61 +f 108/216/62 138/215/62 134/217/62 +f 132/218/63 103/210/63 104/156/63 +f 131/208/64 130/211/64 101/213/64 +f 162/219/65 133/198/65 104/156/65 +f 162/219/66 158/220/66 129/221/66 +f 135/222/67 139/223/67 140/224/67 +f 136/225/68 140/224/68 141/226/68 +f 135/222/69 134/217/69 138/215/69 +f 139/227/70 143/228/70 144/229/70 +f 140/230/71 144/229/71 145/231/71 +f 139/227/72 138/215/72 142/214/72 +f 145/232/73 144/233/73 148/234/73 +f 142/235/74 146/236/74 147/237/74 +f 144/233/75 143/238/75 147/237/75 +f 146/236/76 150/239/76 151/240/76 +f 148/241/77 147/242/77 151/240/77 +f 148/241/78 152/243/78 153/244/78 +f 152/245/79 151/246/79 155/247/79 +f 152/245/80 156/248/80 157/249/80 +f 150/239/81 154/250/81 155/247/81 +f 156/251/82 160/252/82 161/253/82 +f 154/250/83 158/220/83 159/254/83 +f 156/251/84 155/255/84 159/254/84 +f 160/256/85 164/257/85 165/258/85 +f 158/220/86 162/219/86 163/259/86 +f 159/260/87 163/259/87 164/257/87 +f 163/261/88 135/262/88 136/263/88 +f 165/264/89 164/265/89 136/263/89 +f 162/219/90 134/217/90 135/262/90 +f 129/221/91 158/220/91 154/250/91 +f 125/183/92 154/250/92 150/239/92 +f 150/239/93 146/236/93 117/171/93 +f 146/236/94 142/235/94 112/266/94 +f 167/267/31 171/268/31 172/269/31 +f 169/270/32 168/271/32 172/269/32 +f 167/267/33 166/272/33 170/273/33 +f 173/274/34 172/275/34 176/276/34 +f 170/277/35 174/278/35 175/279/35 +f 171/280/36 175/279/36 176/276/36 +f 176/281/37 175/282/37 180/283/37 +f 176/281/38 181/284/38 182/285/38 +f 174/286/39 179/287/39 180/283/39 +f 180/288/40 184/289/40 185/290/40 +f 181/291/41 185/290/41 186/292/41 +f 179/293/42 183/294/42 184/289/42 +f 185/295/43 189/296/43 190/297/43 +f 183/298/44 187/299/44 188/300/44 +f 184/301/45 188/300/45 189/296/45 +f 190/297/46 189/302/46 193/303/46 +f 188/304/47 187/305/47 191/306/47 +f 189/302/48 188/304/48 192/307/48 +f 192/308/49 196/309/49 197/310/49 +f 193/311/50 197/310/50 198/312/50 +f 191/313/51 195/314/51 196/309/51 +f 166/272/52 178/315/52 170/273/52 +f 170/277/53 178/316/53 174/278/53 +f 174/286/54 178/317/54 179/287/54 +f 179/293/55 178/318/55 183/294/55 +f 183/298/56 178/319/56 187/299/56 +f 187/305/57 178/320/57 191/306/57 +f 191/313/58 178/321/58 195/314/58 +f 196/322/59 167/323/59 168/324/59 +f 195/325/60 178/326/60 166/327/60 +f 177/328/61 207/329/61 203/330/61 +f 173/274/62 203/330/62 199/331/62 +f 198/312/63 197/332/63 168/324/63 +f 196/322/64 195/325/64 166/327/64 +f 227/333/65 198/312/65 169/270/65 +f 227/333/66 223/334/66 194/335/66 +f 201/336/67 200/337/67 204/338/67 +f 201/336/68 205/339/68 206/340/68 +f 199/331/69 203/330/69 204/338/69 +f 204/341/70 208/342/70 209/343/70 +f 205/344/71 209/343/71 210/345/71 +f 203/330/72 207/329/72 208/342/72 +f 209/346/73 213/347/73 214/348/73 +f 208/349/74 207/350/74 211/351/74 +f 209/346/75 208/349/75 212/352/75 +f 211/351/76 215/353/76 216/354/76 +f 212/355/77 216/354/77 217/356/77 +f 213/357/78 217/356/78 218/358/78 +f 216/359/79 220/360/79 221/361/79 +f 217/362/80 221/361/80 222/363/80 +f 215/353/81 219/364/81 220/360/81 +f 222/365/82 221/366/82 225/367/82 +f 220/368/83 219/364/83 223/334/83 +f 221/366/84 220/368/84 224/369/84 +f 225/370/85 229/371/85 230/372/85 +f 223/334/86 227/333/86 228/373/86 +f 224/374/87 228/373/87 229/371/87 +f 165/375/65 137/376/65 231/377/65 +f 214/378/95 242/379/95 241/380/95 +f 228/381/88 200/382/88 201/383/88 +f 230/384/89 229/385/89 201/383/89 +f 227/333/90 199/331/90 200/382/90 +f 194/335/91 223/334/91 219/364/91 +f 190/297/92 219/364/92 215/353/92 +f 215/353/93 211/351/93 182/285/93 +f 211/351/94 207/350/94 177/386/94 +f 237/387/96 238/388/96 254/389/96 +f 245/390/97 261/391/97 260/392/97 +f 202/393/98 206/394/98 240/395/98 +f 141/396/99 145/397/99 233/398/99 +f 218/399/100 243/400/100 242/379/100 +f 230/401/65 202/393/65 239/402/65 +f 206/394/99 210/403/99 241/404/99 +f 161/405/101 165/375/101 238/406/101 +f 157/407/102 236/408/102 235/409/102 +f 161/405/103 237/410/103 236/408/103 +f 149/411/95 234/412/95 233/413/95 +f 226/414/101 230/401/101 246/415/101 +f 137/376/98 141/396/98 232/416/98 +f 222/417/102 244/418/102 243/400/102 +f 153/419/100 235/409/100 234/412/100 +f 226/414/103 245/420/103 244/418/103 +f 259/421/104 275/422/104 274/423/104 +f 251/424/104 267/425/104 266/426/104 +f 245/390/96 246/427/96 262/428/96 +f 238/388/105 231/429/105 247/430/105 +f 231/429/106 232/431/106 248/432/106 +f 246/427/105 239/433/105 255/434/105 +f 239/433/106 240/435/106 256/436/106 +f 232/431/107 233/437/107 249/438/107 +f 240/435/107 241/439/107 257/440/107 +f 234/441/108 250/442/108 249/443/108 +f 242/444/108 258/445/108 257/446/108 +f 235/447/109 251/448/109 250/442/109 +f 243/449/109 259/450/109 258/445/109 +f 236/451/110 252/452/110 251/448/110 +f 244/453/110 260/392/110 259/450/110 +f 237/387/97 253/454/97 252/452/97 +f 264/455/111 265/456/111 281/457/111 +f 271/458/112 272/459/112 288/460/112 +f 252/461/113 268/462/113 267/425/113 +f 260/463/113 276/464/113 275/422/113 +f 253/465/114 269/466/114 268/462/114 +f 261/467/114 277/468/114 276/464/114 +f 253/465/115 254/469/115 270/470/115 +f 261/467/115 262/471/115 278/472/115 +f 254/469/116 247/473/116 263/474/116 +f 247/473/117 248/475/117 264/476/117 +f 262/471/116 255/477/116 271/478/116 +f 255/477/117 256/479/117 272/480/117 +f 248/475/118 249/481/118 265/482/118 +f 256/479/118 257/483/118 273/484/118 +f 250/485/119 266/426/119 265/486/119 +f 258/487/119 274/423/119 273/488/119 +f 285/489/120 286/490/120 302/491/120 +f 293/492/121 309/493/121 308/494/121 +f 272/459/111 273/495/111 289/496/111 +f 266/497/122 282/498/122 281/499/122 +f 274/500/122 290/501/122 289/502/122 +f 267/503/123 283/504/123 282/498/123 +f 275/505/123 291/506/123 290/501/123 +f 268/507/124 284/508/124 283/504/124 +f 276/509/124 292/510/124 291/506/124 +f 269/511/125 285/512/125 284/508/125 +f 277/513/125 293/514/125 292/510/125 +f 269/511/126 270/515/126 286/516/126 +f 277/513/126 278/517/126 294/518/126 +f 270/515/127 263/519/127 279/520/127 +f 263/519/112 264/455/112 280/521/112 +f 278/517/127 271/458/127 287/522/127 +f 300/523/128 316/524/128 315/525/128 +f 307/526/129 323/527/129 322/528/129 +f 293/492/120 294/529/120 310/530/120 +f 286/490/14 279/531/14 295/532/14 +f 279/531/130 280/533/130 296/534/130 +f 294/529/14 287/535/14 303/536/14 +f 287/535/130 288/537/130 304/538/130 +f 280/533/131 281/539/131 297/540/131 +f 288/537/131 289/541/131 305/542/131 +f 282/543/132 298/544/132 297/545/132 +f 290/546/132 306/547/132 305/548/132 +f 283/549/133 299/550/133 298/544/133 +f 291/551/133 307/552/133 306/547/133 +f 284/553/134 300/554/134 299/550/134 +f 292/555/134 308/494/134 307/552/134 +f 285/489/121 301/556/121 300/554/121 +f 320/557/135 321/558/135 337/559/135 +f 312/560/135 313/561/135 329/562/135 +f 308/563/128 324/564/128 323/527/128 +f 301/565/136 317/566/136 316/524/136 +f 309/567/136 325/568/136 324/564/136 +f 301/565/137 302/569/137 318/570/137 +f 309/567/137 310/571/137 326/572/137 +f 302/569/138 295/573/138 311/574/138 +f 295/573/139 296/575/139 312/560/139 +f 310/571/138 303/576/138 319/577/138 +f 303/576/139 304/578/139 320/579/139 +f 296/575/140 297/580/140 313/561/140 +f 304/578/140 305/581/140 321/582/140 +f 298/583/141 314/584/141 313/585/141 +f 306/586/141 322/528/141 321/587/141 +f 299/588/129 315/525/129 314/584/129 +f 341/589/142 342/590/142 358/591/142 +f 333/592/142 334/593/142 350/594/142 +f 314/595/143 330/596/143 329/597/143 +f 322/598/143 338/599/143 337/600/143 +f 315/601/144 331/602/144 330/596/144 +f 323/603/144 339/604/144 338/599/144 +f 316/605/145 332/606/145 331/602/145 +f 324/607/145 340/608/145 339/604/145 +f 317/609/146 333/610/146 332/606/146 +f 325/611/146 341/612/146 340/608/146 +f 317/609/147 318/613/147 334/614/147 +f 325/611/147 326/615/147 342/616/147 +f 318/613/148 311/617/148 327/618/148 +f 311/617/149 312/560/149 328/619/149 +f 326/615/148 319/620/148 335/621/148 +f 319/620/149 320/557/149 336/622/149 +f 347/623/93 348/624/93 364/625/93 +f 355/626/92 371/627/92 370/628/92 +f 334/593/150 327/629/150 343/630/150 +f 327/629/151 328/631/151 344/632/151 +f 342/590/150 335/633/150 351/634/150 +f 335/633/151 336/635/151 352/636/151 +f 328/631/152 329/637/152 345/638/152 +f 336/635/152 337/639/152 353/640/152 +f 330/641/153 346/642/153 345/643/153 +f 338/644/153 354/645/153 353/646/153 +f 331/647/154 347/648/154 346/642/154 +f 339/649/154 355/650/154 354/645/154 +f 332/651/155 348/652/155 347/648/155 +f 340/653/155 356/654/155 355/650/155 +f 333/592/156 349/655/156 348/652/156 +f 341/589/156 357/656/156 356/654/156 +f 355/626/93 356/657/93 372/658/93 +f 348/624/94 349/659/94 365/660/94 +f 356/657/94 357/661/94 373/662/94 +f 350/663/61 366/664/61 365/660/61 +f 358/665/61 374/666/61 373/662/61 +f 343/667/62 359/668/62 366/664/62 +f 343/667/65 344/669/65 360/670/65 +f 358/665/62 351/671/62 367/672/62 +f 352/673/65 368/674/65 367/672/65 +f 344/669/66 345/675/66 361/676/66 +f 352/673/66 353/677/66 369/678/66 +f 346/679/91 362/680/91 361/681/91 +f 354/682/91 370/628/91 369/683/91 +f 346/679/92 347/623/92 363/684/92 +f 378/685/1 377/686/1 375/687/1 +f 382/688/2 381/689/2 377/686/2 +f 380/690/3 379/691/3 381/689/3 +f 377/686/5 381/689/5 379/692/5 +f 382/688/6 378/685/6 376/693/6 +f 384/694/1 386/695/1 385/696/1 +f 390/697/2 389/698/2 385/699/2 +f 388/700/3 387/701/3 389/702/3 +f 384/694/157 383/703/157 387/704/157 +f 390/697/6 386/695/6 384/694/6 +f 2/16/1 4/1/1 1/3/1 +f 4/1/2 8/4/2 3/6/2 +f 8/4/3 6/7/3 7/9/3 +f 2/16/4 1/10/4 10/12/4 +f 1/10/5 3/13/5 5/15/5 +f 6/7/6 8/4/6 2/16/6 +f 12/705/3 11/17/3 16/19/3 +f 1/10/4 5/15/4 9/11/4 +f 6/7/4 2/16/4 11/21/4 +f 5/15/4 6/7/4 12/20/4 +f 15/18/4 14/22/4 16/19/4 +f 11/706/6 10/24/6 15/18/6 +f 10/707/1 9/25/1 14/22/1 +f 9/708/5 12/26/5 13/23/5 +f 38/49/7 37/27/7 44/29/7 +f 24/42/2 22/30/2 35/32/2 +f 21/709/8 19/33/8 22/35/8 +f 18/31/8 17/36/8 48/38/8 +f 38/49/2 30/39/2 37/27/2 +f 23/710/9 21/41/9 24/42/9 +f 35/32/9 18/31/9 47/43/9 +f 20/66/2 34/44/2 17/36/2 +f 25/711/10 23/46/10 26/48/10 +f 39/59/11 38/49/11 43/50/11 +f 28/55/2 26/51/2 37/53/2 +f 27/712/12 25/54/12 28/55/12 +f 17/36/13 40/45/13 41/37/13 +f 40/45/2 34/57/2 39/59/2 +f 27/713/7 28/40/7 29/60/7 +f 48/38/4 41/37/4 50/62/4 +f 26/48/2 24/47/2 36/52/2 +f 29/714/11 30/63/11 31/65/11 +f 18/31/2 22/35/2 17/36/2 +f 33/715/13 34/44/13 19/67/13 +f 31/716/14 32/58/14 33/68/14 +f 40/45/14 39/59/14 42/56/14 +f 32/64/2 30/63/2 39/59/2 +f 36/52/10 35/32/10 46/69/10 +f 37/53/12 36/52/12 45/70/12 +f 48/38/4 50/71/4 47/43/4 +f 47/43/4 51/73/4 46/69/4 +f 46/69/4 52/75/4 45/70/4 +f 44/29/4 45/28/4 54/78/4 +f 44/29/4 54/79/4 43/50/4 +f 43/50/4 55/81/4 42/56/4 +f 42/56/4 56/83/4 41/37/4 +f 56/100/14 55/85/14 64/87/14 +f 51/717/4 50/718/4 49/90/4 +f 49/90/4 56/719/4 55/88/4 +f 55/88/4 54/720/4 53/89/4 +f 53/89/4 52/721/4 51/717/4 +f 51/717/4 49/90/4 53/89/4 +f 54/101/7 53/91/7 62/93/7 +f 60/103/10 52/94/10 59/96/10 +f 50/104/8 49/97/8 57/99/8 +f 49/97/13 56/100/13 58/98/13 +f 55/85/11 54/101/11 63/86/11 +f 61/722/12 53/102/12 60/103/12 +f 59/96/9 51/95/9 57/99/9 +f 92/723/15 65/105/15 89/107/15 +f 67/134/16 68/108/16 69/110/16 +f 91/136/17 86/111/17 92/113/17 +f 71/724/18 69/110/18 72/114/18 +f 86/129/19 88/115/19 65/117/19 +f 71/725/20 72/118/20 73/120/20 +f 66/106/21 83/121/21 85/123/21 +f 73/120/22 74/119/22 75/125/22 +f 66/106/23 85/123/23 89/107/23 +f 75/125/24 76/124/24 77/128/24 +f 88/115/25 86/129/25 87/122/25 +f 77/128/26 78/127/26 79/131/26 +f 65/726/15 84/132/15 66/106/15 +f 81/135/27 82/133/27 67/134/27 +f 79/131/28 80/130/28 81/135/28 +f 85/123/25 86/111/25 90/126/25 +f 96/139/25 90/126/25 95/138/25 +f 93/144/4 96/139/4 97/141/4 +f 91/137/29 92/142/29 95/138/29 +f 89/107/30 90/126/30 93/144/30 +f 92/727/15 89/107/15 94/145/15 +f 97/141/19 100/140/19 98/147/19 +f 100/140/25 96/139/25 99/149/25 +f 99/149/2 95/148/2 98/151/2 +f 94/728/15 93/144/15 98/152/15 +f 103/157/31 102/153/31 107/155/31 +f 108/216/32 104/156/32 107/155/32 +f 106/154/33 102/153/33 105/159/33 +f 108/216/34 107/160/34 112/162/34 +f 106/166/35 105/163/35 110/165/35 +f 107/160/36 106/166/36 111/161/36 +f 116/170/37 111/167/37 115/169/37 +f 112/266/38 111/167/38 117/171/38 +f 110/168/39 109/172/39 115/169/39 +f 116/177/40 115/174/40 120/176/40 +f 117/171/41 116/177/41 121/178/41 +f 115/174/42 114/179/42 119/175/42 +f 121/178/43 120/181/43 125/183/43 +f 119/187/44 118/184/44 123/186/44 +f 120/181/45 119/187/45 124/182/45 +f 129/221/46 125/183/46 128/189/46 +f 123/193/47 122/190/47 127/192/47 +f 128/189/48 124/188/48 127/192/48 +f 128/197/49 127/194/49 132/196/49 +f 129/221/50 128/197/50 133/198/50 +f 127/194/51 126/199/51 131/195/51 +f 132/218/59 131/208/59 103/210/59 +f 108/216/61 112/162/61 138/215/61 +f 104/156/62 108/216/62 134/217/62 +f 133/198/63 132/218/63 104/156/63 +f 102/209/64 131/208/64 101/213/64 +f 134/217/65 162/219/65 104/156/65 +f 133/198/66 162/219/66 129/221/66 +f 136/225/67 135/222/67 140/224/67 +f 137/729/68 136/225/68 141/226/68 +f 139/223/69 135/222/69 138/215/69 +f 140/230/70 139/227/70 144/229/70 +f 141/730/71 140/230/71 145/231/71 +f 143/228/72 139/227/72 142/214/72 +f 149/731/73 145/232/73 148/234/73 +f 143/238/74 142/235/74 147/237/74 +f 148/234/75 144/233/75 147/237/75 +f 147/242/76 146/236/76 151/240/76 +f 152/243/77 148/241/77 151/240/77 +f 149/732/78 148/241/78 153/244/78 +f 156/248/79 152/245/79 155/247/79 +f 153/733/80 152/245/80 157/249/80 +f 151/246/81 150/239/81 155/247/81 +f 157/734/82 156/251/82 161/253/82 +f 155/255/83 154/250/83 159/254/83 +f 160/252/84 156/251/84 159/254/84 +f 161/735/85 160/256/85 165/258/85 +f 159/260/86 158/220/86 163/259/86 +f 160/256/87 159/260/87 164/257/87 +f 164/265/88 163/261/88 136/263/88 +f 137/736/89 165/264/89 136/263/89 +f 163/261/90 162/219/90 135/262/90 +f 125/183/91 129/221/91 154/250/91 +f 121/178/92 125/183/92 150/239/92 +f 121/178/93 150/239/93 117/171/93 +f 117/171/94 146/236/94 112/266/94 +f 168/271/31 167/267/31 172/269/31 +f 173/274/32 169/270/32 172/269/32 +f 171/268/33 167/267/33 170/273/33 +f 177/328/34 173/274/34 176/276/34 +f 171/280/35 170/277/35 175/279/35 +f 172/275/36 171/280/36 176/276/36 +f 181/284/37 176/281/37 180/283/37 +f 177/386/38 176/281/38 182/285/38 +f 175/282/39 174/286/39 180/283/39 +f 181/291/40 180/288/40 185/290/40 +f 182/285/41 181/291/41 186/292/41 +f 180/288/42 179/293/42 184/289/42 +f 186/292/43 185/295/43 190/297/43 +f 184/301/44 183/298/44 188/300/44 +f 185/295/45 184/301/45 189/296/45 +f 194/335/46 190/297/46 193/303/46 +f 192/307/47 188/304/47 191/306/47 +f 193/303/48 189/302/48 192/307/48 +f 193/311/49 192/308/49 197/310/49 +f 194/335/50 193/311/50 198/312/50 +f 192/308/51 191/313/51 196/309/51 +f 197/332/59 196/322/59 168/324/59 +f 173/274/61 177/328/61 203/330/61 +f 169/270/62 173/274/62 199/331/62 +f 169/270/63 198/312/63 168/324/63 +f 167/323/64 196/322/64 166/327/64 +f 199/331/65 227/333/65 169/270/65 +f 198/312/66 227/333/66 194/335/66 +f 205/339/67 201/336/67 204/338/67 +f 202/737/68 201/336/68 206/340/68 +f 200/337/69 199/331/69 204/338/69 +f 205/344/70 204/341/70 209/343/70 +f 206/738/71 205/344/71 210/345/71 +f 204/341/72 203/330/72 208/342/72 +f 210/739/73 209/346/73 214/348/73 +f 212/352/74 208/349/74 211/351/74 +f 213/347/75 209/346/75 212/352/75 +f 212/355/76 211/351/76 216/354/76 +f 213/357/77 212/355/77 217/356/77 +f 214/740/78 213/357/78 218/358/78 +f 217/362/79 216/359/79 221/361/79 +f 218/741/80 217/362/80 222/363/80 +f 216/359/81 215/353/81 220/360/81 +f 226/742/82 222/365/82 225/367/82 +f 224/369/83 220/368/83 223/334/83 +f 225/367/84 221/366/84 224/369/84 +f 226/743/85 225/370/85 230/372/85 +f 224/374/86 223/334/86 228/373/86 +f 225/370/87 224/374/87 229/371/87 +f 238/406/158 165/375/158 231/377/158 +f 210/744/159 214/378/159 241/380/159 +f 229/385/88 228/381/88 201/383/88 +f 202/745/89 230/384/89 201/383/89 +f 228/381/90 227/333/90 200/382/90 +f 190/297/91 194/335/91 219/364/91 +f 186/292/92 190/297/92 215/353/92 +f 186/292/93 215/353/93 182/285/93 +f 182/285/94 211/351/94 177/386/94 +f 253/454/160 237/387/160 254/389/160 +f 244/453/161 245/390/161 260/392/161 +f 239/402/162 202/393/162 240/395/162 +f 232/416/163 141/396/163 233/398/163 +f 214/378/164 218/399/164 242/379/164 +f 246/415/158 230/401/158 239/402/158 +f 240/395/163 206/394/163 241/404/163 +f 237/410/165 161/405/165 238/406/165 +f 153/419/92 157/407/92 235/409/92 +f 157/407/166 161/405/166 236/408/166 +f 145/746/159 149/411/159 233/413/159 +f 245/420/165 226/414/165 246/415/165 +f 231/377/162 137/376/162 232/416/162 +f 218/399/92 222/417/92 243/400/92 +f 149/411/164 153/419/164 234/412/164 +f 222/417/166 226/414/166 244/418/166 +f 258/487/167 259/421/167 274/423/167 +f 250/485/167 251/424/167 266/426/167 +f 261/391/160 245/390/160 262/428/160 +f 254/389/168 238/388/168 247/430/168 +f 247/430/169 231/429/169 248/432/169 +f 262/428/168 246/427/168 255/434/168 +f 255/434/169 239/433/169 256/436/169 +f 248/432/170 232/431/170 249/438/170 +f 256/436/170 240/435/170 257/440/170 +f 233/747/171 234/441/171 249/443/171 +f 241/748/171 242/444/171 257/446/171 +f 234/441/172 235/447/172 250/442/172 +f 242/444/172 243/449/172 258/445/172 +f 235/447/173 236/451/173 251/448/173 +f 243/449/173 244/453/173 259/450/173 +f 236/451/161 237/387/161 252/452/161 +f 280/521/174 264/455/174 281/457/174 +f 287/522/175 271/458/175 288/460/175 +f 251/424/176 252/461/176 267/425/176 +f 259/421/176 260/463/176 275/422/176 +f 252/461/177 253/465/177 268/462/177 +f 260/463/177 261/467/177 276/464/177 +f 269/466/178 253/465/178 270/470/178 +f 277/468/178 261/467/178 278/472/178 +f 270/470/179 254/469/179 263/474/179 +f 263/474/180 247/473/180 264/476/180 +f 278/472/179 262/471/179 271/478/179 +f 271/478/180 255/477/180 272/480/180 +f 264/476/181 248/475/181 265/482/181 +f 272/480/181 256/479/181 273/484/181 +f 249/749/182 250/485/182 265/486/182 +f 257/750/182 258/487/182 273/488/182 +f 301/556/183 285/489/183 302/491/183 +f 292/555/184 293/492/184 308/494/184 +f 288/460/174 272/459/174 289/496/174 +f 265/751/185 266/497/185 281/499/185 +f 273/752/185 274/500/185 289/502/185 +f 266/497/186 267/503/186 282/498/186 +f 274/500/186 275/505/186 290/501/186 +f 267/503/187 268/507/187 283/504/187 +f 275/505/187 276/509/187 291/506/187 +f 268/507/188 269/511/188 284/508/188 +f 276/509/188 277/513/188 292/510/188 +f 285/512/189 269/511/189 286/516/189 +f 293/514/189 277/513/189 294/518/189 +f 286/516/190 270/515/190 279/520/190 +f 279/520/175 263/519/175 280/521/175 +f 294/518/190 278/517/190 287/522/190 +f 299/588/191 300/523/191 315/525/191 +f 306/586/192 307/526/192 322/528/192 +f 309/493/183 293/492/183 310/530/183 +f 302/491/193 286/490/193 295/532/193 +f 295/532/194 279/531/194 296/534/194 +f 310/530/193 294/529/193 303/536/193 +f 303/536/194 287/535/194 304/538/194 +f 296/534/195 280/533/195 297/540/195 +f 304/538/195 288/537/195 305/542/195 +f 281/753/196 282/543/196 297/545/196 +f 289/754/196 290/546/196 305/548/196 +f 282/543/197 283/549/197 298/544/197 +f 290/546/197 291/551/197 306/547/197 +f 283/549/9 284/553/9 299/550/9 +f 291/551/9 292/555/9 307/552/9 +f 284/553/184 285/489/184 300/554/184 +f 336/622/198 320/557/198 337/559/198 +f 328/619/198 312/560/198 329/562/198 +f 307/526/191 308/563/191 323/527/191 +f 300/523/199 301/565/199 316/524/199 +f 308/563/199 309/567/199 324/564/199 +f 317/566/200 301/565/200 318/570/200 +f 325/568/200 309/567/200 326/572/200 +f 318/570/201 302/569/201 311/574/201 +f 311/574/202 295/573/202 312/560/202 +f 326/572/201 310/571/201 319/577/201 +f 319/577/202 303/576/202 320/579/202 +f 312/560/203 296/575/203 313/561/203 +f 320/579/203 304/578/203 321/582/203 +f 297/755/204 298/583/204 313/585/204 +f 305/756/204 306/586/204 321/587/204 +f 298/583/192 299/588/192 314/584/192 +f 357/656/205 341/589/205 358/591/205 +f 349/655/205 333/592/205 350/594/205 +f 313/757/206 314/595/206 329/597/206 +f 321/758/206 322/598/206 337/600/206 +f 314/595/207 315/601/207 330/596/207 +f 322/598/207 323/603/207 338/599/207 +f 315/601/208 316/605/208 331/602/208 +f 323/603/208 324/607/208 339/604/208 +f 316/605/209 317/609/209 332/606/209 +f 324/607/209 325/611/209 340/608/209 +f 333/610/210 317/609/210 334/614/210 +f 341/612/210 325/611/210 342/616/210 +f 334/614/211 318/613/211 327/618/211 +f 327/618/212 311/617/212 328/619/212 +f 342/616/211 326/615/211 335/621/211 +f 335/621/212 319/620/212 336/622/212 +f 363/684/93 347/623/93 364/625/93 +f 354/682/92 355/626/92 370/628/92 +f 350/594/213 334/593/213 343/630/213 +f 343/630/214 327/629/214 344/632/214 +f 358/591/213 342/590/213 351/634/213 +f 351/634/214 335/633/214 352/636/214 +f 344/632/215 328/631/215 345/638/215 +f 352/636/215 336/635/215 353/640/215 +f 329/759/216 330/641/216 345/643/216 +f 337/760/216 338/644/216 353/646/216 +f 330/641/217 331/647/217 346/642/217 +f 338/644/217 339/649/217 354/645/217 +f 331/647/218 332/651/218 347/648/218 +f 339/649/218 340/653/218 355/650/218 +f 332/651/219 333/592/219 348/652/219 +f 340/653/219 341/589/219 356/654/219 +f 371/627/93 355/626/93 372/658/93 +f 364/625/94 348/624/94 365/660/94 +f 372/658/94 356/657/94 373/662/94 +f 349/659/61 350/663/61 365/660/61 +f 357/661/61 358/665/61 373/662/61 +f 350/663/62 343/667/62 366/664/62 +f 359/668/65 343/667/65 360/670/65 +f 374/666/62 358/665/62 367/672/62 +f 351/671/65 352/673/65 367/672/65 +f 360/670/66 344/669/66 361/676/66 +f 368/674/66 352/673/66 369/678/66 +f 345/761/91 346/679/91 361/681/91 +f 353/762/91 354/682/91 369/683/91 +f 362/680/92 346/679/92 363/684/92 +f 376/763/1 378/685/1 375/687/1 +f 378/685/2 382/688/2 377/686/2 +f 382/688/3 380/690/3 381/689/3 +f 375/764/5 377/686/5 379/692/5 +f 380/765/6 382/688/6 376/693/6 +f 383/766/1 384/694/1 385/696/1 +f 386/695/2 390/697/2 385/699/2 +f 390/697/3 388/700/3 389/702/3 +f 388/700/157 384/694/157 387/704/157 +f 388/700/6 390/697/6 384/694/6 diff --git a/assets/hbm/models/turret_heavy_base.obj b/assets/hbm/models/turret_heavy_base.obj index 06f612958..a90b51be6 100644 --- a/assets/hbm/models/turret_heavy_base.obj +++ b/assets/hbm/models/turret_heavy_base.obj @@ -41,6 +41,86 @@ v -0.368061 0.125000 -0.212500 v -0.368061 0.250000 -0.212500 v -0.212500 0.125000 -0.368061 v -0.212500 0.250000 -0.368061 +vt 0.698520 0.032316 +vt 0.963791 0.164951 +vt 0.831156 0.430222 +vt 0.172997 0.501253 +vt 0.172997 0.454359 +vt 0.360572 0.454359 +vt 0.032316 0.172997 +vt 0.079210 0.172997 +vt 0.079210 0.360572 +vt 0.487518 0.139838 +vt 0.454359 0.172997 +vt 0.360572 0.079210 +vt 0.046051 0.393730 +vt 0.501253 0.360572 +vt 0.454359 0.360572 +vt 0.360572 0.032316 +vt 0.172997 0.079210 +vt 0.393731 0.487518 +vt 0.139839 0.046051 +vt 0.191950 0.920790 +vt 0.274481 0.920790 +vt 0.274481 0.967684 +vt 0.345955 0.879524 +vt 0.369402 0.920135 +vt 0.387221 0.808050 +vt 0.427832 0.831497 +vt 0.387221 0.725519 +vt 0.434115 0.725519 +vt 0.345955 0.654045 +vt 0.386567 0.630598 +vt 0.274481 0.612779 +vt 0.297928 0.572168 +vt 0.191950 0.612779 +vt 0.191950 0.565885 +vt 0.120476 0.654045 +vt 0.097029 0.613433 +vt 0.079210 0.725519 +vt 0.038599 0.702072 +vt 0.079210 0.808050 +vt 0.032316 0.808050 +vt 0.120475 0.879524 +vt 0.168503 0.961401 +vt 0.079864 0.902971 +vt 0.346504 0.404862 +vt 0.266784 0.426223 +vt 0.187065 0.404862 +vt 0.128707 0.346503 +vt 0.107346 0.266784 +vt 0.128707 0.187065 +vt 0.187065 0.128707 +vt 0.404862 0.346504 +vt 0.426223 0.266784 +vt 0.404862 0.187065 +vt 0.346504 0.128707 +vt 0.266785 0.107346 +vt 0.698520 0.430222 +vt 0.565885 0.297587 +vt 0.565885 0.164951 +vt 0.831156 0.032316 +vt 0.963791 0.297587 +vt 0.360572 0.501253 +vt 0.032316 0.360572 +vt 0.393731 0.046051 +vt 0.139838 0.487518 +vt 0.501253 0.172997 +vt 0.172997 0.032316 +vt 0.487518 0.393731 +vt 0.046051 0.139838 +vt 0.191950 0.967684 +vt 0.297928 0.961401 +vt 0.386567 0.902971 +vt 0.434115 0.808050 +vt 0.427832 0.702072 +vt 0.369402 0.613433 +vt 0.274481 0.565885 +vt 0.168503 0.572168 +vt 0.079864 0.630598 +vt 0.032316 0.725519 +vt 0.097029 0.920135 +vt 0.038599 0.831497 vn 0.000000 -1.000000 0.000000 vn 0.000000 0.000000 -1.000000 vn -1.000000 0.000000 0.000000 @@ -60,79 +140,79 @@ vn -0.965900 0.000000 -0.258800 vn 0.000000 1.000000 0.000000 vn -0.258800 0.000000 -0.965900 s off -f 2//1 5//1 8//1 -f 6//2 14//2 13//2 -f 1//3 10//3 9//3 -f 5//4 15//4 12//4 -f 3//5 9//5 14//5 -f 7//6 16//6 15//6 -f 4//7 12//7 11//7 -f 2//8 13//8 16//8 -f 8//9 11//9 10//9 -f 18//10 20//10 19//10 -f 20//8 22//8 21//8 -f 22//11 24//11 23//11 -f 24//12 26//12 25//12 -f 26//4 28//4 27//4 -f 28//13 30//13 29//13 -f 30//14 32//14 31//14 -f 32//9 34//9 33//9 -f 34//15 36//15 35//15 -f 36//16 38//16 37//16 -f 38//17 30//17 22//17 -f 40//18 18//18 17//18 -f 38//5 40//5 39//5 -f 16//17 13//17 19//17 -f 19//17 13//17 17//17 -f 13//17 14//17 17//17 -f 17//17 14//17 39//17 -f 9//17 37//17 39//17 -f 37//17 9//17 35//17 -f 9//17 10//17 35//17 -f 35//17 10//17 33//17 -f 11//17 31//17 33//17 -f 21//17 23//17 16//17 -f 15//17 25//17 27//17 -f 25//17 15//17 23//17 -f 15//17 16//17 23//17 -f 27//17 29//17 12//17 -f 31//17 11//17 29//17 -f 11//17 12//17 29//17 -f 8//1 1//1 3//1 -f 3//1 6//1 2//1 -f 2//1 7//1 5//1 -f 5//1 4//1 8//1 -f 8//1 3//1 2//1 -f 2//2 6//2 13//2 -f 3//3 1//3 9//3 -f 4//4 5//4 12//4 -f 6//5 3//5 14//5 -f 5//6 7//6 15//6 -f 8//7 4//7 11//7 -f 7//8 2//8 16//8 -f 1//9 8//9 10//9 -f 17//10 18//10 19//10 -f 19//8 20//8 21//8 -f 21//11 22//11 23//11 -f 23//12 24//12 25//12 -f 25//4 26//4 27//4 -f 27//13 28//13 29//13 -f 29//14 30//14 31//14 -f 31//9 32//9 33//9 -f 33//15 34//15 35//15 -f 35//16 36//16 37//16 -f 22//17 20//17 18//17 -f 18//17 40//17 22//17 -f 38//17 36//17 30//17 -f 34//17 32//17 30//17 -f 30//17 28//17 22//17 -f 26//17 24//17 22//17 -f 22//17 40//17 38//17 -f 36//17 34//17 30//17 -f 28//17 26//17 22//17 -f 39//18 40//18 17//18 -f 37//5 38//5 39//5 -f 21//17 16//17 19//17 -f 14//17 9//17 39//17 -f 10//17 11//17 33//17 -f 12//17 15//17 27//17 +f 2/1/1 5/2/1 8/3/1 +f 6/4/2 14/5/2 13/6/2 +f 1/7/3 10/8/3 9/9/3 +f 5/10/4 15/11/4 12/12/4 +f 3/13/5 9/9/5 14/5/5 +f 7/14/6 16/15/6 15/11/6 +f 4/16/7 12/12/7 11/17/7 +f 2/18/8 13/6/8 16/15/8 +f 8/19/9 11/17/9 10/8/9 +f 18/20/10 20/21/10 19/22/10 +f 20/21/8 22/23/8 21/24/8 +f 22/23/11 24/25/11 23/26/11 +f 24/25/12 26/27/12 25/28/12 +f 26/27/4 28/29/4 27/30/4 +f 28/29/13 30/31/13 29/32/13 +f 30/31/14 32/33/14 31/34/14 +f 32/33/9 34/35/9 33/36/9 +f 34/35/15 36/37/15 35/38/15 +f 36/37/16 38/39/16 37/40/16 +f 38/39/17 30/31/17 22/23/17 +f 40/41/18 18/20/18 17/42/18 +f 38/39/5 40/41/5 39/43/5 +f 16/15/17 13/6/17 19/44/17 +f 19/44/17 13/6/17 17/45/17 +f 13/6/17 14/5/17 17/45/17 +f 17/45/17 14/5/17 39/46/17 +f 9/9/17 37/47/17 39/46/17 +f 37/47/17 9/9/17 35/48/17 +f 9/9/17 10/8/17 35/48/17 +f 35/48/17 10/8/17 33/49/17 +f 11/17/17 31/50/17 33/49/17 +f 21/51/17 23/52/17 16/15/17 +f 15/11/17 25/53/17 27/54/17 +f 25/53/17 15/11/17 23/52/17 +f 15/11/17 16/15/17 23/52/17 +f 27/54/17 29/55/17 12/12/17 +f 31/50/17 11/17/17 29/55/17 +f 11/17/17 12/12/17 29/55/17 +f 8/3/1 1/56/1 3/57/1 +f 3/57/1 6/58/1 2/1/1 +f 2/1/1 7/59/1 5/2/1 +f 5/2/1 4/60/1 8/3/1 +f 8/3/1 3/57/1 2/1/1 +f 2/61/2 6/4/2 13/6/2 +f 3/62/3 1/7/3 9/9/3 +f 4/63/4 5/10/4 12/12/4 +f 6/64/5 3/13/5 14/5/5 +f 5/65/6 7/14/6 15/11/6 +f 8/66/7 4/16/7 11/17/7 +f 7/67/8 2/18/8 16/15/8 +f 1/68/9 8/19/9 10/8/9 +f 17/69/10 18/20/10 19/22/10 +f 19/70/8 20/21/8 21/24/8 +f 21/71/11 22/23/11 23/26/11 +f 23/72/12 24/25/12 25/28/12 +f 25/73/4 26/27/4 27/30/4 +f 27/74/13 28/29/13 29/32/13 +f 29/75/14 30/31/14 31/34/14 +f 31/76/9 32/33/9 33/36/9 +f 33/77/15 34/35/15 35/38/15 +f 35/78/16 36/37/16 37/40/16 +f 22/23/17 20/21/17 18/20/17 +f 18/20/17 40/41/17 22/23/17 +f 38/39/17 36/37/17 30/31/17 +f 34/35/17 32/33/17 30/31/17 +f 30/31/17 28/29/17 22/23/17 +f 26/27/17 24/25/17 22/23/17 +f 22/23/17 40/41/17 38/39/17 +f 36/37/17 34/35/17 30/31/17 +f 28/29/17 26/27/17 22/23/17 +f 39/79/18 40/41/18 17/42/18 +f 37/80/5 38/39/5 39/43/5 +f 21/51/17 16/15/17 19/44/17 +f 14/5/17 9/9/17 39/46/17 +f 10/8/17 11/17/17 33/49/17 +f 12/12/17 15/11/17 27/54/17 diff --git a/assets/hbm/models/turret_heavy_gun.obj b/assets/hbm/models/turret_heavy_gun.obj index bcfcbbed3..b4eafcede 100644 --- a/assets/hbm/models/turret_heavy_gun.obj +++ b/assets/hbm/models/turret_heavy_gun.obj @@ -109,6 +109,180 @@ v -0.075000 0.554834 0.137964 v -0.075000 0.734018 -0.328826 v 0.075000 0.734018 -0.328826 v 0.075000 0.554834 0.137964 +vt 0.433336 0.891529 +vt 0.433336 0.871043 +vt 0.767919 0.871043 +vt 0.433336 0.850557 +vt 0.767919 0.850557 +vt 0.433336 0.830070 +vt 0.767919 0.830070 +vt 0.433336 0.809584 +vt 0.767919 0.809584 +vt 0.433337 0.973475 +vt 0.433337 0.952988 +vt 0.767919 0.952988 +vt 0.433336 0.932502 +vt 0.767919 0.932502 +vt 0.433336 0.912016 +vt 0.767919 0.891529 +vt 0.767919 0.912015 +vt 0.880596 0.024656 +vt 0.892961 0.019535 +vt 0.892961 0.050264 +vt 0.880596 0.198789 +vt 0.880596 0.178303 +vt 0.892961 0.173182 +vt 0.260434 0.695260 +vt 0.260434 0.775560 +vt 0.153367 0.775559 +vt 0.892961 0.111723 +vt 0.959877 0.111723 +vt 0.959877 0.142452 +vt 0.153368 0.426926 +vt 0.153368 0.293093 +vt 0.260434 0.293093 +vt 0.153368 0.019535 +vt 0.260434 0.019535 +vt 0.260434 0.159260 +vt 0.153367 0.695260 +vt 0.153368 0.560759 +vt 0.260434 0.560759 +vt 0.153368 0.159260 +vt 0.260434 0.426926 +vt 0.394267 0.560759 +vt 0.059684 0.694592 +vt 0.019535 0.560759 +vt 0.880596 0.106601 +vt 0.880596 0.086115 +vt 0.892961 0.080993 +vt 0.880596 0.239762 +vt 0.892961 0.234640 +vt 0.892961 0.265370 +vt 0.880596 0.168060 +vt 0.880596 0.147574 +vt 0.892961 0.142452 +vt 0.880596 0.116844 +vt 0.880596 0.055386 +vt 0.880596 0.209033 +vt 0.892961 0.203911 +vt 0.959877 0.173182 +vt 0.959877 0.234640 +vt 0.959877 0.265370 +vt 0.959877 0.050264 +vt 0.959877 0.080993 +vt 0.959877 0.203911 +vt 0.959877 0.019535 +vt 0.637432 0.148299 +vt 0.567169 0.168207 +vt 0.530686 0.039442 +vt 0.637432 0.227930 +vt 0.567169 0.208022 +vt 0.600948 0.356694 +vt 0.530686 0.336786 +vt 0.433336 0.208022 +vt 0.771265 0.148299 +vt 0.806396 0.208189 +vt 0.771265 0.227929 +vt 0.792201 0.202309 +vt 0.393186 0.829994 +vt 0.259353 0.829994 +vt 0.259353 0.814629 +vt 0.786321 0.188114 +vt 0.792201 0.173919 +vt 0.393186 0.845358 +vt 0.259353 0.845358 +vt 0.806396 0.168039 +vt 0.393186 0.860723 +vt 0.259353 0.860723 +vt 0.820591 0.202309 +vt 0.841527 0.208022 +vt 0.393186 0.876088 +vt 0.259353 0.876088 +vt 0.826471 0.188114 +vt 0.393186 0.891452 +vt 0.259353 0.891453 +vt 0.841527 0.168206 +vt 0.393186 0.906817 +vt 0.259353 0.906817 +vt 0.820591 0.173919 +vt 0.393186 0.922182 +vt 0.393186 0.937547 +vt 0.259353 0.937547 +vt 0.259353 0.922182 +vt 0.220284 0.937547 +vt 0.220284 0.958033 +vt 0.019535 0.958033 +vt 0.220284 0.978519 +vt 0.019535 0.978519 +vt 0.220284 0.814629 +vt 0.220284 0.835115 +vt 0.019535 0.835115 +vt 0.220284 0.855602 +vt 0.019535 0.855602 +vt 0.220284 0.876088 +vt 0.019535 0.876088 +vt 0.220284 0.896574 +vt 0.019535 0.896574 +vt 0.220284 0.917060 +vt 0.019535 0.937547 +vt 0.019535 0.917060 +vt 0.819866 0.422530 +vt 0.819866 0.529596 +vt 0.793099 0.529596 +vt 0.953699 0.422530 +vt 0.953699 0.529596 +vt 0.980465 0.422530 +vt 0.980465 0.529596 +vt 0.819866 0.663429 +vt 0.819866 0.556363 +vt 0.953699 0.556363 +vt 0.819866 0.395763 +vt 0.676377 0.687137 +vt 0.708754 0.557280 +vt 0.754030 0.574125 +vt 0.573608 0.444071 +vt 0.573608 0.395763 +vt 0.613758 0.395763 +vt 0.510989 0.687137 +vt 0.481298 0.699069 +vt 0.433336 0.574125 +vt 0.613758 0.738516 +vt 0.613758 0.770515 +vt 0.573608 0.770515 +vt 0.613758 0.444071 +vt 0.613758 0.492378 +vt 0.573608 0.492378 +vt 0.573608 0.706517 +vt 0.573608 0.674519 +vt 0.613758 0.674519 +vt 0.478612 0.557280 +vt 0.525602 0.546078 +vt 0.541913 0.678913 +vt 0.645454 0.678913 +vt 0.573608 0.738516 +vt 0.613758 0.706517 +vt 0.573608 0.540686 +vt 0.613758 0.540686 +vt 0.661764 0.546078 +vt 0.767919 0.973474 +vt 0.880596 0.045142 +vt 0.354117 0.694592 +vt 0.273817 0.694592 +vt 0.394267 0.426926 +vt 0.019535 0.426926 +vt 0.139984 0.694592 +vt 0.880596 0.260248 +vt 0.880596 0.137331 +vt 0.880596 0.075872 +vt 0.880596 0.229519 +vt 0.600948 0.019535 +vt 0.433336 0.168207 +vt 0.393186 0.814629 +vt 0.019535 0.814629 +vt 0.793099 0.422530 +vt 0.953699 0.663429 +vt 0.953699 0.395763 +vt 0.706068 0.699069 vn 0.382700 0.923900 -0.000000 vn 0.923900 0.382700 -0.000000 vn 0.923900 -0.382700 0.000000 @@ -143,165 +317,163 @@ vn 0.000000 -0.106400 0.994300 vn 0.000000 0.933600 0.358400 vn 0.000000 0.251900 -0.967700 s off -f 2//1 4//1 3//1 -f 4//2 6//2 5//2 -f 6//3 8//3 7//3 -f 8//4 10//4 9//4 -f 10//5 12//5 11//5 -f 12//6 14//6 13//6 -f 16//7 2//7 1//7 -f 14//8 16//8 15//8 -f 9//9 33//9 32//9 -f 13//9 15//9 36//9 -f 24//10 23//10 19//10 -f 30//1 37//1 39//1 -f 18//9 17//9 21//9 -f 19//11 23//11 28//11 -f 24//12 20//12 25//12 -f 27//13 25//13 18//13 -f 26//14 28//14 21//14 -f 27//15 22//15 28//15 -f 25//16 19//16 26//16 -f 3//9 5//9 31//9 -f 11//9 34//9 33//9 -f 15//9 1//9 29//9 -f 3//9 30//9 29//9 -f 7//9 32//9 31//9 -f 13//9 35//9 34//9 -f 35//8 36//8 44//8 -f 34//5 42//5 41//5 -f 32//3 40//3 38//3 -f 31//2 38//2 37//2 -f 29//7 39//7 44//7 -f 34//6 35//6 43//6 -f 33//4 41//4 40//4 -f 48//17 47//17 45//17 -f 52//10 51//10 47//10 -f 50//18 49//18 51//18 -f 47//14 51//14 49//14 -f 52//13 48//13 46//13 -f 58//9 50//9 56//9 -f 55//5 56//5 54//5 -f 54//9 46//9 68//9 -f 57//6 58//6 56//6 -f 68//9 46//9 66//9 -f 59//8 60//8 58//8 -f 58//9 60//9 49//9 -f 61//7 62//7 60//7 -f 60//9 62//9 49//9 -f 63//1 64//1 62//1 -f 50//9 46//9 54//9 -f 45//9 49//9 62//9 -f 65//2 66//2 64//2 -f 62//9 64//9 45//9 -f 67//4 53//4 54//4 -f 67//3 68//3 66//3 -f 56//9 50//9 54//9 -f 45//9 64//9 66//9 -f 70//19 72//19 71//19 -f 72//20 74//20 73//20 -f 74//21 76//21 75//21 -f 76//22 78//22 77//22 -f 78//23 80//23 79//23 -f 80//24 82//24 81//24 -f 84//25 70//25 69//25 -f 82//26 84//26 83//26 -f 88//16 87//16 85//16 -f 92//10 91//10 87//10 -f 90//15 89//15 91//15 -f 86//9 85//9 89//9 -f 87//14 91//14 89//14 -f 92//13 88//13 86//13 -f 94//16 96//16 95//16 -f 100//27 99//27 95//27 -f 98//15 97//15 99//15 -f 94//28 93//28 97//28 -f 95//14 99//14 97//14 -f 96//29 102//29 103//29 -f 104//30 108//30 105//30 -f 100//15 103//15 104//15 -f 96//16 94//16 101//16 -f 98//31 104//31 101//31 -f 107//32 106//32 105//32 -f 102//33 106//33 107//33 -f 103//15 107//15 108//15 -f 102//16 101//16 105//16 -f 1//1 2//1 3//1 -f 3//2 4//2 5//2 -f 5//3 6//3 7//3 -f 7//4 8//4 9//4 -f 9//5 10//5 11//5 -f 11//6 12//6 13//6 -f 15//7 16//7 1//7 -f 13//8 14//8 15//8 -f 7//9 9//9 32//9 -f 35//9 13//9 36//9 -f 20//10 24//10 19//10 -f 29//1 30//1 39//1 -f 22//9 18//9 21//9 -f 26//11 19//11 28//11 -f 27//12 24//12 25//12 -f 22//13 27//13 18//13 -f 17//14 26//14 21//14 -f 28//15 23//15 27//15 -f 24//15 27//15 23//15 -f 22//15 21//15 28//15 -f 26//16 17//16 18//16 -f 18//16 25//16 26//16 -f 20//16 19//16 25//16 -f 30//9 3//9 31//9 -f 9//9 11//9 33//9 -f 36//9 15//9 29//9 -f 1//9 3//9 29//9 -f 5//9 7//9 31//9 -f 11//9 13//9 34//9 -f 43//8 35//8 44//8 -f 33//5 34//5 41//5 -f 31//3 32//3 38//3 -f 30//2 31//2 37//2 -f 36//7 29//7 44//7 -f 42//6 34//6 43//6 -f 32//4 33//4 40//4 -f 46//17 48//17 45//17 -f 48//10 52//10 47//10 -f 52//18 50//18 51//18 -f 45//14 47//14 49//14 -f 50//13 52//13 46//13 -f 53//5 55//5 54//5 -f 55//6 57//6 56//6 -f 57//8 59//8 58//8 -f 50//9 58//9 49//9 -f 59//7 61//7 60//7 -f 61//1 63//1 62//1 -f 63//2 65//2 64//2 -f 68//4 67//4 54//4 -f 65//3 67//3 66//3 -f 46//9 45//9 66//9 -f 69//19 70//19 71//19 -f 71//20 72//20 73//20 -f 73//21 74//21 75//21 -f 75//22 76//22 77//22 -f 77//23 78//23 79//23 -f 79//24 80//24 81//24 -f 83//25 84//25 69//25 -f 81//26 82//26 83//26 -f 86//16 88//16 85//16 -f 88//10 92//10 87//10 -f 92//15 90//15 91//15 -f 90//9 86//9 89//9 -f 85//14 87//14 89//14 -f 90//13 92//13 86//13 -f 93//16 94//16 95//16 -f 96//27 100//27 95//27 -f 100//15 98//15 99//15 -f 98//28 94//28 97//28 -f 93//14 95//14 97//14 -f 100//29 96//29 103//29 -f 101//30 104//30 105//30 -f 98//15 100//15 104//15 -f 102//16 96//16 101//16 -f 94//31 98//31 101//31 -f 108//32 107//32 105//32 -f 103//33 102//33 107//33 -f 104//15 103//15 108//15 -f 106//16 102//16 105//16 +f 2/1/1 4/2/1 3/3/1 +f 4/2/2 6/4/2 5/5/2 +f 6/4/3 8/6/3 7/7/3 +f 8/6/4 10/8/4 9/9/4 +f 10/10/5 12/11/5 11/12/5 +f 12/11/6 14/13/6 13/14/6 +f 16/15/7 2/1/7 1/16/7 +f 14/13/8 16/15/8 15/17/8 +f 9/18/9 33/19/9 32/20/9 +f 13/21/9 15/22/9 36/23/9 +f 24/24/10 23/25/10 19/26/10 +f 30/27/1 37/28/1 39/29/1 +f 18/30/9 17/31/9 21/32/9 +f 19/33/11 23/34/11 28/35/11 +f 24/24/12 20/36/12 25/37/12 +f 27/38/13 25/37/13 18/30/13 +f 26/39/14 28/35/14 21/32/14 +f 27/38/15 22/40/15 28/41/15 +f 25/37/16 19/42/16 26/43/16 +f 3/44/9 5/45/9 31/46/9 +f 11/47/9 34/48/9 33/49/9 +f 15/50/9 1/51/9 29/52/9 +f 3/53/9 30/27/9 29/52/9 +f 7/54/9 32/20/9 31/46/9 +f 13/55/9 35/56/9 34/48/9 +f 35/56/8 36/23/8 44/57/8 +f 34/48/5 42/58/5 41/59/5 +f 32/20/3 40/60/3 38/61/3 +f 31/46/2 38/61/2 37/28/2 +f 29/52/7 39/29/7 44/57/7 +f 34/48/6 35/56/6 43/62/6 +f 33/19/4 41/63/4 40/60/4 +f 48/64/17 47/65/17 45/66/17 +f 52/67/10 51/68/10 47/65/10 +f 50/69/18 49/70/18 51/68/18 +f 47/65/14 51/68/14 49/71/14 +f 52/67/13 48/64/13 46/72/13 +f 58/73/9 50/74/9 56/75/9 +f 55/76/5 56/77/5 54/78/5 +f 54/79/9 46/72/9 68/80/9 +f 57/81/6 58/82/6 56/77/6 +f 68/80/9 46/72/9 66/83/9 +f 59/84/8 60/85/8 58/82/8 +f 58/73/9 60/86/9 49/87/9 +f 61/88/7 62/89/7 60/85/7 +f 60/86/9 62/90/9 49/87/9 +f 63/91/1 64/92/1 62/89/1 +f 50/74/9 46/72/9 54/79/9 +f 45/93/9 49/87/9 62/90/9 +f 65/94/2 66/95/2 64/92/2 +f 62/90/9 64/96/9 45/93/9 +f 67/97/4 53/98/4 54/99/4 +f 67/97/3 68/100/3 66/95/3 +f 56/75/9 50/74/9 54/79/9 +f 45/93/9 64/96/9 66/83/9 +f 70/101/19 72/102/19 71/103/19 +f 72/102/20 74/104/20 73/105/20 +f 74/106/21 76/107/21 75/108/21 +f 76/107/22 78/109/22 77/110/22 +f 78/109/23 80/111/23 79/112/23 +f 80/111/24 82/113/24 81/114/24 +f 84/115/25 70/101/25 69/116/25 +f 82/113/26 84/115/26 83/117/26 +f 88/118/16 87/119/16 85/120/16 +f 92/121/10 91/122/10 87/119/10 +f 90/123/15 89/124/15 91/122/15 +f 86/125/9 85/126/9 89/127/9 +f 87/119/14 91/122/14 89/127/14 +f 92/121/13 88/118/13 86/128/13 +f 94/129/16 96/130/16 95/131/16 +f 100/132/27 99/133/27 95/134/27 +f 98/135/15 97/136/15 99/137/15 +f 94/138/28 93/139/28 97/140/28 +f 96/141/29 102/142/29 103/143/29 +f 104/144/30 108/145/30 105/146/30 +f 100/147/15 103/148/15 104/149/15 +f 96/130/16 94/129/16 101/150/16 +f 98/151/31 104/144/31 101/152/31 +f 107/153/32 106/154/32 105/146/32 +f 102/142/33 106/154/33 107/153/33 +f 103/148/15 107/153/15 108/145/15 +f 102/155/16 101/150/16 105/146/16 +f 1/16/1 2/1/1 3/3/1 +f 3/3/2 4/2/2 5/5/2 +f 5/5/3 6/4/3 7/7/3 +f 7/7/4 8/6/4 9/9/4 +f 9/156/5 10/10/5 11/12/5 +f 11/12/6 12/11/6 13/14/6 +f 15/17/7 16/15/7 1/16/7 +f 13/14/8 14/13/8 15/17/8 +f 7/157/9 9/18/9 32/20/9 +f 35/56/9 13/21/9 36/23/9 +f 20/36/10 24/24/10 19/26/10 +f 29/52/1 30/27/1 39/29/1 +f 22/40/9 18/30/9 21/32/9 +f 26/39/11 19/33/11 28/35/11 +f 27/38/12 24/24/12 25/37/12 +f 22/40/13 27/38/13 18/30/13 +f 17/31/14 26/39/14 21/32/14 +f 28/41/15 23/158/15 27/38/15 +f 24/159/15 27/38/15 23/158/15 +f 22/40/15 21/160/15 28/41/15 +f 26/43/16 17/161/16 18/30/16 +f 18/30/16 25/37/16 26/43/16 +f 20/162/16 19/42/16 25/37/16 +f 30/27/9 3/44/9 31/46/9 +f 9/163/9 11/47/9 33/49/9 +f 36/23/9 15/50/9 29/52/9 +f 1/164/9 3/53/9 29/52/9 +f 5/165/9 7/54/9 31/46/9 +f 11/166/9 13/55/9 34/48/9 +f 43/62/8 35/56/8 44/57/8 +f 33/49/5 34/48/5 41/59/5 +f 31/46/3 32/20/3 38/61/3 +f 30/27/2 31/46/2 37/28/2 +f 36/23/7 29/52/7 44/57/7 +f 42/58/6 34/48/6 43/62/6 +f 32/20/4 33/19/4 40/60/4 +f 46/167/17 48/64/17 45/66/17 +f 48/64/10 52/67/10 47/65/10 +f 52/67/18 50/69/18 51/68/18 +f 45/168/14 47/65/14 49/71/14 +f 50/74/13 52/67/13 46/72/13 +f 53/169/5 55/76/5 54/78/5 +f 55/76/6 57/81/6 56/77/6 +f 57/81/8 59/84/8 58/82/8 +f 50/74/9 58/73/9 49/87/9 +f 59/84/7 61/88/7 60/85/7 +f 61/88/1 63/91/1 62/89/1 +f 63/91/2 65/94/2 64/92/2 +f 68/100/4 67/97/4 54/99/4 +f 65/94/3 67/97/3 66/95/3 +f 46/72/9 45/93/9 66/83/9 +f 69/116/19 70/101/19 71/103/19 +f 71/103/20 72/102/20 73/105/20 +f 73/170/21 74/106/21 75/108/21 +f 75/108/22 76/107/22 77/110/22 +f 77/110/23 78/109/23 79/112/23 +f 79/112/24 80/111/24 81/114/24 +f 83/117/25 84/115/25 69/116/25 +f 81/114/26 82/113/26 83/117/26 +f 86/171/16 88/118/16 85/120/16 +f 88/118/10 92/121/10 87/119/10 +f 92/121/15 90/123/15 91/122/15 +f 90/172/9 86/125/9 89/127/9 +f 85/126/14 87/119/14 89/127/14 +f 90/173/13 92/121/13 86/128/13 +f 93/174/16 94/129/16 95/131/16 +f 96/141/27 100/132/27 95/134/27 +f 100/147/15 98/135/15 99/137/15 +f 98/151/28 94/138/28 97/140/28 +f 100/132/29 96/141/29 103/143/29 +f 101/152/30 104/144/30 105/146/30 +f 98/135/15 100/147/15 104/149/15 +f 102/155/16 96/130/16 101/150/16 +f 94/138/31 98/151/31 101/152/31 +f 108/145/32 107/153/32 105/146/32 +f 103/143/33 102/142/33 107/153/33 +f 104/149/15 103/148/15 108/145/15 +f 106/154/16 102/155/16 105/146/16 diff --git a/assets/hbm/models/turret_heavy_rotor.obj b/assets/hbm/models/turret_heavy_rotor.obj index 183be7c1e..307fc5a6f 100644 --- a/assets/hbm/models/turret_heavy_rotor.obj +++ b/assets/hbm/models/turret_heavy_rotor.obj @@ -65,6 +65,106 @@ v 0.200000 0.507596 0.386824 v 0.700000 0.507596 0.386824 v 0.200000 1.492404 0.213176 v 0.700000 1.342404 0.213176 +vt 0.471550 0.978182 +vt 0.442112 0.981045 +vt 0.442112 0.962420 +vt 0.412674 0.978182 +vt 0.412674 0.959558 +vt 0.752477 0.642507 +vt 0.780414 0.671715 +vt 0.429349 0.671715 +vt 0.797175 0.700923 +vt 0.429349 0.700923 +vt 0.801831 0.730131 +vt 0.429349 0.730131 +vt 0.797175 0.759339 +vt 0.429349 0.759339 +vt 0.780413 0.788547 +vt 0.429349 0.788547 +vt 0.752477 0.817754 +vt 0.018956 0.516973 +vt 0.018956 0.487765 +vt 0.386782 0.487765 +vt 0.391438 0.516973 +vt 0.386782 0.546181 +vt 0.018956 0.546180 +vt 0.370020 0.575389 +vt 0.018955 0.575388 +vt 0.342084 0.604596 +vt 0.018955 0.671715 +vt 0.018955 0.642508 +vt 0.342084 0.642507 +vt 0.018955 0.700923 +vt 0.370020 0.671715 +vt 0.018956 0.730131 +vt 0.386782 0.700923 +vt 0.391438 0.730131 +vt 0.386782 0.759339 +vt 0.018956 0.759339 +vt 0.370020 0.788547 +vt 0.018956 0.788546 +vt 0.342084 0.817754 +vt 0.752477 0.429349 +vt 0.780414 0.458557 +vt 0.429349 0.458557 +vt 0.797175 0.487765 +vt 0.429349 0.487765 +vt 0.801831 0.516972 +vt 0.429349 0.516973 +vt 0.797175 0.546180 +vt 0.429349 0.546181 +vt 0.780413 0.575388 +vt 0.429349 0.575389 +vt 0.752478 0.604596 +vt 0.380083 0.969703 +vt 0.380083 0.951079 +vt 0.342084 0.955935 +vt 0.342084 0.937311 +vt 0.018955 0.937311 +vt 0.018955 0.458557 +vt 0.018955 0.429349 +vt 0.342084 0.429349 +vt 0.370020 0.458557 +vt 0.471550 0.959558 +vt 0.504140 0.951079 +vt 0.504140 0.969703 +vt 0.542140 0.937311 +vt 0.542140 0.955935 +vt 0.865269 0.937310 +vt 0.542140 0.899399 +vt 0.542140 0.880775 +vt 0.865269 0.880774 +vt 0.504141 0.885631 +vt 0.504141 0.867006 +vt 0.471550 0.877152 +vt 0.471550 0.858528 +vt 0.442112 0.874289 +vt 0.442112 0.855665 +vt 0.412674 0.877152 +vt 0.412674 0.858528 +vt 0.380084 0.885631 +vt 0.380084 0.867007 +vt 0.342084 0.899399 +vt 0.342084 0.880775 +vt 0.018955 0.899399 +vt 0.205197 0.018955 +vt 0.205493 0.391438 +vt 0.018955 0.336563 +vt 0.243700 0.018955 +vt 0.429942 0.018955 +vt 0.429942 0.336563 +vt 0.429349 0.642507 +vt 0.429349 0.817754 +vt 0.018955 0.604596 +vt 0.018955 0.817754 +vt 0.429349 0.429349 +vt 0.429349 0.604596 +vt 0.018955 0.955935 +vt 0.865269 0.955935 +vt 0.865269 0.899399 +vt 0.018955 0.880775 +vt 0.018955 0.018955 +vt 0.243404 0.391438 vn 0.000000 0.987400 0.158200 vn 0.000000 0.987400 -0.158200 vn 0.881900 -0.000000 -0.471400 @@ -89,87 +189,87 @@ vn -0.052000 0.173400 0.983500 vn 0.000000 0.203700 0.979000 vn 0.052000 0.173400 0.983500 s off -f 12//1 10//1 27//1 -f 8//2 29//2 27//2 -f 4//3 6//3 5//3 -f 6//4 8//4 7//4 -f 8//5 10//5 9//5 -f 9//6 10//6 12//6 -f 11//7 12//7 14//7 -f 13//8 14//8 16//8 -f 54//6 52//6 51//6 -f 54//5 53//5 55//5 -f 56//4 55//4 17//4 -f 18//3 17//3 19//3 -f 24//9 22//9 21//9 -f 26//10 24//10 23//10 -f 28//11 26//11 25//11 -f 28//12 27//12 29//12 -f 30//13 29//13 31//13 -f 32//14 31//14 33//14 -f 36//14 38//14 37//14 -f 38//13 40//13 39//13 -f 40//12 42//12 41//12 -f 41//11 42//11 44//11 -f 43//10 44//10 46//10 -f 45//9 46//9 48//9 -f 6//15 31//15 29//15 -f 4//16 33//16 31//16 -f 34//17 33//17 4//17 -f 50//8 2//8 1//8 -f 52//7 50//7 49//7 -f 25//18 23//18 14//18 -f 23//19 21//19 16//19 -f 16//20 21//20 22//20 -f 19//20 36//20 35//20 -f 17//19 38//19 36//19 -f 55//18 40//18 38//18 -f 53//1 42//1 40//1 -f 53//2 51//2 44//2 -f 51//15 49//15 46//15 -f 49//16 1//16 48//16 -f 48//17 1//17 2//17 -f 58//21 60//21 59//21 -f 61//22 62//22 64//22 -f 25//1 12//1 27//1 -f 10//2 8//2 27//2 -f 3//3 4//3 5//3 -f 5//4 6//4 7//4 -f 7//5 8//5 9//5 -f 11//6 9//6 12//6 -f 13//7 11//7 14//7 -f 15//8 13//8 16//8 -f 53//6 54//6 51//6 -f 56//5 54//5 55//5 -f 18//4 56//4 17//4 -f 20//3 18//3 19//3 -f 23//9 24//9 21//9 -f 25//10 26//10 23//10 -f 27//11 28//11 25//11 -f 30//12 28//12 29//12 -f 32//13 30//13 31//13 -f 34//14 32//14 33//14 -f 35//14 36//14 37//14 -f 37//13 38//13 39//13 -f 39//12 40//12 41//12 -f 43//11 41//11 44//11 -f 45//10 43//10 46//10 -f 47//9 45//9 48//9 -f 8//15 6//15 29//15 -f 6//16 4//16 31//16 -f 3//17 34//17 4//17 -f 49//8 50//8 1//8 -f 51//7 52//7 49//7 -f 12//18 25//18 14//18 -f 14//19 23//19 16//19 -f 15//20 16//20 22//20 -f 20//20 19//20 35//20 -f 19//19 17//19 36//19 -f 17//18 55//18 38//18 -f 55//1 53//1 40//1 -f 42//2 53//2 44//2 -f 44//15 51//15 46//15 -f 46//16 49//16 48//16 -f 47//17 48//17 2//17 -f 57//22 58//22 59//22 -f 63//23 61//23 64//23 +f 12/1/1 10/2/1 27/3/1 +f 8/4/2 29/5/2 27/3/2 +f 4/6/3 6/7/3 5/8/3 +f 6/7/4 8/9/4 7/10/4 +f 8/9/5 10/11/5 9/12/5 +f 9/12/6 10/11/6 12/13/6 +f 11/14/7 12/13/7 14/15/7 +f 13/16/8 14/15/8 16/17/8 +f 54/18/6 52/19/6 51/20/6 +f 54/18/5 53/21/5 55/22/5 +f 56/23/4 55/22/4 17/24/4 +f 18/25/3 17/24/3 19/26/3 +f 24/27/9 22/28/9 21/29/9 +f 26/30/10 24/27/10 23/31/10 +f 28/32/11 26/30/11 25/33/11 +f 28/32/12 27/34/12 29/35/12 +f 30/36/13 29/35/13 31/37/13 +f 32/38/14 31/37/14 33/39/14 +f 36/40/14 38/41/14 37/42/14 +f 38/41/13 40/43/13 39/44/13 +f 40/43/12 42/45/12 41/46/12 +f 41/46/11 42/45/11 44/47/11 +f 43/48/10 44/47/10 46/49/10 +f 45/50/9 46/49/9 48/51/9 +f 6/52/15 31/53/15 29/5/15 +f 4/54/16 33/55/16 31/53/16 +f 34/56/17 33/55/17 4/54/17 +f 50/57/8 2/58/8 1/59/8 +f 52/19/7 50/57/7 49/60/7 +f 25/61/18 23/62/18 14/63/18 +f 23/62/19 21/64/19 16/65/19 +f 16/65/20 21/64/20 22/66/20 +f 19/67/20 36/68/20 35/69/20 +f 17/70/19 38/71/19 36/68/19 +f 55/72/18 40/73/18 38/71/18 +f 53/74/1 42/75/1 40/73/1 +f 53/74/2 51/76/2 44/77/2 +f 51/76/15 49/78/15 46/79/15 +f 49/78/16 1/80/16 48/81/16 +f 48/81/17 1/80/17 2/82/17 +f 58/83/21 60/84/21 59/85/21 +f 61/86/22 62/87/22 64/88/22 +f 25/61/1 12/1/1 27/3/1 +f 10/2/2 8/4/2 27/3/2 +f 3/89/3 4/6/3 5/8/3 +f 5/8/4 6/7/4 7/10/4 +f 7/10/5 8/9/5 9/12/5 +f 11/14/6 9/12/6 12/13/6 +f 13/16/7 11/14/7 14/15/7 +f 15/90/8 13/16/8 16/17/8 +f 53/21/6 54/18/6 51/20/6 +f 56/23/5 54/18/5 55/22/5 +f 18/25/4 56/23/4 17/24/4 +f 20/91/3 18/25/3 19/26/3 +f 23/31/9 24/27/9 21/29/9 +f 25/33/10 26/30/10 23/31/10 +f 27/34/11 28/32/11 25/33/11 +f 30/36/12 28/32/12 29/35/12 +f 32/38/13 30/36/13 31/37/13 +f 34/92/14 32/38/14 33/39/14 +f 35/93/14 36/40/14 37/42/14 +f 37/42/13 38/41/13 39/44/13 +f 39/44/12 40/43/12 41/46/12 +f 43/48/11 41/46/11 44/47/11 +f 45/50/10 43/48/10 46/49/10 +f 47/94/9 45/50/9 48/51/9 +f 8/4/15 6/52/15 29/5/15 +f 6/52/16 4/54/16 31/53/16 +f 3/95/17 34/56/17 4/54/17 +f 49/60/8 50/57/8 1/59/8 +f 51/20/7 52/19/7 49/60/7 +f 12/1/18 25/61/18 14/63/18 +f 14/63/19 23/62/19 16/65/19 +f 15/96/20 16/65/20 22/66/20 +f 20/97/20 19/67/20 35/69/20 +f 19/67/19 17/70/19 36/68/19 +f 17/70/18 55/72/18 38/71/18 +f 55/72/1 53/74/1 40/73/1 +f 42/75/2 53/74/2 44/77/2 +f 44/77/15 51/76/15 46/79/15 +f 46/79/16 49/78/16 48/81/16 +f 47/98/17 48/81/17 2/82/17 +f 57/99/22 58/83/22 59/85/22 +f 63/100/23 61/86/23 64/88/23 diff --git a/assets/hbm/models/turret_light_gun.obj b/assets/hbm/models/turret_light_gun.obj index 358d6828c..a8504b499 100644 --- a/assets/hbm/models/turret_light_gun.obj +++ b/assets/hbm/models/turret_light_gun.obj @@ -129,6 +129,216 @@ v -0.375000 0.100000 -0.000000 v 0.375000 0.100000 -0.000000 v -0.375000 0.070711 -0.070711 v 0.375000 0.070711 -0.070711 +vt 0.409216 0.148396 +vt 0.409216 0.246203 +vt 0.148396 0.246203 +vt 0.507024 0.246204 +vt 0.507024 0.148396 +vt 0.769874 0.148396 +vt 0.148396 0.148396 +vt 0.138615 0.167957 +vt 0.044067 0.167957 +vt 0.148396 0.017985 +vt 0.409216 0.050588 +vt 0.409216 0.344011 +vt 0.260057 0.412584 +vt 0.260057 0.575597 +vt 0.181811 0.575597 +vt 0.138615 0.226642 +vt 0.017985 0.148395 +vt 0.044067 0.226642 +vt 0.017985 0.246203 +vt 0.260057 0.634281 +vt 0.181811 0.634281 +vt 0.017985 0.575597 +vt 0.260057 0.797294 +vt 0.165510 0.797294 +vt 0.423070 0.634281 +vt 0.017986 0.858219 +vt 0.017986 0.851981 +vt 0.344029 0.851991 +vt 0.017986 0.845742 +vt 0.344029 0.845753 +vt 0.017986 0.839503 +vt 0.344029 0.839516 +vt 0.017986 0.833265 +vt 0.344030 0.833279 +vt 0.017985 0.883174 +vt 0.017985 0.876935 +vt 0.344029 0.876939 +vt 0.017985 0.870696 +vt 0.344029 0.870702 +vt 0.468077 0.897383 +vt 0.468077 0.893640 +vt 0.647390 0.893639 +vt 0.017986 0.864458 +vt 0.344029 0.858228 +vt 0.344029 0.864465 +vt 0.468077 0.889897 +vt 0.647390 0.889896 +vt 0.468077 0.886154 +vt 0.647389 0.886153 +vt 0.468077 0.882411 +vt 0.647389 0.882410 +vt 0.468077 0.912355 +vt 0.468077 0.908612 +vt 0.647390 0.908611 +vt 0.468077 0.904869 +vt 0.468077 0.901126 +vt 0.647390 0.897382 +vt 0.647390 0.901125 +vt 0.465430 0.879764 +vt 0.465430 0.888801 +vt 0.902544 0.741978 +vt 0.902544 0.807183 +vt 0.804736 0.807183 +vt 0.902544 0.709376 +vt 0.967748 0.709375 +vt 0.967748 0.741978 +vt 0.804736 0.709375 +vt 0.804736 0.644170 +vt 0.902544 0.644171 +vt 0.804736 0.741978 +vt 0.739530 0.741978 +vt 0.739530 0.709375 +vt 0.902544 0.839786 +vt 0.804736 0.839786 +vt 0.889503 0.724047 +vt 0.740128 0.942905 +vt 0.739889 0.929866 +vt 0.748650 0.929785 +vt 0.889503 0.711006 +vt 0.850380 0.711006 +vt 0.850380 0.724047 +vt 0.750328 0.890466 +vt 0.759089 0.890386 +vt 0.759447 0.929507 +vt 0.739530 0.877703 +vt 0.750331 0.877784 +vt 0.748291 0.890664 +vt 0.739530 0.890744 +vt 0.750925 0.942626 +vt 0.751933 0.981737 +vt 0.761723 0.942348 +vt 0.772520 0.942070 +vt 0.773528 0.981180 +vt 0.762731 0.981458 +vt 0.750686 0.929588 +vt 0.750328 0.877425 +vt 0.761129 0.877505 +vt 0.772281 0.929031 +vt 0.781042 0.928951 +vt 0.761484 0.929309 +vt 0.770245 0.929229 +vt 0.761125 0.877147 +vt 0.771926 0.877227 +vt 0.769886 0.890108 +vt 0.761125 0.890188 +vt 0.790639 0.890232 +vt 0.797118 0.891373 +vt 0.790333 0.929903 +vt 0.771923 0.876869 +vt 0.782724 0.876949 +vt 0.780684 0.889829 +vt 0.771923 0.889910 +vt 0.783318 0.941792 +vt 0.784326 0.980902 +vt 0.796384 0.941455 +vt 0.796683 0.928418 +vt 0.803692 0.929189 +vt 0.797391 0.980565 +vt 0.783854 0.928762 +vt 0.794586 0.877802 +vt 0.806751 0.882582 +vt 0.820199 0.877142 +vt 0.832364 0.881922 +vt 0.822731 0.890713 +vt 0.803510 0.876739 +vt 0.815687 0.879785 +vt 0.807975 0.890301 +vt 0.800965 0.889530 +vt 0.808931 0.941132 +vt 0.809939 0.980242 +vt 0.826578 0.888870 +vt 0.833588 0.889642 +vt 0.829305 0.928530 +vt 0.816252 0.889572 +vt 0.815946 0.929243 +vt 0.821997 0.940795 +vt 0.823005 0.979905 +vt 0.809467 0.928102 +vt 0.834544 0.940472 +vt 0.834843 0.927434 +vt 0.841852 0.928206 +vt 0.835552 0.979582 +vt 0.822296 0.927758 +vt 0.829123 0.876079 +vt 0.841300 0.879125 +vt 0.805844 0.229902 +vt 0.805844 0.132094 +vt 0.822146 0.132094 +vt 0.841671 0.875756 +vt 0.853847 0.878802 +vt 0.846135 0.889318 +vt 0.839126 0.888546 +vt 0.847091 0.940149 +vt 0.848099 0.979259 +vt 0.952556 0.017985 +vt 0.952556 0.115793 +vt 0.822146 0.115793 +vt 0.952556 0.229902 +vt 0.952556 0.132094 +vt 0.968857 0.132094 +vt 0.822146 0.229902 +vt 0.952556 0.246203 +vt 0.822146 0.246203 +vt 0.703560 0.494090 +vt 0.703560 0.412584 +vt 0.866573 0.412584 +vt 0.703560 0.526693 +vt 0.622054 0.526693 +vt 0.622054 0.494090 +vt 0.866573 0.526693 +vt 0.866573 0.608199 +vt 0.703560 0.608199 +vt 0.866573 0.494090 +vt 0.948079 0.494090 +vt 0.948079 0.526693 +vt 0.459041 0.526693 +vt 0.703560 0.793888 +vt 0.703560 0.818841 +vt 0.459041 0.818841 +vt 0.703560 0.843794 +vt 0.459041 0.843794 +vt 0.703560 0.644170 +vt 0.703560 0.669123 +vt 0.459041 0.669123 +vt 0.703560 0.694076 +vt 0.459041 0.694076 +vt 0.703560 0.719029 +vt 0.459041 0.719029 +vt 0.703560 0.743982 +vt 0.459041 0.743982 +vt 0.703560 0.768935 +vt 0.459041 0.793888 +vt 0.459041 0.768935 +vt 0.769874 0.246204 +vt 0.148395 0.376613 +vt 0.165510 0.412584 +vt 0.017985 0.634281 +vt 0.423070 0.575597 +vt 0.344029 0.883176 +vt 0.647390 0.912354 +vt 0.647390 0.904868 +vt 0.461687 0.888801 +vt 0.459041 0.886154 +vt 0.459041 0.882411 +vt 0.461687 0.879765 +vt 0.741136 0.982015 +vt 0.822146 0.017985 +vt 0.968857 0.229902 +vt 0.459041 0.494090 +vt 0.459041 0.644170 vn 0.000000 1.000000 0.000000 vn 0.000000 -0.992300 -0.124000 vn -0.000000 0.000000 1.000000 @@ -173,199 +383,199 @@ vn -0.000000 0.382700 -0.923900 vn -0.000000 0.923900 -0.382700 vn 0.556100 0.831100 0.000000 s off -f 1//1 5//1 7//1 -f 6//2 2//2 4//2 -f 3//3 11//3 10//3 -f 3//4 4//4 2//4 -f 1//5 2//5 6//5 -f 7//6 5//6 6//6 -f 11//4 15//4 14//4 -f 7//3 12//3 11//3 -f 4//3 10//3 9//3 -f 7//3 8//3 9//3 -f 16//3 13//3 14//3 -f 10//7 14//7 13//7 -f 12//6 9//6 13//6 -f 12//1 16//1 15//1 -f 18//8 20//8 19//8 -f 20//9 22//9 21//9 -f 22//10 24//10 23//10 -f 24//11 26//11 25//11 -f 26//12 28//12 27//12 -f 28//13 30//13 29//13 -f 34//8 36//8 35//8 -f 32//14 18//14 17//14 -f 30//15 32//15 31//15 -f 36//9 38//9 37//9 -f 38//10 40//10 39//10 -f 40//11 42//11 41//11 -f 42//12 44//12 43//12 -f 43//13 44//13 46//13 -f 48//14 34//14 33//14 -f 46//15 48//15 47//15 -f 44//3 42//3 38//3 -f 52//6 51//6 49//6 -f 56//5 55//5 51//5 -f 54//4 53//4 55//4 -f 50//3 49//3 53//3 -f 51//16 55//16 53//16 -f 56//1 52//1 58//1 -f 57//3 60//3 64//3 -f 56//1 59//1 60//1 -f 52//1 50//1 57//1 -f 54//1 60//1 57//1 -f 63//17 67//17 68//17 -f 58//5 62//5 63//5 -f 59//18 63//18 64//18 -f 57//19 61//19 62//19 -f 65//20 69//20 70//20 -f 61//21 65//21 66//21 -f 61//3 64//3 68//3 -f 62//5 66//5 67//5 -f 69//3 72//3 76//3 -f 65//3 68//3 72//3 -f 66//5 70//5 71//5 -f 67//22 71//22 72//22 -f 75//23 79//23 80//23 -f 70//5 74//5 75//5 -f 71//24 75//24 76//24 -f 69//25 73//25 74//25 -f 77//3 80//3 84//3 -f 73//26 77//26 78//26 -f 73//3 76//3 80//3 -f 74//5 78//5 79//5 -f 82//5 86//5 87//5 -f 78//5 82//5 83//5 -f 79//27 83//27 84//27 -f 77//28 81//28 82//28 -f 87//29 91//29 92//29 -f 83//30 87//30 88//30 -f 81//31 85//31 86//31 -f 81//3 84//3 88//3 -f 89//3 92//3 96//3 -f 85//32 89//32 90//32 -f 85//3 88//3 92//3 -f 86//5 90//5 91//5 -f 100//6 99//6 97//6 -f 90//5 94//5 95//5 -f 91//33 95//33 96//33 -f 89//34 93//34 94//34 -f 104//5 103//5 99//5 -f 102//4 101//4 103//4 -f 98//3 97//3 101//3 -f 99//16 103//16 101//16 -f 104//1 100//1 98//1 -f 108//6 107//6 105//6 -f 112//5 111//5 107//5 -f 110//4 109//4 111//4 -f 106//3 105//3 109//3 -f 107//16 111//16 109//16 -f 112//1 108//1 106//1 -f 114//35 116//35 115//35 -f 116//36 118//36 117//36 -f 118//37 120//37 119//37 -f 120//38 122//38 121//38 -f 122//39 124//39 123//39 -f 124//40 126//40 125//40 -f 128//41 114//41 113//41 -f 126//42 128//42 127//42 -f 3//1 1//1 7//1 -f 8//2 6//2 4//2 -f 4//3 3//3 10//3 -f 1//4 3//4 2//4 -f 5//5 1//5 6//5 -f 8//6 7//6 6//6 -f 10//4 11//4 14//4 -f 3//3 7//3 11//3 -f 8//3 4//3 9//3 -f 12//3 7//3 9//3 -f 15//3 16//3 14//3 -f 9//7 10//7 13//7 -f 16//6 12//6 13//6 -f 11//1 12//1 15//1 -f 17//8 18//8 19//8 -f 19//9 20//9 21//9 -f 21//10 22//10 23//10 -f 23//11 24//11 25//11 -f 25//12 26//12 27//12 -f 27//13 28//13 29//13 -f 33//8 34//8 35//8 -f 31//14 32//14 17//14 -f 29//15 30//15 31//15 -f 35//9 36//9 37//9 -f 37//10 38//10 39//10 -f 39//11 40//11 41//11 -f 41//12 42//12 43//12 -f 45//13 43//13 46//13 -f 47//14 48//14 33//14 -f 45//15 46//15 47//15 -f 38//3 36//3 34//3 -f 34//3 48//3 38//3 -f 46//3 44//3 38//3 -f 42//3 40//3 38//3 -f 38//3 48//3 46//3 -f 50//6 52//6 49//6 -f 52//5 56//5 51//5 -f 56//4 54//4 55//4 -f 54//3 50//3 53//3 -f 49//16 51//16 53//16 -f 59//1 56//1 58//1 -f 61//3 57//3 64//3 -f 54//1 56//1 60//1 -f 58//1 52//1 57//1 -f 50//1 54//1 57//1 -f 64//17 63//17 68//17 -f 59//5 58//5 63//5 -f 60//18 59//18 64//18 -f 58//19 57//19 62//19 -f 66//20 65//20 70//20 -f 62//21 61//21 66//21 -f 65//3 61//3 68//3 -f 63//5 62//5 67//5 -f 73//3 69//3 76//3 -f 69//3 65//3 72//3 -f 67//5 66//5 71//5 -f 68//22 67//22 72//22 -f 76//23 75//23 80//23 -f 71//5 70//5 75//5 -f 72//24 71//24 76//24 -f 70//25 69//25 74//25 -f 81//3 77//3 84//3 -f 74//26 73//26 78//26 -f 77//3 73//3 80//3 -f 75//5 74//5 79//5 -f 83//5 82//5 87//5 -f 79//5 78//5 83//5 -f 80//27 79//27 84//27 -f 78//28 77//28 82//28 -f 88//29 87//29 92//29 -f 84//30 83//30 88//30 -f 82//31 81//31 86//31 -f 85//3 81//3 88//3 -f 93//3 89//3 96//3 -f 86//43 85//43 90//43 -f 89//3 85//3 92//3 -f 87//5 86//5 91//5 -f 98//6 100//6 97//6 -f 91//5 90//5 95//5 -f 92//33 91//33 96//33 -f 90//34 89//34 94//34 -f 100//5 104//5 99//5 -f 104//4 102//4 103//4 -f 102//3 98//3 101//3 -f 97//16 99//16 101//16 -f 102//1 104//1 98//1 -f 106//6 108//6 105//6 -f 108//5 112//5 107//5 -f 112//4 110//4 111//4 -f 110//3 106//3 109//3 -f 105//16 107//16 109//16 -f 110//1 112//1 106//1 -f 113//35 114//35 115//35 -f 115//36 116//36 117//36 -f 117//37 118//37 119//37 -f 119//38 120//38 121//38 -f 121//39 122//39 123//39 -f 123//40 124//40 125//40 -f 127//41 128//41 113//41 -f 125//42 126//42 127//42 +f 1/1/1 5/2/1 7/3/1 +f 6/4/2 2/5/2 4/6/2 +f 3/7/3 11/8/3 10/9/3 +f 3/7/4 4/10/4 2/11/4 +f 1/1/5 2/5/5 6/4/5 +f 7/3/6 5/2/6 6/12/6 +f 11/13/4 15/14/4 14/15/4 +f 7/3/3 12/16/3 11/8/3 +f 4/17/3 10/9/3 9/18/3 +f 7/3/3 8/19/3 9/18/3 +f 16/20/3 13/21/3 14/15/3 +f 10/22/7 14/15/7 13/21/7 +f 12/23/6 9/24/6 13/21/6 +f 12/25/1 16/20/1 15/14/1 +f 18/26/8 20/27/8 19/28/8 +f 20/27/9 22/29/9 21/30/9 +f 22/29/10 24/31/10 23/32/10 +f 24/31/11 26/33/11 25/34/11 +f 26/35/12 28/36/12 27/37/12 +f 28/36/13 30/38/13 29/39/13 +f 34/40/8 36/41/8 35/42/8 +f 32/43/14 18/26/14 17/44/14 +f 30/38/15 32/43/15 31/45/15 +f 36/41/9 38/46/9 37/47/9 +f 38/46/10 40/48/10 39/49/10 +f 40/48/11 42/50/11 41/51/11 +f 42/52/12 44/53/12 43/54/12 +f 43/54/13 44/53/13 46/55/13 +f 48/56/14 34/40/14 33/57/14 +f 46/55/15 48/56/15 47/58/15 +f 44/59/3 42/50/3 38/60/3 +f 52/61/6 51/62/6 49/63/6 +f 56/64/5 55/65/5 51/66/5 +f 54/67/4 53/68/4 55/69/4 +f 50/70/3 49/71/3 53/72/3 +f 51/62/16 55/73/16 53/74/16 +f 56/64/1 52/61/1 58/75/1 +f 57/76/3 60/77/3 64/78/3 +f 56/64/1 59/79/1 60/80/1 +f 52/61/1 50/70/1 57/81/1 +f 54/67/1 60/80/1 57/81/1 +f 63/82/17 67/83/17 68/84/17 +f 58/85/5 62/86/5 63/87/5 +f 59/88/18 63/87/18 64/78/18 +f 57/76/19 61/89/19 62/90/19 +f 65/91/20 69/92/20 70/93/20 +f 61/89/21 65/91/21 66/94/21 +f 61/89/3 64/95/3 68/84/3 +f 62/96/5 66/97/5 67/83/5 +f 69/92/3 72/98/3 76/99/3 +f 65/91/3 68/100/3 72/101/3 +f 66/102/5 70/103/5 71/104/5 +f 67/105/22 71/104/22 72/101/22 +f 75/106/23 79/107/23 80/108/23 +f 70/109/5 74/110/5 75/111/5 +f 71/112/24 75/111/24 76/99/24 +f 69/92/25 73/113/25 74/114/25 +f 77/115/3 80/116/3 84/117/3 +f 73/113/26 77/115/26 78/118/26 +f 73/113/3 76/119/3 80/108/3 +f 74/120/5 78/121/5 79/107/5 +f 82/122/5 86/123/5 87/124/5 +f 78/125/5 82/126/5 83/127/5 +f 79/128/27 83/127/27 84/117/27 +f 77/115/28 81/129/28 82/130/28 +f 87/131/29 91/132/29 92/133/29 +f 83/134/30 87/124/30 88/135/30 +f 81/129/31 85/136/31 86/137/31 +f 81/129/3 84/138/3 88/135/3 +f 89/139/3 92/140/3 96/141/3 +f 85/136/32 89/139/32 90/142/32 +f 85/136/3 88/143/3 92/133/3 +f 86/144/5 90/145/5 91/132/5 +f 100/146/6 99/147/6 97/148/6 +f 90/149/5 94/150/5 95/151/5 +f 91/152/33 95/151/33 96/141/33 +f 89/139/34 93/153/34 94/154/34 +f 104/155/5 103/156/5 99/157/5 +f 102/158/4 101/159/4 103/160/4 +f 98/161/3 97/148/3 101/159/3 +f 99/157/16 103/156/16 101/159/16 +f 104/162/1 100/163/1 98/161/1 +f 108/164/6 107/165/6 105/166/6 +f 112/167/5 111/168/5 107/169/5 +f 110/170/4 109/171/4 111/172/4 +f 106/173/3 105/174/3 109/175/3 +f 107/169/16 111/168/16 109/176/16 +f 112/167/1 108/164/1 106/173/1 +f 114/177/35 116/178/35 115/179/35 +f 116/178/36 118/180/36 117/181/36 +f 118/182/37 120/183/37 119/184/37 +f 120/183/38 122/185/38 121/186/38 +f 122/185/39 124/187/39 123/188/39 +f 124/187/40 126/189/40 125/190/40 +f 128/191/41 114/177/41 113/192/41 +f 126/189/42 128/191/42 127/193/42 +f 3/7/1 1/1/1 7/3/1 +f 8/194/2 6/4/2 4/6/2 +f 4/17/3 3/7/3 10/9/3 +f 1/1/4 3/7/4 2/11/4 +f 5/2/5 1/1/5 6/4/5 +f 8/195/6 7/3/6 6/12/6 +f 10/196/4 11/13/4 14/15/4 +f 3/7/3 7/3/3 11/8/3 +f 8/19/3 4/17/3 9/18/3 +f 12/16/3 7/3/3 9/18/3 +f 15/14/3 16/20/3 14/15/3 +f 9/197/7 10/22/7 13/21/7 +f 16/20/6 12/23/6 13/21/6 +f 11/198/1 12/25/1 15/14/1 +f 17/44/8 18/26/8 19/28/8 +f 19/28/9 20/27/9 21/30/9 +f 21/30/10 22/29/10 23/32/10 +f 23/32/11 24/31/11 25/34/11 +f 25/199/12 26/35/12 27/37/12 +f 27/37/13 28/36/13 29/39/13 +f 33/57/8 34/40/8 35/42/8 +f 31/45/14 32/43/14 17/44/14 +f 29/39/15 30/38/15 31/45/15 +f 35/42/9 36/41/9 37/47/9 +f 37/47/10 38/46/10 39/49/10 +f 39/49/11 40/48/11 41/51/11 +f 41/200/12 42/52/12 43/54/12 +f 45/201/13 43/54/13 46/55/13 +f 47/58/14 48/56/14 33/57/14 +f 45/201/15 46/55/15 47/58/15 +f 38/60/3 36/202/3 34/203/3 +f 34/203/3 48/204/3 38/60/3 +f 46/205/3 44/59/3 38/60/3 +f 42/50/3 40/48/3 38/60/3 +f 38/60/3 48/204/3 46/205/3 +f 50/70/6 52/61/6 49/63/6 +f 52/61/5 56/64/5 51/66/5 +f 56/64/4 54/67/4 55/69/4 +f 54/67/3 50/70/3 53/72/3 +f 49/63/16 51/62/16 53/74/16 +f 59/79/1 56/64/1 58/75/1 +f 61/89/3 57/76/3 64/78/3 +f 54/67/1 56/64/1 60/80/1 +f 58/75/1 52/61/1 57/81/1 +f 50/70/1 54/67/1 57/81/1 +f 64/95/17 63/82/17 68/84/17 +f 59/88/5 58/85/5 63/87/5 +f 60/77/18 59/88/18 64/78/18 +f 58/206/19 57/76/19 62/90/19 +f 66/94/20 65/91/20 70/93/20 +f 62/90/21 61/89/21 66/94/21 +f 65/91/3 61/89/3 68/84/3 +f 63/82/5 62/96/5 67/83/5 +f 73/113/3 69/92/3 76/99/3 +f 69/92/3 65/91/3 72/101/3 +f 67/105/5 66/102/5 71/104/5 +f 68/100/22 67/105/22 72/101/22 +f 76/119/23 75/106/23 80/108/23 +f 71/112/5 70/109/5 75/111/5 +f 72/98/24 71/112/24 76/99/24 +f 70/93/25 69/92/25 74/114/25 +f 81/129/3 77/115/3 84/117/3 +f 74/114/26 73/113/26 78/118/26 +f 77/115/3 73/113/3 80/108/3 +f 75/106/5 74/120/5 79/107/5 +f 83/134/5 82/122/5 87/124/5 +f 79/128/5 78/125/5 83/127/5 +f 80/116/27 79/128/27 84/117/27 +f 78/118/28 77/115/28 82/130/28 +f 88/143/29 87/131/29 92/133/29 +f 84/138/30 83/134/30 88/135/30 +f 82/130/31 81/129/31 86/137/31 +f 85/136/3 81/129/3 88/135/3 +f 93/153/3 89/139/3 96/141/3 +f 86/137/43 85/136/43 90/142/43 +f 89/139/3 85/136/3 92/133/3 +f 87/131/5 86/144/5 91/132/5 +f 98/161/6 100/146/6 97/148/6 +f 91/152/5 90/149/5 95/151/5 +f 92/140/33 91/152/33 96/141/33 +f 90/142/34 89/139/34 94/154/34 +f 100/207/5 104/155/5 99/157/5 +f 104/208/4 102/158/4 103/160/4 +f 102/158/3 98/161/3 101/159/3 +f 97/148/16 99/157/16 101/159/16 +f 102/158/1 104/162/1 98/161/1 +f 106/173/6 108/164/6 105/166/6 +f 108/164/5 112/167/5 107/169/5 +f 112/167/4 110/170/4 111/172/4 +f 110/170/3 106/173/3 109/175/3 +f 105/209/16 107/169/16 109/176/16 +f 110/170/1 112/167/1 106/173/1 +f 113/192/35 114/177/35 115/179/35 +f 115/179/36 116/178/36 117/181/36 +f 117/210/37 118/182/37 119/184/37 +f 119/184/38 120/183/38 121/186/38 +f 121/186/39 122/185/39 123/188/39 +f 123/188/40 124/187/40 125/190/40 +f 127/193/41 128/191/41 113/192/41 +f 125/190/42 126/189/42 127/193/42 diff --git a/assets/hbm/models/turret_rocket_gun.obj b/assets/hbm/models/turret_rocket_gun.obj index 7a2849f3b..b50e0c05a 100644 --- a/assets/hbm/models/turret_rocket_gun.obj +++ b/assets/hbm/models/turret_rocket_gun.obj @@ -115,6 +115,215 @@ v 0.250000 0.330000 -0.131250 v 0.250000 -0.080000 -0.131250 v 0.250000 0.330000 0.131250 v 0.250000 -0.080000 0.131250 +vt 0.546756 0.160984 +vt 0.546756 0.238616 +vt 0.024234 0.238615 +vt 0.546756 0.053793 +vt 0.024235 0.053793 +vt 0.024235 0.024234 +vt 0.024235 0.131425 +vt 0.546756 0.131425 +vt 0.546756 0.268174 +vt 0.024234 0.268174 +vt 0.024234 0.345806 +vt 0.546756 0.345806 +vt 0.546756 0.375365 +vt 0.587914 0.572912 +vt 0.289294 0.572912 +vt 0.289295 0.558627 +vt 0.587914 0.587197 +vt 0.289294 0.587196 +vt 0.587914 0.601481 +vt 0.289294 0.601481 +vt 0.587914 0.615766 +vt 0.289294 0.615765 +vt 0.587914 0.515774 +vt 0.289295 0.515773 +vt 0.289295 0.501489 +vt 0.587914 0.530058 +vt 0.289295 0.530058 +vt 0.587914 0.558627 +vt 0.289295 0.544342 +vt 0.587914 0.544343 +vt 0.598015 0.625867 +vt 0.598015 0.591380 +vt 0.612299 0.591381 +vt 0.895198 0.268504 +vt 0.596579 0.268503 +vt 0.596579 0.254219 +vt 0.895198 0.282788 +vt 0.596579 0.282788 +vt 0.895198 0.297073 +vt 0.596579 0.297072 +vt 0.895198 0.311358 +vt 0.596579 0.311357 +vt 0.895198 0.211365 +vt 0.596579 0.211365 +vt 0.596579 0.197081 +vt 0.895198 0.225650 +vt 0.596579 0.225650 +vt 0.895198 0.254219 +vt 0.596579 0.239934 +vt 0.895198 0.239934 +vt 0.905299 0.321458 +vt 0.905299 0.286972 +vt 0.919584 0.286972 +vt 0.895199 0.095657 +vt 0.596579 0.095657 +vt 0.596579 0.081372 +vt 0.895198 0.109942 +vt 0.596579 0.109941 +vt 0.895198 0.124227 +vt 0.596579 0.124226 +vt 0.895198 0.138511 +vt 0.596579 0.138510 +vt 0.895199 0.038519 +vt 0.596579 0.038519 +vt 0.596579 0.024234 +vt 0.895199 0.052804 +vt 0.596579 0.052803 +vt 0.895199 0.081373 +vt 0.596579 0.067088 +vt 0.895199 0.067088 +vt 0.905299 0.148612 +vt 0.905299 0.114126 +vt 0.919584 0.114126 +vt 0.587914 0.745758 +vt 0.289294 0.745758 +vt 0.289294 0.731473 +vt 0.587914 0.760043 +vt 0.289294 0.760042 +vt 0.587914 0.774328 +vt 0.289294 0.774327 +vt 0.587914 0.788612 +vt 0.289294 0.788611 +vt 0.587914 0.688620 +vt 0.289295 0.688620 +vt 0.289295 0.674335 +vt 0.587914 0.702904 +vt 0.289295 0.702904 +vt 0.587914 0.731474 +vt 0.289295 0.717189 +vt 0.587914 0.717189 +vt 0.598014 0.798713 +vt 0.598015 0.764227 +vt 0.612299 0.764227 +vt 0.740550 0.815492 +vt 0.727353 0.820958 +vt 0.722074 0.815679 +vt 0.759026 0.789285 +vt 0.753560 0.802482 +vt 0.740550 0.789472 +vt 0.759026 0.815679 +vt 0.753747 0.820958 +vt 0.727540 0.802482 +vt 0.722074 0.789285 +vt 0.727353 0.784006 +vt 0.721886 0.770809 +vt 0.772223 0.783818 +vt 0.753747 0.784006 +vt 0.772223 0.821146 +vt 0.759214 0.834155 +vt 0.785421 0.815679 +vt 0.755331 0.872163 +vt 0.753747 0.847353 +vt 0.790887 0.802482 +vt 0.810231 0.817263 +vt 0.810231 0.787701 +vt 0.785421 0.789285 +vt 0.759214 0.770809 +vt 0.753747 0.757611 +vt 0.740550 0.752145 +vt 0.755331 0.732800 +vt 0.725769 0.732800 +vt 0.727353 0.757611 +vt 0.721886 0.834155 +vt 0.708877 0.821146 +vt 0.727353 0.847353 +vt 0.740550 0.852819 +vt 0.725769 0.872163 +vt 0.670869 0.817263 +vt 0.695679 0.815679 +vt 0.690213 0.802482 +vt 0.670869 0.787701 +vt 0.695679 0.789285 +vt 0.708877 0.783818 +vt 0.114613 0.695591 +vt 0.114613 0.606006 +vt 0.150447 0.606006 +vt 0.024234 0.375364 +vt 0.546756 0.453020 +vt 0.024234 0.452996 +vt 0.150447 0.695591 +vt 0.162392 0.787934 +vt 0.024234 0.920865 +vt 0.046406 0.911363 +vt 0.088637 0.953594 +vt 0.102668 0.516420 +vt 0.162392 0.501489 +vt 0.162392 0.516420 +vt 0.024234 0.620937 +vt 0.024234 0.606006 +vt 0.240826 0.620937 +vt 0.894833 0.638621 +vt 0.894833 0.661476 +vt 0.670869 0.661477 +vt 0.894833 0.684332 +vt 0.670869 0.684332 +vt 0.894833 0.501489 +vt 0.894833 0.524344 +vt 0.670869 0.524344 +vt 0.894833 0.547200 +vt 0.670869 0.547200 +vt 0.894833 0.570055 +vt 0.670869 0.570055 +vt 0.858700 0.855234 +vt 0.858700 0.732800 +vt 0.937087 0.732801 +vt 0.894833 0.592910 +vt 0.670869 0.592910 +vt 0.937087 0.855234 +vt 0.937087 0.884796 +vt 0.894833 0.615766 +vt 0.670869 0.638621 +vt 0.670869 0.615766 +vt 0.937087 0.940041 +vt 0.858700 0.940041 +vt 0.024234 0.891303 +vt 0.079135 0.836403 +vt 0.163597 0.920865 +vt 0.108697 0.975766 +vt 0.024235 0.160983 +vt 0.546756 0.024235 +vt 0.587914 0.501489 +vt 0.622400 0.601481 +vt 0.622400 0.615766 +vt 0.612299 0.625867 +vt 0.895198 0.197081 +vt 0.929685 0.297073 +vt 0.929685 0.311358 +vt 0.919584 0.321458 +vt 0.895199 0.024234 +vt 0.929685 0.124227 +vt 0.929685 0.138511 +vt 0.919584 0.148612 +vt 0.587914 0.674335 +vt 0.622400 0.774328 +vt 0.622400 0.788612 +vt 0.612299 0.798713 +vt 0.548110 0.452986 +vt 0.102668 0.787934 +vt 0.079135 0.975766 +vt 0.102668 0.501489 +vt 0.024234 0.717988 +vt 0.240826 0.606006 +vt 0.240826 0.717988 +vt 0.670869 0.501489 +vt 0.858700 0.884796 +vt 0.108697 0.836403 +vt 0.115031 0.842738 +vt 0.157262 0.884969 +vt 0.163597 0.891303 vn 0.000000 1.000000 0.000000 vn 0.707100 -0.707100 0.000000 vn 0.707100 0.707100 0.000000 @@ -132,7 +341,7 @@ vn 0.382700 -0.923900 0.000000 vn 0.923900 -0.382700 0.000000 vn 0.000000 0.000000 1.000000 vn 0.000000 0.000000 -1.000000 -vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000000 vn 0.000000 0.970100 -0.242500 vn 0.991200 0.000000 -0.132200 vn -0.991200 0.000000 -0.132200 @@ -145,203 +354,201 @@ vn -0.000000 0.923900 0.382700 vn -0.000000 0.382700 -0.923900 vn -0.000000 0.923900 -0.382700 s off -f 1//1 5//1 7//1 -f 10//2 12//2 4//2 -f 11//3 9//3 1//3 -f 13//4 15//4 7//4 -f 11//5 12//5 10//5 -f 16//6 14//6 6//6 -f 13//7 14//7 16//7 -f 19//8 20//8 18//8 -f 21//9 22//9 20//9 -f 23//10 24//10 22//10 -f 25//11 26//11 24//11 -f 27//12 28//12 26//12 -f 29//13 30//13 28//13 -f 17//14 18//14 32//14 -f 31//15 32//15 30//15 -f 27//16 21//16 19//16 -f 35//8 36//8 34//8 -f 37//9 38//9 36//9 -f 39//10 40//10 38//10 -f 41//11 42//11 40//11 -f 43//12 44//12 42//12 -f 45//13 46//13 44//13 -f 33//14 34//14 48//14 -f 47//15 48//15 46//15 -f 43//16 37//16 35//16 -f 51//8 52//8 50//8 -f 53//9 54//9 52//9 -f 55//10 56//10 54//10 -f 57//11 58//11 56//11 -f 59//12 60//12 58//12 -f 61//13 62//13 60//13 -f 49//14 50//14 64//14 -f 63//15 64//15 62//15 -f 59//16 53//16 51//16 -f 67//8 68//8 66//8 -f 69//9 70//9 68//9 -f 71//10 72//10 70//10 -f 73//11 74//11 72//11 -f 75//12 76//12 74//12 -f 77//13 78//13 76//13 -f 65//14 66//14 80//14 -f 79//15 80//15 78//15 -f 75//16 69//16 67//16 -f 56//16 58//16 18//16 -f 74//16 76//16 48//16 -f 76//16 78//16 54//16 -f 56//16 20//16 48//16 -f 22//16 46//16 48//16 -f 44//16 46//16 22//16 -f 72//16 74//16 34//16 -f 54//16 78//16 80//16 -f 52//16 80//16 66//16 -f 7//16 50//16 66//16 -f 66//16 68//16 3//16 -f 3//16 68//16 11//16 -f 68//16 70//16 11//16 -f 70//16 72//16 36//16 -f 11//16 70//16 38//16 -f 38//16 40//16 12//16 -f 12//16 40//16 4//16 -f 40//16 42//16 4//16 -f 58//16 60//16 32//16 -f 32//16 60//16 62//16 -f 50//16 7//16 64//16 -f 7//16 15//16 64//16 -f 64//16 15//16 62//16 -f 15//16 16//16 30//16 -f 30//16 16//16 28//16 -f 16//16 8//16 28//16 -f 28//16 8//16 26//16 -f 42//16 44//16 24//16 -f 42//16 26//16 8//16 -f 86//17 90//17 89//17 -f 6//18 81//18 8//18 -f 81//17 14//17 82//17 -f 86//19 83//19 82//19 -f 84//17 85//17 10//17 -f 1//17 85//17 82//17 -f 89//18 90//18 88//18 -f 81//16 87//16 88//16 -f 84//20 88//20 90//20 -f 83//21 89//21 81//21 -f 94//22 96//22 95//22 -f 96//23 98//23 97//23 -f 98//24 100//24 99//24 -f 100//25 102//25 101//25 -f 102//26 104//26 103//26 -f 113//5 114//5 112//5 -f 104//27 106//27 105//27 -f 113//3 111//3 92//3 -f 108//28 94//28 93//28 -f 106//29 108//29 107//29 -f 92//1 109//1 110//1 -f 3//1 1//1 7//1 -f 2//2 10//2 4//2 -f 3//3 11//3 1//3 -f 5//4 13//4 7//4 -f 9//5 11//5 10//5 -f 8//6 16//6 6//6 -f 15//7 13//7 16//7 -f 17//8 19//8 18//8 -f 19//9 21//9 20//9 -f 21//10 23//10 22//10 -f 23//11 25//11 24//11 -f 25//12 27//12 26//12 -f 27//13 29//13 28//13 -f 31//14 17//14 32//14 -f 29//15 31//15 30//15 -f 19//16 17//16 27//16 -f 31//16 29//16 27//16 -f 27//16 25//16 23//16 -f 23//16 21//16 27//16 -f 17//16 31//16 27//16 -f 33//8 35//8 34//8 -f 35//9 37//9 36//9 -f 37//10 39//10 38//10 -f 39//11 41//11 40//11 -f 41//12 43//12 42//12 -f 43//13 45//13 44//13 -f 47//14 33//14 48//14 -f 45//15 47//15 46//15 -f 35//16 33//16 43//16 -f 47//16 45//16 43//16 -f 43//16 41//16 39//16 -f 39//16 37//16 43//16 -f 33//16 47//16 43//16 -f 49//8 51//8 50//8 -f 51//9 53//9 52//9 -f 53//10 55//10 54//10 -f 55//11 57//11 56//11 -f 57//12 59//12 58//12 -f 59//13 61//13 60//13 -f 63//14 49//14 64//14 -f 61//15 63//15 62//15 -f 51//16 49//16 59//16 -f 63//16 61//16 59//16 -f 59//16 57//16 55//16 -f 55//16 53//16 59//16 -f 49//16 63//16 59//16 -f 65//8 67//8 66//8 -f 67//9 69//9 68//9 -f 69//10 71//10 70//10 -f 71//11 73//11 72//11 -f 73//12 75//12 74//12 -f 75//13 77//13 76//13 -f 79//14 65//14 80//14 -f 77//15 79//15 78//15 -f 67//16 65//16 75//16 -f 79//16 77//16 75//16 -f 75//16 73//16 71//16 -f 71//16 69//16 75//16 -f 65//16 79//16 75//16 -f 20//16 56//16 18//16 -f 34//16 74//16 48//16 -f 56//16 76//16 54//16 -f 76//16 56//16 48//16 -f 20//16 22//16 48//16 -f 24//16 44//16 22//16 -f 36//16 72//16 34//16 -f 52//16 54//16 80//16 -f 50//16 52//16 66//16 -f 3//16 7//16 66//16 -f 38//16 70//16 36//16 -f 12//16 11//16 38//16 -f 18//16 58//16 32//16 -f 30//16 32//16 62//16 -f 62//16 15//16 30//16 -f 26//16 42//16 24//16 -f 4//16 42//16 8//16 -f 83//17 86//17 89//17 -f 4//18 8//18 81//18 -f 6//16 84//16 81//16 -f 81//18 2//18 4//18 -f 81//16 84//16 6//16 -f 5//17 82//17 13//17 -f 14//17 13//17 82//17 -f 81//17 6//17 14//17 -f 85//19 86//19 82//19 -f 2//16 81//16 84//16 -f 9//17 10//17 85//17 -f 85//17 1//17 9//17 -f 2//17 84//17 10//17 -f 5//17 1//17 82//17 -f 87//18 89//18 88//18 -f 84//16 81//16 88//16 -f 90//20 86//20 84//20 -f 85//20 84//20 86//20 -f 87//21 81//21 89//21 -f 82//21 83//21 81//21 -f 93//22 94//22 95//22 -f 95//23 96//23 97//23 -f 97//24 98//24 99//24 -f 99//25 100//25 101//25 -f 101//26 102//26 103//26 -f 111//5 113//5 112//5 -f 103//27 104//27 105//27 -f 91//3 113//3 92//3 -f 107//28 108//28 93//28 -f 105//29 106//29 107//29 -f 91//1 92//1 110//1 +f 1/1/1 5/2/1 7/3/1 +f 10/4/2 12/5/2 4/6/2 +f 11/7/3 9/8/3 1/1/3 +f 13/9/4 15/10/4 7/3/4 +f 11/7/5 12/5/5 10/4/5 +f 16/11/6 14/12/6 6/13/6 +f 13/9/7 14/12/7 16/11/7 +f 19/14/8 20/15/8 18/16/8 +f 21/17/9 22/18/9 20/15/9 +f 23/19/10 24/20/10 22/18/10 +f 25/21/11 26/22/11 24/20/11 +f 27/23/12 28/24/12 26/25/12 +f 29/26/13 30/27/13 28/24/13 +f 17/28/14 18/16/14 32/29/14 +f 31/30/15 32/29/15 30/27/15 +f 27/31/16 21/32/16 19/33/16 +f 35/34/8 36/35/8 34/36/8 +f 37/37/9 38/38/9 36/35/9 +f 39/39/10 40/40/10 38/38/10 +f 41/41/11 42/42/11 40/40/11 +f 43/43/12 44/44/12 42/45/12 +f 45/46/13 46/47/13 44/44/13 +f 33/48/14 34/36/14 48/49/14 +f 47/50/15 48/49/15 46/47/15 +f 43/51/16 37/52/16 35/53/16 +f 51/54/8 52/55/8 50/56/8 +f 53/57/9 54/58/9 52/55/9 +f 55/59/10 56/60/10 54/58/10 +f 57/61/11 58/62/11 56/60/11 +f 59/63/12 60/64/12 58/65/12 +f 61/66/13 62/67/13 60/64/13 +f 49/68/14 50/56/14 64/69/14 +f 63/70/15 64/69/15 62/67/15 +f 59/71/16 53/72/16 51/73/16 +f 67/74/8 68/75/8 66/76/8 +f 69/77/9 70/78/9 68/75/9 +f 71/79/10 72/80/10 70/78/10 +f 73/81/11 74/82/11 72/80/11 +f 75/83/12 76/84/12 74/85/12 +f 77/86/13 78/87/13 76/84/13 +f 65/88/14 66/76/14 80/89/14 +f 79/90/15 80/89/15 78/87/15 +f 75/91/16 69/92/16 67/93/16 +f 56/94/16 58/95/16 18/96/16 +f 74/97/16 76/98/16 48/99/16 +f 76/98/16 78/100/16 54/101/16 +f 56/94/16 20/102/16 48/99/16 +f 22/103/16 46/104/16 48/99/16 +f 44/105/16 46/104/16 22/103/16 +f 72/106/16 74/97/16 34/107/16 +f 54/101/16 78/100/16 80/108/16 +f 52/109/16 80/108/16 66/110/16 +f 7/111/16 50/112/16 66/110/16 +f 66/110/16 68/113/16 3/114/16 +f 3/114/16 68/113/16 11/115/16 +f 68/113/16 70/116/16 11/115/16 +f 70/116/16 72/106/16 36/117/16 +f 11/115/16 70/116/16 38/118/16 +f 38/118/16 40/119/16 12/120/16 +f 12/120/16 40/119/16 4/121/16 +f 40/119/16 42/122/16 4/121/16 +f 58/95/16 60/123/16 32/124/16 +f 32/124/16 60/123/16 62/125/16 +f 50/112/16 7/111/16 64/126/16 +f 7/111/16 15/127/16 64/126/16 +f 64/126/16 15/127/16 62/125/16 +f 15/127/16 16/128/16 30/129/16 +f 30/129/16 16/128/16 28/130/16 +f 16/128/16 8/131/16 28/130/16 +f 28/130/16 8/131/16 26/132/16 +f 42/122/16 44/105/16 24/133/16 +f 42/122/16 26/132/16 8/131/16 +f 86/134/17 90/135/17 89/136/17 +f 8/137/18 84/138/18 4/139/18 +f 86/134/19 83/140/19 82/141/19 +f 1/142/17 85/143/17 82/144/17 +f 89/136/18 90/135/18 88/145/18 +f 81/146/16 87/147/16 88/145/16 +f 84/148/20 88/149/20 90/135/20 +f 83/140/21 89/136/21 81/150/21 +f 94/151/22 96/152/22 95/153/22 +f 96/152/23 98/154/23 97/155/23 +f 98/156/24 100/157/24 99/158/24 +f 100/157/25 102/159/25 101/160/25 +f 102/159/26 104/161/26 103/162/26 +f 113/163/5 114/164/5 112/165/5 +f 104/161/27 106/166/27 105/167/27 +f 113/163/3 111/168/3 92/169/3 +f 108/170/28 94/151/28 93/171/28 +f 106/166/29 108/170/29 107/172/29 +f 92/169/1 109/173/1 110/174/1 +f 85/143/17 9/175/17 10/176/17 +f 82/144/17 14/177/17 13/178/17 +f 3/179/1 1/1/1 7/3/1 +f 2/180/2 10/4/2 4/6/2 +f 3/179/3 11/7/3 1/1/3 +f 5/2/4 13/9/4 7/3/4 +f 9/8/5 11/7/5 10/4/5 +f 8/137/6 16/11/6 6/13/6 +f 15/10/7 13/9/7 16/11/7 +f 17/28/8 19/14/8 18/16/8 +f 19/14/9 21/17/9 20/15/9 +f 21/17/10 23/19/10 22/18/10 +f 23/19/11 25/21/11 24/20/11 +f 25/181/12 27/23/12 26/25/12 +f 27/23/13 29/26/13 28/24/13 +f 31/30/14 17/28/14 32/29/14 +f 29/26/15 31/30/15 30/27/15 +f 19/33/16 17/182/16 27/31/16 +f 31/183/16 29/184/16 27/31/16 +f 27/31/16 25/21/16 23/19/16 +f 23/19/16 21/32/16 27/31/16 +f 17/182/16 31/183/16 27/31/16 +f 33/48/8 35/34/8 34/36/8 +f 35/34/9 37/37/9 36/35/9 +f 37/37/10 39/39/10 38/38/10 +f 39/39/11 41/41/11 40/40/11 +f 41/185/12 43/43/12 42/45/12 +f 43/43/13 45/46/13 44/44/13 +f 47/50/14 33/48/14 48/49/14 +f 45/46/15 47/50/15 46/47/15 +f 35/53/16 33/186/16 43/51/16 +f 47/187/16 45/188/16 43/51/16 +f 43/51/16 41/41/16 39/39/16 +f 39/39/16 37/52/16 43/51/16 +f 33/186/16 47/187/16 43/51/16 +f 49/68/8 51/54/8 50/56/8 +f 51/54/9 53/57/9 52/55/9 +f 53/57/10 55/59/10 54/58/10 +f 55/59/11 57/61/11 56/60/11 +f 57/189/12 59/63/12 58/65/12 +f 59/63/13 61/66/13 60/64/13 +f 63/70/14 49/68/14 64/69/14 +f 61/66/15 63/70/15 62/67/15 +f 51/73/16 49/190/16 59/71/16 +f 63/191/16 61/192/16 59/71/16 +f 59/71/16 57/61/16 55/59/16 +f 55/59/16 53/72/16 59/71/16 +f 49/190/16 63/191/16 59/71/16 +f 65/88/8 67/74/8 66/76/8 +f 67/74/9 69/77/9 68/75/9 +f 69/77/10 71/79/10 70/78/10 +f 71/79/11 73/81/11 72/80/11 +f 73/193/12 75/83/12 74/85/12 +f 75/83/13 77/86/13 76/84/13 +f 79/90/14 65/88/14 80/89/14 +f 77/86/15 79/90/15 78/87/15 +f 67/93/16 65/194/16 75/91/16 +f 79/195/16 77/196/16 75/91/16 +f 75/91/16 73/81/16 71/79/16 +f 71/79/16 69/92/16 75/91/16 +f 65/194/16 79/195/16 75/91/16 +f 20/102/16 56/94/16 18/96/16 +f 34/107/16 74/97/16 48/99/16 +f 56/94/16 76/98/16 54/101/16 +f 76/98/16 56/94/16 48/99/16 +f 20/102/16 22/103/16 48/99/16 +f 24/133/16 44/105/16 22/103/16 +f 36/117/16 72/106/16 34/107/16 +f 52/109/16 54/101/16 80/108/16 +f 50/112/16 52/109/16 66/110/16 +f 3/114/16 7/111/16 66/110/16 +f 38/118/16 70/116/16 36/117/16 +f 12/120/16 11/115/16 38/118/16 +f 18/96/16 58/95/16 32/124/16 +f 30/129/16 32/124/16 62/125/16 +f 62/125/16 15/127/16 30/129/16 +f 26/132/16 42/122/16 24/133/16 +f 4/121/16 42/122/16 8/131/16 +f 83/140/17 86/134/17 89/136/17 +f 2/138/18 4/139/18 84/138/18 +f 8/137/18 6/13/18 81/197/18 +f 81/197/18 84/138/18 8/137/18 +f 85/198/19 86/134/19 82/141/19 +f 5/199/17 1/142/17 82/144/17 +f 87/147/18 89/136/18 88/145/18 +f 84/200/16 81/146/16 88/145/16 +f 90/135/20 86/134/20 84/148/20 +f 85/201/20 84/148/20 86/134/20 +f 87/202/21 81/150/21 89/136/21 +f 82/203/21 83/140/21 81/150/21 +f 93/171/22 94/151/22 95/153/22 +f 95/153/23 96/152/23 97/155/23 +f 97/204/24 98/156/24 99/158/24 +f 99/158/25 100/157/25 101/160/25 +f 101/160/26 102/159/26 103/162/26 +f 111/168/5 113/163/5 112/165/5 +f 103/162/27 104/161/27 105/167/27 +f 91/205/3 113/163/3 92/169/3 +f 107/172/28 108/170/28 93/171/28 +f 105/167/29 106/166/29 107/172/29 +f 91/205/1 92/169/1 110/174/1 +f 10/176/17 2/206/17 84/207/17 +f 84/207/17 85/143/17 10/176/17 +f 1/142/17 9/175/17 85/143/17 +f 13/178/17 5/199/17 82/144/17 +f 82/144/17 81/208/17 14/177/17 +f 6/209/17 14/177/17 81/208/17 diff --git a/assets/hbm/models/turret_tau_gun.obj b/assets/hbm/models/turret_tau_gun.obj index a45db2e5f..098555a9b 100644 --- a/assets/hbm/models/turret_tau_gun.obj +++ b/assets/hbm/models/turret_tau_gun.obj @@ -136,6 +136,234 @@ v 0.125000 -0.050000 0.050000 v 0.125000 0.250000 0.050000 v 0.125000 -0.050000 -0.450000 v 0.125000 0.250000 -0.450000 +vt 0.671849 0.152564 +vt 0.671849 0.281602 +vt 0.413772 0.281603 +vt 0.023526 0.281603 +vt 0.023526 0.152564 +vt 0.284734 0.152564 +vt 0.284734 0.281603 +vt 0.413772 0.152564 +vt 0.413772 0.023526 +vt 0.671849 0.063850 +vt 0.760563 0.152564 +vt 0.760563 0.281602 +vt 0.671849 0.370316 +vt 0.828328 0.500121 +vt 0.746833 0.506182 +vt 0.746833 0.457692 +vt 0.828329 0.597100 +vt 0.746834 0.603161 +vt 0.746833 0.554672 +vt 0.625537 0.677453 +vt 0.587672 0.704803 +vt 0.586731 0.704392 +vt 0.828329 0.742568 +vt 0.746834 0.748630 +vt 0.746834 0.700140 +vt 0.665077 0.748220 +vt 0.627212 0.775570 +vt 0.828329 0.694079 +vt 0.746834 0.651651 +vt 0.828329 0.645589 +vt 0.665139 0.700704 +vt 0.625415 0.676385 +vt 0.828328 0.512243 +vt 0.828328 0.548610 +vt 0.666018 0.700141 +vt 0.587610 0.752319 +vt 0.586731 0.752882 +vt 0.666018 0.748630 +vt 0.627334 0.776637 +vt 0.674099 0.598312 +vt 0.738752 0.598312 +vt 0.674099 0.559521 +vt 0.666017 0.603161 +vt 0.738752 0.559521 +vt 0.674099 0.549823 +vt 0.738752 0.549823 +vt 0.666017 0.506182 +vt 0.674099 0.511031 +vt 0.738752 0.511031 +vt 0.674099 0.501333 +vt 0.738752 0.501333 +vt 0.674099 0.462541 +vt 0.738752 0.462541 +vt 0.674100 0.743781 +vt 0.738753 0.743781 +vt 0.674099 0.704990 +vt 0.738752 0.704989 +vt 0.674099 0.646802 +vt 0.738752 0.646802 +vt 0.674099 0.608010 +vt 0.738752 0.608010 +vt 0.674099 0.695292 +vt 0.738752 0.695291 +vt 0.674099 0.656500 +vt 0.738752 0.656500 +vt 0.594796 0.870465 +vt 0.594796 0.831754 +vt 0.659315 0.831754 +vt 0.659315 0.870465 +vt 0.659315 0.878530 +vt 0.586731 0.831754 +vt 0.594796 0.823689 +vt 0.667380 0.831754 +vt 0.815679 0.278652 +vt 0.815679 0.239940 +vt 0.880199 0.239940 +vt 0.880199 0.278652 +vt 0.880199 0.286717 +vt 0.807615 0.278652 +vt 0.815679 0.231875 +vt 0.888264 0.278652 +vt 0.722496 0.870465 +vt 0.722496 0.831754 +vt 0.787015 0.831754 +vt 0.787015 0.870465 +vt 0.787015 0.878530 +vt 0.714431 0.870465 +vt 0.722496 0.823689 +vt 0.795080 0.831754 +vt 0.850197 0.870465 +vt 0.850197 0.831754 +vt 0.914716 0.831754 +vt 0.914716 0.870465 +vt 0.914716 0.878530 +vt 0.842132 0.870465 +vt 0.850197 0.823689 +vt 0.922781 0.870465 +vt 0.815679 0.380544 +vt 0.815679 0.341833 +vt 0.880199 0.341833 +vt 0.880199 0.380544 +vt 0.880199 0.388609 +vt 0.807615 0.380544 +vt 0.815679 0.333768 +vt 0.888264 0.380544 +vt 0.922157 0.530276 +vt 0.883446 0.530276 +vt 0.883446 0.465757 +vt 0.922157 0.465757 +vt 0.930222 0.465757 +vt 0.922157 0.538341 +vt 0.875381 0.530276 +vt 0.883446 0.457692 +vt 0.326493 0.807178 +vt 0.326493 0.799113 +vt 0.487791 0.799112 +vt 0.326493 0.791048 +vt 0.487791 0.791048 +vt 0.326493 0.782983 +vt 0.487791 0.782983 +vt 0.326493 0.831372 +vt 0.326493 0.823308 +vt 0.487791 0.823307 +vt 0.312524 0.791048 +vt 0.326493 0.815243 +vt 0.487791 0.807177 +vt 0.487791 0.815242 +vt 0.888263 0.088045 +vt 0.888263 0.055785 +vt 0.912498 0.060510 +vt 0.888263 0.023526 +vt 0.912498 0.028250 +vt 0.875381 0.585393 +vt 0.907640 0.585393 +vt 0.902916 0.609627 +vt 0.888264 0.184824 +vt 0.888264 0.152564 +vt 0.912498 0.157288 +vt 0.888263 0.120305 +vt 0.912498 0.125029 +vt 0.934396 0.071915 +vt 0.912498 0.083321 +vt 0.934396 0.039656 +vt 0.912498 0.051061 +vt 0.807615 0.088045 +vt 0.807615 0.055785 +vt 0.807615 0.023526 +vt 0.891510 0.631525 +vt 0.880105 0.609627 +vt 0.807615 0.120305 +vt 0.934396 0.168694 +vt 0.912498 0.180099 +vt 0.807615 0.184824 +vt 0.807615 0.152564 +vt 0.934396 0.136434 +vt 0.912498 0.147840 +vt 0.912498 0.115580 +vt 0.934396 0.104175 +vt 0.912498 0.092769 +vt 0.265472 0.927093 +vt 0.265472 0.951784 +vt 0.023526 0.951784 +vt 0.265473 0.976474 +vt 0.023526 0.976474 +vt 0.281602 0.635120 +vt 0.281602 0.554471 +vt 0.442900 0.554471 +vt 0.265472 0.778951 +vt 0.265472 0.803641 +vt 0.023526 0.803641 +vt 0.184824 0.554471 +vt 0.184824 0.635120 +vt 0.023526 0.635120 +vt 0.265472 0.828332 +vt 0.023526 0.828331 +vt 0.539679 0.554471 +vt 0.539679 0.635120 +vt 0.265472 0.853022 +vt 0.023526 0.853022 +vt 0.442900 0.635120 +vt 0.442900 0.731899 +vt 0.281602 0.731899 +vt 0.265472 0.877712 +vt 0.023526 0.877712 +vt 0.265472 0.902403 +vt 0.023526 0.927093 +vt 0.023526 0.902403 +vt 0.281602 0.457692 +vt 0.442900 0.457692 +vt 0.413772 0.410641 +vt 0.828328 0.463754 +vt 0.828328 0.560733 +vt 0.828329 0.706201 +vt 0.828329 0.657711 +vt 0.828329 0.609222 +vt 0.666017 0.554672 +vt 0.666017 0.457692 +vt 0.666018 0.651651 +vt 0.594796 0.878530 +vt 0.586731 0.870465 +vt 0.659315 0.823689 +vt 0.667380 0.870465 +vt 0.815679 0.286717 +vt 0.807615 0.239940 +vt 0.880199 0.231875 +vt 0.888264 0.239940 +vt 0.722496 0.878530 +vt 0.714431 0.831754 +vt 0.787015 0.823689 +vt 0.795080 0.870465 +vt 0.850197 0.878530 +vt 0.842132 0.831754 +vt 0.914716 0.823689 +vt 0.922781 0.831754 +vt 0.815679 0.388609 +vt 0.807615 0.341833 +vt 0.880199 0.333768 +vt 0.888263 0.341833 +vt 0.930222 0.530276 +vt 0.883446 0.538341 +vt 0.875381 0.465757 +vt 0.922157 0.457692 +vt 0.487791 0.831372 +vt 0.319508 0.795080 +vt 0.312524 0.782983 +vt 0.319508 0.778950 +vt 0.023526 0.778950 +vt 0.023526 0.554471 vn 0.000000 1.000000 0.000000 vn 0.000000 -0.988000 -0.154400 vn 0.000000 0.000000 1.000000 @@ -178,223 +406,223 @@ vn -0.000000 0.923900 0.382700 vn -0.000000 0.382700 -0.923900 vn -0.000000 0.923900 -0.382700 s off -f 1//1 5//1 7//1 -f 6//2 2//2 4//2 -f 7//3 8//3 4//3 -f 3//4 4//4 2//4 -f 1//5 2//5 6//5 -f 7//6 5//6 6//6 -f 13//7 25//7 27//7 -f 9//8 21//8 22//8 -f 20//3 10//3 24//3 -f 15//9 27//9 29//9 -f 10//3 16//3 14//3 -f 17//10 29//10 31//10 -f 19//11 31//11 21//11 -f 18//3 20//3 32//3 -f 13//12 11//12 22//12 -f 16//3 18//3 30//3 -f 10//3 12//3 23//3 -f 14//3 16//3 28//3 -f 12//3 14//3 26//3 -f 34//13 33//13 21//13 -f 35//13 34//13 24//13 -f 22//13 36//13 35//13 -f 33//13 36//13 22//13 -f 38//4 37//4 22//4 -f 26//4 39//4 38//4 -f 25//4 40//4 39//4 -f 37//4 40//4 25//4 -f 42//14 41//14 25//14 -f 43//14 42//14 26//14 -f 27//14 44//14 43//14 -f 41//14 44//14 27//14 -f 46//15 45//15 27//15 -f 47//15 46//15 28//15 -f 29//15 48//15 47//15 -f 45//15 48//15 29//15 -f 50//16 49//16 31//16 -f 24//16 51//16 50//16 -f 21//16 52//16 51//16 -f 49//16 52//16 21//16 -f 54//6 53//6 29//6 -f 55//6 54//6 30//6 -f 31//6 56//6 55//6 -f 53//6 56//6 31//6 -f 58//13 59//13 60//13 -f 58//17 57//17 33//17 -f 35//5 59//5 58//5 -f 60//18 59//18 35//18 -f 57//3 60//3 36//3 -f 62//4 63//4 64//4 -f 62//19 61//19 37//19 -f 63//5 62//5 38//5 -f 64//1 63//1 39//1 -f 37//3 61//3 64//3 -f 66//14 67//14 68//14 -f 66//20 65//20 41//20 -f 67//5 66//5 42//5 -f 68//21 67//21 43//21 -f 65//3 68//3 44//3 -f 70//15 71//15 72//15 -f 70//18 69//18 45//18 -f 71//5 70//5 46//5 -f 72//17 71//17 47//17 -f 45//3 69//3 72//3 -f 74//16 75//16 76//16 -f 74//21 73//21 49//21 -f 75//5 74//5 50//5 -f 76//20 75//20 51//20 -f 49//3 73//3 76//3 -f 78//6 79//6 80//6 -f 78//1 77//1 53//1 -f 79//5 78//5 54//5 -f 80//19 79//19 55//19 -f 77//3 80//3 56//3 -f 82//13 84//13 83//13 -f 84//4 86//4 85//4 -f 86//14 88//14 87//14 -f 88//15 90//15 89//15 -f 82//3 88//3 86//3 -f 92//16 82//16 81//16 -f 90//6 92//6 91//6 -f 94//22 98//22 99//22 -f 98//23 101//23 102//23 -f 101//24 104//24 105//24 -f 104//25 107//25 108//25 -f 107//26 110//26 111//26 -f 96//27 95//27 99//27 -f 96//28 99//28 102//28 -f 94//18 109//18 106//18 -f 106//1 103//1 101//1 -f 96//29 102//29 105//29 -f 94//20 110//20 93//20 -f 96//30 105//30 108//30 -f 104//17 100//17 97//17 -f 96//31 108//31 111//31 -f 111//32 110//32 94//32 -f 110//19 107//19 97//19 -f 96//33 111//33 95//33 -f 115//34 117//34 116//34 -f 117//35 119//35 118//35 -f 135//1 131//1 112//1 -f 119//36 121//36 120//36 -f 130//19 134//19 132//19 -f 121//37 123//37 122//37 -f 112//3 113//3 132//3 -f 123//38 125//38 124//38 -f 133//4 132//4 134//4 -f 125//39 127//39 126//39 -f 135//5 134//5 130//5 -f 129//40 115//40 114//40 -f 127//41 129//41 128//41 -f 131//6 130//6 113//6 -f 3//1 1//1 7//1 -f 8//2 6//2 4//2 -f 3//3 7//3 4//3 -f 1//4 3//4 2//4 -f 5//5 1//5 6//5 -f 8//6 7//6 6//6 -f 15//7 13//7 27//7 -f 11//8 9//8 22//8 -f 32//3 20//3 24//3 -f 17//9 15//9 29//9 -f 14//3 12//3 10//3 -f 10//3 20//3 18//3 -f 18//3 16//3 10//3 -f 19//10 17//10 31//10 -f 9//11 19//11 21//11 -f 30//3 18//3 32//3 -f 25//12 13//12 22//12 -f 28//3 16//3 30//3 -f 24//3 10//3 23//3 -f 26//3 14//3 28//3 -f 23//3 12//3 26//3 -f 24//13 34//13 21//13 -f 23//13 35//13 24//13 -f 23//13 22//13 35//13 -f 21//13 33//13 22//13 -f 23//4 38//4 22//4 -f 23//4 26//4 38//4 -f 26//4 25//4 39//4 -f 22//4 37//4 25//4 -f 26//14 42//14 25//14 -f 28//14 43//14 26//14 -f 28//14 27//14 43//14 -f 25//14 41//14 27//14 -f 28//15 46//15 27//15 -f 30//15 47//15 28//15 -f 30//15 29//15 47//15 -f 27//15 45//15 29//15 -f 32//16 50//16 31//16 -f 32//16 24//16 50//16 -f 24//16 21//16 51//16 -f 31//16 49//16 21//16 -f 30//6 54//6 29//6 -f 32//6 55//6 30//6 -f 32//6 31//6 55//6 -f 29//6 53//6 31//6 -f 57//13 58//13 60//13 -f 34//17 58//17 33//17 -f 34//5 35//5 58//5 -f 36//18 60//18 35//18 -f 33//3 57//3 36//3 -f 61//4 62//4 64//4 -f 38//19 62//19 37//19 -f 39//5 63//5 38//5 -f 40//1 64//1 39//1 -f 40//3 37//3 64//3 -f 65//14 66//14 68//14 -f 42//20 66//20 41//20 -f 43//5 67//5 42//5 -f 44//21 68//21 43//21 -f 41//3 65//3 44//3 -f 69//15 70//15 72//15 -f 46//18 70//18 45//18 -f 47//5 71//5 46//5 -f 48//17 72//17 47//17 -f 48//3 45//3 72//3 -f 73//16 74//16 76//16 -f 50//21 74//21 49//21 -f 51//5 75//5 50//5 -f 52//20 76//20 51//20 -f 52//3 49//3 76//3 -f 77//6 78//6 80//6 -f 54//1 78//1 53//1 -f 55//5 79//5 54//5 -f 56//19 80//19 55//19 -f 53//3 77//3 56//3 -f 81//13 82//13 83//13 -f 83//4 84//4 85//4 -f 85//14 86//14 87//14 -f 87//15 88//15 89//15 -f 86//3 84//3 82//3 -f 82//3 92//3 90//3 -f 90//3 88//3 82//3 -f 91//16 92//16 81//16 -f 89//6 90//6 91//6 -f 95//22 94//22 99//22 -f 99//23 98//23 102//23 -f 102//24 101//24 105//24 -f 105//25 104//25 108//25 -f 108//26 107//26 111//26 -f 98//18 94//18 106//18 -f 98//1 106//1 101//1 -f 109//20 94//20 93//20 -f 107//17 104//17 97//17 -f 95//32 111//32 94//32 -f 93//19 110//19 97//19 -f 114//34 115//34 116//34 -f 116//35 117//35 118//35 -f 133//1 135//1 112//1 -f 118//36 119//36 120//36 -f 113//19 130//19 132//19 -f 120//37 121//37 122//37 -f 133//3 112//3 132//3 -f 122//38 123//38 124//38 -f 135//4 133//4 134//4 -f 124//39 125//39 126//39 -f 131//5 135//5 130//5 -f 128//40 129//40 114//40 -f 126//41 127//41 128//41 -f 112//6 131//6 113//6 +f 1/1/1 5/2/1 7/3/1 +f 6/4/2 2/5/2 4/6/2 +f 7/3/3 8/7/3 4/6/3 +f 3/8/4 4/9/4 2/10/4 +f 1/1/5 2/11/5 6/12/5 +f 7/3/6 5/2/6 6/13/6 +f 13/14/7 25/15/7 27/16/7 +f 9/17/8 21/18/8 22/19/8 +f 20/20/3 10/21/3 24/22/3 +f 15/23/9 27/24/9 29/25/9 +f 10/21/3 16/26/3 14/27/3 +f 17/28/10 29/25/10 31/29/10 +f 19/30/11 31/29/11 21/18/11 +f 18/31/3 20/20/3 32/32/3 +f 13/33/12 11/34/12 22/19/12 +f 16/26/3 18/31/3 30/35/3 +f 10/21/3 12/36/3 23/37/3 +f 14/27/3 16/26/3 28/38/3 +f 12/36/3 14/27/3 26/39/3 +f 34/40/13 33/41/13 21/18/13 +f 35/42/13 34/40/13 24/43/13 +f 22/19/13 36/44/13 35/42/13 +f 33/41/13 36/44/13 22/19/13 +f 38/45/4 37/46/4 22/19/4 +f 26/47/4 39/48/4 38/45/4 +f 25/15/4 40/49/4 39/48/4 +f 37/46/4 40/49/4 25/15/4 +f 42/50/14 41/51/14 25/15/14 +f 43/52/14 42/50/14 26/47/14 +f 27/16/14 44/53/14 43/52/14 +f 41/51/14 44/53/14 27/16/14 +f 46/54/15 45/55/15 27/24/15 +f 47/56/15 46/54/15 28/38/15 +f 29/25/15 48/57/15 47/56/15 +f 45/55/15 48/57/15 29/25/15 +f 50/58/16 49/59/16 31/29/16 +f 24/43/16 51/60/16 50/58/16 +f 21/18/16 52/61/16 51/60/16 +f 49/59/16 52/61/16 21/18/16 +f 54/62/6 53/63/6 29/25/6 +f 55/64/6 54/62/6 30/35/6 +f 31/29/6 56/65/6 55/64/6 +f 53/63/6 56/65/6 31/29/6 +f 58/66/13 59/67/13 60/68/13 +f 58/66/17 57/69/17 33/70/17 +f 35/71/5 59/67/5 58/66/5 +f 60/68/18 59/67/18 35/72/18 +f 57/69/3 60/68/3 36/73/3 +f 62/74/4 63/75/4 64/76/4 +f 62/74/19 61/77/19 37/78/19 +f 63/75/5 62/74/5 38/79/5 +f 64/76/1 63/75/1 39/80/1 +f 37/81/3 61/77/3 64/76/3 +f 66/82/14 67/83/14 68/84/14 +f 66/82/20 65/85/20 41/86/20 +f 67/83/5 66/82/5 42/87/5 +f 68/84/21 67/83/21 43/88/21 +f 65/85/3 68/84/3 44/89/3 +f 70/90/15 71/91/15 72/92/15 +f 70/90/18 69/93/18 45/94/18 +f 71/91/5 70/90/5 46/95/5 +f 72/92/17 71/91/17 47/96/17 +f 45/97/3 69/93/3 72/92/3 +f 74/98/16 75/99/16 76/100/16 +f 74/98/21 73/101/21 49/102/21 +f 75/99/5 74/98/5 50/103/5 +f 76/100/20 75/99/20 51/104/20 +f 49/105/3 73/101/3 76/100/3 +f 78/106/6 79/107/6 80/108/6 +f 78/106/1 77/109/1 53/110/1 +f 79/107/5 78/106/5 54/111/5 +f 80/108/19 79/107/19 55/112/19 +f 77/109/3 80/108/3 56/113/3 +f 82/114/13 84/115/13 83/116/13 +f 84/115/4 86/117/4 85/118/4 +f 86/117/14 88/119/14 87/120/14 +f 88/121/15 90/122/15 89/123/15 +f 82/124/3 88/119/3 86/117/3 +f 92/125/16 82/114/16 81/126/16 +f 90/122/6 92/125/6 91/127/6 +f 94/128/22 98/129/22 99/130/22 +f 98/129/23 101/131/23 102/132/23 +f 101/133/24 104/134/24 105/135/24 +f 104/136/25 107/137/25 108/138/25 +f 107/137/26 110/139/26 111/140/26 +f 96/141/27 95/142/27 99/130/27 +f 96/143/28 99/144/28 102/132/28 +f 94/128/18 109/145/18 106/146/18 +f 106/146/1 103/147/1 101/131/1 +f 96/148/29 102/149/29 105/135/29 +f 94/128/20 110/139/20 93/150/20 +f 96/151/30 105/152/30 108/138/30 +f 104/136/17 100/153/17 97/154/17 +f 96/155/31 108/156/31 111/140/31 +f 111/157/32 110/139/32 94/128/32 +f 110/139/19 107/137/19 97/154/19 +f 96/158/33 111/157/33 95/159/33 +f 115/160/34 117/161/34 116/162/34 +f 117/161/35 119/163/35 118/164/35 +f 135/165/1 131/166/1 112/167/1 +f 119/168/36 121/169/36 120/170/36 +f 130/171/19 134/172/19 132/173/19 +f 121/169/37 123/174/37 122/175/37 +f 112/167/3 113/176/3 132/177/3 +f 123/174/38 125/178/38 124/179/38 +f 133/180/4 132/181/4 134/182/4 +f 125/178/39 127/183/39 126/184/39 +f 135/165/5 134/172/5 130/171/5 +f 129/185/40 115/160/40 114/186/40 +f 127/183/41 129/185/41 128/187/41 +f 131/166/6 130/188/6 113/189/6 +f 3/8/1 1/1/1 7/3/1 +f 8/7/2 6/4/2 4/6/2 +f 3/8/3 7/3/3 4/6/3 +f 1/1/4 3/8/4 2/10/4 +f 5/2/5 1/1/5 6/12/5 +f 8/190/6 7/3/6 6/13/6 +f 15/191/7 13/14/7 27/16/7 +f 11/192/8 9/17/8 22/19/8 +f 32/32/3 20/20/3 24/22/3 +f 17/193/9 15/23/9 29/25/9 +f 14/27/3 12/36/3 10/21/3 +f 10/21/3 20/20/3 18/31/3 +f 18/31/3 16/26/3 10/21/3 +f 19/194/10 17/28/10 31/29/10 +f 9/195/11 19/30/11 21/18/11 +f 30/35/3 18/31/3 32/32/3 +f 25/15/12 13/33/12 22/19/12 +f 28/38/3 16/26/3 30/35/3 +f 24/22/3 10/21/3 23/37/3 +f 26/39/3 14/27/3 28/38/3 +f 23/37/3 12/36/3 26/39/3 +f 24/43/13 34/40/13 21/18/13 +f 23/196/13 35/42/13 24/43/13 +f 23/196/13 22/19/13 35/42/13 +f 21/18/13 33/41/13 22/19/13 +f 23/196/4 38/45/4 22/19/4 +f 23/196/4 26/47/4 38/45/4 +f 26/47/4 25/15/4 39/48/4 +f 22/19/4 37/46/4 25/15/4 +f 26/47/14 42/50/14 25/15/14 +f 28/197/14 43/52/14 26/47/14 +f 28/197/14 27/16/14 43/52/14 +f 25/15/14 41/51/14 27/16/14 +f 28/38/15 46/54/15 27/24/15 +f 30/35/15 47/56/15 28/38/15 +f 30/35/15 29/25/15 47/56/15 +f 27/24/15 45/55/15 29/25/15 +f 32/198/16 50/58/16 31/29/16 +f 32/198/16 24/43/16 50/58/16 +f 24/43/16 21/18/16 51/60/16 +f 31/29/16 49/59/16 21/18/16 +f 30/35/6 54/62/6 29/25/6 +f 32/198/6 55/64/6 30/35/6 +f 32/198/6 31/29/6 55/64/6 +f 29/25/6 53/63/6 31/29/6 +f 57/69/13 58/66/13 60/68/13 +f 34/199/17 58/66/17 33/70/17 +f 34/200/5 35/71/5 58/66/5 +f 36/201/18 60/68/18 35/72/18 +f 33/202/3 57/69/3 36/73/3 +f 61/77/4 62/74/4 64/76/4 +f 38/203/19 62/74/19 37/78/19 +f 39/204/5 63/75/5 38/79/5 +f 40/205/1 64/76/1 39/80/1 +f 40/206/3 37/81/3 64/76/3 +f 65/85/14 66/82/14 68/84/14 +f 42/207/20 66/82/20 41/86/20 +f 43/208/5 67/83/5 42/87/5 +f 44/209/21 68/84/21 43/88/21 +f 41/210/3 65/85/3 44/89/3 +f 69/93/15 70/90/15 72/92/15 +f 46/211/18 70/90/18 45/94/18 +f 47/212/5 71/91/5 46/95/5 +f 48/213/17 72/92/17 47/96/17 +f 48/214/3 45/97/3 72/92/3 +f 73/101/16 74/98/16 76/100/16 +f 50/215/21 74/98/21 49/102/21 +f 51/216/5 75/99/5 50/103/5 +f 52/217/20 76/100/20 51/104/20 +f 52/218/3 49/105/3 76/100/3 +f 77/109/6 78/106/6 80/108/6 +f 54/219/1 78/106/1 53/110/1 +f 55/220/5 79/107/5 54/111/5 +f 56/221/19 80/108/19 55/112/19 +f 53/222/3 77/109/3 56/113/3 +f 81/126/13 82/114/13 83/116/13 +f 83/116/4 84/115/4 85/118/4 +f 85/118/14 86/117/14 87/120/14 +f 87/223/15 88/121/15 89/123/15 +f 86/117/3 84/224/3 82/124/3 +f 82/124/3 92/225/3 90/226/3 +f 90/226/3 88/119/3 82/124/3 +f 91/127/16 92/125/16 81/126/16 +f 89/123/6 90/122/6 91/127/6 +f 95/142/22 94/128/22 99/130/22 +f 99/144/23 98/129/23 102/132/23 +f 102/149/24 101/133/24 105/135/24 +f 105/152/25 104/136/25 108/138/25 +f 108/156/26 107/137/26 111/140/26 +f 98/129/18 94/128/18 106/146/18 +f 98/129/1 106/146/1 101/131/1 +f 109/145/20 94/128/20 93/150/20 +f 107/137/17 104/136/17 97/154/17 +f 95/159/32 111/157/32 94/128/32 +f 93/150/19 110/139/19 97/154/19 +f 114/186/34 115/160/34 116/162/34 +f 116/162/35 117/161/35 118/164/35 +f 133/180/1 135/165/1 112/167/1 +f 118/227/36 119/168/36 120/170/36 +f 113/228/19 130/171/19 132/173/19 +f 120/170/37 121/169/37 122/175/37 +f 133/180/3 112/167/3 132/177/3 +f 122/175/38 123/174/38 124/179/38 +f 135/165/4 133/180/4 134/182/4 +f 124/179/39 125/178/39 126/184/39 +f 131/166/5 135/165/5 130/171/5 +f 128/187/40 129/185/40 114/186/40 +f 126/184/41 127/183/41 128/187/41 +f 112/167/6 131/166/6 113/189/6 diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index 63be6959f..91ae07828 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -51,6 +51,10 @@ "weapon.sparkShoot": {"category": "player", "sounds": ["weapon/sparkShoot1", "weapon/sparkShoot2", "weapon/sparkShoot3"]}, "weapon.bang": {"category": "player", "sounds": [{"name": "weapon/bang", "stream": false}]}, + "weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]}, + "weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]}, + "weapon.switchmode2": {"category": "player", "sounds": [{"name": "weapon/switchmode2", "stream": false}]}, + "entity.chopperFlyingLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperFlyingLoop", "stream": true}]}, "entity.chopperDrop": {"category": "hostile", "sounds": [{"name": "entity/chopperDrop", "stream": false}]}, "entity.chopperCharge": {"category": "hostile", "sounds": [{"name": "entity/chopperCharge", "stream": false}]}, diff --git a/assets/hbm/sounds/weapon/reloadTurret.ogg b/assets/hbm/sounds/weapon/reloadTurret.ogg new file mode 100644 index 000000000..001c36c0e Binary files /dev/null and b/assets/hbm/sounds/weapon/reloadTurret.ogg differ diff --git a/assets/hbm/sounds/weapon/switchmode1.ogg b/assets/hbm/sounds/weapon/switchmode1.ogg new file mode 100644 index 000000000..99e33186f Binary files /dev/null and b/assets/hbm/sounds/weapon/switchmode1.ogg differ diff --git a/assets/hbm/sounds/weapon/switchmode2.ogg b/assets/hbm/sounds/weapon/switchmode2.ogg new file mode 100644 index 000000000..6bd085c4b Binary files /dev/null and b/assets/hbm/sounds/weapon/switchmode2.ogg differ diff --git a/assets/hbm/textures/items/blade_tungsten.png b/assets/hbm/textures/items/blade_tungsten.png new file mode 100644 index 000000000..c7c3b04bd Binary files /dev/null and b/assets/hbm/textures/items/blade_tungsten.png differ diff --git a/assets/hbm/textures/items/bolt_compound.png b/assets/hbm/textures/items/bolt_compound.png new file mode 100644 index 000000000..faa421927 Binary files /dev/null and b/assets/hbm/textures/items/bolt_compound.png differ diff --git a/assets/hbm/textures/items/bolt_tungsten.png b/assets/hbm/textures/items/bolt_tungsten.png new file mode 100644 index 000000000..b7df361cd Binary files /dev/null and b/assets/hbm/textures/items/bolt_tungsten.png differ diff --git a/assets/hbm/textures/items/chem_icon_SAS3.png b/assets/hbm/textures/items/chem_icon_SAS3.png new file mode 100644 index 000000000..e0e439150 Binary files /dev/null and b/assets/hbm/textures/items/chem_icon_SAS3.png differ diff --git a/assets/hbm/textures/items/gas_bio.png b/assets/hbm/textures/items/gas_biogas.png similarity index 100% rename from assets/hbm/textures/items/gas_bio.png rename to assets/hbm/textures/items/gas_biogas.png diff --git a/assets/hbm/textures/items/ingot_hes.png b/assets/hbm/textures/items/ingot_hes.png index b20996ed6..78fb3e07b 100644 Binary files a/assets/hbm/textures/items/ingot_hes.png and b/assets/hbm/textures/items/ingot_hes.png differ diff --git a/assets/hbm/textures/items/ingot_les.png b/assets/hbm/textures/items/ingot_les.png index 7869cf9e1..696a32b41 100644 Binary files a/assets/hbm/textures/items/ingot_les.png and b/assets/hbm/textures/items/ingot_les.png differ diff --git a/assets/hbm/textures/items/ingot_mox_fuel.png b/assets/hbm/textures/items/ingot_mox_fuel.png index 3408c6e16..9ebb1fc61 100644 Binary files a/assets/hbm/textures/items/ingot_mox_fuel.png and b/assets/hbm/textures/items/ingot_mox_fuel.png differ diff --git a/assets/hbm/textures/items/ingot_plutonium_fuel.png b/assets/hbm/textures/items/ingot_plutonium_fuel.png new file mode 100644 index 000000000..f441bc7a7 Binary files /dev/null and b/assets/hbm/textures/items/ingot_plutonium_fuel.png differ diff --git a/assets/hbm/textures/items/ingot_pu238.png b/assets/hbm/textures/items/ingot_pu238.png new file mode 100644 index 000000000..6e4d99c53 Binary files /dev/null and b/assets/hbm/textures/items/ingot_pu238.png differ diff --git a/assets/hbm/textures/items/ingot_pu239.png b/assets/hbm/textures/items/ingot_pu239.png new file mode 100644 index 000000000..b1bf20307 Binary files /dev/null and b/assets/hbm/textures/items/ingot_pu239.png differ diff --git a/assets/hbm/textures/items/ingot_pu240.png b/assets/hbm/textures/items/ingot_pu240.png new file mode 100644 index 000000000..1ae3965c8 Binary files /dev/null and b/assets/hbm/textures/items/ingot_pu240.png differ diff --git a/assets/hbm/textures/items/ingot_schrabidium_fuel.png b/assets/hbm/textures/items/ingot_schrabidium_fuel.png index f61d10760..eca7f21c3 100644 Binary files a/assets/hbm/textures/items/ingot_schrabidium_fuel.png and b/assets/hbm/textures/items/ingot_schrabidium_fuel.png differ diff --git a/assets/hbm/textures/items/ingot_u235.png b/assets/hbm/textures/items/ingot_u235.png new file mode 100644 index 000000000..c43116a70 Binary files /dev/null and b/assets/hbm/textures/items/ingot_u235.png differ diff --git a/assets/hbm/textures/items/ingot_u238.png b/assets/hbm/textures/items/ingot_u238.png new file mode 100644 index 000000000..b2f5b584f Binary files /dev/null and b/assets/hbm/textures/items/ingot_u238.png differ diff --git a/assets/hbm/textures/items/ingot_uranium_fuel.png b/assets/hbm/textures/items/ingot_uranium_fuel.png new file mode 100644 index 000000000..b3e526967 Binary files /dev/null and b/assets/hbm/textures/items/ingot_uranium_fuel.png differ diff --git a/assets/hbm/textures/items/nugget_hes.png b/assets/hbm/textures/items/nugget_hes.png index 964608c84..e9cc511fd 100644 Binary files a/assets/hbm/textures/items/nugget_hes.png and b/assets/hbm/textures/items/nugget_hes.png differ diff --git a/assets/hbm/textures/items/nugget_les.png b/assets/hbm/textures/items/nugget_les.png index 68b7e1ac3..027f31e77 100644 Binary files a/assets/hbm/textures/items/nugget_les.png and b/assets/hbm/textures/items/nugget_les.png differ diff --git a/assets/hbm/textures/items/nugget_mox_fuel.png b/assets/hbm/textures/items/nugget_mox_fuel.png index 16d410229..af702bf7e 100644 Binary files a/assets/hbm/textures/items/nugget_mox_fuel.png and b/assets/hbm/textures/items/nugget_mox_fuel.png differ diff --git a/assets/hbm/textures/items/nugget_plutonium_fuel.png b/assets/hbm/textures/items/nugget_plutonium_fuel.png new file mode 100644 index 000000000..bbf0aa557 Binary files /dev/null and b/assets/hbm/textures/items/nugget_plutonium_fuel.png differ diff --git a/assets/hbm/textures/items/nugget_pu238.png b/assets/hbm/textures/items/nugget_pu238.png new file mode 100644 index 000000000..8ca407d20 Binary files /dev/null and b/assets/hbm/textures/items/nugget_pu238.png differ diff --git a/assets/hbm/textures/items/nugget_pu239.png b/assets/hbm/textures/items/nugget_pu239.png new file mode 100644 index 000000000..e8a719d76 Binary files /dev/null and b/assets/hbm/textures/items/nugget_pu239.png differ diff --git a/assets/hbm/textures/items/nugget_pu240.png b/assets/hbm/textures/items/nugget_pu240.png new file mode 100644 index 000000000..aedab2a69 Binary files /dev/null and b/assets/hbm/textures/items/nugget_pu240.png differ diff --git a/assets/hbm/textures/items/nugget_schrabidium_fuel.png b/assets/hbm/textures/items/nugget_schrabidium_fuel.png index 3945ba86f..65a1173e7 100644 Binary files a/assets/hbm/textures/items/nugget_schrabidium_fuel.png and b/assets/hbm/textures/items/nugget_schrabidium_fuel.png differ diff --git a/assets/hbm/textures/items/nugget_u235.png b/assets/hbm/textures/items/nugget_u235.png new file mode 100644 index 000000000..2026c787a Binary files /dev/null and b/assets/hbm/textures/items/nugget_u235.png differ diff --git a/assets/hbm/textures/items/nugget_u238.png b/assets/hbm/textures/items/nugget_u238.png new file mode 100644 index 000000000..c46f77291 Binary files /dev/null and b/assets/hbm/textures/items/nugget_u238.png differ diff --git a/assets/hbm/textures/items/nugget_uranium_fuel.png b/assets/hbm/textures/items/nugget_uranium_fuel.png new file mode 100644 index 000000000..37a25f26e Binary files /dev/null and b/assets/hbm/textures/items/nugget_uranium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_dual_mox_fuel.png b/assets/hbm/textures/items/rod_dual_mox_fuel.png index ea1e71675..07bcaf10f 100644 Binary files a/assets/hbm/textures/items/rod_dual_mox_fuel.png and b/assets/hbm/textures/items/rod_dual_mox_fuel.png differ diff --git a/assets/hbm/textures/items/rod_dual_plutonium_fuel.png b/assets/hbm/textures/items/rod_dual_plutonium_fuel.png new file mode 100644 index 000000000..858443384 Binary files /dev/null and b/assets/hbm/textures/items/rod_dual_plutonium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_dual_pu238.png b/assets/hbm/textures/items/rod_dual_pu238.png new file mode 100644 index 000000000..585ae25be Binary files /dev/null and b/assets/hbm/textures/items/rod_dual_pu238.png differ diff --git a/assets/hbm/textures/items/rod_dual_pu239.png b/assets/hbm/textures/items/rod_dual_pu239.png new file mode 100644 index 000000000..059b23678 Binary files /dev/null and b/assets/hbm/textures/items/rod_dual_pu239.png differ diff --git a/assets/hbm/textures/items/rod_dual_pu240.png b/assets/hbm/textures/items/rod_dual_pu240.png new file mode 100644 index 000000000..ff37fc6d9 Binary files /dev/null and b/assets/hbm/textures/items/rod_dual_pu240.png differ diff --git a/assets/hbm/textures/items/rod_dual_schrabidium_fuel.png b/assets/hbm/textures/items/rod_dual_schrabidium_fuel.png index 28b4b3906..9d6de319f 100644 Binary files a/assets/hbm/textures/items/rod_dual_schrabidium_fuel.png and b/assets/hbm/textures/items/rod_dual_schrabidium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_dual_u235.png b/assets/hbm/textures/items/rod_dual_u235.png new file mode 100644 index 000000000..865257160 Binary files /dev/null and b/assets/hbm/textures/items/rod_dual_u235.png differ diff --git a/assets/hbm/textures/items/rod_dual_u238.png b/assets/hbm/textures/items/rod_dual_u238.png new file mode 100644 index 000000000..e5fba3a33 Binary files /dev/null and b/assets/hbm/textures/items/rod_dual_u238.png differ diff --git a/assets/hbm/textures/items/rod_dual_uranium_fuel.png b/assets/hbm/textures/items/rod_dual_uranium_fuel.png new file mode 100644 index 000000000..22450dda7 Binary files /dev/null and b/assets/hbm/textures/items/rod_dual_uranium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_mox_fuel.png b/assets/hbm/textures/items/rod_mox_fuel.png index e025e1dbf..007e34bf0 100644 Binary files a/assets/hbm/textures/items/rod_mox_fuel.png and b/assets/hbm/textures/items/rod_mox_fuel.png differ diff --git a/assets/hbm/textures/items/rod_plutonium_fuel.png b/assets/hbm/textures/items/rod_plutonium_fuel.png new file mode 100644 index 000000000..788f3ecaf Binary files /dev/null and b/assets/hbm/textures/items/rod_plutonium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_pu238.png b/assets/hbm/textures/items/rod_pu238.png new file mode 100644 index 000000000..413d74614 Binary files /dev/null and b/assets/hbm/textures/items/rod_pu238.png differ diff --git a/assets/hbm/textures/items/rod_pu239.png b/assets/hbm/textures/items/rod_pu239.png new file mode 100644 index 000000000..b96471019 Binary files /dev/null and b/assets/hbm/textures/items/rod_pu239.png differ diff --git a/assets/hbm/textures/items/rod_pu240.png b/assets/hbm/textures/items/rod_pu240.png new file mode 100644 index 000000000..d5bc7b1e6 Binary files /dev/null and b/assets/hbm/textures/items/rod_pu240.png differ diff --git a/assets/hbm/textures/items/rod_quad_mox_fuel.png b/assets/hbm/textures/items/rod_quad_mox_fuel.png index 8259f0e1a..9612911a6 100644 Binary files a/assets/hbm/textures/items/rod_quad_mox_fuel.png and b/assets/hbm/textures/items/rod_quad_mox_fuel.png differ diff --git a/assets/hbm/textures/items/rod_quad_plutonium_fuel.png b/assets/hbm/textures/items/rod_quad_plutonium_fuel.png new file mode 100644 index 000000000..f52cfe4a8 Binary files /dev/null and b/assets/hbm/textures/items/rod_quad_plutonium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_quad_pu238.png b/assets/hbm/textures/items/rod_quad_pu238.png new file mode 100644 index 000000000..04b38a688 Binary files /dev/null and b/assets/hbm/textures/items/rod_quad_pu238.png differ diff --git a/assets/hbm/textures/items/rod_quad_pu239.png b/assets/hbm/textures/items/rod_quad_pu239.png new file mode 100644 index 000000000..afffff461 Binary files /dev/null and b/assets/hbm/textures/items/rod_quad_pu239.png differ diff --git a/assets/hbm/textures/items/rod_quad_pu240.png b/assets/hbm/textures/items/rod_quad_pu240.png new file mode 100644 index 000000000..dfa6e0904 Binary files /dev/null and b/assets/hbm/textures/items/rod_quad_pu240.png differ diff --git a/assets/hbm/textures/items/rod_quad_schrabidium_fuel.png b/assets/hbm/textures/items/rod_quad_schrabidium_fuel.png index ee941eac6..f1eb4b577 100644 Binary files a/assets/hbm/textures/items/rod_quad_schrabidium_fuel.png and b/assets/hbm/textures/items/rod_quad_schrabidium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_quad_u235.png b/assets/hbm/textures/items/rod_quad_u235.png new file mode 100644 index 000000000..8d2326a66 Binary files /dev/null and b/assets/hbm/textures/items/rod_quad_u235.png differ diff --git a/assets/hbm/textures/items/rod_quad_u238.png b/assets/hbm/textures/items/rod_quad_u238.png new file mode 100644 index 000000000..2115b8e5b Binary files /dev/null and b/assets/hbm/textures/items/rod_quad_u238.png differ diff --git a/assets/hbm/textures/items/rod_quad_uranium_fuel.png b/assets/hbm/textures/items/rod_quad_uranium_fuel.png new file mode 100644 index 000000000..126c4ef78 Binary files /dev/null and b/assets/hbm/textures/items/rod_quad_uranium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_schrabidium_fuel.png b/assets/hbm/textures/items/rod_schrabidium_fuel.png index c32e26aea..060506e90 100644 Binary files a/assets/hbm/textures/items/rod_schrabidium_fuel.png and b/assets/hbm/textures/items/rod_schrabidium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_u235.png b/assets/hbm/textures/items/rod_u235.png new file mode 100644 index 000000000..8b2e29ce6 Binary files /dev/null and b/assets/hbm/textures/items/rod_u235.png differ diff --git a/assets/hbm/textures/items/rod_u238.png b/assets/hbm/textures/items/rod_u238.png new file mode 100644 index 000000000..4b5afa375 Binary files /dev/null and b/assets/hbm/textures/items/rod_u238.png differ diff --git a/assets/hbm/textures/items/rod_uranium_fuel.png b/assets/hbm/textures/items/rod_uranium_fuel.png new file mode 100644 index 000000000..f0a7fca7e Binary files /dev/null and b/assets/hbm/textures/items/rod_uranium_fuel.png differ diff --git a/assets/hbm/textures/items/turbine_tungsten.png b/assets/hbm/textures/items/turbine_tungsten.png new file mode 100644 index 000000000..51f323786 Binary files /dev/null and b/assets/hbm/textures/items/turbine_tungsten.png differ diff --git a/assets/hbm/textures/items/turret_missile_ammo.png b/assets/hbm/textures/items/turret_rocket_ammo.png similarity index 100% rename from assets/hbm/textures/items/turret_missile_ammo.png rename to assets/hbm/textures/items/turret_rocket_ammo.png diff --git a/assets/hbm/textures/models/ModelDash.png b/assets/hbm/textures/models/ModelDash.png new file mode 100755 index 000000000..26e6cac9d Binary files /dev/null and b/assets/hbm/textures/models/ModelDash.png differ diff --git a/assets/hbm/textures/models/ModelTwiGun.png b/assets/hbm/textures/models/ModelTwiGun.png new file mode 100755 index 000000000..403da0f56 Binary files /dev/null and b/assets/hbm/textures/models/ModelTwiGun.png differ diff --git a/assets/hbm/textures/models/turret_flamer_gun.png b/assets/hbm/textures/models/turret_flamer_gun.png new file mode 100755 index 000000000..90916a63e Binary files /dev/null and b/assets/hbm/textures/models/turret_flamer_gun.png differ diff --git a/assets/hbm/textures/models/turret_flamer_rotor.png b/assets/hbm/textures/models/turret_flamer_rotor.png new file mode 100644 index 000000000..ad2a47f65 Binary files /dev/null and b/assets/hbm/textures/models/turret_flamer_rotor.png differ diff --git a/assets/hbm/textures/models/turret_heavy_base.png b/assets/hbm/textures/models/turret_heavy_base.png new file mode 100755 index 000000000..262ceac2d Binary files /dev/null and b/assets/hbm/textures/models/turret_heavy_base.png differ diff --git a/assets/hbm/textures/models/turret_heavy_gun.png b/assets/hbm/textures/models/turret_heavy_gun.png new file mode 100755 index 000000000..4c86d7de4 Binary files /dev/null and b/assets/hbm/textures/models/turret_heavy_gun.png differ diff --git a/assets/hbm/textures/models/turret_heavy_rotor.png b/assets/hbm/textures/models/turret_heavy_rotor.png new file mode 100644 index 000000000..ae170e08a Binary files /dev/null and b/assets/hbm/textures/models/turret_heavy_rotor.png differ diff --git a/assets/hbm/textures/models/turret_light_gun.png b/assets/hbm/textures/models/turret_light_gun.png new file mode 100755 index 000000000..421dab580 Binary files /dev/null and b/assets/hbm/textures/models/turret_light_gun.png differ diff --git a/assets/hbm/textures/models/turret_light_rotor.png b/assets/hbm/textures/models/turret_light_rotor.png new file mode 100644 index 000000000..23a9d384e Binary files /dev/null and b/assets/hbm/textures/models/turret_light_rotor.png differ diff --git a/assets/hbm/textures/models/turret_rocket_gun.png b/assets/hbm/textures/models/turret_rocket_gun.png new file mode 100755 index 000000000..e4f4f169f Binary files /dev/null and b/assets/hbm/textures/models/turret_rocket_gun.png differ diff --git a/assets/hbm/textures/models/turret_rocket_rotor.png b/assets/hbm/textures/models/turret_rocket_rotor.png new file mode 100644 index 000000000..071f98765 Binary files /dev/null and b/assets/hbm/textures/models/turret_rocket_rotor.png differ diff --git a/assets/hbm/textures/models/turret_rotor.png b/assets/hbm/textures/models/turret_rotor.png new file mode 100755 index 000000000..0583165c1 Binary files /dev/null and b/assets/hbm/textures/models/turret_rotor.png differ diff --git a/assets/hbm/textures/models/turret_tau_gun.png b/assets/hbm/textures/models/turret_tau_gun.png new file mode 100755 index 000000000..153e5b647 Binary files /dev/null and b/assets/hbm/textures/models/turret_tau_gun.png differ diff --git a/assets/hbm/textures/models/turret_tau_rotor.png b/assets/hbm/textures/models/turret_tau_rotor.png new file mode 100644 index 000000000..b7b30f349 Binary files /dev/null and b/assets/hbm/textures/models/turret_tau_rotor.png differ diff --git a/com/hbm/blocks/bomb/TurretBase.java b/com/hbm/blocks/bomb/TurretBase.java index 7375ab039..b08ee6c9d 100644 --- a/com/hbm/blocks/bomb/TurretBase.java +++ b/com/hbm/blocks/bomb/TurretBase.java @@ -2,8 +2,12 @@ package com.hbm.blocks.bomb; import java.util.Random; +import com.hbm.tileentity.bomb.TileEntityTurretBase; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public abstract class TurretBase extends BlockContainer { @@ -29,7 +33,7 @@ public abstract class TurretBase extends BlockContainer { return false; } - public abstract void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z); + public abstract boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z); public abstract void executeReleaseAction(World world, int i, double yaw, double pitch, int x, int y, int z); } diff --git a/com/hbm/blocks/bomb/TurretFlamer.java b/com/hbm/blocks/bomb/TurretFlamer.java index c18dad4fe..f3e4a5b41 100644 --- a/com/hbm/blocks/bomb/TurretFlamer.java +++ b/com/hbm/blocks/bomb/TurretFlamer.java @@ -23,7 +23,9 @@ public class TurretFlamer extends TurretBase { } @Override - public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + public boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + + boolean flag = false; if(pitch < -60) pitch = -60; @@ -57,7 +59,11 @@ public class TurretFlamer extends TurretBase { world.playSoundEffect(x, y, z, "hbm:weapon.flamethrowerIgnite", 1.0F, 1.0F); else world.playSoundEffect(x, y, z, "hbm:weapon.flamethrowerShoot", 1.0F, 1.0F); + + flag = true; } + + return flag; } @Override diff --git a/com/hbm/blocks/bomb/TurretHeavy.java b/com/hbm/blocks/bomb/TurretHeavy.java index e1796c83e..ea68719be 100644 --- a/com/hbm/blocks/bomb/TurretHeavy.java +++ b/com/hbm/blocks/bomb/TurretHeavy.java @@ -24,7 +24,9 @@ public class TurretHeavy extends TurretBase { } @Override - public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + public boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + + boolean flag = false; if(pitch < -60) pitch = -60; @@ -61,7 +63,11 @@ public class TurretHeavy extends TurretBase { } world.playSoundEffect(x, y, z, "hbm:weapon.defabShoot", 1.0F, 0.75F); + + flag = true; } + + return flag; } @Override diff --git a/com/hbm/blocks/bomb/TurretLight.java b/com/hbm/blocks/bomb/TurretLight.java index 47ff7cae6..9bd657bf9 100644 --- a/com/hbm/blocks/bomb/TurretLight.java +++ b/com/hbm/blocks/bomb/TurretLight.java @@ -22,7 +22,9 @@ public class TurretLight extends TurretBase { } @Override - public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + public boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + + boolean flag = false; if(pitch < -60) pitch = -60; @@ -53,7 +55,11 @@ public class TurretLight extends TurretBase { } world.playSoundEffect(x, y, z, "hbm:weapon.rifleShoot", 1.0F, 0.5F + rand.nextFloat() * 0.25F); + + flag = true; } + + return flag; } @Override diff --git a/com/hbm/blocks/bomb/TurretRocket.java b/com/hbm/blocks/bomb/TurretRocket.java index 90ee05384..9796edad4 100644 --- a/com/hbm/blocks/bomb/TurretRocket.java +++ b/com/hbm/blocks/bomb/TurretRocket.java @@ -23,7 +23,9 @@ public class TurretRocket extends TurretBase { } @Override - public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + public boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + + boolean flag = false; if(pitch < -60) pitch = -60; @@ -58,7 +60,11 @@ public class TurretRocket extends TurretBase { } world.playSoundEffect(x, y, z, "hbm:weapon.rpgShoot", 1.0F, 0.75F); + + flag = true; } + + return flag; } @Override diff --git a/com/hbm/blocks/bomb/TurretTau.java b/com/hbm/blocks/bomb/TurretTau.java index 99bfb8bc8..f654d6adb 100644 --- a/com/hbm/blocks/bomb/TurretTau.java +++ b/com/hbm/blocks/bomb/TurretTau.java @@ -22,7 +22,9 @@ public class TurretTau extends TurretBase { } @Override - public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + public boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) { + + boolean flag = false; if(pitch < -60) pitch = -60; @@ -54,7 +56,11 @@ public class TurretTau extends TurretBase { } world.playSoundEffect(x, y, z, "hbm:weapon.tauShoot", 1.0F, 0.5F); + + flag = true; } + + return flag; } @Override diff --git a/com/hbm/blocks/test/TestEventTester.java b/com/hbm/blocks/test/TestEventTester.java index dbc7ff9b6..f040b2176 100644 --- a/com/hbm/blocks/test/TestEventTester.java +++ b/com/hbm/blocks/test/TestEventTester.java @@ -14,10 +14,15 @@ import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentProtection; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.gen.ChunkProviderServer; public class TestEventTester extends Block { @@ -31,10 +36,10 @@ public class TestEventTester extends Block { } @Override - public void onNeighborBlockChange(World p_149695_1_, int x, int y, int z, Block p_149695_5_) + public void onNeighborBlockChange(World p_149695_1_, int x1, int y1, int z1, Block p_149695_5_) { this.worldObj = p_149695_1_; - if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) + if (p_149695_1_.isBlockIndirectlyGettingPowered(x1, y1, z1)) { //The laser thread is too dangerous to use right now //ThreadLaser laser = new ThreadLaser(p_149695_1_, x, y, z, "north"); @@ -68,11 +73,53 @@ public class TestEventTester extends Block { //worldObj.setBlock(x, y, z, Blocks.air); //ExplosionLarge.explode(worldObj, x + 0.5, y + 0.5, z + 0.5, MainRegistry.x, true, true, true); - EntityBlackHole bl = new EntityBlackHole(worldObj, MainRegistry.x * 0.1F); + /*EntityBlackHole bl = new EntityBlackHole(worldObj, MainRegistry.x * 0.1F); bl.posX = x + 0.5F; bl.posY = y + 0.5F; bl.posZ = z + 0.5F; - worldObj.spawnEntityInWorld(bl); + worldObj.spawnEntityInWorld(bl);*/ + if(!worldObj.isRemote) + { + try { + Chunk oldChunk = worldObj.getChunkFromBlockCoords(x1, z1); + + if(worldObj instanceof WorldServer) + { + WorldServer worldServer = (WorldServer) worldObj; + ChunkProviderServer chunkProviderServer = worldServer.theChunkProviderServer; + IChunkProvider chunkProviderGenerate = chunkProviderServer.currentChunkProvider; + + Chunk newChunk = chunkProviderGenerate.provideChunk(oldChunk.xPosition, oldChunk.zPosition); + + for (int x = 0; x < 16; x++) + { + for (int z = 0; z < 16; z++) + { + for (int y = 0; y < worldObj.getHeight(); y++) + { + Block block = newChunk.getBlock(x, y, z); + int metadata = newChunk.getBlockMetadata(x, y, z); + + worldServer.setBlock(x + oldChunk.xPosition * 16, y, z + oldChunk.zPosition * 16, block, metadata, 2); + + TileEntity tileEntity = newChunk.getTileEntityUnsafe(x, y, z); + + if(tileEntity != null) + { + worldServer.setTileEntity(x + oldChunk.xPosition * 16, y, z + oldChunk.zPosition * 16, tileEntity); + } + } + } + } + + oldChunk.isTerrainPopulated = false; + chunkProviderGenerate.populate(chunkProviderGenerate, oldChunk.xPosition, oldChunk.zPosition); + } + } catch(Exception e) { + System.out.println("Rejuvenation Failed!"); + e.printStackTrace(); + } + } } } diff --git a/com/hbm/entity/effect/EntityVortex.java b/com/hbm/entity/effect/EntityVortex.java new file mode 100644 index 000000000..9c7fabaeb --- /dev/null +++ b/com/hbm/entity/effect/EntityVortex.java @@ -0,0 +1,30 @@ +package com.hbm.entity.effect; + +import net.minecraft.world.World; + +public class EntityVortex extends EntityBlackHole { + + public EntityVortex(World p_i1582_1_) { + super(p_i1582_1_); + this.ignoreFrustumCheck = true; + this.isImmuneToFire = true; + } + + public EntityVortex(World world, float size) { + super(world); + this.dataWatcher.updateObject(16, size); + } + + @Override + public void onUpdate() { + + this.dataWatcher.updateObject(16, this.dataWatcher.getWatchableObjectFloat(16) - 0.0025F); + if(this.dataWatcher.getWatchableObjectFloat(16) <= 0) { + this.setDead(); + return; + } + + super.onUpdate(); + } + +} diff --git a/com/hbm/handler/FluidTypeHandler.java b/com/hbm/handler/FluidTypeHandler.java index bfd9c57d7..2a83e0918 100644 --- a/com/hbm/handler/FluidTypeHandler.java +++ b/com/hbm/handler/FluidTypeHandler.java @@ -38,9 +38,12 @@ public class FluidTypeHandler { BIOGAS (0xbfd37c, 12571516, 12, 2, "hbmfluid.biogas"), BIOFUEL (0xeef274, 15659636, 13, 2, "hbmfluid.biofuel"), + + NITAN (0x8018ad, 8394925, 15, 2, "hbmfluid.nitan"), UF6 (0xD1CEBE, 13749950, 14, 1, "hbmfluid.uf6"), PUF6 (0x4C4C4C, 5000268, 15, 1, "hbmfluid.puf6"), + SAS3 (0x4ffffc, 5242876, 14, 2, "hbmfluid.sas3"), AMAT (0x010101, 65793, 0, 2, "hbmfluid.amat"), ASCHRAB (0xb50000, 11862016, 1, 2, "hbmfluid.aschrab"), diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index 006b21920..27c173450 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -14,6 +14,7 @@ import com.hbm.items.tool.ItemChemistryTemplate; import com.hbm.items.tool.ItemFluidIcon; import com.hbm.main.MainRegistry; +import net.minecraft.enchantment.Enchantment; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -2097,6 +2098,18 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.drill_titanium, 1)); list.add(new ItemStack(ModItems.wire_red_copper, 6)); break; + case PUMPJACK: + list.add(new ItemStack(ModBlocks.steel_scaffold, 8)); + list.add(new ItemStack(ModBlocks.block_steel, 8)); + list.add(new ItemStack(ModItems.pipes_steel, 4)); + list.add(new ItemStack(ModItems.tank_steel, 4)); + list.add(new ItemStack(ModItems.ingot_steel, 24)); + list.add(new ItemStack(ModItems.plate_steel, 16)); + list.add(new ItemStack(ModItems.plate_aluminium, 6)); + list.add(new ItemStack(ModItems.drill_titanium, 1)); + list.add(new ItemStack(ModItems.motor, 2)); + list.add(new ItemStack(ModItems.wire_red_copper, 8)); + break; case FLARE_STACK: list.add(new ItemStack(ModBlocks.steel_scaffold, 28)); list.add(new ItemStack(ModItems.tank_steel, 2)); @@ -2132,6 +2145,7 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.hull_big_steel, 4)); break; case MINER: + list.add(new ItemStack(ModBlocks.steel_scaffold, 12)); list.add(new ItemStack(ModItems.ingot_steel, 4)); list.add(new ItemStack(ModItems.plate_titanium, 6)); list.add(new ItemStack(ModItems.wire_red_copper, 4)); @@ -2141,6 +2155,15 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.bolt_dura_steel, 2)); list.add(new ItemStack(ModItems.drill_titanium, 1)); break; + case TURBOFAN: + list.add(new ItemStack(ModItems.hull_big_steel, 1)); + list.add(new ItemStack(ModItems.hull_big_titanium, 3)); + list.add(new ItemStack(ModItems.hull_small_steel, 2)); + list.add(new ItemStack(ModItems.turbine_tungsten, 1)); + list.add(new ItemStack(ModItems.turbine_titanium, 7)); + list.add(new ItemStack(ModItems.bolt_compound, 8)); + list.add(new ItemStack(ModItems.ingot_red_copper, 24)); + break; case TELEPORTER: list.add(new ItemStack(ModItems.ingot_titanium, 6)); list.add(new ItemStack(ModItems.plate_advanced_alloy, 12)); @@ -2198,6 +2221,11 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.plate_lead, 2)); list.add(new ItemStack(ModItems.rod_empty, 3)); break; + case LR_CONTROL: + list.add(new ItemStack(ModItems.ingot_steel, 6)); + list.add(new ItemStack(ModItems.ingot_lead, 4)); + list.add(new ItemStack(ModItems.motor, 1)); + break; case LR_HATCH: list.add(new ItemStack(ModBlocks.brick_concrete, 1)); list.add(new ItemStack(ModItems.plate_steel, 6)); @@ -2396,6 +2424,48 @@ public class MachineRecipes { list.add(new ItemStack(ModBlocks.machine_battery, 1)); list.add(new ItemStack(ModItems.circuit_gold, 2)); break; + case TURRET_LIGHT: + list.add(new ItemStack(ModItems.ingot_steel, 6)); + list.add(new ItemStack(ModItems.pipes_steel, 2)); + list.add(new ItemStack(ModItems.ingot_red_copper, 2)); + list.add(new ItemStack(ModItems.motor, 2)); + list.add(new ItemStack(ModItems.circuit_red_copper, 2)); + break; + case TURRET_HEAVY: + list.add(new ItemStack(ModItems.ingot_steel, 8)); + list.add(new ItemStack(ModItems.ingot_aluminium, 4)); + list.add(new ItemStack(ModItems.pipes_steel, 2)); + list.add(new ItemStack(ModItems.hull_small_steel, 1)); + list.add(new ItemStack(ModItems.ingot_red_copper, 4)); + list.add(new ItemStack(ModItems.motor, 2)); + list.add(new ItemStack(ModItems.circuit_red_copper, 3)); + break; + case TURRET_ROCKET: + list.add(new ItemStack(ModItems.ingot_steel, 12)); + list.add(new ItemStack(ModItems.ingot_titanium, 4)); + list.add(new ItemStack(ModItems.hull_small_steel, 8)); + list.add(new ItemStack(ModItems.ingot_red_copper, 6)); + list.add(new ItemStack(ModItems.motor, 2)); + list.add(new ItemStack(ModItems.circuit_gold, 2)); + break; + case TURRET_FLAMER: + list.add(new ItemStack(ModItems.ingot_steel, 8)); + list.add(new ItemStack(ModItems.ingot_tungsten, 2)); + list.add(new ItemStack(ModItems.pipes_steel, 1)); + list.add(new ItemStack(ModItems.tank_steel, 2)); + list.add(new ItemStack(ModItems.ingot_red_copper, 4)); + list.add(new ItemStack(ModItems.motor, 2)); + list.add(new ItemStack(ModItems.circuit_red_copper, 2)); + break; + case TURRET_TAU: + list.add(new ItemStack(ModItems.ingot_steel, 16)); + list.add(new ItemStack(ModItems.ingot_titanium, 8)); + list.add(new ItemStack(ModItems.plate_advanced_alloy, 4)); + list.add(new ItemStack(ModItems.redcoil_capacitor, 3)); + list.add(new ItemStack(ModItems.ingot_red_copper, 12)); + list.add(new ItemStack(ModItems.motor, 2)); + list.add(new ItemStack(ModItems.circuit_gold, 4)); + break; case HUNTER_CHOPPER: list.add(new ItemStack(ModItems.chopper_blades, 5)); list.add(new ItemStack(ModItems.chopper_gun, 1)); @@ -2547,12 +2617,6 @@ public class MachineRecipes { list.add(new ItemStack(Items.redstone, 7)); list.add(new ItemStack(ModItems.powder_power, 3)); break; - case GREANADE_ENHANCED: - list.add(new ItemStack(ModItems.plate_iron, 4)); - list.add(new ItemStack(ModItems.plate_steel, 2)); - list.add(new ItemStack(ModItems.wire_red_copper, 2)); - list.add(new ItemStack(Blocks.tnt, 1)); - break; case GRENADE_FLAME: list.add(new ItemStack(ModItems.grenade_frag, 1)); list.add(new ItemStack(ModItems.powder_fire, 1)); @@ -3061,6 +3125,9 @@ public class MachineRecipes { case DERRICK: output = new ItemStack(ModBlocks.machine_well, 1); break; + case PUMPJACK: + output = new ItemStack(ModBlocks.machine_pumpjack, 1); + break; case FLARE_STACK: output = new ItemStack(ModBlocks.machine_flare, 1); break; @@ -3076,6 +3143,9 @@ public class MachineRecipes { case MINER: output = new ItemStack(ModBlocks.machine_drill, 1); break; + case TURBOFAN: + output = new ItemStack(ModBlocks.machine_turbofan, 1); + break; case TELEPORTER: output = new ItemStack(ModBlocks.machine_teleporter, 1); break; @@ -3100,6 +3170,9 @@ public class MachineRecipes { case LR_ELEMENT: output = new ItemStack(ModBlocks.reactor_element, 1); break; + case LR_CONTROL: + output = new ItemStack(ModBlocks.reactor_control, 1); + break; case LR_HATCH: output = new ItemStack(ModBlocks.reactor_hatch, 1); break; @@ -3196,6 +3269,21 @@ public class MachineRecipes { case LAUNCH_PAD: output = new ItemStack(ModBlocks.launch_pad, 1); break; + case TURRET_LIGHT: + output = new ItemStack(ModBlocks.turret_light, 1); + break; + case TURRET_HEAVY: + output = new ItemStack(ModBlocks.turret_heavy, 1); + break; + case TURRET_ROCKET: + output = new ItemStack(ModBlocks.turret_rocket, 1); + break; + case TURRET_FLAMER: + output = new ItemStack(ModBlocks.turret_flamer, 1); + break; + case TURRET_TAU: + output = new ItemStack(ModBlocks.turret_tau, 1); + break; case HUNTER_CHOPPER: output = new ItemStack(ModItems.chopper, 1); break; @@ -3262,9 +3350,6 @@ public class MachineRecipes { case COMBINE_BALL: output = new ItemStack(ModItems.gun_osipr_ammo2, 1); break; - case GREANADE_ENHANCED: - output = new ItemStack(ModItems.grenade_strong, 1); - break; case GRENADE_FLAME: output = new ItemStack(ModItems.grenade_fire, 1); break; @@ -3293,7 +3378,7 @@ public class MachineRecipes { output = new ItemStack(ModItems.grenade_schrabidium, 1); break; case GRENADE_NUKE: - output = new ItemStack(ModItems.grenade_nuke, 1); + output = new ItemStack(ModItems.grenade_nuclear, 1); break; case GRENADE_ZOMG: output = new ItemStack(ModItems.grenade_zomg, 1); @@ -3302,7 +3387,10 @@ public class MachineRecipes { output = new ItemStack(ModItems.grenade_black_hole, 1); break; case POWER_FIST: - output = new ItemStack(ModItems.multitool_dig, 1); + ItemStack multitool = new ItemStack(ModItems.multitool_dig, 1); + multitool.addEnchantment(Enchantment.looting, 3); + multitool.addEnchantment(Enchantment.fortune, 3); + output = multitool.copy(); break; case GADGET_PROPELLANT: output = new ItemStack(ModItems.gadget_explosive, 1); @@ -3520,6 +3608,18 @@ public class MachineRecipes { case BP_BIOGAS: list.add(new ItemStack(ModItems.biomass, 16)); break; + case UF6: + list.add(new ItemStack(ModItems.powder_uranium, 1)); + list.add(new ItemStack(ModItems.fluorite, 3)); + break; + case PUF6: + list.add(new ItemStack(ModItems.powder_plutonium, 1)); + list.add(new ItemStack(ModItems.fluorite, 3)); + break; + case SAS3: + list.add(new ItemStack(ModItems.powder_schrabidium, 1)); + list.add(new ItemStack(ModItems.sulfur, 2)); + break; default: break; } @@ -3670,6 +3770,15 @@ public class MachineRecipes { case BP_BIOFUEL: input[0] = new FluidStack(2000, FluidType.BIOGAS); break; + case UF6: + input[0] = new FluidStack(1000, FluidType.WATER); + break; + case PUF6: + input[0] = new FluidStack(1000, FluidType.WATER); + break; + case SAS3: + input[0] = new FluidStack(2000, FluidType.ACID); + break; default: break; } @@ -3845,6 +3954,15 @@ public class MachineRecipes { case BP_BIOFUEL: input[0] = new FluidStack(1000, FluidType.BIOFUEL); break; + case UF6: + input[0] = new FluidStack(1000, FluidType.UF6); + break; + case PUF6: + input[0] = new FluidStack(1000, FluidType.PUF6); + break; + case SAS3: + input[0] = new FluidStack(1000, FluidType.SAS3); + break; default: break; } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 71037ea62..7139d6b9d 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -128,6 +128,8 @@ public class ModItems { public static Item drill_titanium; public static Item plate_dalekanium; public static Item plate_euphemium; + public static Item bolt_tungsten; + public static Item bolt_compound; public static Item ingot_dura_steel; public static Item ingot_polymer; @@ -265,6 +267,8 @@ public class ModItems { public static Item blade_titanium; public static Item turbine_titanium; public static Item generator_front; + public static Item blade_tungsten; + public static Item turbine_tungsten; public static Item toothpicks; public static Item ducttape; @@ -382,10 +386,12 @@ public class ModItems { public static Item canister_heatingoil; public static Item canister_naphtha; public static Item canister_lightoil; + public static Item canister_biofuel; public static Item gas_empty; public static Item gas_full; public static Item gas_petroleum; + public static Item gas_biogas; public static Item fluid_tank_full; public static Item fluid_tank_empty; @@ -621,6 +627,10 @@ public class ModItems { public static Item gun_hp_ammo; public static Item gun_euthanasia; public static Item gun_euthanasia_ammo; + public static Item gun_dash; + public static Item gun_dash_ammo; + public static Item gun_twigun; + public static Item gun_twigun_ammo; public static Item gun_defabricator; public static Item gun_defabricator_ammo; public static Item gun_waluigi; @@ -928,6 +938,12 @@ public class ModItems { public static Item turret_chip; public static Item chopper; + public static Item turret_light_ammo; + public static Item turret_heavy_ammo; + public static Item turret_rocket_ammo; + public static Item turret_flamer_ammo; + public static Item turret_tau_ammo; + public static Item bucket_mud; public static Item bucket_acid; public static Item bucket_toxic; @@ -1036,22 +1052,22 @@ public class ModItems { test_nuke_tier2_target = new Item().setUnlocalizedName("test_nuke_tier2_target").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_tier2_target"); ingot_uranium = new ItemRadioactive().setUnlocalizedName("ingot_uranium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_uranium"); - ingot_u235 = new ItemRadioactive().setUnlocalizedName("ingot_u235").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_uranium"); - ingot_u238 = new ItemRadioactive().setUnlocalizedName("ingot_u238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_uranium"); + ingot_u235 = new ItemRadioactive().setUnlocalizedName("ingot_u235").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_u235"); + ingot_u238 = new ItemRadioactive().setUnlocalizedName("ingot_u238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_u238"); ingot_plutonium = new ItemRadioactive().setUnlocalizedName("ingot_plutonium").setCreativeTab(MainRegistry.tabParts).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium"); - ingot_pu238 = new ItemRadioactive().setUnlocalizedName("ingot_pu238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium"); - ingot_pu239 = new ItemRadioactive().setUnlocalizedName("ingot_pu239").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium"); - ingot_pu240 = new ItemRadioactive().setUnlocalizedName("ingot_pu240").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium"); + ingot_pu238 = new ItemRadioactive().setUnlocalizedName("ingot_pu238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_pu238"); + ingot_pu239 = new ItemRadioactive().setUnlocalizedName("ingot_pu239").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_pu239"); + ingot_pu240 = new ItemRadioactive().setUnlocalizedName("ingot_pu240").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_pu240"); ingot_neptunium = new ItemCustomLore().setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_neptunium"); ingot_titanium = new Item().setUnlocalizedName("ingot_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_titanium"); sulfur = new Item().setUnlocalizedName("sulfur").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":sulfur"); - ingot_uranium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_uranium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_uranium"); - ingot_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_plutonium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium"); + ingot_uranium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_uranium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_uranium_fuel"); + ingot_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_plutonium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium_fuel"); ingot_mox_fuel = new ItemRadioactive().setUnlocalizedName("ingot_mox_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_mox_fuel"); ingot_schrabidium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_schrabidium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_schrabidium_fuel"); - nugget_uranium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_uranium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium"); - nugget_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_plutonium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium"); + nugget_uranium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_uranium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium_fuel"); + nugget_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_plutonium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium_fuel"); nugget_mox_fuel = new ItemRadioactive().setUnlocalizedName("nugget_mox_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_mox_fuel"); nugget_schrabidium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_schrabidium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_schrabidium_fuel"); ingot_advanced_alloy = new Item().setUnlocalizedName("ingot_advanced_alloy").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_advanced_alloy"); @@ -1087,6 +1103,8 @@ public class ModItems { drill_titanium = new Item().setUnlocalizedName("drill_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":drill_titanium"); plate_dalekanium = new Item().setUnlocalizedName("plate_dalekanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_dalekanium"); plate_euphemium = new ItemCustomLore().setUnlocalizedName("plate_euphemium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":plate_euphemium"); + bolt_tungsten = new Item().setUnlocalizedName("bolt_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":bolt_tungsten"); + bolt_compound = new Item().setUnlocalizedName("bolt_compound").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":bolt_compound"); ingot_dura_steel = new ItemCustomLore().setUnlocalizedName("ingot_dura_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_dura_steel"); ingot_polymer = new ItemCustomLore().setUnlocalizedName("ingot_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_polymer"); @@ -1112,12 +1130,12 @@ public class ModItems { nugget_verticium = new ItemCustomLore().setUnlocalizedName("nugget_verticium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_verticium"); nugget_uranium = new ItemRadioactive().setUnlocalizedName("nugget_uranium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium"); - nugget_u235 = new ItemRadioactive().setUnlocalizedName("nugget_u235").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium"); - nugget_u238 = new ItemRadioactive().setUnlocalizedName("nugget_u238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium"); + nugget_u235 = new ItemRadioactive().setUnlocalizedName("nugget_u235").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_u235"); + nugget_u238 = new ItemRadioactive().setUnlocalizedName("nugget_u238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_u238"); nugget_plutonium = new ItemRadioactive().setUnlocalizedName("nugget_plutonium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium"); - nugget_pu238 = new ItemRadioactive().setUnlocalizedName("nugget_pu238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium"); - nugget_pu239 = new ItemRadioactive().setUnlocalizedName("nugget_pu239").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium"); - nugget_pu240 = new ItemRadioactive().setUnlocalizedName("nugget_pu240").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium"); + nugget_pu238 = new ItemRadioactive().setUnlocalizedName("nugget_pu238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_pu238"); + nugget_pu239 = new ItemRadioactive().setUnlocalizedName("nugget_pu239").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_pu239"); + nugget_pu240 = new ItemRadioactive().setUnlocalizedName("nugget_pu240").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_pu240"); nugget_neptunium = new ItemRadioactive().setUnlocalizedName("nugget_neptunium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_neptunium"); plate_titanium = new Item().setUnlocalizedName("plate_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_titanium"); plate_aluminium = new Item().setUnlocalizedName("plate_aluminium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_aluminium"); @@ -1245,6 +1263,8 @@ public class ModItems { blade_titanium = new Item().setUnlocalizedName("blade_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blade_titanium"); turbine_titanium = new Item().setUnlocalizedName("turbine_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":turbine_titanium"); generator_front = new Item().setUnlocalizedName("generator_front").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":generator_front"); + blade_tungsten = new Item().setUnlocalizedName("blade_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blade_tungsten"); + turbine_tungsten = new Item().setUnlocalizedName("turbine_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":turbine_tungsten"); toothpicks = new Item().setUnlocalizedName("toothpicks").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":toothpicks"); ducttape = new Item().setUnlocalizedName("ducttape").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ducttape"); @@ -1360,9 +1380,11 @@ public class ModItems { canister_heatingoil = new ItemCustomLore().setUnlocalizedName("canister_heatingoil").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_heatingoil"); canister_naphtha = new ItemCustomLore().setUnlocalizedName("canister_naphtha").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_naphtha"); canister_lightoil = new ItemCustomLore().setUnlocalizedName("canister_lightoil").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_lightoil"); + canister_biofuel = new ItemCustomLore().setUnlocalizedName("canister_biofuel").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_biofuel"); gas_empty = new Item().setUnlocalizedName("gas_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":gas_empty"); gas_full = new Item().setUnlocalizedName("gas_full").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_full"); gas_petroleum = new Item().setUnlocalizedName("gas_petroleum").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_petroleum"); + gas_biogas = new Item().setUnlocalizedName("gas_biogas").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_biogas"); tank_waste = new ItemTankWaste().setUnlocalizedName("tank_waste").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts); @@ -1402,12 +1424,12 @@ public class ModItems { rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":rod_empty"); rod_uranium = new ItemCustomLore().setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); - rod_u235 = new ItemCustomLore().setUnlocalizedName("rod_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); - rod_u238 = new ItemCustomLore().setUnlocalizedName("rod_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); + rod_u235 = new ItemCustomLore().setUnlocalizedName("rod_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u235"); + rod_u238 = new ItemCustomLore().setUnlocalizedName("rod_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u238"); rod_plutonium = new ItemCustomLore().setUnlocalizedName("rod_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium"); - rod_pu238 = new ItemCustomLore().setUnlocalizedName("rod_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium"); - rod_pu239 = new ItemCustomLore().setUnlocalizedName("rod_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium"); - rod_pu240 = new ItemCustomLore().setUnlocalizedName("rod_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium"); + rod_pu238 = new ItemCustomLore().setUnlocalizedName("rod_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu238"); + rod_pu239 = new ItemCustomLore().setUnlocalizedName("rod_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu239"); + rod_pu240 = new ItemCustomLore().setUnlocalizedName("rod_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu240"); rod_neptunium = new ItemCustomLore().setUnlocalizedName("rod_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_neptunium"); rod_lead = new Item().setUnlocalizedName("rod_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_lead"); rod_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium"); @@ -1421,34 +1443,34 @@ public class ModItems { rod_dual_empty = new Item().setUnlocalizedName("rod_dual_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":rod_dual_empty"); rod_dual_uranium = new ItemCustomLore().setUnlocalizedName("rod_dual_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium"); - rod_dual_u235 = new ItemCustomLore().setUnlocalizedName("rod_dual_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium"); - rod_dual_u238 = new ItemCustomLore().setUnlocalizedName("rod_dual_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium"); + rod_dual_u235 = new ItemCustomLore().setUnlocalizedName("rod_dual_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u235"); + rod_dual_u238 = new ItemCustomLore().setUnlocalizedName("rod_dual_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u238"); rod_dual_plutonium = new ItemCustomLore().setUnlocalizedName("rod_dual_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium"); - rod_dual_pu238 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium"); - rod_dual_pu239 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium"); - rod_dual_pu240 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium"); + rod_dual_pu238 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu238"); + rod_dual_pu239 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu239"); + rod_dual_pu240 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu240"); rod_dual_neptunium = new ItemCustomLore().setUnlocalizedName("rod_dual_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_neptunium"); rod_dual_lead = new Item().setUnlocalizedName("rod_dual_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_lead"); rod_dual_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_dual_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium"); rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":rod_quad_empty"); rod_quad_uranium = new ItemCustomLore().setUnlocalizedName("rod_quad_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium"); - rod_quad_u235 = new ItemCustomLore().setUnlocalizedName("rod_quad_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium"); - rod_quad_u238 = new ItemCustomLore().setUnlocalizedName("rod_quad_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium"); + rod_quad_u235 = new ItemCustomLore().setUnlocalizedName("rod_quad_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u235"); + rod_quad_u238 = new ItemCustomLore().setUnlocalizedName("rod_quad_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u238"); rod_quad_plutonium = new ItemCustomLore().setUnlocalizedName("rod_quad_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium"); - rod_quad_pu238 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium"); - rod_quad_pu239 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium"); - rod_quad_pu240 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium"); + rod_quad_pu238 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu238"); + rod_quad_pu239 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu239"); + rod_quad_pu240 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu240"); rod_quad_neptunium = new ItemCustomLore().setUnlocalizedName("rod_quad_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_neptunium"); rod_quad_lead = new Item().setUnlocalizedName("rod_quad_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_lead"); rod_quad_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_quad_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium"); - rod_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_uranium_fuel").setMaxStackSize(1).setMaxDamage(10000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); - rod_dual_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_uranium_fuel").setMaxStackSize(1).setMaxDamage(20000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium"); - rod_quad_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_uranium_fuel").setMaxStackSize(1).setMaxDamage(40000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium"); - rod_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_plutonium_fuel").setMaxStackSize(1).setMaxDamage(25000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium"); - rod_dual_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_plutonium_fuel").setMaxStackSize(1).setMaxDamage(50000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium"); - rod_quad_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_plutonium_fuel").setMaxStackSize(1).setMaxDamage(100000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium"); + rod_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_uranium_fuel").setMaxStackSize(1).setMaxDamage(10000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel"); + rod_dual_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_uranium_fuel").setMaxStackSize(1).setMaxDamage(20000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel"); + rod_quad_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_uranium_fuel").setMaxStackSize(1).setMaxDamage(40000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium_fuel"); + rod_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_plutonium_fuel").setMaxStackSize(1).setMaxDamage(25000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium_fuel"); + rod_dual_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_plutonium_fuel").setMaxStackSize(1).setMaxDamage(50000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium_fuel"); + rod_quad_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_plutonium_fuel").setMaxStackSize(1).setMaxDamage(100000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium_fuel"); rod_mox_fuel = new ItemFuelRod().setUnlocalizedName("rod_mox_fuel").setMaxStackSize(1).setMaxDamage(100000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_mox_fuel"); rod_dual_mox_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_mox_fuel").setMaxStackSize(1).setMaxDamage(200000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_mox_fuel"); rod_quad_mox_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_mox_fuel").setMaxStackSize(1).setMaxDamage(400000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_mox_fuel"); @@ -1581,6 +1603,10 @@ public class ModItems { gun_hp = new GunHP().setUnlocalizedName("gun_hp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_hp"); gun_euthanasia_ammo = new Item().setUnlocalizedName("gun_euthanasia_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_euthanasia_ammo"); gun_euthanasia = new GunEuthanasia().setUnlocalizedName("gun_euthanasia").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_euthanasia"); + gun_dash_ammo = new Item().setUnlocalizedName("gun_dash_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_dash_ammo"); + gun_dash = new GunEuthanasia().setUnlocalizedName("gun_dash").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_dash"); + gun_twigun_ammo = new Item().setUnlocalizedName("gun_twigun_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_twigun_ammo"); + gun_twigun = new GunEuthanasia().setUnlocalizedName("gun_twigun").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_twigun"); gun_defabricator_ammo = new Item().setUnlocalizedName("gun_defabricator_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_defabricator_ammo"); gun_defabricator = new GunDefabricator().setUnlocalizedName("gun_defabricator").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_defabricator"); gun_super_shotgun = new ItemCustomLore().setUnlocalizedName("gun_super_shotgun").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_super_shotgun"); @@ -1756,6 +1782,12 @@ public class ModItems { turret_chip = new ItemTurretChip().setUnlocalizedName("turret_chip").setFull3D().setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_chip"); geiger_counter = new ItemGeigerCounter().setUnlocalizedName("geiger_counter").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":geiger_counter"); survey_scanner = new ItemSurveyScanner().setUnlocalizedName("survey_scanner").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":survey_scanner"); + + turret_light_ammo = new ItemTurretAmmo(ModBlocks.turret_light, 100).setUnlocalizedName("turret_light_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_light_ammo"); + turret_heavy_ammo = new ItemTurretAmmo(ModBlocks.turret_heavy, 25).setUnlocalizedName("turret_heavy_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_heavy_ammo"); + turret_rocket_ammo = new ItemTurretAmmo(ModBlocks.turret_rocket, 8).setUnlocalizedName("turret_rocket_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_rocket_ammo"); + turret_flamer_ammo = new ItemTurretAmmo(ModBlocks.turret_flamer, 200).setUnlocalizedName("turret_flamer_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_flamer_ammo"); + turret_tau_ammo = new ItemTurretAmmo(ModBlocks.turret_tau, 100).setUnlocalizedName("turret_tau_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_tau_ammo"); template_folder = new ItemTemplateFolder().setUnlocalizedName("template_folder").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":template_folder"); assembly_template = new ItemAssemblyTemplate().setUnlocalizedName("assembly_template").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":assembly_template"); @@ -2184,6 +2216,8 @@ public class ModItems { //Bolts GameRegistry.registerItem(bolt_dura_steel, bolt_dura_steel.getUnlocalizedName()); + GameRegistry.registerItem(bolt_tungsten, bolt_tungsten.getUnlocalizedName()); + GameRegistry.registerItem(bolt_compound, bolt_compound.getUnlocalizedName()); //Other Plates GameRegistry.registerItem(hazmat_cloth, hazmat_cloth.getUnlocalizedName()); @@ -2247,7 +2281,9 @@ public class ModItems { GameRegistry.registerItem(rotor_steel, rotor_steel.getUnlocalizedName()); GameRegistry.registerItem(generator_steel, generator_steel.getUnlocalizedName()); GameRegistry.registerItem(blade_titanium, blade_titanium.getUnlocalizedName()); + GameRegistry.registerItem(blade_tungsten, blade_tungsten.getUnlocalizedName()); GameRegistry.registerItem(turbine_titanium, turbine_titanium.getUnlocalizedName()); + GameRegistry.registerItem(turbine_tungsten, turbine_tungsten.getUnlocalizedName()); GameRegistry.registerItem(generator_front, generator_front.getUnlocalizedName()); GameRegistry.registerItem(toothpicks, toothpicks.getUnlocalizedName()); GameRegistry.registerItem(ducttape, ducttape.getUnlocalizedName()); @@ -2369,6 +2405,7 @@ public class ModItems { GameRegistry.registerItem(canister_lightoil, canister_lightoil.getUnlocalizedName()); GameRegistry.registerItem(canister_reoil, canister_reoil.getUnlocalizedName()); GameRegistry.registerItem(canister_petroil, canister_petroil.getUnlocalizedName()); + GameRegistry.registerItem(canister_biofuel, canister_biofuel.getUnlocalizedName()); GameRegistry.registerItem(canister_napalm, canister_napalm.getUnlocalizedName()); GameRegistry.registerItem(canister_NITAN, canister_NITAN.getUnlocalizedName()); @@ -2376,6 +2413,7 @@ public class ModItems { GameRegistry.registerItem(gas_empty, gas_empty.getUnlocalizedName()); GameRegistry.registerItem(gas_full, gas_full.getUnlocalizedName()); GameRegistry.registerItem(gas_petroleum, gas_petroleum.getUnlocalizedName()); + GameRegistry.registerItem(gas_biogas, gas_biogas.getUnlocalizedName()); //Universal Tank GameRegistry.registerItem(fluid_tank_empty, fluid_tank_empty.getUnlocalizedName()); @@ -2636,6 +2674,8 @@ public class ModItems { GameRegistry.registerItem(gun_spark, gun_spark.getUnlocalizedName()); GameRegistry.registerItem(gun_hp, gun_hp.getUnlocalizedName()); GameRegistry.registerItem(gun_euthanasia, gun_euthanasia.getUnlocalizedName()); + GameRegistry.registerItem(gun_dash, gun_dash.getUnlocalizedName()); + GameRegistry.registerItem(gun_twigun, gun_twigun.getUnlocalizedName()); GameRegistry.registerItem(gun_defabricator, gun_defabricator.getUnlocalizedName()); GameRegistry.registerItem(gun_super_shotgun, gun_super_shotgun.getUnlocalizedName()); GameRegistry.registerItem(gun_moist_nugget, gun_moist_nugget.getUnlocalizedName()); @@ -2668,6 +2708,13 @@ public class ModItems { GameRegistry.registerItem(gun_defabricator_ammo, gun_defabricator_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_euthanasia_ammo, gun_euthanasia_ammo.getUnlocalizedName()); + //Turret Ammo + GameRegistry.registerItem(turret_light_ammo, turret_light_ammo.getUnlocalizedName()); + GameRegistry.registerItem(turret_heavy_ammo, turret_heavy_ammo.getUnlocalizedName()); + GameRegistry.registerItem(turret_rocket_ammo, turret_rocket_ammo.getUnlocalizedName()); + GameRegistry.registerItem(turret_flamer_ammo, turret_flamer_ammo.getUnlocalizedName()); + GameRegistry.registerItem(turret_tau_ammo, turret_tau_ammo.getUnlocalizedName()); + //-C-l-i-p-s- Magazines GameRegistry.registerItem(clip_revolver_iron, clip_revolver_iron.getUnlocalizedName()); GameRegistry.registerItem(clip_revolver, clip_revolver.getUnlocalizedName()); diff --git a/com/hbm/items/special/ItemDrop.java b/com/hbm/items/special/ItemDrop.java index 41b9bcce9..94da4ed94 100644 --- a/com/hbm/items/special/ItemDrop.java +++ b/com/hbm/items/special/ItemDrop.java @@ -4,7 +4,9 @@ import java.util.List; import com.hbm.entity.effect.EntityBlackHole; import com.hbm.entity.effect.EntityCloudFleija; +import com.hbm.entity.effect.EntityVortex; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; +import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; @@ -41,7 +43,7 @@ public class ItemDrop extends Item { entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ, "random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); - EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj); + EntityNukeExplosionMK3 entity = new EntityNukeExplosionMK3(entityItem.worldObj); entity.posX = entityItem.posX; entity.posY = entityItem.posY; entity.posZ = entityItem.posZ; @@ -61,56 +63,32 @@ public class ItemDrop extends Item { } if (stack.getItem() != null && stack.getItem() == ModItems.singularity) { if (!entityItem.worldObj.isRemote) { - entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ, - "random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); - EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj); - entity.posX = entityItem.posX; - entity.posY = entityItem.posY; - entity.posZ = entityItem.posZ; - entity.destructionRange = MainRegistry.aSchrabRadius; - entity.speed = 25; - entity.coefficient = 0.01F; - entity.coefficient2 = 0.01F; - entity.waste = false; - - entityItem.worldObj.spawnEntityInWorld(entity); + EntityVortex bl = new EntityVortex(entityItem.worldObj, 1.5F); + bl.posX = entityItem.posX ; + bl.posY = entityItem.posY ; + bl.posZ = entityItem.posZ ; + entityItem.worldObj.spawnEntityInWorld(bl); } } if (stack.getItem() != null && stack.getItem() == ModItems.singularity_counter_resonant) { if (!entityItem.worldObj.isRemote) { - entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ, - "random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); - EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj); - entity.posX = entityItem.posX; - entity.posY = entityItem.posY; - entity.posZ = entityItem.posZ; - entity.destructionRange = MainRegistry.aSchrabRadius * 2; - entity.speed = 25; - entity.coefficient = 0.01F; - entity.coefficient2 = 0.01F; - entity.waste = false; - - entityItem.worldObj.spawnEntityInWorld(entity); + EntityVortex bl = new EntityVortex(entityItem.worldObj, 2.5F); + bl.posX = entityItem.posX ; + bl.posY = entityItem.posY ; + bl.posZ = entityItem.posZ ; + entityItem.worldObj.spawnEntityInWorld(bl); } } if (stack.getItem() != null && stack.getItem() == ModItems.singularity_super_heated) { if (!entityItem.worldObj.isRemote) { - entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ, - "random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); - EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj); - entity.posX = entityItem.posX; - entity.posY = entityItem.posY; - entity.posZ = entityItem.posZ; - entity.destructionRange = MainRegistry.aSchrabRadius * 2; - entity.speed = 25; - entity.coefficient = 0.01F; - entity.coefficient2 = 0.01F; - entity.waste = false; - - entityItem.worldObj.spawnEntityInWorld(entity); + EntityVortex bl = new EntityVortex(entityItem.worldObj, 2.5F); + bl.posX = entityItem.posX ; + bl.posY = entityItem.posY ; + bl.posZ = entityItem.posZ ; + entityItem.worldObj.spawnEntityInWorld(bl); } } if (stack.getItem() != null && stack.getItem() == ModItems.black_hole) { @@ -130,7 +108,7 @@ public class ItemDrop extends Item { entityItem.worldObj.spawnEntityInWorld(entity);*/ - EntityBlackHole bl = new EntityBlackHole(entityItem.worldObj, 0.5F); + EntityBlackHole bl = new EntityBlackHole(entityItem.worldObj, 1.5F); bl.posX = entityItem.posX ; bl.posY = entityItem.posY ; bl.posZ = entityItem.posZ ; diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java index fc7128588..fc89a5c26 100644 --- a/com/hbm/items/tool/ItemAssemblyTemplate.java +++ b/com/hbm/items/tool/ItemAssemblyTemplate.java @@ -123,11 +123,13 @@ public class ItemAssemblyTemplate extends Item { RF_TO_HE, SHREDDER, DERRICK, + PUMPJACK, FLARE_STACK, REFINERY, CHEMPLANT, TANK, MINER, + TURBOFAN, TELEPORTER, SCHRABTRANS, CMB_FURNACE, @@ -136,6 +138,7 @@ public class ItemAssemblyTemplate extends Item { FA_CORE, FA_PORT, LR_ELEMENT, + LR_CONTROL, LR_HATCH, LR_PORT, LR_CORE, @@ -169,6 +172,11 @@ public class ItemAssemblyTemplate extends Item { BOMB_EXO, LAUNCH_PAD, HUNTER_CHOPPER, + TURRET_LIGHT, + TURRET_HEAVY, + TURRET_ROCKET, + TURRET_FLAMER, + TURRET_TAU, MISSILE_HE_1, MISSILE_FIRE_1, MISSILE_CLUSTER_1, @@ -190,7 +198,6 @@ public class ItemAssemblyTemplate extends Item { MINI_MIRV, DARK_PLUG, COMBINE_BALL, - GREANADE_ENHANCED, GRENADE_FLAME, GRENADE_SHRAPNEL, GRENAGE_CLUSTER, @@ -496,6 +503,8 @@ public class ItemAssemblyTemplate extends Item { return 200; case DERRICK: return 250; + case PUMPJACK: + return 400; case FLARE_STACK: return 200; case REFINERY: @@ -506,6 +515,8 @@ public class ItemAssemblyTemplate extends Item { return 150; case MINER: return 200; + case TURBOFAN: + return 500; case TELEPORTER: return 300; case SCHRABTRANS: @@ -522,6 +533,8 @@ public class ItemAssemblyTemplate extends Item { return 50; case LR_ELEMENT: return 150; + case LR_CONTROL: + return 100; case LR_HATCH: return 150; case LR_PORT: @@ -586,6 +599,16 @@ public class ItemAssemblyTemplate extends Item { return 250; case LAUNCH_PAD: return 250; + case TURRET_LIGHT: + return 200; + case TURRET_HEAVY: + return 250; + case TURRET_ROCKET: + return 300; + case TURRET_FLAMER: + return 250; + case TURRET_TAU: + return 350; case HUNTER_CHOPPER: return 300; case MISSILE_HE_1: @@ -630,8 +653,6 @@ public class ItemAssemblyTemplate extends Item { return 50; case COMBINE_BALL: return 200; - case GREANADE_ENHANCED: - return 150; case GRENADE_FLAME: return 150; case GRENADE_SHRAPNEL: diff --git a/com/hbm/items/tool/ItemChemistryTemplate.java b/com/hbm/items/tool/ItemChemistryTemplate.java index ebb351f3a..cd996ebbb 100644 --- a/com/hbm/items/tool/ItemChemistryTemplate.java +++ b/com/hbm/items/tool/ItemChemistryTemplate.java @@ -67,7 +67,8 @@ public class ItemChemistryTemplate extends Item { DEUTERIUM, STEAM, UF6, - PUF6; + PUF6, + SAS3; public static EnumChemistryTemplate getEnum(int i) { if(i < EnumChemistryTemplate.values().length) @@ -201,6 +202,12 @@ public class ItemChemistryTemplate extends Item { return 200; case BP_BIOFUEL: return 100; + case UF6: + return 100; + case PUF6: + return 150; + case SAS3: + return 200; default: return 100; } diff --git a/com/hbm/items/tool/ItemGeigerCounter.java b/com/hbm/items/tool/ItemGeigerCounter.java index a690bee8c..190ca8560 100644 --- a/com/hbm/items/tool/ItemGeigerCounter.java +++ b/com/hbm/items/tool/ItemGeigerCounter.java @@ -8,6 +8,7 @@ import com.hbm.blocks.ModBlocks; import net.minecraft.block.Block; import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -132,5 +133,13 @@ public class ItemGeigerCounter extends Item { return i * level; } + + /*@Override + public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer player, World world, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) + { + if(!world.isRemote) + player.travelToDimension(1); + return true; + }*/ } diff --git a/com/hbm/items/tool/ItemTurretControl.java b/com/hbm/items/tool/ItemTurretControl.java index 2bba82818..867ea38f9 100644 --- a/com/hbm/items/tool/ItemTurretControl.java +++ b/com/hbm/items/tool/ItemTurretControl.java @@ -166,9 +166,9 @@ public class ItemTurretControl extends Item { if(te != null && te instanceof TileEntityTurretBase) { TileEntityTurretBase turret = (TileEntityTurretBase)te; - if(!turret.isAI) { - ((TurretBase)world.getBlock(x, y, z)).executeHoldAction(world, stack.getMaxItemUseDuration() - count, player.rotationYaw, player.rotationPitch, x, y, z); - + if(!turret.isAI && turret.ammo > 0) { + if(((TurretBase)world.getBlock(x, y, z)).executeHoldAction(world, stack.getMaxItemUseDuration() - count, player.rotationYaw, player.rotationPitch, x, y, z)) + turret.ammo--; } } } diff --git a/com/hbm/items/weapon/ItemTurretAmmo.java b/com/hbm/items/weapon/ItemTurretAmmo.java new file mode 100644 index 000000000..5499eca0d --- /dev/null +++ b/com/hbm/items/weapon/ItemTurretAmmo.java @@ -0,0 +1,42 @@ +package com.hbm.items.weapon; + +import com.hbm.items.ModItems; +import com.hbm.tileentity.bomb.TileEntityTurretBase; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class ItemTurretAmmo extends Item { + + Block turret; + int count; + + public ItemTurretAmmo(Block turret, int count) { + this.turret = turret; + this.count = count; + } + + + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f0, float f1, float f2) + { + if(player.isSneaking()) + return false; + + if(world.getBlock(x, y, z) == turret) { + + if(world.getTileEntity(x, y, z) instanceof TileEntityTurretBase) { + ((TileEntityTurretBase)world.getTileEntity(x, y, z)).ammo += count; + player.inventory.consumeInventoryItem(this); + world.playSoundAtEntity(player, "hbm:weapon.reloadTurret", 1.0F, 1.0F); + } + return true; + } + + return false; + } + +} diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index eee2afe95..17694f283 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -1167,9 +1167,9 @@ public class Library { double length = vector.lengthVector(); Vec3 nVec = vector.normalize(); - for(int i = 0; i < length; i++) - if(world.getBlock((int) (x + (nVec.xCoord * i)), (int) (y + (nVec.yCoord * i)), (int) (z + (nVec.zCoord * i))) != Blocks.air && - !world.getBlock((int) (x + (nVec.xCoord * i)), (int) (y + (nVec.yCoord * i)), (int) (z + (nVec.zCoord * i))).isNormalCube()) + for(float i = 0; i < length; i += 0.25F) + if(world.getBlock((int) Math.round(x + (nVec.xCoord * i)), (int) Math.round(y + (nVec.yCoord * i)), (int) Math.round(z + (nVec.zCoord * i))) != Blocks.air && + world.getBlock((int) Math.round(x + (nVec.xCoord * i)), (int) Math.round(y + (nVec.yCoord * i)), (int) Math.round(z + (nVec.zCoord * i))).isNormalCube()) return true; return false; diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index 0b15f12a8..15e6b0075 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -13,6 +13,7 @@ import com.hbm.entity.effect.EntityFalloutRain; import com.hbm.entity.effect.EntityNukeCloudBig; import com.hbm.entity.effect.EntityNukeCloudNoShroom; import com.hbm.entity.effect.EntityNukeCloudSmall; +import com.hbm.entity.effect.EntityVortex; import com.hbm.entity.grenade.EntityGrenadeASchrab; import com.hbm.entity.grenade.EntityGrenadeBlackHole; import com.hbm.entity.grenade.EntityGrenadeCluster; @@ -134,6 +135,7 @@ import com.hbm.render.entity.RenderRocket; import com.hbm.render.entity.RenderRubble; import com.hbm.render.entity.RenderShrapnel; import com.hbm.render.entity.RenderSmallNukeAlt; +import com.hbm.render.entity.RenderVortex; import com.hbm.render.entity.SSmokeRenderer; import com.hbm.render.entity.SpillRenderer; import com.hbm.render.entity.TSmokeRenderer; @@ -372,6 +374,7 @@ public class ClientProxy extends ServerProxy RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudNoShroom.class, new RenderNoCloud()); RenderingRegistry.registerEntityRenderingHandler(EntityFalloutRain.class, new RenderFallout()); RenderingRegistry.registerEntityRenderingHandler(EntityBlackHole.class, new RenderBlackHole()); + RenderingRegistry.registerEntityRenderingHandler(EntityVortex.class, new RenderVortex()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoTapeRecorder.class, new RenderTapeRecorder()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoSteelPoles.class, new RenderSteelPoles()); @@ -409,6 +412,8 @@ public class ClientProxy extends ServerProxy MinecraftForgeClient.registerItemRenderer(ModItems.gun_hp, new ItemRenderOverkill()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_euthanasia, new ItemRenderOverkill()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_defabricator, new ItemRenderOverkill()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_dash, new ItemRenderOverkill()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_twigun, new ItemRenderOverkill()); MinecraftForgeClient.registerItemRenderer(ModItems.multitool_dig, new ItemRenderMultitool()); MinecraftForgeClient.registerItemRenderer(ModItems.multitool_silk, new ItemRenderMultitool()); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index d8ca5f83f..0330e1a81 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -45,27 +45,29 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.wire_schrabidium, 6), new Object[] { "CCC", 'S', Items.string, 'C', ModItems.ingot_schrabidium }); GameRegistry.addRecipe(new ItemStack(ModItems.wire_advanced_alloy, 6), new Object[] { "CCC", 'S', Items.string, 'C', ModItems.ingot_advanced_alloy }); GameRegistry.addRecipe(new ItemStack(ModItems.wire_magnetized_tungsten, 6), new Object[] { "CCC", 'S', Items.string, 'C', ModItems.ingot_magnetized_tungsten }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hazmat_cloth, 4), new Object[] { "LN", "LN", 'L', Items.leather, 'N', "nuggetLead" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hazmat_cloth, 4), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Items.leather, 'C', "dustLead" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.asbestos_cloth, 4), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Blocks.wool, 'C', "dustNetherQuartz" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hazmat_cloth, 4), new Object[] { "LN", "LN", 'L', Items.leather, 'N', "nuggetLead" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hazmat_cloth, 4), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Items.leather, 'C', "dustLead" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.asbestos_cloth, 4), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Blocks.wool, 'C', "dustNetherQuartz" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.asbestos_cloth, 16), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', ModItems.powder_bromine, 'C', Blocks.wool })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.filter_coal, 1), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Items.paper, 'C', "dustCoal" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_mixed, 3), new Object[] { "ANA", "NCN", "ANA", 'A', ModItems.plate_advanced_alloy, 'N', "plateDenseLead", 'C', ModItems.plate_combine_steel })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.filter_coal, 1), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Items.paper, 'C', "dustCoal" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_mixed, 3), new Object[] { "ANA", "NCN", "ANA", 'A', ModItems.plate_advanced_alloy, 'N', "plateDenseLead", 'C', ModItems.plate_combine_steel })); GameRegistry.addRecipe(new ItemStack(ModItems.bolt_dura_steel, 4), new Object[] { "D", "D", 'D', ModItems.ingot_dura_steel}); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pipes_steel, 1), new Object[] { "B", "B", "B", 'B', "blockSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.drill_titanium, 1), new Object[] { " B ", "IBI", "PPP", 'B', ModItems.bolt_dura_steel, 'I', ModItems.ingot_dura_steel, 'P', "plateTitanium" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.drill_titanium, 1), new Object[] { " B ", "IBI", "PPP", 'B', ModItems.bolt_dura_steel, 'I', ModItems.ingot_dura_steel, 'P', "plateTitanium" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bolt_tungsten, 4), new Object[] { "D", "D", 'D', "ingotTungsten" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bolt_compound, 1), new Object[] { "PDP", "PTP", "PDP", 'D', ModItems.bolt_dura_steel, 'T', ModItems.bolt_tungsten, 'P', "plateTitanium" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.magnet_dee, 1), new Object[] { "SMM", "M M", "MMT", 'S', "ingotSteel", 'M', ModBlocks.fusion_conductor, 'T', ModItems.coil_advanced_torus })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.magnet_circular, 2), new Object[] { "PSP", "MMM", "PSP", 'S', "ingotSteel", 'M', ModBlocks.fusion_conductor, 'P', "plateAdvanced" })); - GameRegistry.addRecipe(new ItemStack(ModItems.cyclotron_tower, 1), new Object[] { "CDC", "CDC", "CDC", 'C', ModItems.magnet_circular, 'D', ModItems.magnet_dee }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.magnet_dee, 1), new Object[] { "SMM", "M M", "MMT", 'S', "ingotSteel", 'M', ModBlocks.fusion_conductor, 'T', ModItems.coil_advanced_torus })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.magnet_circular, 2), new Object[] { "PSP", "MMM", "PSP", 'S', "ingotSteel", 'M', ModBlocks.fusion_conductor, 'P', "plateAdvanced" })); + //GameRegistry.addRecipe(new ItemStack(ModItems.cyclotron_tower, 1), new Object[] { "CDC", "CDC", "CDC", 'C', ModItems.magnet_circular, 'D', ModItems.magnet_dee }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.marker_structure, 1), new Object[] { "L", "G", "R", 'L', "dustLapis", 'G', Items.glowstone_dust, 'R', Blocks.redstone_torch })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_aluminium, 1), new Object[] { "RAR", "ASA", "RAR", 'S', "plateSteel", 'R', "dustRedstone", 'A', ModItems.wire_aluminium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_copper, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_aluminium, 'R', "dustNetherQuartz", 'A', ModItems.wire_copper })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_red_copper, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_copper, 'R', "dustGold", 'A', ModItems.wire_red_copper })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_gold, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_red_copper, 'R', "dustLapis", 'A', ModItems.wire_gold })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_schrabidium, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_gold, 'R', "dustDiamond", 'A', ModItems.wire_schrabidium })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_copper, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_aluminium, 'R', "dustNetherQuartz", 'A', ModItems.wire_copper })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_red_copper, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_copper, 'R', "dustGold", 'A', ModItems.wire_red_copper })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_gold, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_red_copper, 'R', "dustLapis", 'A', ModItems.wire_gold })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_schrabidium, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_gold, 'R', "dustDiamond", 'A', ModItems.wire_schrabidium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "sulfur", "salpeter", Items.coal })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "sulfur", "salpeter", new ItemStack(Items.coal, 1, 1) })); @@ -73,14 +75,14 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "dustSulfur", "dustSalpeter", new ItemStack(Items.coal, 1, 1) })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cell_empty, 6), new Object[] { "SSS", "G G", "SSS", 'S', "plateSteel", 'G', Item.getItemFromBlock(Blocks.glass_pane) })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cell_uf6, 1), new Object[] { ModItems.cell_empty, "dustUranium", "dustFluorite", "dustFluorite", "dustFluorite", Items.water_bucket })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cell_puf6, 1), new Object[] { ModItems.cell_empty, "dustPlutonium", "dustFluorite", "dustFluorite", "dustFluorite", Items.water_bucket })); + //GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cell_uf6, 1), new Object[] { ModItems.cell_empty, "dustUranium", "dustFluorite", "dustFluorite", "dustFluorite", Items.water_bucket })); + //GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cell_puf6, 1), new Object[] { ModItems.cell_empty, "dustPlutonium", "dustFluorite", "dustFluorite", "dustFluorite", Items.water_bucket })); GameRegistry.addRecipe(new ItemStack(ModItems.cell_deuterium, 8), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.cell_empty, 'T', ModItems.mike_deut }); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cell_sas3, 1), new Object[] { ModItems.cell_empty, ModItems.powder_schrabidium, "dustSulfur", "dustSulfur" })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cell_sas3, 1), new Object[] { ModItems.cell_empty, ModItems.powder_schrabidium, "sulfur", "sulfur" })); + //GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cell_sas3, 1), new Object[] { ModItems.cell_empty, ModItems.powder_schrabidium, "dustSulfur", "dustSulfur" })); + //GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cell_sas3, 1), new Object[] { ModItems.cell_empty, ModItems.powder_schrabidium, "sulfur", "sulfur" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.canister_empty, 2), new Object[] { "S ", "AA", "AA", 'S', "plateSteel", 'A', "plateAluminum" })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_barrel), 1), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.canister_fuel, 'T', ModItems.tank_steel }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_barrel), 1), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.canister_fuel, 'T', ModItems.tank_steel }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.yellow_barrel), 1), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.nuclear_waste, 'T', ModItems.tank_steel }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gas_empty, 2), new Object[] { "S ", "AA", "AA", 'A', "plateSteel", 'S', "plateCopper" })); @@ -365,28 +367,28 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.biomass, 4), new Object[] { "plankWood", "plankWood", "plankWood", "plankWood", "plankWood", "plankWood", "plankWood", "plankWood", "plankWood" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.biomass, 8), new Object[] { Blocks.hay_block, Blocks.hay_block }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_lithium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustLithium" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_beryllium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustBeryllium" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_carbon), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustCoal" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_copper), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustCopper" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_plutonium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustPlutonium" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_lithium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustLithium" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_beryllium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustBeryllium" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_carbon), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustCoal" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_copper), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustCopper" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_plutonium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustPlutonium" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_euphemium, 1, 34), new Object[] { ModItems.rod_quad_euphemium }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_euphemium, 1, 34), new Object[] { "###", "###", "###", '#', new ItemStack(ModItems.nugget_euphemium, 1, 34) }); GameRegistry.addRecipe(new ItemStack(ModItems.nugget_euphemium, 9, 34), new Object[] { "#", '#', new ItemStack(ModItems.ingot_euphemium, 1, 34) }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_rtg, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "tinyPu238" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_rtg_weak, 1), new Object[] { "IUI", "UPU", "IUI", 'I', "plateIron", 'P', "tinyPu238", 'U', "tinyU238" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.tritium_deuterium_cake, 1), new Object[] { "DLD", "LTL", "DLD", 'L', "ingotLithium", 'D', ModItems.cell_deuterium, 'T', ModItems.cell_tritium })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_rtg, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "tinyPu238" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_rtg_weak, 1), new Object[] { "IUI", "UPU", "IUI", 'I', "plateIron", 'P', "tinyPu238", 'U', "tinyU238" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.tritium_deuterium_cake, 1), new Object[] { "DLD", "LTL", "DLD", 'L', "ingotLithium", 'D', ModItems.cell_deuterium, 'T', ModItems.cell_tritium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_schrabidium, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "ingotSchrabidium" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_hes, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', ModItems.ingot_hes })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_mes, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', ModItems.ingot_schrabidium_fuel })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_les, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', ModItems.ingot_les })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_beryllium, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', ModItems.ingot_beryllium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_neptunium, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "ingotNeptunium" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_lead, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "ingotLead" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_advanced, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', ModItems.ingot_advanced_alloy })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_schrabidium, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "ingotSchrabidium" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_hes, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', ModItems.ingot_hes })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_mes, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', ModItems.ingot_schrabidium_fuel })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_les, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', ModItems.ingot_les })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_beryllium, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', ModItems.ingot_beryllium })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_neptunium, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "ingotNeptunium" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_lead, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "ingotLead" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_advanced, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', ModItems.ingot_advanced_alloy })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_copper, 1), new Object[] { "WWW", "WIW", "WWW", 'W', ModItems.wire_red_copper, 'I', "ingotIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_advanced_alloy, 1), new Object[] { "WWW", "WIW", "WWW", 'W', ModItems.wire_advanced_alloy, 'I', "ingotIron" })); @@ -398,14 +400,14 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.coil_magnetized_tungsten, 1), new Object[] { "WWW", "WIW", "WWW", 'W', ModItems.wire_magnetized_tungsten, 'I', "ingotIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.tank_steel, 1), new Object[] { "STS", "S S", "STS", 'S', "plateSteel", 'T', "plateTitanium" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.motor, 1), new Object[] { " R ", "ICI", "ITI", 'R', ModItems.wire_red_copper, 'T', ModItems.coil_copper_torus, 'I', "plateIron", 'C', ModItems.coil_copper })); - GameRegistry.addRecipe(new ItemStack(ModItems.centrifuge_element, 1), new Object[] { " T ", "WTW", "RMR", 'R', ModItems.wire_red_copper, 'T', ModItems.tank_steel, 'M', ModItems.motor, 'W', ModItems.coil_tungsten }); - GameRegistry.addRecipe(new ItemStack(ModItems.centrifuge_tower, 1), new Object[] { "LL", "EE", "EE", 'E', ModItems.centrifuge_element, 'L', new ItemStack(Items.dye, 1, 4) }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.reactor_core, 1), new Object[] { "LNL", "N N", "LNL", 'N', "plateDenseLead", 'L', "plateLead" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.rtg_unit, 1), new Object[] { "TIT", "PCP", "TIT", 'T', ModItems.thermo_element, 'I', "ingotLead", 'P', ModItems.board_copper, 'C', ModItems.circuit_copper })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.thermo_unit_empty, 1), new Object[] { "TTT", " S ", "P P", 'S', "ingotSteel", 'P', "plateTitanium", 'T', ModItems.coil_copper_torus })); + //GameRegistry.addRecipe(new ItemStack(ModItems.centrifuge_element, 1), new Object[] { " T ", "WTW", "RMR", 'R', ModItems.wire_red_copper, 'T', ModItems.tank_steel, 'M', ModItems.motor, 'W', ModItems.coil_tungsten }); + //GameRegistry.addRecipe(new ItemStack(ModItems.centrifuge_tower, 1), new Object[] { "LL", "EE", "EE", 'E', ModItems.centrifuge_element, 'L', new ItemStack(Items.dye, 1, 4) }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.reactor_core, 1), new Object[] { "LNL", "N N", "LNL", 'N', "plateDenseLead", 'L', "plateLead" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.rtg_unit, 1), new Object[] { "TIT", "PCP", "TIT", 'T', ModItems.thermo_element, 'I', "ingotLead", 'P', ModItems.board_copper, 'C', ModItems.circuit_copper })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.thermo_unit_empty, 1), new Object[] { "TTT", " S ", "P P", 'S', "ingotSteel", 'P', "plateTitanium", 'T', ModItems.coil_copper_torus })); GameRegistry.addRecipe(new ItemStack(ModItems.thermo_unit_endo, 1), new Object[] { "EEE", "ETE", "EEE", 'E', Item.getItemFromBlock(Blocks.ice), 'T', ModItems.thermo_unit_empty }); GameRegistry.addRecipe(new ItemStack(ModItems.thermo_unit_exo, 1), new Object[] { "LLL", "LTL", "LLL", 'L', Items.lava_bucket, 'T', ModItems.thermo_unit_empty }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.levitation_unit, 1), new Object[] { "CSC", "TAT", "PSP", 'C', ModItems.coil_copper, 'S', ModItems.nugget_schrabidium, 'T', ModItems.coil_tungsten, 'P', "plateTitanium", 'A', "ingotSteel" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.levitation_unit, 1), new Object[] { "CSC", "TAT", "PSP", 'C', ModItems.coil_copper, 'S', ModItems.nugget_schrabidium, 'T', ModItems.coil_tungsten, 'P', "plateTitanium", 'A', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cap_aluminium, 1), new Object[] { "PIP", 'P', "plateAluminum", 'I', "ingotAluminum" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hull_small_steel, 1), new Object[] { "PPP", " ", "PPP", 'P', "plateSteel", 'I', "ingotSteel" })); @@ -420,80 +422,82 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fins_quad_titanium, 1), new Object[] { " PP", "III", " PP", 'P', "plateTitanium", 'I', "ingotTitanium" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.sphere_steel, 1), new Object[] { "PIP", "I I", "PIP", 'P', "plateSteel", 'I', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pedestal_steel, 1), new Object[] { "P P", "P P", "III", 'P', "plateSteel", 'I', "ingotSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.dysfunctional_reactor, 1), new Object[] { "PPP", "CDC", "PPP", 'P', "plateSteel", 'C', ModItems.rod_quad_empty, 'D', new ItemStack(Items.dye, 1, 3) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.warhead_generic_small, 1), new Object[] { " P ", "PTP", "PTP", 'P', "plateTitanium", 'T', Item.getItemFromBlock(Blocks.tnt) })); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_incendiary_small, 1), new Object[] { " P ", "PWP", " P ", 'P', ModItems.powder_fire, 'W', ModItems.warhead_generic_small }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_cluster_small, 1), new Object[] { " P ", "PWP", " P ", 'P', ModItems.pellet_cluster, 'W', ModItems.warhead_generic_small }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_buster_small, 1), new Object[] { " P ", "PWP", " P ", 'P', Item.getItemFromBlock(ModBlocks.det_cord), 'W', ModItems.warhead_generic_small }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.warhead_generic_medium, 1), new Object[] { " P ", "PTP", "TTT", 'P', "plateTitanium", 'T', Item.getItemFromBlock(Blocks.tnt) })); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_incendiary_medium, 1), new Object[] { "PPP", "PWP", "PPP", 'P', ModItems.powder_fire, 'W', ModItems.warhead_generic_medium }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_cluster_medium, 1), new Object[] { "PPP", "PWP", "PPP", 'P', ModItems.pellet_cluster, 'W', ModItems.warhead_generic_medium }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_buster_medium, 1), new Object[] { "PPP", "PWP", "PPP", 'P', Item.getItemFromBlock(ModBlocks.det_cord), 'W', ModItems.warhead_generic_medium }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.warhead_generic_large, 1), new Object[] { "PTP", "PTP", "TTT", 'P', "plateTitanium", 'T', Item.getItemFromBlock(Blocks.tnt) })); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_incendiary_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', ModItems.powder_fire, 'W', ModItems.warhead_generic_large, 'X', Items.lava_bucket }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_cluster_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', ModItems.pellet_cluster, 'W', ModItems.warhead_generic_large, 'X', Item.getItemFromBlock(ModBlocks.det_cord) }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_buster_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', Item.getItemFromBlock(ModBlocks.det_cord), 'W', ModItems.warhead_generic_large, 'X', ModBlocks.det_charge }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_nuclear, 1), new Object[] { " N ", "TZT", "TBT", 'N', ModItems.boy_shielding, 'Z', ModItems.boy_target, 'B', ModItems.boy_bullet, 'T', ModItems.plate_titanium }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_mirvlet, 1), new Object[] { " S ", "SPS", "STS", 'S', ModItems.plate_steel, 'P', ModItems.ingot_pu239, 'T', Item.getItemFromBlock(Blocks.tnt) }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_mirv, 1), new Object[] { "MMM", "MWM", "MMM", 'M', ModItems.warhead_mirvlet, 'W', ModItems.warhead_generic_large }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_thermo_endo, 1), new Object[] { " T ", "TBT", "TBT", 'T', ModItems.plate_titanium, 'B', Item.getItemFromBlock(ModBlocks.therm_endo) }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_thermo_exo, 1), new Object[] { " T ", "TBT", "TBT", 'T', ModItems.plate_titanium, 'B', Item.getItemFromBlock(ModBlocks.therm_exo) }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fuel_tank_small, 1), new Object[] { "PTP", "PTP", "PTP", 'P', "plateTitanium", 'T', ModItems.canister_kerosene })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fuel_tank_medium, 1), new Object[] { "PTP", "PTP", "PTP", 'P', "plateTitanium", 'T', ModItems.fuel_tank_small })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fuel_tank_large, 1), new Object[] { "PTP", "PTP", "PTP", 'P', "plateTitanium", 'T', ModItems.fuel_tank_medium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.thruster_small, 1), new Object[] { "AS ", "AH ", " L ", 'A', ModItems.wire_aluminium, 'S', "plateSteel", 'H', ModItems.hull_small_steel, 'L', ModItems.hull_small_steel })); - GameRegistry.addRecipe(new ItemStack(ModItems.thruster_medium, 1), new Object[] { "AS ", "AH ", " L ", 'A', ModItems.wire_copper, 'S', ModItems.thruster_small, 'H', ModItems.hull_small_steel, 'L', ModItems.hull_big_steel }); - GameRegistry.addRecipe(new ItemStack(ModItems.thruster_large, 1), new Object[] { "AS ", "AH ", " L ", 'A', ModItems.wire_red_copper, 'S', ModItems.thruster_medium, 'H', ModItems.hull_big_steel, 'L', ModItems.hull_big_steel }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.dysfunctional_reactor, 1), new Object[] { "PPP", "CDC", "PPP", 'P', "plateSteel", 'C', ModItems.rod_quad_empty, 'D', new ItemStack(Items.dye, 1, 3) })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.warhead_generic_small, 1), new Object[] { " P ", "PTP", "PTP", 'P', "plateTitanium", 'T', Item.getItemFromBlock(Blocks.tnt) })); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_incendiary_small, 1), new Object[] { " P ", "PWP", " P ", 'P', ModItems.powder_fire, 'W', ModItems.warhead_generic_small }); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_cluster_small, 1), new Object[] { " P ", "PWP", " P ", 'P', ModItems.pellet_cluster, 'W', ModItems.warhead_generic_small }); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_buster_small, 1), new Object[] { " P ", "PWP", " P ", 'P', Item.getItemFromBlock(ModBlocks.det_cord), 'W', ModItems.warhead_generic_small }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.warhead_generic_medium, 1), new Object[] { " P ", "PTP", "TTT", 'P', "plateTitanium", 'T', Item.getItemFromBlock(Blocks.tnt) })); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_incendiary_medium, 1), new Object[] { "PPP", "PWP", "PPP", 'P', ModItems.powder_fire, 'W', ModItems.warhead_generic_medium }); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_cluster_medium, 1), new Object[] { "PPP", "PWP", "PPP", 'P', ModItems.pellet_cluster, 'W', ModItems.warhead_generic_medium }); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_buster_medium, 1), new Object[] { "PPP", "PWP", "PPP", 'P', Item.getItemFromBlock(ModBlocks.det_cord), 'W', ModItems.warhead_generic_medium }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.warhead_generic_large, 1), new Object[] { "PTP", "PTP", "TTT", 'P', "plateTitanium", 'T', Item.getItemFromBlock(Blocks.tnt) })); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_incendiary_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', ModItems.powder_fire, 'W', ModItems.warhead_generic_large, 'X', Items.lava_bucket }); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_cluster_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', ModItems.pellet_cluster, 'W', ModItems.warhead_generic_large, 'X', Item.getItemFromBlock(ModBlocks.det_cord) }); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_buster_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', Item.getItemFromBlock(ModBlocks.det_cord), 'W', ModItems.warhead_generic_large, 'X', ModBlocks.det_charge }); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_nuclear, 1), new Object[] { " N ", "TZT", "TBT", 'N', ModItems.boy_shielding, 'Z', ModItems.boy_target, 'B', ModItems.boy_bullet, 'T', ModItems.plate_titanium }); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_mirvlet, 1), new Object[] { " S ", "SPS", "STS", 'S', ModItems.plate_steel, 'P', ModItems.ingot_pu239, 'T', Item.getItemFromBlock(Blocks.tnt) }); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_mirv, 1), new Object[] { "MMM", "MWM", "MMM", 'M', ModItems.warhead_mirvlet, 'W', ModItems.warhead_generic_large }); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_thermo_endo, 1), new Object[] { " T ", "TBT", "TBT", 'T', ModItems.plate_titanium, 'B', Item.getItemFromBlock(ModBlocks.therm_endo) }); + //GameRegistry.addRecipe(new ItemStack(ModItems.warhead_thermo_exo, 1), new Object[] { " T ", "TBT", "TBT", 'T', ModItems.plate_titanium, 'B', Item.getItemFromBlock(ModBlocks.therm_exo) }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fuel_tank_small, 1), new Object[] { "PTP", "PTP", "PTP", 'P', "plateTitanium", 'T', ModItems.canister_kerosene })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fuel_tank_medium, 1), new Object[] { "PTP", "PTP", "PTP", 'P', "plateTitanium", 'T', ModItems.fuel_tank_small })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fuel_tank_large, 1), new Object[] { "PTP", "PTP", "PTP", 'P', "plateTitanium", 'T', ModItems.fuel_tank_medium })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.thruster_small, 1), new Object[] { "AS ", "AH ", " L ", 'A', ModItems.wire_aluminium, 'S', "plateSteel", 'H', ModItems.hull_small_steel, 'L', ModItems.hull_small_steel })); + //GameRegistry.addRecipe(new ItemStack(ModItems.thruster_medium, 1), new Object[] { "AS ", "AH ", " L ", 'A', ModItems.wire_copper, 'S', ModItems.thruster_small, 'H', ModItems.hull_small_steel, 'L', ModItems.hull_big_steel }); + //GameRegistry.addRecipe(new ItemStack(ModItems.thruster_large, 1), new Object[] { "AS ", "AH ", " L ", 'A', ModItems.wire_red_copper, 'S', ModItems.thruster_medium, 'H', ModItems.hull_big_steel, 'L', ModItems.hull_big_steel }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.lemon, 1), new Object[] { " D ", "DSD", " D ", 'D', new ItemStack(Items.dye, 1, 11), 'S', "stone" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chopper_blades, 1), new Object[] { "CCC", "SIS", " I ", 'C', ModItems.plate_combine_steel, 'S', "plateSteel", 'I', ModItems.ingot_combine_steel })); - GameRegistry.addRecipe(new ItemStack(ModItems.chopper_gun, 1), new Object[] { " PI", "WWC", " PM", 'P', ModItems.plate_combine_steel, 'W', ModItems.wire_magnetized_tungsten, 'I', ModItems.ingot_combine_steel, 'C', ModItems.coil_magnetized_tungsten, 'M', ModItems.motor }); - GameRegistry.addRecipe(new ItemStack(ModItems.chopper_head, 1), new Object[] { " GI", "WIB", "WCB", 'G', ModBlocks.reinforced_glass, 'W', ModItems.wire_magnetized_tungsten, 'I', ModItems.ingot_combine_steel, 'C', ModBlocks.fwatz_computer, 'B', ModBlocks.block_combine_steel }); - GameRegistry.addRecipe(new ItemStack(ModItems.chopper_tail, 1), new Object[] { "PPP", "IIM", " PR", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel, 'M', ModItems.motor, 'R', ModItems.chopper_blades }); - GameRegistry.addRecipe(new ItemStack(ModItems.chopper_torso, 1), new Object[] { "IMI", "MBB", "RCI", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel, 'M', ModItems.motor, 'B', ModBlocks.block_combine_steel, 'R', ModItems.chopper_blades, 'C', ModBlocks.fwatz_computer }); - GameRegistry.addRecipe(new ItemStack(ModItems.chopper_wing, 1), new Object[] { "III", " PP", " PP", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.telepad, 1), new Object[] { "CPC", "SUS", "WWW", 'C', ModItems.plate_combine_steel, 'P', ModItems.plate_schrabidium, 'S', "plateSteel", 'U', ModItems.circuit_schrabidium, 'W', ModItems.wire_gold })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.entanglement_kit, 1), new Object[] { "CEC", "PDP", "CSC", 'C', ModItems.coil_magnetized_tungsten, 'P', "plateDenseLead", 'S', ModItems.singularity_super_heated, 'E', ModItems.singularity_counter_resonant, 'D', ModItems.powder_power })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.entanglement_kit, 1), new Object[] { "CSC", "PDP", "CEC", 'C', ModItems.coil_magnetized_tungsten, 'P', "plateDenseLead", 'S', ModItems.singularity_super_heated, 'E', ModItems.singularity_counter_resonant, 'D', ModItems.powder_power })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chopper_blades, 1), new Object[] { "CCC", "SIS", " I ", 'C', ModItems.plate_combine_steel, 'S', "plateSteel", 'I', ModItems.ingot_combine_steel })); + //GameRegistry.addRecipe(new ItemStack(ModItems.chopper_gun, 1), new Object[] { " PI", "WWC", " PM", 'P', ModItems.plate_combine_steel, 'W', ModItems.wire_magnetized_tungsten, 'I', ModItems.ingot_combine_steel, 'C', ModItems.coil_magnetized_tungsten, 'M', ModItems.motor }); + //GameRegistry.addRecipe(new ItemStack(ModItems.chopper_head, 1), new Object[] { " GI", "WIB", "WCB", 'G', ModBlocks.reinforced_glass, 'W', ModItems.wire_magnetized_tungsten, 'I', ModItems.ingot_combine_steel, 'C', ModBlocks.fwatz_computer, 'B', ModBlocks.block_combine_steel }); + //GameRegistry.addRecipe(new ItemStack(ModItems.chopper_tail, 1), new Object[] { "PPP", "IIM", " PR", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel, 'M', ModItems.motor, 'R', ModItems.chopper_blades }); + //GameRegistry.addRecipe(new ItemStack(ModItems.chopper_torso, 1), new Object[] { "IMI", "MBB", "RCI", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel, 'M', ModItems.motor, 'B', ModBlocks.block_combine_steel, 'R', ModItems.chopper_blades, 'C', ModBlocks.fwatz_computer }); + //GameRegistry.addRecipe(new ItemStack(ModItems.chopper_wing, 1), new Object[] { "III", " PP", " PP", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.telepad, 1), new Object[] { "CPC", "SUS", "WWW", 'C', ModItems.plate_combine_steel, 'P', ModItems.plate_schrabidium, 'S', "plateSteel", 'U', ModItems.circuit_schrabidium, 'W', ModItems.wire_gold })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.entanglement_kit, 1), new Object[] { "CEC", "PDP", "CSC", 'C', ModItems.coil_magnetized_tungsten, 'P', "plateDenseLead", 'S', ModItems.singularity_super_heated, 'E', ModItems.singularity_counter_resonant, 'D', ModItems.powder_power })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.entanglement_kit, 1), new Object[] { "CSC", "PDP", "CEC", 'C', ModItems.coil_magnetized_tungsten, 'P', "plateDenseLead", 'S', ModItems.singularity_super_heated, 'E', ModItems.singularity_counter_resonant, 'D', ModItems.powder_power })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.blade_titanium, 2), new Object[] { "TP", "TP", "TT", 'P', "plateTitanium", 'T', "ingotTitanium" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turbine_titanium, 1), new Object[] { "BBB", "BSB", "BBB", 'B', ModItems.blade_titanium, 'S', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.rotor_steel, 3), new Object[] { "CCC", "SSS", "CCC", 'C', ModItems.coil_gold, 'S', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.generator_steel, 1), new Object[] { "RRR", "CCC", "SSS", 'C', ModItems.coil_gold_torus, 'S', "ingotSteel", 'R', ModItems.rotor_steel })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.generator_front, 1), new Object[] { "PSP", "TBT", "TWT", 'P', "plateSteel", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'B', ModItems.turbine_titanium, 'W', ModBlocks.red_wire_coated })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.generator_front, 1), new Object[] { "PSP", "TBT", "TWT", 'P', "plateSteel", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'B', ModItems.turbine_titanium, 'W', ModBlocks.red_wire_coated })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.shimmer_head, 1), new Object[] { "SSS", "DTD", "SSS", 'S', "ingotSteel", 'D', "blockDesh", 'T', "blockTungsten" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.shimmer_handle, 1), new Object[] { "GP", "GP", "GP", 'G', "plateGold", 'P', "ingotPolymer" })); GameRegistry.addRecipe(new ItemStack(ModItems.shimmer_sledge, 1), new Object[] { "H", "G", "G", 'G', ModItems.shimmer_handle, 'H', ModItems.shimmer_head }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.definitelyfood, 1), new Object[] { "DDD", "SDS", "DDD", 'D', Blocks.dirt, 'S', "plateSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.blade_tungsten, 2), new Object[] { "IP", "TP", "TI", 'P', "plateTitanium", 'T', "ingotTitanium", 'I', "ingotTungsten" })); + GameRegistry.addRecipe(new ItemStack(ModItems.turbine_tungsten, 1), new Object[] { "BBB", "BSB", "BBB", 'B', ModItems.blade_tungsten, 'S', ModItems.ingot_dura_steel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.toothpicks, 3), new Object[] { Items.stick, Items.stick, Items.stick }); GameRegistry.addShapedRecipe(new ItemStack(ModItems.ducttape, 6), new Object[] { "FSF", "SPS", "FSF", 'F', Items.string, 'S', Items.slime_ball, 'P', Items.paper }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_generic, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_generic_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_incendiary, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_incendiary_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_cluster, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_cluster_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_buster, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_buster_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_generic_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_incendiary_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_incendiary_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_cluster_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_cluster_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_buster_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_buster_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_burst, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_generic_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_inferno, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_incendiary_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_rain, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_cluster_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_drill, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_buster_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_nuclear, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_nuclear, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_nuclear_cluster, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_mirv, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_endo, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_thermo_endo, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); - GameRegistry.addRecipe(new ItemStack(ModItems.missile_exo, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_thermo_exo, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_generic, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_generic_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_incendiary, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_incendiary_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_cluster, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_cluster_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_buster, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_buster_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_generic_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_incendiary_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_incendiary_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_cluster_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_cluster_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_buster_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_buster_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_burst, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_generic_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_inferno, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_incendiary_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_rain, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_cluster_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_drill, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_buster_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_nuclear, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_nuclear, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_nuclear_cluster, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_mirv, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_endo, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_thermo_endo, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + //GameRegistry.addRecipe(new ItemStack(ModItems.missile_exo, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_thermo_exo, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 1), new Object[] { "AHA", "TCT", "TPT", 'T', "plateTitanium", 'A', "plateAluminum", 'S', "plateSteel", 'C', "ingotCopper", 'P', Item.getItemFromBlock(Blocks.piston), 'H', Item.getItemFromBlock(Blocks.hopper) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_centrifuge), 1), new Object[] { " T ", "RDR", "RSR", 'S', "plateSteel", 'T', ModItems.centrifuge_tower, 'W', ModItems.coil_tungsten, 'R', ModItems.coil_copper, 'D', Item.getItemFromBlock(ModBlocks.machine_difurnace_off) })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_centrifuge), 1), new Object[] { " T ", "RDR", "RSR", 'S', "plateSteel", 'T', ModItems.centrifuge_tower, 'W', ModItems.coil_tungsten, 'R', ModItems.coil_copper, 'D', Item.getItemFromBlock(ModBlocks.machine_difurnace_off) })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_uf6_tank), 1), new Object[] { "WTW", "WTW", "SRS", 'S', "plateTitanium", 'W', ModItems.coil_tungsten, 'T', ModItems.tank_steel, 'W', ModItems.coil_tungsten,'R', "ingotRedstoneAlloy" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_puf6_tank), 1), new Object[] { "WTW", "WTW", "SRS", 'S', "plateSteel", 'W', ModItems.coil_tungsten, 'T', ModItems.tank_steel, 'W', ModItems.coil_tungsten,'R', "ingotRedstoneAlloy" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_reactor), 1), new Object[] { "LSL", "SCS", "LSL", 'S', "ingotSteel", 'L', "ingotLead", 'C', ModItems.reactor_core })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_reactor), 1), new Object[] { "LSL", "SCS", "LSL", 'S', "ingotSteel", 'L', "ingotLead", 'C', ModItems.reactor_core })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_nuke_furnace_off), 1), new Object[] { "SSS", "SFS", "CCC", 'S', "plateSteel", 'C', "plateCopper", 'F', Item.getItemFromBlock(Blocks.furnace) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_rtg_furnace_off), 1), new Object[] { "NNN", "NFN", "UUU", 'N', "plateDenseLead", 'U', ModItems.rtg_unit, 'F', Item.getItemFromBlock(Blocks.furnace) })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_rtg_furnace_off), 1), new Object[] { "NNN", "NFN", "UUU", 'N', "plateDenseLead", 'U', ModItems.rtg_unit, 'F', Item.getItemFromBlock(Blocks.furnace) })); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off), 1), new Object[] { "BBB", "WFW", "RRR", 'B', ModItems.ingot_beryllium, 'R', ModItems.coil_tungsten, 'W', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(Blocks.furnace) }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_generator), 1), new Object[] { "SLS", "LCL", "SLS", 'C', ModItems.circuit_red_copper, 'L', ModItems.rod_quad_lead, 'S', "ingotSteel" })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_industrial_generator), 1), new Object[] { "PPP", "FGG", "WSS", 'P', ModItems.board_copper, 'F', ModItems.generator_front, 'G', ModItems.generator_steel, 'W', ModBlocks.red_wire_coated, 'S', ModItems.pedestal_steel }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_generator), 1), new Object[] { "SLS", "LCL", "SLS", 'C', ModItems.circuit_red_copper, 'L', ModItems.rod_quad_lead, 'S', "ingotSteel" })); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_industrial_generator), 1), new Object[] { "PPP", "FGG", "WSS", 'P', ModItems.board_copper, 'F', ModItems.generator_front, 'G', ModItems.generator_steel, 'W', ModBlocks.red_wire_coated, 'S', ModItems.pedestal_steel }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_wire_coated), 16), new Object[] { "WRW", "RIR", "WRW", 'W', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_cable), 16), new Object[] { "WRW", "RIR", "WRW", 'W', "plateSteel", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_pylon), 4), new Object[] { "CWC", "PWP", " T ", 'C', ModItems.coil_copper_torus, 'W', "plankWood", 'P', "plateSteel", 'T', ModBlocks.red_wire_coated })); @@ -502,21 +506,21 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.gas_duct_solid), 16), new Object[] { "SPS", "P P", "SPS", 'S', "ingotSteel", 'P', "plateCopper" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.gas_duct), 16), new Object[] { "SIS", " ", "SIS", 'S', "plateSteel", 'I', "plateCopper" })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_deuterium), 1), new Object[] { "TIT", "RFR", "CCC", 'T', ModItems.tank_steel, 'I', "ingotTitanium", 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 'C', ModItems.coil_tungsten })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TST", "RIR", "TLT", 'T', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper, 'S', "blockSulfur", 'L', "blockLead" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TLT", "RIR", "TST", 'T', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper, 'S', "blockSulfur", 'L', "blockLead" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TST", "RIR", "TLT", 'T', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper, 'S', "blockSulfur", 'L', "blockLead" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TLT", "RIR", "TST", 'T', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper, 'S', "blockSulfur", 'L', "blockLead" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_coal_off), 1), new Object[] { "STS", "SCS", "SFS", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'C', "ingotRedstoneAlloy", 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_converter_he_rf), 1), new Object[] { "SSS", "CRC", "SSS", 'S', "ingotSteel", 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_converter_rf_he), 1), new Object[] { "SSS", "CRC", "SSS", 'S', ModItems.ingot_beryllium, 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_schrabidium_transmutator), 1), new Object[] { "TST", "ARA", "BBB", 'S', ModItems.nugget_schrabidium , 'T', "ingotTitanium", 'A', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'R', Item.getItemFromBlock(ModBlocks.machine_reactor), 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_diesel), 1), new Object[] { "HTH", "PRP", "SFS", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'H', ModItems.hull_small_steel, 'P', Item.getItemFromBlock(Blocks.piston), 'R', "ingotRedstoneAlloy", 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_shredder), 1), new Object[] { "SHS", "MBM", "CFC", 'H', ModItems.hull_big_steel, 'S', ModBlocks.steel_beam, 'M', ModItems.motor, 'B', Blocks.iron_bars, 'C', ModBlocks.red_wire_coated, 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_combine_factory), 1), new Object[] { "HCH", "STS", "RFR", 'H', ModItems.tank_steel, 'C', ModItems.coil_advanced_torus, 'S', "plateSteel", 'T', ModBlocks.block_magnetized_tungsten, 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off) })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_converter_he_rf), 1), new Object[] { "SSS", "CRC", "SSS", 'S', "ingotSteel", 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus })); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_converter_rf_he), 1), new Object[] { "SSS", "CRC", "SSS", 'S', ModItems.ingot_beryllium, 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_schrabidium_transmutator), 1), new Object[] { "TST", "ARA", "BBB", 'S', ModItems.nugget_schrabidium , 'T', "ingotTitanium", 'A', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'R', Item.getItemFromBlock(ModBlocks.machine_reactor), 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_diesel), 1), new Object[] { "HTH", "PRP", "SFS", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'H', ModItems.hull_small_steel, 'P', Item.getItemFromBlock(Blocks.piston), 'R', "ingotRedstoneAlloy", 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) })); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_shredder), 1), new Object[] { "SHS", "MBM", "CFC", 'H', ModItems.hull_big_steel, 'S', ModBlocks.steel_beam, 'M', ModItems.motor, 'B', Blocks.iron_bars, 'C', ModBlocks.red_wire_coated, 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_combine_factory), 1), new Object[] { "HCH", "STS", "RFR", 'H', ModItems.tank_steel, 'C', ModItems.coil_advanced_torus, 'S', "plateSteel", 'T', ModBlocks.block_magnetized_tungsten, 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off) })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_teleporter), 1), new Object[] { "PTP", "FKF", "BBB", 'P', "plateTitanium", 'T', ModItems.telepad, 'F', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'K', ModItems.entanglement_kit, 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_rtg_grey), 1), new Object[] { "UPU", "UWU", "UPU", 'P', "plateSteel", 'U', ModItems.rtg_unit, 'W', ModBlocks.red_wire_coated })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_cyclotron), 1), new Object[] { "PTP", "PCP", "WBW", 'P', ModItems.board_copper, 'T', ModItems.cyclotron_tower, 'C', ModBlocks.fusion_core, 'W', ModBlocks.red_wire_coated, 'B', ModBlocks.machine_battery }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_well), 1), new Object[] { "TPM", "GPG", "GDG", 'T', ModItems.tank_steel, 'P', ModItems.pipes_steel, 'M', ModItems.motor, 'G', ModBlocks.steel_scaffold, 'D', ModItems.drill_titanium }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_flare), 1), new Object[] { "UHU", "GPG", "GTG", 'U', ModItems.thermo_element, 'H', ModItems.hull_small_steel, 'G', ModBlocks.steel_scaffold, 'P', ModItems.pipes_steel, 'T', ModItems.tank_steel }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_refinery), 1), new Object[] { "PTP", "CTC", "WFW", 'P', "plateTitanium", 'T', ModItems.tank_steel, 'C', ModItems.coil_tungsten, 'W', ModBlocks.red_wire_coated, 'F', ModBlocks.machine_electric_furnace_off })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_rtg_grey), 1), new Object[] { "UPU", "UWU", "UPU", 'P', "plateSteel", 'U', ModItems.rtg_unit, 'W', ModBlocks.red_wire_coated })); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_cyclotron), 1), new Object[] { "PTP", "PCP", "WBW", 'P', ModItems.board_copper, 'T', ModItems.cyclotron_tower, 'C', ModBlocks.fusion_core, 'W', ModBlocks.red_wire_coated, 'B', ModBlocks.machine_battery }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_well), 1), new Object[] { "TPM", "GPG", "GDG", 'T', ModItems.tank_steel, 'P', ModItems.pipes_steel, 'M', ModItems.motor, 'G', ModBlocks.steel_scaffold, 'D', ModItems.drill_titanium }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_flare), 1), new Object[] { "UHU", "GPG", "GTG", 'U', ModItems.thermo_element, 'H', ModItems.hull_small_steel, 'G', ModBlocks.steel_scaffold, 'P', ModItems.pipes_steel, 'T', ModItems.tank_steel }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_refinery), 1), new Object[] { "PTP", "CTC", "WFW", 'P', "plateTitanium", 'T', ModItems.tank_steel, 'C', ModItems.coil_tungsten, 'W', ModBlocks.red_wire_coated, 'F', ModBlocks.machine_electric_furnace_off })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.crate_iron), 1), new Object[] { "PPP", "I I", "III", 'P', "plateIron", 'I', "ingotIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.crate_steel), 1), new Object[] { "PPP", "I I", "III", 'P', "plateSteel", 'I', "ingotSteel" })); @@ -525,16 +529,16 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_conductor), 1), new Object[] { "SWS", "FFF", "SWS", 'S', "ingotTitanium", 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'F', ModItems.fuse })); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_core), 1), new Object[] { "HPH", "PCP", "HPH", 'H', Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 'C', ModItems.circuit_aluminium, 'P', Item.getItemFromBlock(Blocks.piston) }); GameRegistry.addRecipe(ItemBattery.getEmptyBattery(ModItems.factory_core_titanium), new Object[] { "BRB", "RHR", "BRB", 'B', ItemBattery.getEmptyBattery(ModItems.battery_generic), 'R', Item.getItemFromBlock(Blocks.redstone_block), 'H', Item.getItemFromBlock(ModBlocks.factory_titanium_hull) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 1), new Object[] { "PIP", "I I", "PIP", 'P', ModItems.plate_advanced_alloy, 'I', ModItems.ingot_advanced_alloy }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_furnace), 1), new Object[] { "HMH", "MFM", "HMH", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'M', ModItems.motor, 'F', Item.getItemFromBlock(Blocks.furnace) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_conductor), 1), new Object[] { "SWS", "FFF", "SWS", 'S', ModItems.ingot_advanced_alloy, 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'F', ModItems.fuse }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_core), 1), new Object[] { "HPH", "PCP", "HPH", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'C', ModItems.circuit_red_copper, 'P', Item.getItemFromBlock(Blocks.piston) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 1), new Object[] { "PIP", "I I", "PIP", 'P', ModItems.plate_advanced_alloy, 'I', ModItems.ingot_advanced_alloy }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_furnace), 1), new Object[] { "HMH", "MFM", "HMH", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'M', ModItems.motor, 'F', Item.getItemFromBlock(Blocks.furnace) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_conductor), 1), new Object[] { "SWS", "FFF", "SWS", 'S', ModItems.ingot_advanced_alloy, 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'F', ModItems.fuse }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_core), 1), new Object[] { "HPH", "PCP", "HPH", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'C', ModItems.circuit_red_copper, 'P', Item.getItemFromBlock(Blocks.piston) }); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.factory_core_advanced), new Object[] { "BLB", "SHS", "BLB", 'B', ItemBattery.getEmptyBattery(ModItems.battery_advanced), 'S', "blockSulfur", 'L', "blockLead", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull) })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.factory_core_advanced), new Object[] { "BSB", "LHL", "BSB", 'B', ItemBattery.getEmptyBattery(ModItems.battery_advanced), 'S', "blockSulfur", 'L', "blockLead", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fuse, 1), new Object[] { " S ", "GAG", " S ", 'S', "plateSteel", 'G', Item.getItemFromBlock(Blocks.glass_pane), 'A', ModItems.wire_aluminium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.redcoil_capacitor, 1), new Object[] { "PFP", "CBC", "CBC", 'P', "plateGold", 'B', Item.getItemFromBlock(Blocks.redstone_block), 'C', ModItems.coil_advanced_alloy, 'F', ModItems.fuse })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.titanium_filter, 1), new Object[] { "PFP", "CBC", "CBC", 'P', "plateLead", 'B', "U238", 'C', "plateTitanium", 'F', ModItems.fuse })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fuse, 1), new Object[] { " S ", "GAG", " S ", 'S', "plateSteel", 'G', Item.getItemFromBlock(Blocks.glass_pane), 'A', ModItems.wire_aluminium })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.redcoil_capacitor, 1), new Object[] { "PFP", "CBC", "CBC", 'P', "plateGold", 'B', Item.getItemFromBlock(Blocks.redstone_block), 'C', ModItems.coil_advanced_alloy, 'F', ModItems.fuse })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.titanium_filter, 1), new Object[] { "PFP", "CBC", "CBC", 'P', "plateLead", 'B', "U238", 'C', "plateTitanium", 'F', ModItems.fuse })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.detonator, 1), new Object[] { " W", "SC", "CE", 'S', "plateSteel", 'W', ModItems.wire_red_copper, 'C', ModItems.circuit_red_copper, 'E', "ingotSteel" })); GameRegistry.addRecipe(new ItemStack(ModItems.singularity, 1), new Object[] { "ESE", "SBS", "ESE", 'E', new ItemStack(ModItems.nugget_euphemium, 1, 34), 'S', ModItems.cell_anti_schrabidium, 'B', Item.getItemFromBlock(ModBlocks.block_schrabidium) }); @@ -549,8 +553,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.crystal_energy, 1), new Object[] { "EEE", "EGE", "EEE", 'E', ModItems.powder_power, 'G', Items.glowstone_dust }); GameRegistry.addRecipe(new ItemStack(ModItems.pellet_coolant, 1), new Object[] { "CRC", "RBR", "CRC", 'C', ModItems.powder_ice, 'R', ModItems.rod_quad_coolant, 'B', ModBlocks.block_niter }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.thermo_element, 1), new Object[] { "GRG", "APA", "GRG", 'P', "plateSteel", 'G', Items.gold_nugget, 'R', ModItems.wire_red_copper, 'A', ModItems.wire_aluminium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.limiter, 1), new Object[] { "SC", "SC", "LS", 'S', "plateSteel", 'C', ModItems.circuit_copper, 'L', "plateLead" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.thermo_element, 1), new Object[] { "GRG", "APA", "GRG", 'P', "plateSteel", 'G', Items.gold_nugget, 'R', ModItems.wire_red_copper, 'A', ModItems.wire_aluminium })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.limiter, 1), new Object[] { "SC", "SC", "LS", 'S', "plateSteel", 'C', ModItems.circuit_copper, 'L', "plateLead" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.blades_aluminium, 1), new Object[] { " P ", "PIP", " P ", 'P', "plateAluminum", 'I', "ingotAluminum" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.blades_gold, 1), new Object[] { " P ", "PIP", " P ", 'P', "plateGold", 'I', "ingotGold" })); @@ -561,41 +565,41 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.blades_combine_steel, 1), new Object[] { " P ", "PIP", " P ", 'P', "plateCMBSteel", 'I', "ingotCMBSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.blades_schrabidium, 1), new Object[] { " P ", "PIP", " P ", 'P', "plateSchrabidium", 'I', "ingotSchrabidium" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reactor_element), 1), new Object[] { "SCS", "CSC", "SCS", 'S', "ingotSteel", 'C', ModItems.rod_quad_empty })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reactor_control), 1), new Object[] { "SLS", "SLS", "SLS", 'S', "ingotSteel", 'L', "ingotLead" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reactor_conductor), 1), new Object[] { "SWS", "FFF", "SWS", 'S', "ingotSteel", 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'F', ModItems.fuse })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reactor_computer), 1), new Object[] { "CWC", "CRC", "CWC", 'C', ModItems.circuit_red_copper, 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'R', Item.getItemFromBlock(ModBlocks.reactor_conductor) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reactor_hatch), 1), new Object[] { "BBB", "BFB", "BBB", 'B', Item.getItemFromBlock(ModBlocks.brick_concrete), 'F', Item.getItemFromBlock(Blocks.furnace) }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reactor_element), 1), new Object[] { "SCS", "CSC", "SCS", 'S', "ingotSteel", 'C', ModItems.rod_quad_empty })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reactor_control), 1), new Object[] { "SLS", "SLS", "SLS", 'S', "ingotSteel", 'L', "ingotLead" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reactor_conductor), 1), new Object[] { "SWS", "FFF", "SWS", 'S', "ingotSteel", 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'F', ModItems.fuse })); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reactor_computer), 1), new Object[] { "CWC", "CRC", "CWC", 'C', ModItems.circuit_red_copper, 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'R', Item.getItemFromBlock(ModBlocks.reactor_conductor) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reactor_hatch), 1), new Object[] { "BBB", "BFB", "BBB", 'B', Item.getItemFromBlock(ModBlocks.brick_concrete), 'F', Item.getItemFromBlock(Blocks.furnace) }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_conductor), 1), new Object[] { "SSS", "CCC", "SSS", 'S', "plateSteel", 'C', ModItems.coil_advanced_alloy })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_center), 1), new Object[] { "TMT", "TWT", "TMT", 'T', "ingotTungsten", 'M', Item.getItemFromBlock(ModBlocks.fusion_conductor), 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_motor), 1), new Object[] { "MTM", "TTT", "MTM", 'T', "ingotTitanium", 'M', ModItems.motor })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_heater), 1), new Object[] { "TTT", "CCC", "TTT", 'T', "ingotTungsten", 'C', ModItems.magnetron })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_hatch), 1), new Object[] { "TTT", "TFT", "TTT", 'T', Item.getItemFromBlock(ModBlocks.fusion_heater), 'F', Item.getItemFromBlock(Blocks.furnace) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_core), 1), new Object[] { "CWC", "CRC", "CWC", 'C', ModItems.circuit_gold, 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'R', Item.getItemFromBlock(ModBlocks.fusion_center) }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_conductor), 1), new Object[] { "SSS", "CCC", "SSS", 'S', "plateSteel", 'C', ModItems.coil_advanced_alloy })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_center), 1), new Object[] { "TMT", "TWT", "TMT", 'T', "ingotTungsten", 'M', Item.getItemFromBlock(ModBlocks.fusion_conductor), 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated) })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_motor), 1), new Object[] { "MTM", "TTT", "MTM", 'T', "ingotTitanium", 'M', ModItems.motor })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_heater), 1), new Object[] { "TTT", "CCC", "TTT", 'T', "ingotTungsten", 'C', ModItems.magnetron })); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_hatch), 1), new Object[] { "TTT", "TFT", "TTT", 'T', Item.getItemFromBlock(ModBlocks.fusion_heater), 'F', Item.getItemFromBlock(Blocks.furnace) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fusion_core), 1), new Object[] { "CWC", "CRC", "CWC", 'C', ModItems.circuit_gold, 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'R', Item.getItemFromBlock(ModBlocks.fusion_center) }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_element), 2), new Object[] { "TET", "ERE", "TET", 'T', "ingotTungsten", 'R', Item.getItemFromBlock(ModBlocks.fusion_conductor), 'E', Item.getItemFromBlock(ModBlocks.reactor_element) })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_control), 2), new Object[] { "TMT", "MWM", "TMT", 'T', ModItems.ingot_advanced_alloy, 'M', Item.getItemFromBlock(ModBlocks.reactor_control), 'W', ModItems.coil_copper_torus }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_cooler), 1), new Object[] { "SCS", "CNC", "SCS", 'N', "blockSteel", 'C', ModItems.rod_quad_coolant, 'S', "dustNetherQuartz" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_end), 1), new Object[] { "TST", "SBS", "TST", 'T', "ingotTungsten", 'S', "ingotSteel", 'B', "blockLead" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_conductor), 1), new Object[] { "TWT", "FNF", "TWT", 'T', "ingotTungsten", 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'F', ModItems.fuse, 'N', "nuggetSchrabidium" })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_hatch), 1), new Object[] { "RRR", "RFR", "RRR", 'R', Item.getItemFromBlock(ModBlocks.reinforced_brick), 'F', Item.getItemFromBlock(Blocks.furnace) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_core), 1), new Object[] { "CWC", "CRC", "CWC", 'C', ModItems.circuit_schrabidium, 'W', Item.getItemFromBlock(ModBlocks.watz_conductor), 'R', Item.getItemFromBlock(ModBlocks.block_meteor) }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_element), 2), new Object[] { "TET", "ERE", "TET", 'T', "ingotTungsten", 'R', Item.getItemFromBlock(ModBlocks.fusion_conductor), 'E', Item.getItemFromBlock(ModBlocks.reactor_element) })); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_control), 2), new Object[] { "TMT", "MWM", "TMT", 'T', ModItems.ingot_advanced_alloy, 'M', Item.getItemFromBlock(ModBlocks.reactor_control), 'W', ModItems.coil_copper_torus }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_cooler), 1), new Object[] { "SCS", "CNC", "SCS", 'N', "blockSteel", 'C', ModItems.rod_quad_coolant, 'S', "dustNetherQuartz" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_end), 1), new Object[] { "TST", "SBS", "TST", 'T', "ingotTungsten", 'S', "ingotSteel", 'B', "blockLead" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_conductor), 1), new Object[] { "TWT", "FNF", "TWT", 'T', "ingotTungsten", 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'F', ModItems.fuse, 'N', "nuggetSchrabidium" })); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_hatch), 1), new Object[] { "RRR", "RFR", "RRR", 'R', Item.getItemFromBlock(ModBlocks.reinforced_brick), 'F', Item.getItemFromBlock(Blocks.furnace) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.watz_core), 1), new Object[] { "CWC", "CRC", "CWC", 'C', ModItems.circuit_schrabidium, 'W', Item.getItemFromBlock(ModBlocks.watz_conductor), 'R', Item.getItemFromBlock(ModBlocks.block_meteor) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_conductor), 1), new Object[] { "SSS", "CCC", "SSS", 'S', ModItems.plate_combine_steel, 'C', ModItems.coil_magnetized_tungsten }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_cooler), 1), new Object[] { "IPI", "IPI", "IPI", 'I', "ingotTitanium", 'P', "plateTitanium" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_tank), 1), new Object[] { "CGC", "GGG", "CGC", 'C', ModItems.plate_combine_steel, 'G', "paneGlass" })); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_conductor), 1), new Object[] { "SSS", "CCC", "SSS", 'S', ModItems.plate_combine_steel, 'C', ModItems.coil_magnetized_tungsten }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_cooler), 1), new Object[] { "IPI", "IPI", "IPI", 'I', "ingotTitanium", 'P', "plateTitanium" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_tank), 1), new Object[] { "CGC", "GGG", "CGC", 'C', ModItems.plate_combine_steel, 'G', "paneGlass" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_scaffold), 1), new Object[] { "IPI", "P P", "IPI", 'I', "ingotTungsten", 'P', "plateDenseLead" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_hatch), 1), new Object[] { "SSS", "SFS", "SSS", 'S', ModBlocks.fwatz_scaffold, 'F', Blocks.furnace })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_computer), 1), new Object[] { "DTD", "TMT", "DTD", 'D', "dustDiamond", 'T', "dustMagnetizedTungsten", 'M', ModBlocks.block_meteor })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_core), 1), new Object[] { "CMC", "MAM", "CMC", 'C', ModItems.circuit_schrabidium, 'M', ModBlocks.fwatz_computer, 'A', ModBlocks.fwatz_conductor })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_hatch), 1), new Object[] { "SSS", "SFS", "SSS", 'S', ModBlocks.fwatz_scaffold, 'F', Blocks.furnace })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_computer), 1), new Object[] { "DTD", "TMT", "DTD", 'D', "dustDiamond", 'T', "dustMagnetizedTungsten", 'M', ModBlocks.block_meteor })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_core), 1), new Object[] { "CMC", "MAM", "CMC", 'C', ModItems.circuit_schrabidium, 'M', ModBlocks.fwatz_computer, 'A', ModBlocks.fwatz_conductor })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.asphalt), 8), new Object[] { "BGB", "GSG", "BGB", 'B', ModItems.canister_smear, 'G', Blocks.gravel, 'S', Blocks.sand }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.asphalt), 8), new Object[] { "BGB", "GSG", "BGB", 'B', ModItems.canister_bitumen, 'G', Blocks.gravel, 'S', Blocks.sand }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_light), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.fence, 'B', Blocks.brick_block }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.stone }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_obsidian), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick), 4), new Object[] { "PPP", "PIP", "PPP", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick_reinforced), 8), new Object[] { "TBT", "BCB", "TBT", 'T', ModBlocks.block_magnetized_tungsten, 'B', ModBlocks.brick_concrete, 'C', ModBlocks.cmb_brick }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick), 4), new Object[] { "PPP", "PIP", "PPP", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick_reinforced), 8), new Object[] { "TBT", "BCB", "TBT", 'T', ModBlocks.block_magnetized_tungsten, 'B', ModBlocks.brick_concrete, 'C', ModBlocks.cmb_brick }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_brick), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', ModBlocks.brick_concrete }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_glass), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.glass }); @@ -613,8 +617,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_roof), 2), new Object[] { "SSS", 'S', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_scaffold), 8), new Object[] { "SSS", " S ", "SSS", 'S', "ingotSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.seal_frame, 2), new Object[] { "SSS", "WRW", "III", 'S', ModBlocks.steel_roof, 'W', ModItems.wire_aluminium, 'R', "dustRedstone", 'I', "ingotSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.seal_controller, 1), new Object[] { "SSS", "RCR", "III", 'S', ModBlocks.steel_roof, 'C', ModItems.ingot_red_copper, 'R', "dustRedstone", 'I', "ingotSteel" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.seal_frame, 2), new Object[] { "SSS", "WRW", "III", 'S', ModBlocks.steel_roof, 'W', ModItems.wire_aluminium, 'R', "dustRedstone", 'I', "ingotSteel" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.seal_controller, 1), new Object[] { "SSS", "RCR", "III", 'S', ModBlocks.steel_roof, 'C', ModItems.ingot_red_copper, 'R', "dustRedstone", 'I', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg, 1), new Object[] { "SSW", " SW", 'S', "plateSteel", 'W', "plateIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg_ammo, 8), new Object[] { "SI ", "ITI", " I ", 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt), 'I', "plateIron" })); @@ -638,9 +642,9 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_nightmare2, 1), new Object[] { "SSS", "RRW", 'S', "plateDenseLead", 'W', "ingotTungsten", 'R', ModItems.wire_gold })); GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_nightmare2_ammo, 6), new Object[] { "L", "S", 'L', ModItems.powder_power, 'S', Items.gunpowder }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_fatman, 1), new Object[] { "SSI", "III", "WPH", 'S', "plateSteel", 'I', "ingotSteel", 'W', ModItems.wire_aluminium, 'H', ModItems.hull_small_steel, 'P', Item.getItemFromBlock(Blocks.piston) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_fatman_ammo, 2), new Object[] { " S ", "SPS", "ITI", 'S', "plateSteel", 'P', ModItems.ingot_pu239, 'T', Item.getItemFromBlock(Blocks.tnt), 'I', "plateIron" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_fatman_ammo, 2), new Object[] { " S ", "SPS", "ITI", 'S', "plateSteel", 'P', ModItems.ingot_pu239, 'T', Item.getItemFromBlock(Blocks.tnt), 'I', "plateIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mirv, 1), new Object[] { "LLL", "WFW", "SSS", 'S', "plateSteel", 'L', "plateLead", 'W', ModItems.wire_gold, 'F', ModItems.gun_fatman })); - GameRegistry.addRecipe(new ItemStack(ModItems.gun_mirv_ammo, 1), new Object[] { "NNN", "NSN", "NNN", 'S', ModItems.hull_small_steel, 'N', ModItems.gun_fatman_ammo }); + //GameRegistry.addRecipe(new ItemStack(ModItems.gun_mirv_ammo, 1), new Object[] { "NNN", "NSN", "NNN", 'S', ModItems.hull_small_steel, 'N', ModItems.gun_fatman_ammo }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bf, 1), new Object[] { "LLL", "WFW", "SSS", 'S', ModItems.plate_paa, 'L', "plateDenseLead", 'W', ModItems.wire_advanced_alloy, 'F', ModItems.gun_mirv })); GameRegistry.addRecipe(new ItemStack(ModItems.gun_bf_ammo, 1), new Object[] { "AEA", "SHS", "AEA", 'H', ModItems.hull_small_steel, 'A', ModItems.cell_antimatter, 'S', ModItems.cell_anti_schrabidium, 'E', ModItems.powder_power }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp40, 1), new Object[] { "III", " SW", " S ", 'S', "plateSteel", 'I', "ingotSteel", 'W', "plankWood" })); @@ -655,9 +659,9 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_xvl1456_ammo, 16), new Object[] { " S ", " R ", " S ", 'S', "plateSteel", 'R', "U238" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_xvl1456_ammo, 16), new Object[] { "SRS", 'S', "plateSteel", 'R', "U238" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_osipr, 1), new Object[] { "CCT", "WWI", "MCC", 'C', ModItems.plate_combine_steel, 'T', "ingotTungsten", 'W', ModItems.wire_magnetized_tungsten, 'I', ModItems.ingot_magnetized_tungsten, 'M', ModItems.coil_magnetized_tungsten })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_osipr_ammo, 16), new Object[] { "G", "R", "S", 'G', "dustGlowstone", 'R', "dustRedstone", 'S', "plateSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_osipr_ammo, 16), new Object[] { "R", "G", "S", 'G', "dustGlowstone", 'R', "dustRedstone", 'S', "plateSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_osipr_ammo2, 1), new Object[] { " C ", "PPP", " C ", 'C', ModItems.plate_combine_steel, 'P', ModItems.powder_power })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_osipr_ammo, 16), new Object[] { "G", "R", "S", 'G', "dustGlowstone", 'R', "dustRedstone", 'S', "plateSteel" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_osipr_ammo, 16), new Object[] { "R", "G", "S", 'G', "dustGlowstone", 'R', "dustRedstone", 'S', "plateSteel" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_osipr_ammo2, 1), new Object[] { " C ", "PPP", " C ", 'C', ModItems.plate_combine_steel, 'P', ModItems.powder_power })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_immolator, 1), new Object[] { "WCC", "PMT", "WAA", 'W', ModItems.wire_gold, 'C', "plateCopper", 'P', "plateAdvanced", 'M', ModItems.motor, 'T', ModItems.tank_steel, 'A', "plateSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_immolator_ammo, 16), new Object[] { "SPS", "PCP", "SPS", 'S', "plateSteel", 'C', "dustCoal", 'P', ModItems.powder_fire })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_immolator_ammo, 16), new Object[] { " F ", "SFS", " F ", 'S', "plateSteel", 'F', ModItems.canister_fuel })); @@ -679,29 +683,29 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_spark_ammo, 4), new Object[] { "PCP", "DDD", "PCP", 'P', "plateLead", 'C', ModItems.coil_gold, 'D', ModItems.powder_power })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_hp, 1), new Object[] { "TDT", "ASA", " T ", 'A', "ingotReiium", 'T', ModItems.toothpicks, 'S', ModItems.gun_xvl1456, 'D', ModItems.ducttape })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_hp_ammo, 8), new Object[] { " R ", "BSK", " Y ", 'S', "plateSteel", 'K', new ItemStack(Items.dye, 1, 0), 'R', new ItemStack(Items.dye, 1, 1), 'B', new ItemStack(Items.dye, 1, 4), 'Y', new ItemStack(Items.dye, 1, 11) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_defabricator, 1), new Object[] { " SS", "DDD", "TCB", 'S', "plateSteel", 'D', ModItems.plate_dalekanium, 'T', "plateTitanium", 'C', ModItems.circuit_gold, 'B', ModItems.battery_lithium })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_defabricator, 1), new Object[] { " SS", "DDD", "TCB", 'S', "plateSteel", 'D', ModItems.plate_dalekanium, 'T', "plateTitanium", 'C', ModItems.circuit_gold, 'B', ModItems.battery_lithium })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_defabricator_ammo, 16), new Object[] { "PCP", "DDD", "PCP", 'P', "plateSteel", 'C', ModItems.coil_copper, 'D', "dustLithium" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_generic, 4), new Object[] { "RS ", "ITI", " I ", 'I', "plateIron", 'R', ModItems.wire_red_copper, 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt) })); GameRegistry.addRecipe(new ItemStack(ModItems.grenade_strong, 2), new Object[] { " G ", "SGS", " S ", 'G', ModItems.grenade_generic, 'S', Items.gunpowder }); GameRegistry.addRecipe(new ItemStack(ModItems.grenade_frag, 2), new Object[] { " G ", "WGW", " K ", 'G', ModItems.grenade_generic, 'W', Item.getItemFromBlock(Blocks.planks), 'K', Item.getItemFromBlock(Blocks.gravel) }); - GameRegistry.addRecipe(new ItemStack(ModItems.grenade_fire, 2), new Object[] { " G ", "PFP", " P ", 'G', ModItems.grenade_generic, 'F', ModItems.grenade_frag, 'P', ModItems.powder_fire }); - GameRegistry.addRecipe(new ItemStack(ModItems.grenade_shrapnel, 2), new Object[] { " G ", "PFP", " P ", 'G', ModItems.grenade_generic, 'P', ModItems.pellet_buckshot, 'F', ModItems.grenade_strong }); - GameRegistry.addRecipe(new ItemStack(ModItems.grenade_cluster, 2), new Object[] { " G ", "PFP", " P ", 'G', ModItems.grenade_generic, 'P', ModItems.pellet_cluster, 'F', ModItems.grenade_frag }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_flare, 2), new Object[] { " G ", "DGD", " D ", 'G', ModItems.grenade_generic, 'D', "dustGlowstone" })); - GameRegistry.addRecipe(new ItemStack(ModItems.grenade_electric, 2), new Object[] { " G ", "CSC", " C ", 'G', ModItems.grenade_generic, 'C', ModItems.circuit_red_copper, 'S', ModItems.grenade_strong }); + //GameRegistry.addRecipe(new ItemStack(ModItems.grenade_fire, 2), new Object[] { " G ", "PFP", " P ", 'G', ModItems.grenade_generic, 'F', ModItems.grenade_frag, 'P', ModItems.powder_fire }); + //GameRegistry.addRecipe(new ItemStack(ModItems.grenade_shrapnel, 2), new Object[] { " G ", "PFP", " P ", 'G', ModItems.grenade_generic, 'P', ModItems.pellet_buckshot, 'F', ModItems.grenade_strong }); + //GameRegistry.addRecipe(new ItemStack(ModItems.grenade_cluster, 2), new Object[] { " G ", "PFP", " P ", 'G', ModItems.grenade_generic, 'P', ModItems.pellet_cluster, 'F', ModItems.grenade_frag }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_flare, 2), new Object[] { " G ", "DGD", " D ", 'G', ModItems.grenade_generic, 'D', "dustGlowstone" })); + //GameRegistry.addRecipe(new ItemStack(ModItems.grenade_electric, 2), new Object[] { " G ", "CSC", " C ", 'G', ModItems.grenade_generic, 'C', ModItems.circuit_red_copper, 'S', ModItems.grenade_strong }); GameRegistry.addRecipe(new ItemStack(ModItems.grenade_poison, 2), new Object[] { " G ", "PGP", " P ", 'G', ModItems.grenade_generic, 'P', ModItems.powder_poison }); GameRegistry.addRecipe(new ItemStack(ModItems.grenade_gas, 2), new Object[] { " G ", "CGC", " C ", 'G', ModItems.grenade_generic, 'C', ModItems.pellet_gas }); - GameRegistry.addRecipe(new ItemStack(ModItems.grenade_schrabidium, 2), new Object[] { " G ", "CFC", " C ", 'G', ModItems.grenade_generic, 'C', ModItems.ingot_schrabidium, 'F', ModItems.grenade_flare }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_nuclear, 1), new Object[] {"RS ", "ITI", " I ", 'I', "plateIron", 'R', ModItems.wire_red_copper, 'S', "plateSteel", 'T', ModItems.gun_fatman_ammo })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_plasma, 1), new Object[] {"RS ", "ICI", "TID", 'I', "plateIron", 'R', ModItems.wire_red_copper, 'S', "plateSteel", 'C', ModItems.coil_advanced_torus, 'D', ModItems.cell_deuterium, 'T', ModItems.cell_tritium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_tau, 1), new Object[] {"RS ", "ITI", "UIU", 'I', "plateLead", 'R', ModItems.wire_red_copper, 'S', "plateAdvanced", 'T', ModItems.coil_advanced_torus, 'U', ModItems.gun_xvl1456_ammo })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_zomg, 1), new Object[] {"RC ", "PXP", "NPN", 'P', ModItems.plate_paa, 'R', ModItems.wire_red_copper, 'C', "plateCMBSteel", 'X', ModItems.crystal_xen, 'N', ModItems.powder_power })); + //GameRegistry.addRecipe(new ItemStack(ModItems.grenade_schrabidium, 2), new Object[] { " G ", "CFC", " C ", 'G', ModItems.grenade_generic, 'C', ModItems.ingot_schrabidium, 'F', ModItems.grenade_flare }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_nuclear, 1), new Object[] {"RS ", "ITI", " I ", 'I', "plateIron", 'R', ModItems.wire_red_copper, 'S', "plateSteel", 'T', ModItems.gun_fatman_ammo })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_plasma, 1), new Object[] {"RS ", "ICI", "TID", 'I', "plateIron", 'R', ModItems.wire_red_copper, 'S', "plateSteel", 'C', ModItems.coil_advanced_torus, 'D', ModItems.cell_deuterium, 'T', ModItems.cell_tritium })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_tau, 1), new Object[] {"RS ", "ITI", "UIU", 'I', "plateLead", 'R', ModItems.wire_red_copper, 'S', "plateAdvanced", 'T', ModItems.coil_advanced_torus, 'U', ModItems.gun_xvl1456_ammo })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_zomg, 1), new Object[] {"RC ", "PXP", "NPN", 'P', ModItems.plate_paa, 'R', ModItems.wire_red_copper, 'C', "plateCMBSteel", 'X', ModItems.crystal_xen, 'N', ModItems.powder_power })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_aschrab, 1), new Object[] {"RS ", "ITI", " S ", 'I', "paneGlassColorless", 'R', ModItems.wire_red_copper, 'S', "plateSteel", 'T', ModItems.cell_anti_schrabidium })); GameRegistry.addRecipe(new ItemStack(ModItems.grenade_mk2, 2), new Object[] { " G ", "SGS", " S ", 'G', ModItems.grenade_strong, 'S', Items.gunpowder }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_pulse, 4), new Object[] { "WPW", "WSW", "SMS", 'W', ModItems.wire_red_copper, 'P', "plateIron", 'S', "plateSteel", 'M', ModItems.magnetron })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_pulse, 4), new Object[] { "WPW", "WSW", "SMS", 'W', ModItems.wire_red_copper, 'P', "plateIron", 'S', "plateSteel", 'M', ModItems.magnetron })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.grenade_lemon, 1), new Object[] { ModItems.lemon, ModItems.grenade_strong })); - GameRegistry.addRecipe(new ItemStack(ModItems.grenade_black_hole, 1), new Object[] { " C ", "PBP", "PCP", 'C', ModItems.coil_advanced_alloy, 'P', ModItems.ingot_polymer, 'B', ModItems.black_hole }); + //GameRegistry.addRecipe(new ItemStack(ModItems.grenade_black_hole, 1), new Object[] { " C ", "PBP", "PCP", 'C', ModItems.coil_advanced_alloy, 'P', ModItems.ingot_polymer, 'B', ModItems.black_hole }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.gun_moist_nugget, 12), new Object[] { Items.bread, Items.wheat, Items.cooked_chicken, Items.egg }); GameRegistry.addRecipe(new ItemStack(ModItems.bomb_waffle, 1), new Object[] { "WEW", "MPM", "WEW", 'W', Items.wheat, 'E', Items.egg, 'M', Items.milk_bucket, 'P', ModItems.man_core }); @@ -752,29 +756,29 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.stealth_boy, 1), new Object[] { " B", "LI", "LC", 'B', Item.getItemFromBlock(Blocks.stone_button), 'L', Items.leather, 'I', "ingotSteel", 'C', ModItems.circuit_red_copper })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_gadget), 1), new Object[] { "DGD", "FCF", "DPD", 'G', ModItems.wire_gold, 'F', ModItems.fins_flat, 'C', ModItems.sphere_steel, 'P', ModItems.pedestal_steel, 'D', new ItemStack(Items.dye, 1, 8) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_boy), 1), new Object[] { "ADD", "HHF", "CDD", 'A', ModItems.wire_aluminium, 'H', ModItems.hull_small_steel, 'C', ModItems.circuit_aluminium, 'F', ModItems.fins_small_steel, 'D', new ItemStack(Items.dye, 1, 4) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_man), 1), new Object[] { "ADD", "SHF", "CDD", 'A', ModItems.wire_aluminium, 'S', ModItems.sphere_steel, 'H', ModItems.hull_big_steel, 'F', ModItems.fins_big_steel, 'C', ModItems.circuit_aluminium, 'D', new ItemStack(Items.dye, 1, 11) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_mike), 1), new Object[] { "DCD", "HSH", "ATA", 'C', ModItems.cap_aluminium, 'H', ModItems.hull_big_aluminium, 'S', ModItems.sphere_steel, 'A', ModItems.circuit_red_copper, 'T', ModItems.tank_steel, 'D', new ItemStack(Items.dye, 1, 7) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_tsar), 1), new Object[] { "CHD", "STF", "CHD", 'C', ModItems.circuit_red_copper, 'H', ModItems.hull_big_titanium, 'S', ModItems.sphere_steel, 'T', ModItems.tank_steel, 'F', ModItems.fins_tri_steel, 'D', new ItemStack(Items.dye, 1, 0) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_fleija), 1), new Object[] { "DGD", "CHF", "DGD", 'G', ModItems.wire_gold, 'C', ModItems.circuit_gold, 'H', ModItems.hull_small_aluminium, 'F', ModItems.fins_quad_titanium, 'D', new ItemStack(Items.dye, 1, 15) }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_prototype), 1), new Object[] { "GCG", "HRH", "GCG", 'G', ModItems.wire_gold, 'C', new ItemStack(ModItems.ingot_euphemium, 1, 34), 'H', ModItems.hull_small_steel, 'R', ModItems.dysfunctional_reactor }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_custom), 1), new Object[] { "ADD", "HHF", "CDD", 'A', ModItems.wire_gold, 'H', ModItems.hull_small_steel, 'C', ModItems.circuit_gold, 'F', ModItems.fins_small_steel, 'D', new ItemStack(Items.dye, 1, 8) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_gadget), 1), new Object[] { "DGD", "FCF", "DPD", 'G', ModItems.wire_gold, 'F', ModItems.fins_flat, 'C', ModItems.sphere_steel, 'P', ModItems.pedestal_steel, 'D', new ItemStack(Items.dye, 1, 8) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_boy), 1), new Object[] { "ADD", "HHF", "CDD", 'A', ModItems.wire_aluminium, 'H', ModItems.hull_small_steel, 'C', ModItems.circuit_aluminium, 'F', ModItems.fins_small_steel, 'D', new ItemStack(Items.dye, 1, 4) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_man), 1), new Object[] { "ADD", "SHF", "CDD", 'A', ModItems.wire_aluminium, 'S', ModItems.sphere_steel, 'H', ModItems.hull_big_steel, 'F', ModItems.fins_big_steel, 'C', ModItems.circuit_aluminium, 'D', new ItemStack(Items.dye, 1, 11) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_mike), 1), new Object[] { "DCD", "HSH", "ATA", 'C', ModItems.cap_aluminium, 'H', ModItems.hull_big_aluminium, 'S', ModItems.sphere_steel, 'A', ModItems.circuit_red_copper, 'T', ModItems.tank_steel, 'D', new ItemStack(Items.dye, 1, 7) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_tsar), 1), new Object[] { "CHD", "STF", "CHD", 'C', ModItems.circuit_red_copper, 'H', ModItems.hull_big_titanium, 'S', ModItems.sphere_steel, 'T', ModItems.tank_steel, 'F', ModItems.fins_tri_steel, 'D', new ItemStack(Items.dye, 1, 0) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_fleija), 1), new Object[] { "DGD", "CHF", "DGD", 'G', ModItems.wire_gold, 'C', ModItems.circuit_gold, 'H', ModItems.hull_small_aluminium, 'F', ModItems.fins_quad_titanium, 'D', new ItemStack(Items.dye, 1, 15) }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_prototype), 1), new Object[] { "GCG", "HRH", "GCG", 'G', ModItems.wire_gold, 'C', new ItemStack(ModItems.ingot_euphemium, 1, 34), 'H', ModItems.hull_small_steel, 'R', ModItems.dysfunctional_reactor }); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_custom), 1), new Object[] { "ADD", "HHF", "CDD", 'A', ModItems.wire_gold, 'H', ModItems.hull_small_steel, 'C', ModItems.circuit_gold, 'F', ModItems.fins_small_steel, 'D', new ItemStack(Items.dye, 1, 8) }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.launch_pad), 1), new Object[] { "PPP", "ICI", "CBC", 'P', "plateSteel", 'I', "ingotSteel", 'C', ModItems.circuit_gold, 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.launch_pad), 1), new Object[] { "PPP", "ICI", "CBC", 'P', "plateSteel", 'I', "ingotSteel", 'C', ModItems.circuit_gold, 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.book_guide), 1), new Object[] { "IBI", "LBL", "IBI", 'B', Items.book, 'I', new ItemStack(Items.dye, 1, 0), 'L', new ItemStack(Items.dye, 1, 4) }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.rail_highspeed), 16), new Object[] { "S S", "SIS", "S S", 'S', "ingotSteel", 'I', "plateIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.rail_booster), 6), new Object[] { "S S", "CIC", "SRS", 'S', "ingotSteel", 'I', "plateIron", 'R', "ingotRedstoneAlloy", 'C', ModItems.coil_copper })); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.bomb_multi), 1), new Object[] { "AAD", "CHF", "AAD", 'A', ModItems.wire_aluminium, 'C', ModItems.circuit_aluminium, 'H', ModItems.hull_small_aluminium, 'F', ModItems.fins_quad_titanium, 'D', new ItemStack(Items.dye, 1, 15) }); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_cluster, 8), new Object[] { "plateIron", Item.getItemFromBlock(Blocks.tnt), "plateSteel" })); + //GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_cluster, 8), new Object[] { "plateIron", Item.getItemFromBlock(Blocks.tnt), "plateSteel" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_fire, 4), new Object[] { Items.blaze_powder, "dustSulfur", "dustRedstone" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_ice, 4), new Object[] { Items.snowball, "dustNiter", "dustRedstone" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_poison, 4), new Object[] { Items.spider_eye, "dustRedstone", "gemQuartz" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_gas, 2), new Object[] { Items.water_bucket, "dustGlowstone", "plateSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.magnetron, 2), new Object[] { "PWP", "ITI", "PWP", 'P', "plateAdvanced", 'I', "ingotAdvanced", 'W', ModItems.wire_tungsten, 'T', ModItems.coil_tungsten })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_buckshot, 2), new Object[] { "nuggetLead", "nuggetLead", "nuggetLead" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.magnetron, 2), new Object[] { "PWP", "ITI", "PWP", 'P', "plateAdvanced", 'I', "ingotAdvanced", 'W', ModItems.wire_tungsten, 'T', ModItems.coil_tungsten })); + //GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_buckshot, 2), new Object[] { "nuggetLead", "nuggetLead", "nuggetLead" })); GameRegistry.addRecipe(new ItemStack(ModItems.flame_pony, 1), new Object[] { " O ", "DPD", " O ", 'D', new ItemStack(Items.dye, 1, 11), 'O', new ItemStack(Items.dye, 1, 9), 'P', Items.paper }); GameRegistry.addRecipe(new ItemStack(ModItems.flame_conspiracy, 1), new Object[] { " S ", "STS", " S ", 'S', ModItems.canister_fuel, 'T', ModItems.ingot_steel }); @@ -782,35 +786,35 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.flame_opinion, 1), new Object[] { " R ", "RPR", " R ", 'P', Items.paper, 'R', new ItemStack(Items.dye, 1, 1) }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.flame_war), 1), new Object[] { "WHW", "CTP", "WOW", 'W', Item.getItemFromBlock(Blocks.planks), 'T', Item.getItemFromBlock(Blocks.tnt), 'H', ModItems.flame_pony, 'C', ModItems.flame_conspiracy, 'P', ModItems.flame_politics, 'O', ModItems.flame_opinion }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.float_bomb), 1), new Object[] { "TGT", "TUT", "TGT", 'T', "plateTitanium", 'U', ModItems.levitation_unit, 'G', ModItems.circuit_gold })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.therm_endo), 1), new Object[] { "TGT", "TUT", "TGT", 'T', "plateTitanium", 'U', ModItems.thermo_unit_endo, 'G', ModItems.circuit_gold })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.therm_exo), 1), new Object[] { "TGT", "TUT", "TGT", 'T', "plateTitanium", 'U', ModItems.thermo_unit_exo, 'G', ModItems.circuit_gold })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.float_bomb), 1), new Object[] { "TGT", "TUT", "TGT", 'T', "plateTitanium", 'U', ModItems.levitation_unit, 'G', ModItems.circuit_gold })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.therm_endo), 1), new Object[] { "TGT", "TUT", "TGT", 'T', "plateTitanium", 'U', ModItems.thermo_unit_endo, 'G', ModItems.circuit_gold })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.therm_exo), 1), new Object[] { "TGT", "TUT", "TGT", 'T', "plateTitanium", 'U', ModItems.thermo_unit_exo, 'G', ModItems.circuit_gold })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.det_cord), 8), new Object[] { "TNT", "NGN", "TNT", 'T', "plateIron", 'N', "dustNiter", 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.det_charge), 1), new Object[] { "PDP", "DTD", "PDP", 'P', "plateSteel", 'D', ModBlocks.det_cord, 'T', Blocks.tnt })); - GameRegistry.addRecipe(new ItemStack(ModItems.gadget_core, 1), new Object[] { "PPP", "PUP", "PPP", 'P', ModItems.nugget_pu239, 'U', ModItems.nugget_u238 }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gadget_explosive, 16), new Object[] { "ATP", "ATW", "ATP", 'P', "plateTitanium", 'A', "plateAluminum", 'T', Item.getItemFromBlock(Blocks.tnt), 'W', ModItems.wire_gold })); + //GameRegistry.addRecipe(new ItemStack(ModItems.gadget_core, 1), new Object[] { "PPP", "PUP", "PPP", 'P', ModItems.nugget_pu239, 'U', ModItems.nugget_u238 }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gadget_explosive, 16), new Object[] { "ATP", "ATW", "ATP", 'P', "plateTitanium", 'A', "plateAluminum", 'T', Item.getItemFromBlock(Blocks.tnt), 'W', ModItems.wire_gold })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gadget_explosive8, 1), new Object[] { "EEE", "EPE", "EEE", 'E', ModItems.gadget_explosive, 'P', "plateAluminum" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gadget_wireing, 1), new Object[] { "WWW", "WSW", "WWW", 'W', ModItems.wire_gold, 'S', "plateTitanium" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gadget_wireing, 1), new Object[] { "WWW", "WSW", "WWW", 'W', ModItems.wire_gold, 'S', "plateTitanium" })); - GameRegistry.addRecipe(new ItemStack(ModItems.boy_bullet, 1), new Object[] { "##", '#', ModItems.nugget_u235 }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.boy_igniter, 1), new Object[] { " AA", "WWS", " AA", 'A', "plateAluminum", 'W', ModItems.wire_red_copper, 'S', ModItems.circuit_aluminium })); - GameRegistry.addRecipe(new ItemStack(ModItems.boy_propellant, 1), new Object[] { "TTT", "PPW", "TTT", 'T', ModItems.plate_titanium, 'W', ModItems.wire_red_copper, 'P', Item.getItemFromBlock(Blocks.tnt) }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.boy_shielding, 1), new Object[] { "## ", "# #", "## ", '#', "plateDenseLead" })); - GameRegistry.addRecipe(new ItemStack(ModItems.boy_target, 1), new Object[] { "###", "# ", "###", '#', ModItems.nugget_u235 }); + //GameRegistry.addRecipe(new ItemStack(ModItems.boy_bullet, 1), new Object[] { "##", '#', ModItems.nugget_u235 }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.boy_igniter, 1), new Object[] { " AA", "WWS", " AA", 'A', "plateAluminum", 'W', ModItems.wire_red_copper, 'S', ModItems.circuit_aluminium })); + //GameRegistry.addRecipe(new ItemStack(ModItems.boy_propellant, 1), new Object[] { "TTT", "PPW", "TTT", 'T', ModItems.plate_titanium, 'W', ModItems.wire_red_copper, 'P', Item.getItemFromBlock(Blocks.tnt) }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.boy_shielding, 1), new Object[] { "## ", "# #", "## ", '#', "plateDenseLead" })); + //GameRegistry.addRecipe(new ItemStack(ModItems.boy_target, 1), new Object[] { "###", "# ", "###", '#', ModItems.nugget_u235 }); - GameRegistry.addRecipe(new ItemStack(ModItems.man_core, 1), new Object[] { "PPP", "PBP", "PPP", 'P', ModItems.nugget_pu239, 'B', ModItems.nugget_beryllium }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.man_explosive, 16), new Object[] { "UTP", "UTW", "UTP", 'P', "plateTitanium", 'U', ModItems.nugget_u238, 'T', Item.getItemFromBlock(Blocks.tnt), 'W', ModItems.wire_red_copper })); + //GameRegistry.addRecipe(new ItemStack(ModItems.man_core, 1), new Object[] { "PPP", "PBP", "PPP", 'P', ModItems.nugget_pu239, 'B', ModItems.nugget_beryllium }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.man_explosive, 16), new Object[] { "UTP", "UTW", "UTP", 'P', "plateTitanium", 'U', ModItems.nugget_u238, 'T', Item.getItemFromBlock(Blocks.tnt), 'W', ModItems.wire_red_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.man_explosive8, 1), new Object[] { "EEE", "ESE", "EEE", 'E', ModItems.man_explosive, 'S', "plateSteel" })); - GameRegistry.addRecipe(new ItemStack(ModItems.man_igniter, 1), new Object[] { " S ", "WWW", 'W', ModItems.wire_red_copper, 'S', ModItems.circuit_aluminium }); + //GameRegistry.addRecipe(new ItemStack(ModItems.man_igniter, 1), new Object[] { " S ", "WWW", 'W', ModItems.wire_red_copper, 'S', ModItems.circuit_aluminium }); - GameRegistry.addRecipe(new ItemStack(ModItems.mike_core, 1), new Object[] { "UPU", "UPU", "UPU", 'U', ModItems.nugget_u238, 'P', ModItems.nugget_pu239 }); - GameRegistry.addRecipe(new ItemStack(ModItems.mike_deut, 1), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.cell_deuterium, 'T', ModItems.tank_steel }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mike_cooling_unit, 1), new Object[] { "WSC", "WMC", "WAC", 'W', ModItems.coil_tungsten, 'C', ModItems.coil_copper, 'S', "plateSteel", 'M', ModItems.motor, 'A', ModItems.circuit_copper })); + //GameRegistry.addRecipe(new ItemStack(ModItems.mike_core, 1), new Object[] { "UPU", "UPU", "UPU", 'U', ModItems.nugget_u238, 'P', ModItems.nugget_pu239 }); + //GameRegistry.addRecipe(new ItemStack(ModItems.mike_deut, 1), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.cell_deuterium, 'T', ModItems.tank_steel }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mike_cooling_unit, 1), new Object[] { "WSC", "WMC", "WAC", 'W', ModItems.coil_tungsten, 'C', ModItems.coil_copper, 'S', "plateSteel", 'M', ModItems.motor, 'A', ModItems.circuit_copper })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fleija_igniter, 1), new Object[] { " TT", "TSW", " TT", 'T', "plateTitanium", 'S', ModItems.circuit_schrabidium, 'W', ModItems.wire_schrabidium })); - GameRegistry.addRecipe(new ItemStack(ModItems.fleija_propellant, 1), new Object[] { "PPP", "TST", "PPP", 'P', ModItems.plate_schrabidium, 'S', ModItems.ingot_schrabidium, 'T', Item.getItemFromBlock(Blocks.tnt) }); - GameRegistry.addRecipe(new ItemStack(ModItems.fleija_core, 1), new Object[] { "NUU", "BHW", "NUU", 'N', ModItems.nugget_neptunium, 'B', ModItems.nugget_beryllium, 'U', ModItems.nugget_u235, 'H', ModItems.coil_copper, 'W', ModItems.wire_red_copper }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fleija_igniter, 1), new Object[] { " TT", "TSW", " TT", 'T', "plateTitanium", 'S', ModItems.circuit_schrabidium, 'W', ModItems.wire_schrabidium })); + //GameRegistry.addRecipe(new ItemStack(ModItems.fleija_propellant, 1), new Object[] { "PPP", "TST", "PPP", 'P', ModItems.plate_schrabidium, 'S', ModItems.ingot_schrabidium, 'T', Item.getItemFromBlock(Blocks.tnt) }); + //GameRegistry.addRecipe(new ItemStack(ModItems.fleija_core, 1), new Object[] { "NUU", "BHW", "NUU", 'N', ModItems.nugget_neptunium, 'B', ModItems.nugget_beryllium, 'U', ModItems.nugget_u235, 'H', ModItems.coil_copper, 'W', ModItems.wire_red_copper }); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_generic), new Object[] { " A ", "PRP", "PRP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'R', Items.redstone })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PSP", "PLP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "sulfur", 'L', "dustLead" })); @@ -896,10 +900,10 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.wiring_red_copper, 1), new Object[] { "PPP", "PIP", "PPP", 'P', "plateSteel", 'I', "ingotSteel" })); - ItemStack multitool = new ItemStack(ModItems.multitool_dig, 1); - multitool.addEnchantment(Enchantment.looting, 3); - multitool.addEnchantment(Enchantment.fortune, 3); - GameRegistry.addShapedRecipe((multitool), new Object[] { "R#V", "W+U", "A@D", 'R', ModItems.rod_reiium, 'W', ModItems.rod_weidanium, 'A', ModItems.rod_australium, 'V', ModItems.rod_verticium, 'U', ModItems.rod_unobtainium, 'D', ModItems.rod_daffergon, '#', ModBlocks.steel_scaffold, '+', ModItems.circuit_gold, '@', ModItems.ducttape }); + //ItemStack multitool = new ItemStack(ModItems.multitool_dig, 1); + //multitool.addEnchantment(Enchantment.looting, 3); + //multitool.addEnchantment(Enchantment.fortune, 3); + //GameRegistry.addShapedRecipe((multitool), new Object[] { "R#V", "W+U", "A@D", 'R', ModItems.rod_reiium, 'W', ModItems.rod_weidanium, 'A', ModItems.rod_australium, 'V', ModItems.rod_verticium, 'U', ModItems.rod_unobtainium, 'D', ModItems.rod_daffergon, '#', ModBlocks.steel_scaffold, '+', ModItems.circuit_gold, '@', ModItems.ducttape }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.tank_waste, 1), new Object[] { "PTP", "PTP", "PTP", 'T', ModItems.tank_steel, 'P', "plateSteel" })); @@ -919,7 +923,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.paa_legs, 1), new Object[] { "EEE", "N N", "E E", 'E', ModItems.plate_paa, 'N', "plateDenseLead" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.paa_boots, 1), new Object[] { "E E", "N N", 'E', ModItems.plate_paa, 'N', "plateDenseLead" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.australium_iii, 1), new Object[] { "WIW", "PAP", " W ", 'W', ModItems.wire_copper, 'I', "ingotSteel", 'A', ModItems.ingot_australium, 'P', "plateSteel" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.australium_iii, 1), new Object[] { "WIW", "PAP", " W ", 'W', ModItems.wire_copper, 'I', "ingotSteel", 'A', ModItems.ingot_australium, 'P', "plateSteel" })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.australium_iv, 1), new Object[] { "WCW", "PAP", "SWS", 'W', ModItems.wire_red_copper, 'C', ModItems.circuit_red_copper, 'P', "plateTitanium", 'A', ModItems.rod_australium, 'S', ModItems.syringe_metal_empty })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.australium_v, 1), new Object[] { "SCS", "PAP", "ESE", 'S', ModItems.syringe_metal_empty, 'C', ModItems.circuit_gold, 'P', "plateAdvanced", 'A', ModItems.nugget_australium, 'E', ModItems.powder_power })); @@ -951,7 +955,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.survey_scanner, 1), new Object[] { "SWS", " G ", "PCP", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_gold, 'S', "plateSteel", 'G', "ingotGold" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.geiger_counter, 1), new Object[] { "GPP", "WCS", "WBB", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_copper, 'G', "ingotGold", 'S', "plateSteel", 'B', ModItems.ingot_beryllium })); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hammer, 1), new Object[] { "BBB", "BBB", " S ", 'B', Item.getItemFromBlock(ModBlocks.block_schrabidium), 'S', Items.stick }); + //GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hammer, 1), new Object[] { "BBB", "BBB", " S ", 'B', Item.getItemFromBlock(ModBlocks.block_schrabidium), 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_stopper, 1), new Object[] { "I", "S", "S", 'I', new ItemStack(ModItems.ingot_euphemium, 1, 34), 'S', Items.stick }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "sulfur", 'S', Items.stick })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "dustSulfur", 'S', Items.stick })); @@ -965,10 +969,10 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.dye, 1, 4), new Object[] { "#", '#', "dustLapis" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.diamond, 1), new Object[] { "#", '#', "dustDiamond" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.emerald, 1), new Object[] { "#", '#', "dustEmerald" })); - if(MainRegistry.enableNITAN) { - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_neptunium, ModItems.powder_iodine, ModItems.powder_thorium, ModItems.powder_astatine, ModItems.powder_neodymium, ModItems.powder_caesium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_tennessine, ModItems.powder_niobium, ModItems.powder_cerium }); - } + //if(MainRegistry.enableNITAN) { + //GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_neptunium, ModItems.powder_iodine, ModItems.powder_thorium, ModItems.powder_astatine, ModItems.powder_neodymium, ModItems.powder_caesium }); + //GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_tennessine, ModItems.powder_niobium, ModItems.powder_cerium }); + //} GameRegistry.addRecipe(new ItemStack(ModItems.canister_petroil, 9), new Object[] { "RRR", "RLR", "RRR", 'R', ModItems.canister_reoil, 'L', ModItems.canister_canola }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_lc, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotSteel", 'D', "dustLapis" })); @@ -997,7 +1001,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bottle_opener, 1), new Object[] { "S", "P", 'S', "plateSteel", 'P', "plankWood" })); - GameRegistry.addRecipe(new ItemStack(ModItems.chopper, 1), new Object[] { "BBB", "HTF", "GWW", 'B', ModItems.chopper_blades, 'H', ModItems.chopper_head, 'T', ModItems.chopper_torso, 'F', ModItems.chopper_tail, 'G', ModItems.chopper_gun, 'W', ModItems.chopper_wing }); + //GameRegistry.addRecipe(new ItemStack(ModItems.chopper, 1), new Object[] { "BBB", "HTF", "GWW", 'B', ModItems.chopper_blades, 'H', ModItems.chopper_head, 'T', ModItems.chopper_torso, 'F', ModItems.chopper_tail, 'G', ModItems.chopper_gun, 'W', ModItems.chopper_wing }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.polaroid, 1), new Object[] { " C ", "RPY", " B ", 'B', "dustLapis", 'C', "dustCoal", 'R', "dustAdvanced", 'Y', "dustGold", 'P', Items.paper })); @@ -1012,16 +1016,16 @@ public class CraftingManager { //TEMPORARY GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fluid_duct, 8), new Object[] { "SAS", " ", "SAS", 'S', "plateSteel", 'A', "plateAluminum" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_assembler, 1), new Object[] { "WWW", "MCM", "ISI", 'W', ModItems.coil_copper, 'M', ModItems.motor, 'C', ModItems.circuit_aluminium, 'I', "blockIron", 'S', "blockSteel" })); - GameRegistry.addRecipe(new ItemStack(ModBlocks.machine_chemplant, 1), new Object[] { "HTT", "HPP", "DCD", 'H', ModItems.hull_big_steel, 'T', ModItems.tank_steel, 'P', Blocks.piston, 'D', ModBlocks.fluid_duct, 'C', ModItems.circuit_red_copper }); - GameRegistry.addRecipe(new ItemStack(ModBlocks.machine_fluidtank, 1), new Object[] { "HHH", "HHH", "D D", 'H', ModItems.hull_big_steel, 'D', ModBlocks.fluid_duct }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_pumpjack, 1), new Object[] { "BBB", "PSM", "PST", 'B', "blockSteel", 'P', ModItems.pipes_steel, 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'T', ModItems.tank_steel })); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_drill), 1), new Object[] { "MPM", "GPG", "GDG", 'P', ModItems.ingot_dura_steel, 'M', ModItems.motor, 'G', ModBlocks.steel_scaffold, 'D', ModItems.drill_titanium }); + //GameRegistry.addRecipe(new ItemStack(ModBlocks.machine_chemplant, 1), new Object[] { "HTT", "HPP", "DCD", 'H', ModItems.hull_big_steel, 'T', ModItems.tank_steel, 'P', Blocks.piston, 'D', ModBlocks.fluid_duct, 'C', ModItems.circuit_red_copper }); + //GameRegistry.addRecipe(new ItemStack(ModBlocks.machine_fluidtank, 1), new Object[] { "HHH", "HHH", "D D", 'H', ModItems.hull_big_steel, 'D', ModBlocks.fluid_duct }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_pumpjack, 1), new Object[] { "BBB", "PSM", "PST", 'B', "blockSteel", 'P', ModItems.pipes_steel, 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'T', ModItems.tank_steel })); + //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_drill), 1), new Object[] { "MPM", "GPG", "GDG", 'P', ModItems.ingot_dura_steel, 'M', ModItems.motor, 'G', ModBlocks.steel_scaffold, 'D', ModItems.drill_titanium }); GameRegistry.addRecipe(new ItemStack(ModItems.template_folder, 1), new Object[] { "LPL", "BPB", "LPL", 'P', Items.paper, 'L', new ItemStack(Items.dye, 1, 4), 'B', new ItemStack(Items.dye, 1, 15) }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_light, 1), new Object[] { "PPR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_heavy, 1), new Object[] { "IIR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_rocket, 1), new Object[] { "BBR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_flamer, 1), new Object[] { "NIR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium, 'N', ModItems.pipes_steel })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_tau, 1), new Object[] { "ADR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium, 'A', ModItems.coil_advanced_alloy, 'D', ModItems.coil_advanced_torus })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_light, 1), new Object[] { "PPR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_heavy, 1), new Object[] { "IIR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_rocket, 1), new Object[] { "BBR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_flamer, 1), new Object[] { "NIR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium, 'N', ModItems.pipes_steel })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_tau, 1), new Object[] { "ADR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium, 'A', ModItems.coil_advanced_alloy, 'D', ModItems.coil_advanced_torus })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_control, 1), new Object[] { "R12", "PPI", " I", 'R', Items.redstone, '1', ModItems.circuit_aluminium, '2', ModItems.circuit_red_copper, 'P', "plateSteel", 'I', "ingotSteel" })); GameRegistry.addRecipe(new ItemStack(ModItems.pellet_antimatter, 1), new Object[] { "###", "###", "###", '#', ModItems.cell_antimatter }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fluid_tank_empty, 8), new Object[] { "121", "1 1", "121", '1', "plateAluminum", '2', "plateIron" })); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 8b5ec9745..5a212aabc 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -39,6 +39,7 @@ import com.hbm.entity.effect.EntityFalloutRain; import com.hbm.entity.effect.EntityNukeCloudBig; import com.hbm.entity.effect.EntityNukeCloudNoShroom; import com.hbm.entity.effect.EntityNukeCloudSmall; +import com.hbm.entity.effect.EntityVortex; import com.hbm.entity.grenade.EntityGrenadeASchrab; import com.hbm.entity.grenade.EntityGrenadeBlackHole; import com.hbm.entity.grenade.EntityGrenadeCluster; @@ -583,6 +584,7 @@ public class MainRegistry EntityRegistry.registerModEntity(EntityBombletSelena.class, "entity_selena", 80, this, 1000, 1, true); EntityRegistry.registerModEntity(EntityTSmokeFX.class, "entity_t_smoke_fx", 81, this, 1000, 1, true); EntityRegistry.registerModEntity(EntityNukeExplosionMK3.class, "entity_nuke_mk3", 82, this, 1000, 1, true); + EntityRegistry.registerModEntity(EntityVortex.class, "entity_vortex", 83, this, 250, 1, true); EntityRegistry.registerGlobalEntityID(EntityNuclearCreeper.class, "entity_mob_nuclear_creeper", EntityRegistry.findGlobalUniqueEntityId(), 0x204131, 0x75CE00); EntityRegistry.registerGlobalEntityID(EntityHunterChopper.class, "entity_mob_hunter_chopper", EntityRegistry.findGlobalUniqueEntityId(), 0x000020, 0x2D2D72); @@ -879,8 +881,11 @@ public class MainRegistry FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_fuel), new ItemStack(ModItems.canister_empty), FluidType.DIESEL, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_lightoil), new ItemStack(ModItems.canister_empty), FluidType.LIGHTOIL, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_kerosene), new ItemStack(ModItems.canister_empty), FluidType.KEROSENE, 1000)); + FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_biofuel), new ItemStack(ModItems.canister_empty), FluidType.BIOFUEL, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full), new ItemStack(ModItems.gas_empty), FluidType.GAS, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_petroleum), new ItemStack(ModItems.gas_empty), FluidType.PETROLEUM, 1000)); + FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_biogas), new ItemStack(ModItems.gas_empty), FluidType.BIOGAS, 1000)); + FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModBlocks.red_barrel), new ItemStack(ModItems.tank_steel), FluidType.DIESEL, 10000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_deuterium), new ItemStack(ModItems.cell_empty), FluidType.DEUTERIUM, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_tritium), new ItemStack(ModItems.cell_empty), FluidType.TRITIUM, 1000)); @@ -891,6 +896,7 @@ public class MainRegistry FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_puf6), new ItemStack(ModItems.cell_empty), FluidType.PUF6, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_antimatter), new ItemStack(ModItems.cell_empty), FluidType.AMAT, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_anti_schrabidium), new ItemStack(ModItems.cell_empty), FluidType.ASCHRAB, 1000)); + FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_sas3), new ItemStack(ModItems.cell_empty), FluidType.SAS3, 1000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_oil), new ItemStack(ModBlocks.ore_oil_empty), FluidType.OIL, 500)); diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index 4cc507de8..8432a23a2 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -32,6 +32,19 @@ public class ResourceManager { ////Textures TEs public static final ResourceLocation universal = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png"); + + public static final ResourceLocation turret_heavy_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_heavy_base.png"); + + public static final ResourceLocation turret_heavy_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_heavy_rotor.png"); + public static final ResourceLocation turret_heavy_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_heavy_gun.png"); + public static final ResourceLocation turret_light_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_light_rotor.png"); + public static final ResourceLocation turret_light_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_light_gun.png"); + public static final ResourceLocation turret_rocket_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_rocket_rotor.png"); + public static final ResourceLocation turret_rocket_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_rocket_gun.png"); + public static final ResourceLocation turret_flamer_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_flamer_rotor.png"); + public static final ResourceLocation turret_flamer_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_flamer_gun.png"); + public static final ResourceLocation turret_tau_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_tau_rotor.png"); + public static final ResourceLocation turret_tau_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_tau_gun.png"); //Pumpjack public static final ResourceLocation pumpjack_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/pumpjack_base.png"); diff --git a/com/hbm/render/entity/RenderVortex.java b/com/hbm/render/entity/RenderVortex.java new file mode 100644 index 000000000..35bbbdeb6 --- /dev/null +++ b/com/hbm/render/entity/RenderVortex.java @@ -0,0 +1,125 @@ +package com.hbm.render.entity; + +import java.util.Random; + +import org.lwjgl.opengl.GL11; + +import com.hbm.entity.effect.EntityBlackHole; +import com.hbm.lib.RefStrings; + +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.AdvancedModelLoader; +import net.minecraftforge.client.model.IModelCustom; + +public class RenderVortex extends Render { + + private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/Sphere.obj"); + private IModelCustom blastModel; + private ResourceLocation blastTexture; + + + public RenderVortex() { + blastModel = AdvancedModelLoader.loadModel(objTesterModelRL); + blastTexture = new ResourceLocation(RefStrings.MODID, "textures/models/BlackHole.png"); + + } + + @Override + public void doRender(Entity entity, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, + float p_76986_9_) { + + if(entity instanceof EntityBlackHole) { + GL11.glPushMatrix(); + GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); + GL11.glRotatef((entity.ticksExisted % 360) * 10, 1, 1, 1); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + + float size = entity.getDataWatcher().getWatchableObjectFloat(16); + + GL11.glScalef(size, size, size); + + bindTexture(blastTexture); + blastModel.renderAll(); + + + GL11.glScalef(0.2F, 0.2F, 0.2F); + + //FLARE START + Tessellator tessellator = Tessellator.instance; + RenderHelper.disableStandardItemLighting(); + int j = 75;//entity.ticksExisted > 250 ? 250 : entity.ticksExisted; + float f1 = (j + 2.0F) / 200.0F; + float f2 = 0.0F; + int count = 250; + + /*if(entity.ticksExisted < 250) + { + count = entity.ticksExisted * 3; + }*/ + + count = j; + + if (f1 > 0.8F) + { + f2 = (f1 - 0.8F) / 0.2F; + } + + Random random = new Random(432L); + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glShadeModel(GL11.GL_SMOOTH); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDepthMask(false); + GL11.glPushMatrix(); + + //for (int i = 0; (float)i < (f1 + f1 * f1) / 2.0F * 60.0F; ++i) + for(int i = 0; i < count; i++) + { + GL11.glRotatef(random.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(random.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(random.nextFloat() * 360.0F + f1 * 90.0F, 0.0F, 0.0F, 1.0F); + tessellator.startDrawing(6); + float f3 = random.nextFloat() * 20.0F + 5.0F + f2 * 10.0F; + float f4 = random.nextFloat() * 2.0F + 1.0F + f2 * 2.0F; + //tessellator.setColorRGBA_I(16777215, (int)(255.0F * (1.0F - f2))); + tessellator.setColorRGBA_I(0x3898b3, (int)(255.0F * (1.0F/* - f2*/))); + tessellator.addVertex(0.0D, 0.0D, 0.0D); + //tessellator.setColorRGBA_I(16711935, 0); + tessellator.setColorRGBA_I(0x3898b3, 0); + tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4); + tessellator.addVertex(0.866D * f4, f3, -0.5F * f4); + tessellator.addVertex(0.0D, f3, 1.0F * f4); + tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4); + tessellator.draw(); + } + + GL11.glPopMatrix(); + GL11.glPopMatrix(); + GL11.glDepthMask(true); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_BLEND); + GL11.glShadeModel(GL11.GL_FLAT); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_ALPHA_TEST); + RenderHelper.enableStandardItemLighting(); + //FLARE END + + } + } + + @Override + protected ResourceLocation getEntityTexture(Entity p_110775_1_) { + return null; + } +} diff --git a/com/hbm/render/item/ItemRenderOverkill.java b/com/hbm/render/item/ItemRenderOverkill.java index 16a9caa6b..5dccbdd75 100644 --- a/com/hbm/render/item/ItemRenderOverkill.java +++ b/com/hbm/render/item/ItemRenderOverkill.java @@ -4,11 +4,15 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; +import com.hbm.render.model.ModelDash; import com.hbm.render.model.ModelDefabricator; import com.hbm.render.model.ModelEuthanasia; +import com.hbm.render.model.ModelGun; import com.hbm.render.model.ModelHP; import com.hbm.render.model.ModelJack; import com.hbm.render.model.ModelSpark; +import com.hbm.render.model.ModelTwiGun; + import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; @@ -22,6 +26,8 @@ public class ItemRenderOverkill implements IItemRenderer { protected ModelHP hppLaserjet; protected ModelEuthanasia euthanasia; protected ModelDefabricator defab; + protected ModelDash dasher; + protected ModelTwiGun rgottp; public ItemRenderOverkill() { powerJack = new ModelJack(); @@ -29,6 +35,8 @@ public class ItemRenderOverkill implements IItemRenderer { hppLaserjet = new ModelHP(); euthanasia = new ModelEuthanasia(); defab = new ModelDefabricator(); + dasher = new ModelDash(); + rgottp = new ModelTwiGun(); } @Override @@ -64,6 +72,10 @@ public class ItemRenderOverkill implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelEuthanasia.png")); if(item.getItem() == ModItems.gun_defabricator) Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDefabricator.png")); + if(item.getItem() == ModItems.gun_dash) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDash.png")); + if(item.getItem() == ModItems.gun_twigun) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelTwiGun.png")); GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(-0.5F, 0.0F, -0.2F); @@ -84,6 +96,10 @@ public class ItemRenderOverkill implements IItemRenderer { euthanasia.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); if(item.getItem() == ModItems.gun_defabricator) defab.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + if(item.getItem() == ModItems.gun_dash) + dasher.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + if(item.getItem() == ModItems.gun_twigun) + rgottp.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); break; case EQUIPPED: @@ -100,6 +116,10 @@ public class ItemRenderOverkill implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelEuthanasia.png")); if(item.getItem() == ModItems.gun_defabricator) Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDefabricator.png")); + if(item.getItem() == ModItems.gun_dash) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDash.png")); + if(item.getItem() == ModItems.gun_twigun) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelTwiGun.png")); GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); @@ -128,6 +148,10 @@ public class ItemRenderOverkill implements IItemRenderer { euthanasia.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); if(item.getItem() == ModItems.gun_defabricator) defab.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + if(item.getItem() == ModItems.gun_dash) + dasher.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + if(item.getItem() == ModItems.gun_twigun) + rgottp.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); default: break; } diff --git a/com/hbm/render/model/ModelDash.java b/com/hbm/render/model/ModelDash.java new file mode 100755 index 000000000..81741c8bd --- /dev/null +++ b/com/hbm/render/model/ModelDash.java @@ -0,0 +1,124 @@ +//This File was created with the Minecraft-SMP Modelling Toolbox 2.3.0.0 +// Copyright (C) 2017 Minecraft-SMP.de +// This file is for Flan's Flying Mod Version 4.0.x+ + +// Model: ModelDash +// Model Creator: +// Created on: 01.11.2017 - 20:07:57 +// Last changed on: 01.11.2017 - 20:07:57 + +package com.hbm.render.model; //Path where the model is located + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelDash extends ModelBase //Same as Filename +{ + int textureX = 64; + int textureY = 64; + ModelRenderer[] bodyModel; + + public ModelDash() //Same as Filename + { + textureWidth = 64; + textureHeight = 64; + bodyModel = new ModelRenderer[16]; + bodyModel[0] = new ModelRenderer(this, 1, 1); // Box 0 + bodyModel[1] = new ModelRenderer(this, 25, 1); // Box 1 + bodyModel[2] = new ModelRenderer(this, 1, 9); // Box 2 + bodyModel[3] = new ModelRenderer(this, 33, 9); // Box 3 + bodyModel[4] = new ModelRenderer(this, 57, 1); // Box 4 + bodyModel[5] = new ModelRenderer(this, 1, 17); // Box 5 + bodyModel[6] = new ModelRenderer(this, 9, 17); // Box 6 + bodyModel[7] = new ModelRenderer(this, 17, 17); // Box 7 + bodyModel[8] = new ModelRenderer(this, 41, 17); // Box 8 + bodyModel[9] = new ModelRenderer(this, 1, 25); // Box 9 + bodyModel[10] = new ModelRenderer(this, 17, 25); // Box 10 + bodyModel[11] = new ModelRenderer(this, 41, 25); // Box 11 + bodyModel[12] = new ModelRenderer(this, 49, 25); // Box 12 + bodyModel[13] = new ModelRenderer(this, 1, 33); // Box 13 + bodyModel[14] = new ModelRenderer(this, 17, 33); // Box 14 + bodyModel[15] = new ModelRenderer(this, 25, 33); // Box 16 + + bodyModel[0].addBox(0F, 0F, 0F, 7, 3, 3, 0F); // Box 0 + bodyModel[0].setRotationPoint(0F, 0F, -1.5F); + + bodyModel[1].addBox(0F, 0F, -1F, 12, 3, 2, 0F); // Box 1 + bodyModel[1].setRotationPoint(-12F, 1F, 0F); + + bodyModel[2].addBox(0F, 0F, -1F, 12, 3, 2, 0F); // Box 2 + bodyModel[2].setRotationPoint(-12F, 1F, 0F); + bodyModel[2].rotateAngleX = 2.0943951F; + + bodyModel[3].addBox(0F, 0F, -1F, 12, 3, 2, 0F); // Box 3 + bodyModel[3].setRotationPoint(-12F, 1F, 0F); + bodyModel[3].rotateAngleX = -2.0943951F; + + bodyModel[4].addBox(0F, 1.5F, -0.5F, 1, 1, 1, 0F); // Box 4 + bodyModel[4].setRotationPoint(-12.5F, 1F, 0F); + + bodyModel[5].addBox(0F, 1.5F, -0.5F, 1, 1, 1, 0F); // Box 5 + bodyModel[5].setRotationPoint(-12.5F, 1F, 0F); + bodyModel[5].rotateAngleX = 2.0943951F; + + bodyModel[6].addBox(0F, 1.5F, -0.5F, 1, 1, 1, 0F); // Box 6 + bodyModel[6].setRotationPoint(-12.5F, 1F, 0F); + bodyModel[6].rotateAngleX = -2.0943951F; + + bodyModel[7].addBox(0F, 0F, 0F, 7, 1, 2, 0F); // Box 7 + bodyModel[7].setRotationPoint(0F, -0.5F, -1F); + + bodyModel[8].addBox(0F, 0F, 0F, 7, 2, 2, 0F); // Box 8 + bodyModel[8].setRotationPoint(7F, 0.5F, -1F); + + bodyModel[9].addBox(0F, 0F, 0F, 2, 2, 2, 0F); // Box 9 + bodyModel[9].setRotationPoint(12F, 2.5F, -1F); + + bodyModel[10].addBox(-6F, -2F, 0F, 6, 2, 2, 0F); // Box 10 + bodyModel[10].setRotationPoint(12F, 4.5F, -1F); + bodyModel[10].rotateAngleZ = 0.29670597F; + + bodyModel[11].addBox(0F, 0F, 0F, 1, 3, 1, 0F); // Box 11 + bodyModel[11].setRotationPoint(6F, 3F, -0.5F); + bodyModel[11].rotateAngleZ = -0.26179939F; + + bodyModel[12].addBox(0F, 0F, 0F, 5, 2, 2, 0F); // Box 12 + bodyModel[12].setRotationPoint(0F, 3F, -1F); + + bodyModel[13].addBox(0F, 0F, 0F, 6, 1, 1, 0F); // Box 13 + bodyModel[13].setRotationPoint(2F, 5F, -0.5F); + + bodyModel[14].addBox(0F, 0F, 0F, 1, 4, 1, 0F); // Box 14 + bodyModel[14].setRotationPoint(0.5F, 1F, -1.5F); + bodyModel[14].rotateAngleX = -0.61086524F; + + bodyModel[15].addBox(0F, 0F, 0F, 3, 1, 1, 0F); // Box 16 + bodyModel[15].setRotationPoint(3F, -1F, -0.5F); + + for(int i = 0; i < 16; i++) + { + bodyModel[i].setTextureSize(textureX, textureY); + bodyModel[i].mirror = true; + } + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + for(int i = 0; i < 16; i++) + { + bodyModel[i].render(f5); + } + } + + @Override + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } +} \ No newline at end of file diff --git a/com/hbm/render/model/ModelDefabricator.java b/com/hbm/render/model/ModelDefabricator.java index a697ca62e..bc156eb79 100755 --- a/com/hbm/render/model/ModelDefabricator.java +++ b/com/hbm/render/model/ModelDefabricator.java @@ -199,7 +199,7 @@ public class ModelDefabricator extends ModelBase modeldefabricatorModel[39].addBox(0F, 0F, 0F, 13, 0, 1); // Box 41 modeldefabricatorModel[39].setRotationPoint(5F, -5F, -0.5F); - modeldefabricatorModel[39].rotateAngleZ = -0.17453293F; + modeldefabricatorModel[39].rotateAngleZ = 0.17453293F; for(int i = 0; i < 40; i++) { diff --git a/com/hbm/render/model/ModelTwiGun.java b/com/hbm/render/model/ModelTwiGun.java new file mode 100755 index 000000000..2318476af --- /dev/null +++ b/com/hbm/render/model/ModelTwiGun.java @@ -0,0 +1,329 @@ +//This File was created with the Minecraft-SMP Modelling Toolbox 2.3.0.0 +// Copyright (C) 2017 Minecraft-SMP.de +// This file is for Flan's Flying Mod Version 4.0.x+ + +// Model: TwiGun +// Model Creator: +// Created on: 01.11.2017 - 20:26:01 +// Last changed on: 01.11.2017 - 20:26:01 + +package com.hbm.render.model; //Path where the model is located + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelTwiGun extends ModelBase //Same as Filename +{ + int textureX = 128; + int textureY = 128; + ModelRenderer[] bodyModel; + + public ModelTwiGun() //Same as Filename + { + textureWidth = 128; + textureHeight = 128; + bodyModel = new ModelRenderer[65]; + bodyModel[0] = new ModelRenderer(this, 1, 1); // Rotor5 + bodyModel[1] = new ModelRenderer(this, 17, 1); // Rotor4 + bodyModel[2] = new ModelRenderer(this, 33, 1); // Rotor1 + bodyModel[3] = new ModelRenderer(this, 49, 1); // Rotor6 + bodyModel[4] = new ModelRenderer(this, 65, 1); // Rotor3 + bodyModel[5] = new ModelRenderer(this, 81, 1); // Rotor2 + bodyModel[6] = new ModelRenderer(this, 89, 1); // Box 8 + bodyModel[7] = new ModelRenderer(this, 113, 1); // Box 9 + bodyModel[8] = new ModelRenderer(this, 1, 9); // Box 10 + bodyModel[9] = new ModelRenderer(this, 17, 9); // Box 11 + bodyModel[10] = new ModelRenderer(this, 33, 9); // Box 12 + bodyModel[11] = new ModelRenderer(this, 49, 9); // Box 13 + bodyModel[12] = new ModelRenderer(this, 65, 9); // Box 14 + bodyModel[13] = new ModelRenderer(this, 1, 17); // Box 15 + bodyModel[14] = new ModelRenderer(this, 9, 17); // Box 16 + bodyModel[15] = new ModelRenderer(this, 33, 17); // Box 17 + bodyModel[16] = new ModelRenderer(this, 73, 9); // Box 18 + bodyModel[17] = new ModelRenderer(this, 105, 9); // Box 19 + bodyModel[18] = new ModelRenderer(this, 57, 17); // Box 20 + bodyModel[19] = new ModelRenderer(this, 33, 17); // Box 21 + bodyModel[20] = new ModelRenderer(this, 1, 25); // Box 22 + bodyModel[21] = new ModelRenderer(this, 73, 17); // Box 23 + bodyModel[22] = new ModelRenderer(this, 25, 33); // Box 24 + bodyModel[23] = new ModelRenderer(this, 1, 25); // Box 25 + bodyModel[24] = new ModelRenderer(this, 57, 33); // Box 26 + bodyModel[25] = new ModelRenderer(this, 89, 33); // Box 27 + bodyModel[26] = new ModelRenderer(this, 1, 49); // Box 28 + bodyModel[27] = new ModelRenderer(this, 1, 49); // Box 29 + bodyModel[28] = new ModelRenderer(this, 97, 17); // Box 30 + bodyModel[29] = new ModelRenderer(this, 25, 49); // Box 31 + bodyModel[30] = new ModelRenderer(this, 65, 49); // Box 32 + bodyModel[31] = new ModelRenderer(this, 25, 57); // Box 33 + bodyModel[32] = new ModelRenderer(this, 65, 57); // Box 34 + bodyModel[33] = new ModelRenderer(this, 33, 65); // Box 35 + bodyModel[34] = new ModelRenderer(this, 97, 49); // Box 36 + bodyModel[35] = new ModelRenderer(this, 57, 25); // Box 37 + bodyModel[36] = new ModelRenderer(this, 73, 65); // Box 38 + bodyModel[37] = new ModelRenderer(this, 1, 73); // Box 40 + bodyModel[38] = new ModelRenderer(this, 33, 73); // Box 41 + bodyModel[39] = new ModelRenderer(this, 49, 73); // Box 42 + bodyModel[40] = new ModelRenderer(this, 105, 57); // Box 43 + bodyModel[41] = new ModelRenderer(this, 113, 65); // Box 44 + bodyModel[42] = new ModelRenderer(this, 113, 25); // Box 45 + bodyModel[43] = new ModelRenderer(this, 121, 9); // Box 46 + bodyModel[44] = new ModelRenderer(this, 73, 73); // Box 47 + bodyModel[45] = new ModelRenderer(this, 25, 73); // Box 48 + bodyModel[46] = new ModelRenderer(this, 89, 73); // Box 49 + bodyModel[47] = new ModelRenderer(this, 25, 25); // Box 50 + bodyModel[48] = new ModelRenderer(this, 17, 9); // Box 51 + bodyModel[49] = new ModelRenderer(this, 49, 33); // Box 52 + bodyModel[50] = new ModelRenderer(this, 81, 33); // Box 53 + bodyModel[51] = new ModelRenderer(this, 57, 1); // Box 54 + bodyModel[52] = new ModelRenderer(this, 73, 1); // Box 55 + bodyModel[53] = new ModelRenderer(this, 105, 73); // Box 56 + bodyModel[54] = new ModelRenderer(this, 89, 73); // Box 57 + bodyModel[55] = new ModelRenderer(this, 17, 81); // Box 58 + bodyModel[56] = new ModelRenderer(this, 73, 81); // Box 59 + bodyModel[57] = new ModelRenderer(this, 1, 89); // Box 60 + bodyModel[58] = new ModelRenderer(this, 33, 89); // Box 61 + bodyModel[59] = new ModelRenderer(this, 49, 41); // Box 63 + bodyModel[60] = new ModelRenderer(this, 89, 81); // Box 64 + bodyModel[61] = new ModelRenderer(this, 113, 81); // Box 65 + bodyModel[62] = new ModelRenderer(this, 1, 89); // Box 66 + bodyModel[63] = new ModelRenderer(this, 89, 89); // Box 67 + bodyModel[64] = new ModelRenderer(this, 17, 97); // Box 68 + + bodyModel[0].addBox(0F, 1F, -1F, 3, 4, 2, 0F); // Rotor5 + bodyModel[0].setRotationPoint(-12F, 0F, 0F); + + bodyModel[1].addBox(0F, 1F, -1F, 3, 4, 2, 0F); // Rotor4 + bodyModel[1].setRotationPoint(-12F, 0F, 0F); + bodyModel[1].rotateAngleX = 2.0943951F; + + bodyModel[2].addBox(0F, 1F, -1F, 3, 4, 2, 0F); // Rotor1 + bodyModel[2].setRotationPoint(-12F, 0F, 0F); + bodyModel[2].rotateAngleX = -2.0943951F; + + bodyModel[3].addBox(0F, 4.5F, -0.5F, 3, 1, 1, 0F); // Rotor6 + bodyModel[3].setRotationPoint(-12F, 0F, 0F); + + bodyModel[4].addBox(0F, 4.5F, -0.5F, 3, 1, 1, 0F); // Rotor3 + bodyModel[4].setRotationPoint(-12F, 0F, 0F); + bodyModel[4].rotateAngleX = 2.0943951F; + + bodyModel[5].addBox(0F, 4.5F, -0.5F, 3, 1, 1, 0F); // Rotor2 + bodyModel[5].setRotationPoint(-12F, 0F, 0F); + bodyModel[5].rotateAngleX = -2.0943951F; + + bodyModel[6].addBox(0F, 0F, 0F, 5, 0, 8, 0F); // Box 8 + bodyModel[6].setRotationPoint(-13F, -6F, -4F); + + bodyModel[7].addBox(0F, -1F, -1F, 5, 2, 2, 0F); // Box 9 + bodyModel[7].setRotationPoint(-13F, 0F, 0F); + + bodyModel[8].addBox(0F, -1F, -1F, 5, 2, 2, 0F); // Box 10 + bodyModel[8].setRotationPoint(-13F, 0F, 0F); + bodyModel[8].rotateAngleX = 0.78539816F; + + bodyModel[9].addBox(0F, 0F, 0F, 5, 0, 5, 0F); // Box 11 + bodyModel[9].setRotationPoint(-13F, -6F, 4F); + bodyModel[9].rotateAngleX = -0.78539816F; + + bodyModel[10].addBox(0F, 0F, 0F, 9, 1, 1, 0F); // Box 12 + bodyModel[10].setRotationPoint(-15F, -3F, 7F); + + bodyModel[11].addBox(0F, 0F, -5F, 5, 0, 5, 0F); // Box 13 + bodyModel[11].setRotationPoint(-13F, -6F, -4F); + bodyModel[11].rotateAngleX = 0.78539816F; + + bodyModel[12].addBox(0F, 0F, 0F, 9, 1, 1, 0F); // Box 14 + bodyModel[12].setRotationPoint(-15F, -3F, -8F); + + bodyModel[13].addBox(0F, 0F, 0F, 5, 0, 7, 0F); // Box 15 + bodyModel[13].setRotationPoint(-13F, 6.5F, -3.5F); + + bodyModel[14].addBox(0F, 0F, 0F, 5, 0, 10, 0F); // Box 16 + bodyModel[14].setRotationPoint(-13F, 6.5F, 3.5F); + bodyModel[14].rotateAngleX = 1.13446401F; + + bodyModel[15].addBox(0F, 0F, -10F, 5, 0, 10, 0F); // Box 17 + bodyModel[15].setRotationPoint(-13F, 6.5F, -3.5F); + bodyModel[15].rotateAngleX = -1.13446401F; + + bodyModel[16].addBox(0F, 0F, 0F, 2, 2, 16, 0F); // Box 18 + bodyModel[16].setRotationPoint(-15F, -2F, -8F); + + bodyModel[17].addBox(0F, 0F, 0F, 3, 4, 4, 0F); // Box 19 + bodyModel[17].setRotationPoint(-16F, -2F, -2F); + + bodyModel[18].addBox(0F, 0F, 0F, 5, 1, 1, 0F); // Box 20 + bodyModel[18].setRotationPoint(-13F, 6F, -0.5F); + + bodyModel[19].addBox(0F, 0F, 0F, 2, 5, 2, 0F); // Box 21 + bodyModel[19].setRotationPoint(-15F, 2F, -1F); + + bodyModel[20].addBox(0F, 0F, 0F, 0, 10, 10, 0F); // Box 22 + bodyModel[20].setRotationPoint(-13F, -5F, -5F); + + bodyModel[21].addBox(0F, -1.5F, -1.5F, 3, 3, 3, 0F); // Box 23 + bodyModel[21].setRotationPoint(-19F, 0F, 0F); + + bodyModel[22].addBox(0F, -2F, -2F, 8, 4, 4, 0F); // Box 24 + bodyModel[22].setRotationPoint(-27F, 0F, 0F); + + bodyModel[23].addBox(0F, -1.5F, -1.5F, 3, 3, 3, 0F); // Box 25 + bodyModel[23].setRotationPoint(-19F, 0F, 0F); + bodyModel[23].rotateAngleX = -0.78539816F; + + bodyModel[24].addBox(0F, -2F, -2F, 8, 4, 4, 0F); // Box 26 + bodyModel[24].setRotationPoint(-27F, 0F, 0F); + bodyModel[24].rotateAngleX = -0.78539816F; + + bodyModel[25].addBox(0F, 0F, 0F, 14, 6, 4, 0F); // Box 27 + bodyModel[25].setRotationPoint(-6F, -3F, -2F); + + bodyModel[26].addBox(0F, 0F, 0F, 2, 2, 16, 0F); // Box 28 + bodyModel[26].setRotationPoint(-8F, -2F, -8F); + + bodyModel[27].addBox(0F, 0F, 0F, 3, 4, 4, 0F); // Box 29 + bodyModel[27].setRotationPoint(-9F, -2F, -2F); + + bodyModel[28].addBox(0F, 0F, 0F, 2, 5, 2, 0F); // Box 30 + bodyModel[28].setRotationPoint(-8F, 2F, -1F); + + bodyModel[29].addBox(0F, 0F, 0F, 14, 1, 5, 0F); // Box 31 + bodyModel[29].setRotationPoint(-6F, -3F, 2F); + bodyModel[29].rotateAngleX = -0.26179939F; + + bodyModel[30].addBox(0F, 0F, 0F, 14, 1, 1, 0F); // Box 32 + bodyModel[30].setRotationPoint(-6F, -1.5F, 6F); + + bodyModel[31].addBox(0F, -1F, 0F, 14, 1, 5, 0F); // Box 33 + bodyModel[31].setRotationPoint(-6F, 1F, 2F); + bodyModel[31].rotateAngleX = 0.26179939F; + + bodyModel[32].addBox(0F, -1F, -5F, 14, 1, 5, 0F); // Box 34 + bodyModel[32].setRotationPoint(-6F, 1F, -2F); + bodyModel[32].rotateAngleX = -0.26179939F; + + bodyModel[33].addBox(0F, 0F, -5F, 14, 1, 5, 0F); // Box 35 + bodyModel[33].setRotationPoint(-6F, -3F, -2F); + bodyModel[33].rotateAngleX = 0.26179939F; + + bodyModel[34].addBox(0F, 0F, 0F, 14, 1, 1, 0F); // Box 36 + bodyModel[34].setRotationPoint(-6F, -1.5F, -7F); + + bodyModel[35].addBox(0F, 0F, 0F, 5, 0, 4, 0F); // Box 37 + bodyModel[35].setRotationPoint(-8F, -6F, -2F); + bodyModel[35].rotateAngleZ = 0.78539816F; + + bodyModel[36].addBox(0F, 0F, 0F, 16, 4, 2, 0F); // Box 38 + bodyModel[36].setRotationPoint(-6F, 3F, -1F); + + bodyModel[37].addBox(0F, 0F, 0F, 6, 6, 6, 0F); // Box 40 + bodyModel[37].setRotationPoint(8F, -3F, -3F); + + bodyModel[38].addBox(0F, 0F, 0F, 3, 2, 10, 0F); // Box 41 + bodyModel[38].setRotationPoint(8F, -2F, -5F); + + bodyModel[39].addBox(0F, 0F, 0F, 4, 1, 13, 0F); // Box 42 + bodyModel[39].setRotationPoint(8F, -1.5F, -6.5F); + + bodyModel[40].addBox(0F, 0F, 0F, 8, 3, 3, 0F); // Box 43 + bodyModel[40].setRotationPoint(14F, -1F, -1.5F); + + bodyModel[41].addBox(0F, 0F, 0F, 1, 7, 3, 0F); // Box 44 + bodyModel[41].setRotationPoint(22.5F, -1F, -1.5F); + + bodyModel[42].addBox(0F, 0F, 0F, 4, 4, 3, 0F); // Box 45 + bodyModel[42].setRotationPoint(18F, 2F, -1.5F); + + bodyModel[43].addBox(0F, 0F, 0F, 2, 4, 1, 0F); // Box 46 + bodyModel[43].setRotationPoint(13F, 2F, 0F); + + bodyModel[44].addBox(0F, -5F, 0F, 2, 5, 3, 0F); // Box 47 + bodyModel[44].setRotationPoint(18F, 6F, -1.5F); + bodyModel[44].rotateAngleZ = -0.43633231F; + + bodyModel[45].addBox(0F, 0F, 0F, 6, 1, 2, 0F); // Box 48 + bodyModel[45].setRotationPoint(10F, 6F, -1F); + + bodyModel[46].addBox(0F, 0F, 0F, 3, 2, 2, 0F); // Box 49 + bodyModel[46].setRotationPoint(14F, -3F, -1F); + bodyModel[46].rotateAngleZ = 0.78539816F; + + bodyModel[47].addBox(0F, 0F, 0F, 2, 1, 5, 0F); // Box 50 + bodyModel[47].setRotationPoint(14F, 0F, -2.5F); + + bodyModel[48].addBox(0F, 0F, 0F, 1, 1, 1, 0F); // Box 51 + bodyModel[48].setRotationPoint(10.5F, -3.5F, -0.5F); + + bodyModel[49].addBox(0F, 0F, 0F, 3, 1, 1, 0F); // Box 52 + bodyModel[49].setRotationPoint(9F, -3.5F, -2F); + + bodyModel[50].addBox(0F, 0F, 0F, 3, 1, 1, 0F); // Box 53 + bodyModel[50].setRotationPoint(10F, -3.5F, 1F); + + bodyModel[51].addBox(0F, 0F, 0F, 1, 1, 3, 0F); // Box 54 + bodyModel[51].setRotationPoint(9F, -3.5F, -1F); + + bodyModel[52].addBox(0F, 0F, 0F, 1, 1, 3, 0F); // Box 55 + bodyModel[52].setRotationPoint(12F, -3.5F, -2F); + + bodyModel[53].addBox(0F, 0F, 0F, 1, 6, 2, 0F); // Box 56 + bodyModel[53].setRotationPoint(22F, -0.5F, -1F); + + bodyModel[54].addBox(0F, 0F, 0F, 0, 3, 12, 0F); // Box 57 + bodyModel[54].setRotationPoint(-5F, -0.5F, -6F); + + bodyModel[55].addBox(0F, 0F, 0F, 0, 3, 12, 0F); // Box 58 + bodyModel[55].setRotationPoint(-4F, -0.5F, -6F); + + bodyModel[56].addBox(0F, 0F, 0F, 0, 3, 12, 0F); // Box 59 + bodyModel[56].setRotationPoint(-3F, -0.5F, -6F); + + bodyModel[57].addBox(0F, 0F, 0F, 0, 3, 12, 0F); // Box 60 + bodyModel[57].setRotationPoint(-2F, -0.5F, -6F); + + bodyModel[58].addBox(0F, 0F, 0F, 0, 3, 12, 0F); // Box 61 + bodyModel[58].setRotationPoint(-1F, -0.5F, -6F); + + bodyModel[59].addBox(0F, 0F, 0F, 2, 1, 2, 0F); // Box 63 + bodyModel[59].setRotationPoint(-4F, -3.5F, -1F); + + bodyModel[60].addBox(0F, 0F, 0F, 2, 1, 2, 0F); // Box 64 + bodyModel[60].setRotationPoint(-1F, -3.5F, -1F); + + bodyModel[61].addBox(0F, 0F, 0F, 2, 1, 2, 0F); // Box 65 + bodyModel[61].setRotationPoint(2F, -3.5F, -1F); + + bodyModel[62].addBox(0F, 0F, 0F, 2, 1, 2, 0F); // Box 66 + bodyModel[62].setRotationPoint(5F, -3.5F, -1F); + + bodyModel[63].addBox(0F, 0F, 0F, 0, 3, 12, 0F); // Box 67 + bodyModel[63].setRotationPoint(0F, -0.5F, -6F); + + bodyModel[64].addBox(0F, 0F, 0F, 0, 3, 12, 0F); // Box 68 + bodyModel[64].setRotationPoint(1F, -0.5F, -6F); + + for(int i = 0; i < 65; i++) + { + bodyModel[i].setTextureSize(textureX, textureY); + bodyModel[i].mirror = true; + } + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + for(int i = 0; i < 65; i++) + { + bodyModel[i].render(f5); + } + } + + @Override + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } +} \ No newline at end of file diff --git a/com/hbm/render/tileentity/RenderFlamerTurret.java b/com/hbm/render/tileentity/RenderFlamerTurret.java index 9791a9c8b..fe0f32fac 100644 --- a/com/hbm/render/tileentity/RenderFlamerTurret.java +++ b/com/hbm/render/tileentity/RenderFlamerTurret.java @@ -13,7 +13,6 @@ import net.minecraft.util.ResourceLocation; public class RenderFlamerTurret extends TileEntitySpecialRenderer { public RenderFlamerTurret() { } - private ResourceLocation gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png"); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) @@ -32,7 +31,7 @@ public class RenderFlamerTurret extends TileEntitySpecialRenderer { pitch = ((TileEntityTurretBase)tileEntity).rotationPitch; } - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_heavy_base_tex); ResourceManager.turret_heavy_base.renderAll(); GL11.glPopMatrix(); @@ -50,7 +49,7 @@ public class RenderFlamerTurret extends TileEntitySpecialRenderer { GL11.glRotated(yaw + 180, 0F, -1F, 0F); - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_flamer_rotor_tex); ResourceManager.turret_heavy_rotor.renderAll(); GL11.glPopMatrix(); @@ -69,7 +68,7 @@ public class RenderFlamerTurret extends TileEntitySpecialRenderer { GL11.glRotated(yaw + 180, 0F, -1F, 0F); GL11.glRotated(pitch, 1F, 0F, 0F); - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_flamer_gun_tex); ResourceManager.turret_flamer_gun.renderAll(); GL11.glPopMatrix(); diff --git a/com/hbm/render/tileentity/RenderHeavyTurret.java b/com/hbm/render/tileentity/RenderHeavyTurret.java index 1547f3338..3c433bf20 100644 --- a/com/hbm/render/tileentity/RenderHeavyTurret.java +++ b/com/hbm/render/tileentity/RenderHeavyTurret.java @@ -16,7 +16,6 @@ import net.minecraftforge.client.model.IModelCustom; public class RenderHeavyTurret extends TileEntitySpecialRenderer { public RenderHeavyTurret() { } - private ResourceLocation gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png"); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) @@ -35,7 +34,7 @@ public class RenderHeavyTurret extends TileEntitySpecialRenderer { pitch = ((TileEntityTurretBase)tileEntity).rotationPitch; } - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_heavy_base_tex); ResourceManager.turret_heavy_base.renderAll(); GL11.glPopMatrix(); @@ -53,7 +52,7 @@ public class RenderHeavyTurret extends TileEntitySpecialRenderer { GL11.glRotated(yaw + 180, 0F, -1F, 0F); - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_heavy_rotor_tex); ResourceManager.turret_heavy_rotor.renderAll(); GL11.glPopMatrix(); @@ -72,7 +71,7 @@ public class RenderHeavyTurret extends TileEntitySpecialRenderer { GL11.glRotated(yaw + 180, 0F, -1F, 0F); GL11.glRotated(pitch, 1F, 0F, 0F); - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_heavy_gun_tex); ResourceManager.turret_heavy_gun.renderAll(); GL11.glPopMatrix(); diff --git a/com/hbm/render/tileentity/RenderLightTurret.java b/com/hbm/render/tileentity/RenderLightTurret.java index 0d6035b0a..39529d26a 100644 --- a/com/hbm/render/tileentity/RenderLightTurret.java +++ b/com/hbm/render/tileentity/RenderLightTurret.java @@ -13,7 +13,6 @@ import net.minecraft.util.ResourceLocation; public class RenderLightTurret extends TileEntitySpecialRenderer { public RenderLightTurret() { } - private ResourceLocation gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png"); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) @@ -32,7 +31,7 @@ public class RenderLightTurret extends TileEntitySpecialRenderer { pitch = ((TileEntityTurretBase)tileEntity).rotationPitch; } - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_heavy_base_tex); ResourceManager.turret_heavy_base.renderAll(); GL11.glPopMatrix(); @@ -50,7 +49,7 @@ public class RenderLightTurret extends TileEntitySpecialRenderer { GL11.glRotated(yaw + 180, 0F, -1F, 0F); - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_light_rotor_tex); ResourceManager.turret_heavy_rotor.renderAll(); GL11.glPopMatrix(); @@ -69,7 +68,7 @@ public class RenderLightTurret extends TileEntitySpecialRenderer { GL11.glRotated(yaw + 180, 0F, -1F, 0F); GL11.glRotated(pitch, 1F, 0F, 0F); - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_light_gun_tex); ResourceManager.turret_light_gun.renderAll(); GL11.glPopMatrix(); diff --git a/com/hbm/render/tileentity/RenderRocketTurret.java b/com/hbm/render/tileentity/RenderRocketTurret.java index e52177bb0..6a86da1da 100644 --- a/com/hbm/render/tileentity/RenderRocketTurret.java +++ b/com/hbm/render/tileentity/RenderRocketTurret.java @@ -13,7 +13,6 @@ import net.minecraft.util.ResourceLocation; public class RenderRocketTurret extends TileEntitySpecialRenderer { public RenderRocketTurret() { } - private ResourceLocation gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png"); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) @@ -32,7 +31,7 @@ public class RenderRocketTurret extends TileEntitySpecialRenderer { pitch = ((TileEntityTurretBase)tileEntity).rotationPitch; } - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_heavy_base_tex); ResourceManager.turret_heavy_base.renderAll(); GL11.glPopMatrix(); @@ -50,7 +49,7 @@ public class RenderRocketTurret extends TileEntitySpecialRenderer { GL11.glRotated(yaw + 180, 0F, -1F, 0F); - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_rocket_rotor_tex); ResourceManager.turret_heavy_rotor.renderAll(); GL11.glPopMatrix(); @@ -69,7 +68,7 @@ public class RenderRocketTurret extends TileEntitySpecialRenderer { GL11.glRotated(yaw + 180, 0F, -1F, 0F); GL11.glRotated(pitch, 1F, 0F, 0F); - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_rocket_gun_tex); ResourceManager.turret_rocket_gun.renderAll(); GL11.glPopMatrix(); diff --git a/com/hbm/render/tileentity/RenderTauTurret.java b/com/hbm/render/tileentity/RenderTauTurret.java index c02e3305b..59995aac8 100644 --- a/com/hbm/render/tileentity/RenderTauTurret.java +++ b/com/hbm/render/tileentity/RenderTauTurret.java @@ -13,7 +13,6 @@ import net.minecraft.util.ResourceLocation; public class RenderTauTurret extends TileEntitySpecialRenderer { public RenderTauTurret() { } - private ResourceLocation gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png"); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) @@ -32,7 +31,7 @@ public class RenderTauTurret extends TileEntitySpecialRenderer { pitch = ((TileEntityTurretBase)tileEntity).rotationPitch; } - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_heavy_base_tex); ResourceManager.turret_heavy_base.renderAll(); GL11.glPopMatrix(); @@ -50,7 +49,7 @@ public class RenderTauTurret extends TileEntitySpecialRenderer { GL11.glRotated(yaw + 180, 0F, -1F, 0F); - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_tau_rotor_tex); ResourceManager.turret_heavy_rotor.renderAll(); GL11.glPopMatrix(); @@ -69,7 +68,7 @@ public class RenderTauTurret extends TileEntitySpecialRenderer { GL11.glRotated(yaw + 180, 0F, -1F, 0F); GL11.glRotated(pitch, 1F, 0F, 0F); - this.bindTexture(gadgetTexture); + this.bindTexture(ResourceManager.turret_tau_gun_tex); ResourceManager.turret_tau_gun.renderAll(); GL11.glPopMatrix(); diff --git a/com/hbm/tileentity/bomb/TileEntityTurretBase.java b/com/hbm/tileentity/bomb/TileEntityTurretBase.java index d190f43f3..dbbbad7a2 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretBase.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretBase.java @@ -1,6 +1,7 @@ package com.hbm.tileentity.bomb; import com.hbm.blocks.bomb.TurretBase; +import com.hbm.lib.Library; import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TETurretPacket; @@ -23,8 +24,9 @@ public abstract class TileEntityTurretBase extends TileEntity { public double rotationYaw; public double rotationPitch; public boolean isAI = false; - public String uuid; + public String uuid = "none"; public int use; + public int ammo = 0; @Override public void updateEntity() { @@ -32,7 +34,9 @@ public abstract class TileEntityTurretBase extends TileEntity { if(isAI) { Object[] iter = worldObj.loadedEntityList.toArray(); - double radius = 500; + double radius = 1000; + if(this instanceof TileEntityTurretFlamer) + radius /= 2; Entity target = null; for (int i = 0; i < iter.length; i++) { @@ -60,8 +64,9 @@ public abstract class TileEntityTurretBase extends TileEntity { use++; - if(worldObj.getBlock(xCoord, yCoord, zCoord) instanceof TurretBase) { - ((TurretBase)worldObj.getBlock(xCoord, yCoord, zCoord)).executeHoldAction(worldObj, use, rotationYaw, rotationPitch, xCoord, yCoord, zCoord); + if(worldObj.getBlock(xCoord, yCoord, zCoord) instanceof TurretBase && ammo > 0) { + if(((TurretBase)worldObj.getBlock(xCoord, yCoord, zCoord)).executeHoldAction(worldObj, use, rotationYaw, rotationPitch, xCoord, yCoord, zCoord)) + ammo--; } } else { @@ -85,14 +90,14 @@ public abstract class TileEntityTurretBase extends TileEntity { Vec3 side = Vec3.createVectorHelper(entity.xCoord - turret.xCoord, entity.yCoord - turret.yCoord, entity.zCoord - turret.zCoord); side = side.normalize(); - turret.xCoord += side.xCoord * 1.5; - turret.yCoord += side.yCoord * 1.5; - turret.zCoord += side.zCoord * 1.5; + turret.xCoord += side.xCoord; + turret.yCoord += side.yCoord; + turret.zCoord += side.zCoord; - MovingObjectPosition pos = worldObj.rayTraceBlocks(entity, turret); + if(this instanceof TileEntityTurretTau) + return true; - return true; - //return pos != null; + return !Library.isObstructed(worldObj, turret.xCoord, turret.yCoord, turret.zCoord, entity.xCoord, entity.yCoord, entity.zCoord); } @Override @@ -114,6 +119,7 @@ public abstract class TileEntityTurretBase extends TileEntity { rotationPitch = nbt.getDouble("pitch"); isAI = nbt.getBoolean("AI"); uuid = nbt.getString("player"); + ammo = nbt.getInteger("ammo"); } @Override @@ -123,6 +129,7 @@ public abstract class TileEntityTurretBase extends TileEntity { nbt.setDouble("pitch", rotationPitch); nbt.setBoolean("AI", isAI); nbt.setString("player", uuid); + nbt.setInteger("ammo", ammo); } } diff --git a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java index bc368080e..a6a831041 100644 --- a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java @@ -516,7 +516,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv //Batteries - power = Library.chargeItemsFromTE(slots, 32, power, maxPower); + power = Library.chargeItemsFromTE(slots, 34, power, maxPower); } } @@ -629,7 +629,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv } public boolean hasFuse() { - return slots[33] != null && (slots[33].getItem() == ModItems.fuse || slots[33].getItem() == ModItems.screwdriver); + return slots[35] != null && (slots[35].getItem() == ModItems.fuse || slots[35].getItem() == ModItems.screwdriver); } public void attemptPower(int i) {