diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 1199b051e..4f1bf466b 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -9,6 +9,8 @@ achievement.sacrifice.desc=Überlebe den Flammentod. achievement.impossible=Vollkommen unmöglich achievement.impossible.desc=Du kannst diese Errungenschaft nicht bekommen. +potion.hbm_taint=Verseucht + hbmfluid.none=Nichts hbmfluid.water=Wasser hbmfluid.steam=Dampf @@ -50,6 +52,8 @@ chem.FP_NAPHTHA=Mitteldestillatsverarbeitung chem.FP_LIGHTOIL=Leichtölverarbeitung chem.FR_REOIL=Öl-Wiederaufbereitung chem.FR_PETROIL=Gemischherstellung +chem.OIL_SAND=Teersand-Extraktion +chem.FC_BITUMEN=Bitumen-Cracking chem.FC_I_NAPHTHA=Industriöl-Cracking chem.FC_GAS_PETROLEUM=Erdgas-Cracking chem.FC_DIESEL_KEROSENE=Diesel-Cracking @@ -83,6 +87,7 @@ chem.SF_BIOFUEL=Biodieselverfestigung chem.POLYMER=Polymersynthese chem.DEUTERIUM=Deuteriumextrahierung chem.STEAM=WWasser kochen +chem.YELLOWCAKE=Yellowcakeproduction chem.UF6=Uranhexafluoritproduktion chem.PUF6=Plutoniumhexafluoritproduktion chem.BP_BIOGAS=Biogasherstellung @@ -497,6 +502,7 @@ tile.block_unobtainium.name=Unobtainiumblock tile.block_daffergon.name=Daffergonblock tile.block_verticium.name=Verticiumblock tile.block_desh.name=Verstärketer Deshblock +tile.block_yellowcake.name=Yellowcakeblock tile.ore_aluminium.name=Aluminiumerz tile.ore_copper.name=Kupfererz @@ -528,6 +534,7 @@ tile.ore_rare.name=Seltenerden-Erz tile.ore_oil.name=Ölvorkommen tile.ore_oil_empty.name=Leeres Ölvorkommen +tile.ore_oil_sand.name=Teersand tile.reinforced_brick.name=Verstärkter Stein tile.reinforced_glass.name=Verstärktes Glas @@ -612,6 +619,8 @@ item.powder_niobium_tiny.name=Kleiner Haufen Niobstaub item.powder_cerium_tiny.name=Kleiner Haufen Cerstaub item.powder_lanthanium_tiny.name=Kleiner Haufen Lanthanstaub item.powder_actinium_tiny.name=Kleiner Haufen Actiniumstaub +item.powder_yellowcake.name=Yellowcake +item.powder_magic.name=Pulverisierte Verzauberung item.fragment_neodymium.name=Neodymfragment item.fragment_cobalt.name=Cobaltfragment @@ -694,6 +703,8 @@ item.magnet_circular.name=Flachmagnet item.cyclotron_tower.name=Zyklotronenturm item.plate_dalekanium.name=Wütendes Metall item.biomass.name=Biomasse +item.component_limiter.name=Stabilisatorkomponente +item.component_emitter.name=Emitterkomponente item.cell_empty.name=Leere Zelle item.cell_uf6.name=Uranhexafluorit-Zelle @@ -1131,6 +1142,7 @@ tile.yellow_barrel.name=Radioaktives Fass item.designator.name=Kurzdistanz Zielmarkierer item.designator_range.name=Weitstrecken-Zielmarkierer +item.designator_manual.name=Manueller Zielmarkierer item.missile_generic.name=HE Rakete item.missile_anti_ballistic.name=Flugabwehrrakete (WIP) item.missile_incendiary.name=Brandrakete @@ -1276,6 +1288,7 @@ item.cape_codered_.name=codered_s Cape tile.machine_converter_he_rf.name=HE zu RF Konverter tile.machine_converter_rf_he.name=RF zu HE Konverter +tile.machine_transformer.name=Transformator item.schrabidium_hammer.name=Schrabidiumhammer item.shimmer_sledge.name=Shimmer Sledge @@ -1332,6 +1345,7 @@ item.can_creature.name='Creature' Energy-Drink item.can_redbomb.name='Red Bomb' Energy-Drink item.can_mrsugar.name='Dr. Sugar' Softdrink item.can_overcharge.name=Overcharge Delirium XT +item.can_luna.name=Black Mesa Luna - Dark Cola item.bottle_empty.name=Leere bombenförmige Glasflasche item.bottle_nuka.name=Nuka-Cola Flasche item.bottle_cherry.name=Nuka-Cherry Flasche @@ -1413,11 +1427,20 @@ item.ams_catalyst_niobium.name=Niob-Reaktionskatalysator item.ams_catalyst_strontium.name=Strontium-Reaktionskatalysator item.ams_catalyst_thorium.name=Thorium-Reaktionskatalysator item.ams_catalyst_tungsten.name=Wolfram-Reaktionskatalysator +item.ams_catalyst_schrabidium.name=Schrabidium-Reaktionskatalysator +item.ams_catalyst_dineutronium.name=Dineutronium-Reaktionskatalysator item.ams_focus_blank.name=Blanker Stabilisierungsfokus item.ams_focus_limiter.name=Beschränkender Stabilisierungsfokus item.ams_focus_booster.name=Verstärkender Stabilisierungsfokus +item.ams_muzzle.name=Strahlenemissions-Mündung + +item.ams_core_sing.name=Vibrierende Singularität (AMS-Kern) +item.ams_core_wormhole.name=Winziges Wurmloch (AMS-Kern) +item.ams_core_eyeofharmony.name=Auge der Harmonie (AMS-Kern) +item.ams_core_thingy.name=Dings (AMS-Kern) + item.crystal_energy.name=Energiekristall item.pellet_coolant.name=Kühlcluster @@ -1454,7 +1477,7 @@ item.reer_graar.name=The Reer Graar item.letter.name=Eilbrief item.polaroid.name=Das Polaroid -item.glitch.name=Glitch [WIP] +item.glitch.name=Glitch item.book_secret.name=3-596-50802-9 item.burnt_bark.name=Verbrannte Rinde diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index f0b4f286a..8750d0eeb 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -9,6 +9,8 @@ achievement.sacrifice.desc=Face the fire and live. achievement.impossible=Literally impossible achievement.impossible.desc=You can't get this achievement. +potion.hbm_taint=Tainted + hbmfluid.none=None hbmfluid.water=Water hbmfluid.steam=Steam @@ -50,6 +52,8 @@ chem.FP_NAPHTHA=Naphtha Processing chem.FP_LIGHTOIL=Light Oil Processing chem.FR_REOIL=Oil Reprocessing chem.FR_PETROIL=Petroil Mixing +chem.OIL_SAND=Tar Sand Extraction +chem.FC_BITUMEN=Bitumen Cracking chem.FC_I_NAPHTHA=Industrial Oil Cracking chem.FC_GAS_PETROLEUM=Gas Cracking chem.FC_DIESEL_KEROSENE=Diesel Cracking @@ -83,6 +87,7 @@ chem.SF_BIOFUEL=Biofuel Solidification chem.POLYMER=Polymer Synthesis chem.DEUTERIUM=Deuterium Extraction chem.STEAM=Water Boiling +chem.YELLOWCAKE=Yellowcake Production chem.UF6=Uranium Hexafluoride Production chem.PUF6=Plutonium Hexafluoride Production chem.BP_BIOGAS=Biogas Production @@ -497,6 +502,7 @@ tile.block_unobtainium.name=Block of Unobtainium tile.block_daffergon.name=Block of Daffergon tile.block_verticium.name=Block of Verticium tile.block_desh.name=Reinforced Block of Desh +tile.block_yellowcake.name=Block of Yellowcake tile.ore_aluminium.name=Aluminium Ore tile.ore_copper.name=Copper Ore @@ -528,6 +534,7 @@ tile.ore_rare.name=Rare Earth Ore tile.ore_oil.name=Oil Deposit tile.ore_oil_empty.name=Empty Oil Deposit +tile.ore_oil_sand.name=Tar Sand tile.reinforced_brick.name=Reinforced Stone tile.reinforced_glass.name=Reinforced Glass @@ -614,7 +621,9 @@ item.powder_lanthanium_tiny.name=Tiny Pile of Lanthanium Powder item.powder_actinium_tiny.name=Tiny Pile of Actinium Powder item.powder_euphemium.name=Euphemium Powder item.powder_meteorite.name=Meteorite Powder -item.powder_meteorite_tiny.name=Tiny Pile of Ḿeteorite Powder +item.powder_meteorite_tiny.name=Tiny Pile of Meteorite Powder +item.powder_yellowcake.name=Yellowcake +item.powder_magic.name=Pulverized Enchantment item.fragment_neodymium.name=Neodymium Fragment item.fragment_cobalt.name=Cobalt Fragment @@ -697,6 +706,8 @@ item.magnet_circular.name=Flat Magnet item.cyclotron_tower.name=Cyclotron Tower item.plate_dalekanium.name=Angry Metal item.biomass.name=Biomass +item.component_limiter.name=Stabilizer Component +item.component_emitter.name=Emitter Component item.cell_empty.name=Empty Cell item.cell_uf6.name=Uranium Hexafluorite Cell @@ -1134,6 +1145,7 @@ tile.yellow_barrel.name=Radioactive Barrel item.designator.name=Short Range Target Designator item.designator_range.name=Long Range Target Designator +item.designator_manual.name=Manual Target Designator item.missile_generic.name=High Explosive Missile item.missile_anti_ballistic.name=Anti Ballistic Missile (WIP) item.missile_incendiary.name=Incendiary Missile @@ -1279,6 +1291,7 @@ item.cape_codered_.name=codered_'s Cape tile.machine_converter_he_rf.name=HE to RF Converter tile.machine_converter_rf_he.name=RF to HE Converter +tile.machine_transformer.name=Transformer item.schrabidium_hammer.name=Schrabidium Hammer item.shimmer_sledge.name=Shimmer Sledge @@ -1335,6 +1348,7 @@ item.can_creature.name='Creature' Energy Drink item.can_redbomb.name='Red Bomb' Energy Drink item.can_mrsugar.name='Dr. Sugar' Soft Drink item.can_overcharge.name=Overcharge Delirium XT +item.can_luna.name=Black Mesa Luna - Dark Cola item.bottle_empty.name=Empty Bomb-Shaped Bottle item.bottle_nuka.name=Bottle of Nuka Cola item.bottle_cherry.name=Bottle of Nuka Cherry @@ -1416,11 +1430,20 @@ item.ams_catalyst_niobium.name=Niobium Reaction Catalyst item.ams_catalyst_strontium.name=Strontium Reaction Catalyst item.ams_catalyst_thorium.name=Thorium Reaction Catalyst item.ams_catalyst_tungsten.name=Tungsten Reaction Catalyst +item.ams_catalyst_schrabidium.name=Schrabidium Reaction Catalyst +item.ams_catalyst_dineutronium.name=Dineutronium Reaction Catalyst item.ams_focus_blank.name=Blank Stabilizer Focus item.ams_focus_limiter.name=Limiting Stabilizer Focus item.ams_focus_booster.name=Boosting Stabilizer Focus +item.ams_muzzle.name=Ray-Emission Muzzle + +item.ams_core_sing.name=Vibrant Singularity (AMS Core) +item.ams_core_wormhole.name=Tiny Wormhole (AMS Core) +item.ams_core_eyeofharmony.name=Eye of Harmony (AMS Core) +item.ams_core_thingy.name=Thingy (AMS Core) + item.crystal_energy.name=Energy Crystal item.pellet_coolant.name=Coolant Cluster @@ -1457,7 +1480,7 @@ item.reer_graar.name=The Reer Graar item.letter.name=Express Mail item.polaroid.name=The Polaroid -item.glitch.name=Glitch [WIP] +item.glitch.name=Glitch item.book_secret.name=3-596-50802-9 item.burnt_bark.name=Burnt Bark diff --git a/assets/hbm/models/ams_emitter.obj b/assets/hbm/models/ams_emitter.obj index 5c7e9c799..0d4aa9ea5 100644 --- a/assets/hbm/models/ams_emitter.obj +++ b/assets/hbm/models/ams_emitter.obj @@ -305,578 +305,580 @@ v -0.843750 5.750000 0.156250 v -0.843750 6.000000 0.156250 v -0.843750 5.750000 -0.156250 v -0.843750 6.000000 -0.156250 -vt 0.597601 0.320994 -vt 0.595523 0.331439 -vt 0.558123 0.331439 -vt 0.514489 0.267742 -vt 0.472933 0.267742 -vt 0.477089 0.220293 -vt 0.514489 0.320994 -vt 0.556045 0.267742 -vt 0.223599 0.320994 -vt 0.223599 0.267742 -vt 0.265155 0.267742 -vt 0.556045 0.320994 -vt 0.597601 0.267742 -vt 0.265155 0.320994 -vt 0.306710 0.267742 -vt 0.639156 0.267742 -vt 0.306710 0.320994 -vt 0.348266 0.267742 -vt 0.015820 0.320994 -vt 0.015820 0.267742 -vt 0.057376 0.267742 -vt 0.639156 0.320994 -vt 0.680712 0.267742 -vt 0.348266 0.320994 -vt 0.389822 0.267742 -vt 0.057376 0.320994 -vt 0.098932 0.267742 -vt 0.389822 0.320994 -vt 0.431378 0.267742 -vt 0.098932 0.320994 -vt 0.140487 0.267742 -vt 0.431378 0.320994 -vt 0.140487 0.320994 -vt 0.182043 0.267742 -vt 0.472933 0.320994 -vt 0.182043 0.320994 -vt 0.049065 0.188653 -vt 0.049065 0.103450 -vt 0.082309 0.103450 -vt 0.186199 0.220293 -vt 0.518645 0.220294 -vt 0.227755 0.220293 -vt 0.260999 0.220294 -vt 0.560200 0.220293 -vt 0.593445 0.220293 -vt 0.269310 0.220293 -vt 0.302555 0.220293 -vt 0.601756 0.220293 -vt 0.635001 0.220293 -vt 0.310866 0.220293 -vt 0.344111 0.220294 -vt 0.019976 0.220293 -vt 0.053220 0.220293 -vt 0.643312 0.220293 -vt 0.352422 0.220294 -vt 0.385666 0.220294 -vt 0.061532 0.220293 -vt 0.094776 0.220293 -vt 0.393977 0.220293 -vt 0.427222 0.220293 -vt 0.103087 0.220293 -vt 0.136332 0.220293 -vt 0.435533 0.220293 -vt 0.468778 0.220294 -vt 0.144643 0.220293 -vt 0.177888 0.220293 -vt 0.215288 0.103450 -vt 0.228586 0.024177 -vt 0.235235 0.024177 -vt 0.315022 0.188653 -vt 0.315022 0.103450 -vt 0.348266 0.103450 -vt 0.082309 0.188653 -vt 0.115554 0.103450 -vt 0.348266 0.188653 -vt 0.381511 0.103450 -vt 0.115554 0.188653 -vt 0.148799 0.103450 -vt 0.381511 0.188653 -vt 0.414755 0.103450 -vt 0.148799 0.188653 -vt 0.182043 0.103450 -vt 0.448000 0.188653 -vt 0.414755 0.188653 -vt 0.182043 0.188653 -vt 0.448000 0.103450 -vt 0.481245 0.103450 -vt 0.215288 0.188653 -vt 0.248532 0.103450 -vt 0.481245 0.188653 -vt 0.514489 0.103450 -vt 0.248532 0.188653 -vt 0.281777 0.103450 -vt 0.015820 0.188653 -vt 0.015820 0.103450 -vt 0.514489 0.188653 -vt 0.547734 0.103450 -vt 0.281777 0.188653 -vt 0.295075 0.024177 -vt 0.296737 0.015820 -vt 0.300061 0.015820 -vt 0.494542 0.024177 -vt 0.261830 0.024177 -vt 0.268479 0.024177 -vt 0.029118 0.024177 -vt 0.035767 0.024177 -vt 0.527787 0.024177 -vt 0.534436 0.024177 -vt 0.062363 0.024177 -vt 0.069012 0.024177 -vt 0.328320 0.024177 -vt 0.095607 0.024177 -vt 0.102256 0.024177 -vt 0.361564 0.024177 -vt 0.128852 0.024177 -vt 0.135501 0.024177 -vt 0.394809 0.024177 -vt 0.401457 0.024177 -vt 0.162096 0.024177 -vt 0.168745 0.024177 -vt 0.428053 0.024177 -vt 0.195341 0.024177 -vt 0.201990 0.024177 -vt 0.461298 0.024177 -vt 0.467947 0.024177 -vt 0.058422 0.854277 -vt 0.137695 0.867575 -vt 0.137695 0.874224 -vt 0.911572 0.189368 -vt 0.924870 0.110095 -vt 0.931518 0.110095 -vt 0.901064 0.484954 -vt 0.914362 0.405681 -vt 0.921011 0.405681 -vt 0.597597 0.704618 -vt 0.610895 0.625345 -vt 0.617544 0.625345 -vt 0.885506 0.126386 -vt 0.597597 0.747220 -vt 0.630841 0.704618 -vt 0.121403 0.913588 -vt 0.042131 0.926886 -vt 0.058422 0.887522 -vt 0.911572 0.231969 -vt 0.944816 0.189368 -vt 0.970882 0.126386 -vt 0.984180 0.205659 -vt 0.921011 0.363080 -vt 0.874999 0.421972 -vt 0.180296 0.874224 -vt 0.571531 0.641637 -vt 0.610895 0.582744 -vt 0.617543 0.582744 -vt 0.960375 0.421972 -vt 0.973673 0.501245 -vt 0.934309 0.484954 -vt 0.931518 0.067494 -vt 0.901064 0.527556 -vt 0.656907 0.641637 -vt 0.670205 0.720909 -vt 0.121403 0.828212 -vt 0.015820 0.854277 -vt 0.860921 0.910281 -vt 0.823520 0.910281 -vt 0.823520 0.878329 -vt 0.786120 0.910281 -vt 0.786120 0.878329 -vt 0.748720 0.910281 -vt 0.748720 0.878329 -vt 0.711320 0.910281 -vt 0.711320 0.878329 -vt 0.673920 0.910281 -vt 0.673920 0.878329 -vt 0.636519 0.910281 -vt 0.636519 0.878330 -vt 0.599119 0.910281 -vt 0.599119 0.878330 -vt 0.561719 0.910281 -vt 0.561719 0.878330 -vt 0.524319 0.910281 -vt 0.524319 0.878330 -vt 0.486919 0.910281 -vt 0.486919 0.878330 -vt 0.449519 0.910281 -vt 0.449519 0.878330 -vt 0.412118 0.910281 -vt 0.412118 0.878329 -vt 0.374718 0.910281 -vt 0.374718 0.878329 -vt 0.337318 0.910281 -vt 0.337318 0.878329 -vt 0.482182 0.438391 -vt 0.594893 0.363080 -vt 0.670205 0.475792 -vt 0.299918 0.910281 -vt 0.262518 0.910281 -vt 0.262518 0.878329 -vt 0.299918 0.878329 -vt 0.436229 0.510345 -vt 0.303276 0.536791 -vt 0.409783 0.377392 -vt 0.745175 0.430311 -vt 0.786731 0.430311 -vt 0.786731 0.499135 -vt 0.898560 0.701995 -vt 0.898560 0.743551 -vt 0.829735 0.743551 -vt 0.755682 0.203550 -vt 0.755682 0.134725 -vt 0.797238 0.134725 -vt 0.305848 0.649974 -vt 0.347403 0.649974 -vt 0.347403 0.718799 -vt 0.965791 0.706151 -vt 0.965791 0.739396 -vt 0.759838 0.067494 -vt 0.793082 0.067494 -vt 0.310003 0.582744 -vt 0.343248 0.582744 -vt 0.749331 0.363080 -vt 0.782575 0.363080 -vt 0.782575 0.627025 -vt 0.749331 0.627025 -vt 0.701845 0.739395 -vt 0.701845 0.706151 -vt 0.797238 0.203550 -vt 0.793082 0.331439 -vt 0.343248 0.846689 -vt 0.310003 0.846689 -vt 0.950133 0.786881 -vt 0.712352 0.083152 -vt 0.840568 0.083152 -vt 0.305848 0.718799 -vt 0.262518 0.598401 -vt 0.390733 0.598401 -vt 0.745175 0.499135 -vt 0.701845 0.378738 -vt 0.830060 0.378738 -vt 0.829735 0.701995 -vt 0.950133 0.658666 -vt 0.496673 0.688937 -vt 0.496673 0.667636 -vt 0.499997 0.667636 -vt 0.064025 0.015820 -vt 0.067349 0.015820 -vt 0.329982 0.015821 -vt 0.333306 0.015821 -vt 0.097269 0.015820 -vt 0.100594 0.015820 -vt 0.363226 0.015821 -vt 0.366551 0.015821 -vt 0.130514 0.015820 -vt 0.133838 0.015820 -vt 0.396471 0.015821 -vt 0.399795 0.015821 -vt 0.163759 0.015820 -vt 0.167083 0.015820 -vt 0.434702 0.024177 -vt 0.429716 0.015821 -vt 0.197003 0.015820 -vt 0.200328 0.015820 -vt 0.462960 0.015820 -vt 0.230248 0.015820 -vt 0.501191 0.024177 -vt 0.496205 0.015820 -vt 0.263493 0.015820 -vt 0.266817 0.015820 -vt 0.030780 0.015821 -vt 0.529449 0.015820 -vt 0.532774 0.015820 -vt 0.644997 0.117426 -vt 0.636250 0.104335 -vt 0.641672 0.100712 -vt 0.473401 0.688937 -vt 0.473401 0.667636 -vt 0.476726 0.667636 -vt 0.523268 0.688937 -vt 0.523268 0.667636 -vt 0.526593 0.667636 -vt 0.499997 0.688937 -vt 0.503322 0.667636 -vt 0.476726 0.688937 -vt 0.480050 0.667636 -vt 0.503322 0.688937 -vt 0.506646 0.667636 -vt 0.480050 0.688937 -vt 0.483375 0.667636 -vt 0.509971 0.688937 -vt 0.506646 0.688937 -vt 0.483375 0.688937 -vt 0.486699 0.667636 -vt 0.509971 0.667636 -vt 0.513295 0.667636 -vt 0.490024 0.688937 -vt 0.486699 0.688937 -vt 0.513295 0.688937 -vt 0.516619 0.667636 -vt 0.490024 0.667636 -vt 0.493348 0.667636 -vt 0.516619 0.688937 -vt 0.519944 0.667636 -vt 0.493348 0.688937 -vt 0.519944 0.688937 -vt 0.206809 0.563029 -vt 0.197009 0.557944 -vt 0.214866 0.523529 -vt 0.304633 0.331439 -vt 0.637079 0.331439 -vt 0.346188 0.331439 -vt 0.308788 0.331439 -vt 0.055298 0.331439 -vt 0.680712 0.320994 -vt 0.678634 0.331439 -vt 0.641234 0.331439 -vt 0.387744 0.331439 -vt 0.096854 0.331439 -vt 0.059454 0.331439 -vt 0.429300 0.331439 -vt 0.391900 0.331439 -vt 0.138410 0.331439 -vt 0.101009 0.331439 -vt 0.470856 0.331439 -vt 0.433455 0.331439 -vt 0.179965 0.331439 -vt 0.512411 0.331439 -vt 0.475011 0.331439 -vt 0.221521 0.331439 -vt 0.184121 0.331439 -vt 0.553967 0.331439 -vt 0.516567 0.331439 -vt 0.263077 0.331439 -vt 0.225677 0.331439 -vt 0.074418 0.374660 -vt 0.081438 0.383350 -vt 0.050921 0.408001 -vt 0.174287 0.592024 -vt 0.167014 0.583482 -vt 0.119992 0.363186 -vt 0.122412 0.374854 -vt 0.079619 0.592359 -vt 0.083330 0.580239 -vt 0.125893 0.593272 -vt 0.128681 0.604982 -vt 0.167653 0.376758 -vt 0.163758 0.388532 -vt 0.043875 0.561590 -vt 0.051747 0.552596 -vt 0.201549 0.405876 -vt 0.194146 0.414530 -vt 0.022920 0.523005 -vt 0.032876 0.517631 -vt 0.222706 0.442783 -vt 0.213121 0.448187 -vt 0.015820 0.481488 -vt 0.026620 0.479706 -vt 0.230727 0.483614 -vt 0.220075 0.485594 -vt 0.021793 0.440080 -vt 0.032593 0.441780 -vt 0.225668 0.525012 -vt 0.041302 0.402781 -vt 0.157359 0.563237 -vt 0.127091 0.569855 -vt 0.095160 0.559218 -vt 0.069901 0.538127 -vt 0.054144 0.510545 -vt 0.048750 0.480041 -vt 0.053248 0.449163 -vt 0.067460 0.422226 -vt 0.090489 0.403674 -vt 0.120702 0.397916 -vt 0.152199 0.408998 -vt 0.176763 0.428710 -vt 0.192326 0.455414 -vt 0.198102 0.485635 -vt 0.194046 0.516442 -vt 0.180029 0.543965 -vt 0.145700 0.418890 -vt 0.116608 0.411615 -vt 0.047521 0.648165 -vt 0.162061 0.724698 -vt 0.130360 0.772142 -vt 0.079189 0.531256 -vt 0.102495 0.548881 -vt 0.167822 0.435400 -vt 0.145855 0.419046 -vt 0.064802 0.507139 -vt 0.079087 0.531072 -vt 0.181817 0.458799 -vt 0.167920 0.435576 -vt 0.059982 0.480207 -vt 0.064755 0.506945 -vt 0.186964 0.486053 -vt 0.181864 0.458991 -vt 0.064397 0.451323 -vt 0.059987 0.480007 -vt 0.182939 0.513936 -vt 0.186987 0.486251 -vt 0.077536 0.428113 -vt 0.064364 0.451102 -vt 0.169750 0.538258 -vt 0.182940 0.514148 -vt 0.097351 0.413696 -vt 0.077563 0.427870 -vt 0.150187 0.553325 -vt 0.169730 0.538506 -vt 0.116387 0.411301 -vt 0.097416 0.413357 -vt 0.102642 0.549085 -vt 0.130907 0.555937 -vt 0.131138 0.556247 -vt 0.150130 0.553667 -vt 0.645628 0.042446 -vt 0.634978 0.042446 -vt 0.634978 0.029133 -vt 0.645628 0.055759 -vt 0.634978 0.055759 -vt 0.645628 0.069072 -vt 0.634978 0.069072 -vt 0.645628 0.029133 -vt 0.634978 0.015820 -vt 0.513280 0.609370 -vt 0.502630 0.609370 -vt 0.502630 0.596057 -vt 0.658941 0.042446 -vt 0.513280 0.622683 -vt 0.502630 0.622683 -vt 0.513280 0.635996 -vt 0.502630 0.635996 -vt 0.513280 0.596057 -vt 0.502630 0.582744 -vt 0.526593 0.609370 -vt 0.433024 0.609370 -vt 0.422373 0.609370 -vt 0.422373 0.596057 -vt 0.433024 0.622683 -vt 0.422373 0.622683 -vt 0.433024 0.635996 -vt 0.422373 0.635996 -vt 0.433024 0.596057 -vt 0.422373 0.582744 -vt 0.446337 0.609370 -vt 0.590025 0.127338 -vt 0.579374 0.127338 -vt 0.579374 0.114025 -vt 0.590025 0.140651 -vt 0.579374 0.140651 -vt 0.590025 0.153964 -vt 0.579374 0.153964 -vt 0.590025 0.114025 -vt 0.579374 0.100712 -vt 0.603338 0.127338 -vt 0.590025 0.042446 -vt 0.579374 0.042446 -vt 0.579374 0.029133 -vt 0.590025 0.055759 -vt 0.579374 0.055759 -vt 0.590025 0.069072 -vt 0.579374 0.069072 -vt 0.590025 0.029133 -vt 0.579374 0.015820 -vt 0.603338 0.042446 -vt 0.510334 0.220294 -vt 0.219443 0.220293 -vt 0.551889 0.220293 -vt 0.676556 0.220293 -vt 0.547734 0.188653 -vt 0.301724 0.024177 -vt 0.334968 0.024177 -vt 0.368213 0.024177 -vt 0.872208 0.205659 -vt 0.630841 0.747220 -vt 0.944816 0.231969 -vt 0.914362 0.363080 -vt 0.861701 0.501245 -vt 0.180296 0.867575 -vt 0.558233 0.720909 -vt 0.924870 0.067494 -vt 0.934309 0.527556 -vt 0.042131 0.814914 -vt 0.015820 0.887522 -vt 0.860921 0.878329 -vt 0.655893 0.510345 -vt 0.629447 0.536791 -vt 0.594893 0.551103 -vt 0.557493 0.551103 -vt 0.522940 0.536791 -vt 0.496494 0.510345 -vt 0.482182 0.475792 -vt 0.496494 0.403838 -vt 0.522940 0.377392 -vt 0.557493 0.363080 -vt 0.629447 0.377392 -vt 0.655892 0.403838 -vt 0.670205 0.438391 -vt 0.276830 0.403838 -vt 0.303276 0.377392 -vt 0.337830 0.363080 -vt 0.375230 0.363080 -vt 0.436229 0.403838 -vt 0.450541 0.438391 -vt 0.450541 0.475792 -vt 0.409783 0.536791 -vt 0.375230 0.551103 -vt 0.337830 0.551103 -vt 0.276830 0.510345 -vt 0.262518 0.475792 -vt 0.262518 0.438391 -vt 0.759838 0.331439 -vt 0.433040 0.015821 -vt 0.466284 0.015820 -vt 0.233572 0.015820 -vt 0.499529 0.015820 -vt 0.034105 0.015821 -vt 0.644997 0.100712 -vt 0.648068 0.101985 -vt 0.650419 0.104335 -vt 0.651691 0.107407 -vt 0.651691 0.110731 -vt 0.650419 0.113803 -vt 0.648068 0.116153 -vt 0.641672 0.117426 -vt 0.638601 0.116153 -vt 0.636250 0.113803 -vt 0.634978 0.110731 -vt 0.634978 0.107407 -vt 0.638601 0.101985 -vt 0.526593 0.688937 -vt 0.224666 0.528614 -vt 0.267232 0.331439 -vt 0.599678 0.331439 -vt 0.017898 0.331439 -vt 0.350344 0.331439 -vt 0.142565 0.331439 -vt 0.043902 0.399311 -vt 0.204281 0.566485 -vt 0.079018 0.371682 -vt 0.122181 0.605393 -vt 0.169802 0.595192 -vt 0.126307 0.363080 -vt 0.075458 0.589233 -vt 0.171161 0.379878 -vt 0.041790 0.557969 -vt 0.203730 0.409126 -vt 0.022076 0.519413 -vt 0.223774 0.446207 -vt 0.015820 0.478005 -vt 0.230878 0.487077 -vt 0.022973 0.436561 -vt 0.103485 0.783273 -vt 0.074396 0.783273 -vt 0.047521 0.772142 -vt 0.026952 0.751572 -vt 0.015820 0.724698 -vt 0.015820 0.695609 -vt 0.026952 0.668734 -vt 0.074396 0.637033 -vt 0.103485 0.637033 -vt 0.130360 0.648165 -vt 0.150929 0.668734 -vt 0.162061 0.695609 -vt 0.150929 0.751572 -vt 0.645628 0.015820 -vt 0.658941 0.029133 -vt 0.513280 0.582744 -vt 0.526593 0.596057 -vt 0.433024 0.582744 -vt 0.446337 0.596057 -vt 0.590025 0.100712 -vt 0.603338 0.114025 -vt 0.590025 0.015820 -vt 0.603338 0.029133 +vt 0.575431 0.309735 +vt 0.573431 0.319789 +vt 0.537435 0.319789 +vt 0.495439 0.258482 +vt 0.455444 0.258482 +vt 0.459443 0.212815 +vt 0.495439 0.309735 +vt 0.535435 0.258482 +vt 0.215469 0.309735 +vt 0.215469 0.258482 +vt 0.255465 0.258482 +vt 0.535435 0.309735 +vt 0.575431 0.258482 +vt 0.255465 0.309735 +vt 0.295461 0.258482 +vt 0.615427 0.258482 +vt 0.295461 0.309735 +vt 0.335456 0.258482 +vt 0.015490 0.309735 +vt 0.015490 0.258482 +vt 0.055486 0.258482 +vt 0.615427 0.309735 +vt 0.655423 0.258482 +vt 0.335456 0.309735 +vt 0.375452 0.258482 +vt 0.055486 0.309735 +vt 0.095482 0.258482 +vt 0.375452 0.309735 +vt 0.415448 0.258482 +vt 0.095482 0.309735 +vt 0.135477 0.258482 +vt 0.415448 0.309735 +vt 0.135477 0.309735 +vt 0.175473 0.258482 +vt 0.455444 0.309735 +vt 0.175473 0.309735 +vt 0.047487 0.181835 +vt 0.047487 0.099830 +vt 0.079483 0.099830 +vt 0.179473 0.212815 +vt 0.499439 0.212815 +vt 0.219469 0.212815 +vt 0.251465 0.212815 +vt 0.539435 0.212815 +vt 0.571431 0.212815 +vt 0.259464 0.212815 +vt 0.291461 0.212815 +vt 0.579431 0.212815 +vt 0.611427 0.212815 +vt 0.299460 0.212815 +vt 0.331457 0.212815 +vt 0.019490 0.212815 +vt 0.051486 0.212815 +vt 0.619426 0.212815 +vt 0.339456 0.212815 +vt 0.371453 0.212815 +vt 0.059485 0.212815 +vt 0.091482 0.212815 +vt 0.379452 0.212815 +vt 0.411448 0.212815 +vt 0.099481 0.212815 +vt 0.131478 0.212815 +vt 0.419448 0.212815 +vt 0.451444 0.212815 +vt 0.139477 0.212815 +vt 0.171474 0.212815 +vt 0.207470 0.099830 +vt 0.220269 0.023533 +vt 0.226668 0.023533 +vt 0.303460 0.181835 +vt 0.303460 0.099830 +vt 0.335456 0.099830 +vt 0.079483 0.181835 +vt 0.111480 0.099830 +vt 0.335456 0.181835 +vt 0.367453 0.099830 +vt 0.111480 0.181835 +vt 0.143477 0.099830 +vt 0.367453 0.181835 +vt 0.399450 0.099830 +vt 0.143477 0.181835 +vt 0.175473 0.099830 +vt 0.431446 0.181835 +vt 0.399450 0.181835 +vt 0.175473 0.181835 +vt 0.431446 0.099830 +vt 0.463443 0.099830 +vt 0.207470 0.181835 +vt 0.239466 0.099830 +vt 0.463443 0.181835 +vt 0.495440 0.099830 +vt 0.239466 0.181835 +vt 0.271463 0.099830 +vt 0.015490 0.181835 +vt 0.015490 0.099830 +vt 0.495440 0.181835 +vt 0.527436 0.099830 +vt 0.271463 0.181835 +vt 0.284262 0.023533 +vt 0.285862 0.015490 +vt 0.289061 0.015490 +vt 0.476242 0.023533 +vt 0.252265 0.023533 +vt 0.258664 0.023533 +vt 0.028289 0.023533 +vt 0.034688 0.023533 +vt 0.508238 0.023533 +vt 0.514638 0.023533 +vt 0.060285 0.023533 +vt 0.066685 0.023533 +vt 0.316258 0.023533 +vt 0.092282 0.023533 +vt 0.098681 0.023533 +vt 0.348255 0.023533 +vt 0.124278 0.023533 +vt 0.130678 0.023533 +vt 0.380252 0.023533 +vt 0.386651 0.023533 +vt 0.156275 0.023533 +vt 0.162675 0.023533 +vt 0.412248 0.023533 +vt 0.188272 0.023533 +vt 0.194671 0.023533 +vt 0.444245 0.023533 +vt 0.450644 0.023533 +vt 0.867211 0.388654 +vt 0.943508 0.401453 +vt 0.943508 0.407852 +vt 0.878671 0.183050 +vt 0.891469 0.106753 +vt 0.897869 0.106753 +vt 0.053376 0.889796 +vt 0.066175 0.813499 +vt 0.072574 0.813499 +vt 0.053376 0.700514 +vt 0.066174 0.624218 +vt 0.072574 0.624218 +vt 0.853583 0.122432 +vt 0.053376 0.741517 +vt 0.085372 0.700514 +vt 0.927828 0.445738 +vt 0.851531 0.458537 +vt 0.867211 0.420651 +vt 0.878671 0.224052 +vt 0.910667 0.183050 +vt 0.935755 0.122432 +vt 0.948553 0.198729 +vt 0.072574 0.772497 +vt 0.028289 0.829178 +vt 0.984510 0.407852 +vt 0.028289 0.639897 +vt 0.066174 0.583215 +vt 0.072574 0.583215 +vt 0.110460 0.829178 +vt 0.123258 0.905475 +vt 0.085373 0.889796 +vt 0.897869 0.065751 +vt 0.053376 0.930798 +vt 0.110460 0.639897 +vt 0.123258 0.716194 +vt 0.927828 0.363567 +vt 0.826209 0.388654 +vt 0.823876 0.878483 +vt 0.787879 0.878483 +vt 0.787879 0.847731 +vt 0.751883 0.878483 +vt 0.751883 0.847731 +vt 0.715887 0.878483 +vt 0.715887 0.847731 +vt 0.679891 0.878483 +vt 0.679891 0.847731 +vt 0.643894 0.878483 +vt 0.643894 0.847731 +vt 0.607898 0.878483 +vt 0.607898 0.847731 +vt 0.571902 0.878483 +vt 0.571902 0.847731 +vt 0.535906 0.878483 +vt 0.535906 0.847731 +vt 0.499910 0.878483 +vt 0.499910 0.847731 +vt 0.463913 0.878483 +vt 0.463913 0.847731 +vt 0.427917 0.878483 +vt 0.427917 0.847731 +vt 0.391921 0.878483 +vt 0.391921 0.847731 +vt 0.355925 0.878483 +vt 0.355925 0.847731 +vt 0.319929 0.878483 +vt 0.319929 0.847731 +vt 0.459881 0.423253 +vt 0.568362 0.350769 +vt 0.640846 0.459249 +vt 0.283932 0.878483 +vt 0.247936 0.878483 +vt 0.247936 0.847731 +vt 0.283932 0.847731 +vt 0.415126 0.492505 +vt 0.287165 0.517959 +vt 0.389673 0.364544 +vt 0.713530 0.415475 +vt 0.753525 0.415475 +vt 0.753525 0.481717 +vt 0.861157 0.677489 +vt 0.861157 0.717485 +vt 0.794915 0.717485 +vt 0.728106 0.196700 +vt 0.728106 0.130458 +vt 0.768102 0.130458 +vt 0.289639 0.627421 +vt 0.329635 0.627421 +vt 0.329635 0.693662 +vt 0.925864 0.681488 +vt 0.925864 0.713485 +vt 0.732105 0.065751 +vt 0.764102 0.065751 +vt 0.293639 0.562714 +vt 0.325636 0.562714 +vt 0.717529 0.350769 +vt 0.749526 0.350769 +vt 0.749526 0.604806 +vt 0.717529 0.604806 +vt 0.671826 0.713485 +vt 0.671826 0.681488 +vt 0.768102 0.196700 +vt 0.764102 0.319789 +vt 0.325636 0.816751 +vt 0.293639 0.816751 +vt 0.910794 0.759188 +vt 0.686403 0.080821 +vt 0.809805 0.080821 +vt 0.289639 0.693662 +vt 0.247936 0.577784 +vt 0.371338 0.577784 +vt 0.713530 0.481717 +vt 0.671826 0.365839 +vt 0.795229 0.365839 +vt 0.794915 0.677489 +vt 0.910794 0.635786 +vt 0.596447 0.665448 +vt 0.596447 0.644947 +vt 0.599646 0.644947 +vt 0.061885 0.015490 +vt 0.065085 0.015490 +vt 0.317858 0.015490 +vt 0.321058 0.015490 +vt 0.093882 0.015490 +vt 0.097081 0.015490 +vt 0.349855 0.015490 +vt 0.353054 0.015490 +vt 0.125878 0.015490 +vt 0.129078 0.015490 +vt 0.381851 0.015490 +vt 0.385051 0.015490 +vt 0.157875 0.015490 +vt 0.161075 0.015490 +vt 0.418648 0.023533 +vt 0.413848 0.015490 +vt 0.189872 0.015490 +vt 0.193071 0.015490 +vt 0.445845 0.015490 +vt 0.221868 0.015490 +vt 0.482641 0.023533 +vt 0.477841 0.015490 +vt 0.253865 0.015490 +vt 0.257065 0.015490 +vt 0.029888 0.015490 +vt 0.509838 0.015490 +vt 0.513038 0.015490 +vt 0.622103 0.113809 +vt 0.613684 0.101210 +vt 0.618903 0.097723 +vt 0.574049 0.665448 +vt 0.574049 0.644947 +vt 0.577249 0.644947 +vt 0.622044 0.665448 +vt 0.622044 0.644947 +vt 0.625244 0.644947 +vt 0.599646 0.665448 +vt 0.602846 0.644947 +vt 0.577249 0.665448 +vt 0.580448 0.644947 +vt 0.602846 0.665448 +vt 0.606045 0.644947 +vt 0.580448 0.665448 +vt 0.583648 0.644947 +vt 0.609245 0.665448 +vt 0.606045 0.665448 +vt 0.583648 0.665448 +vt 0.586848 0.644947 +vt 0.609245 0.644947 +vt 0.612445 0.644947 +vt 0.590047 0.665448 +vt 0.586848 0.665448 +vt 0.612445 0.665448 +vt 0.615645 0.644947 +vt 0.590047 0.644947 +vt 0.593247 0.644947 +vt 0.615645 0.665448 +vt 0.618844 0.644947 +vt 0.593247 0.665448 +vt 0.618844 0.665448 +vt 0.216956 0.469500 +vt 0.206706 0.469500 +vt 0.206706 0.433504 +vt 0.293461 0.319789 +vt 0.613427 0.319789 +vt 0.333457 0.319789 +vt 0.297460 0.319789 +vt 0.053486 0.319788 +vt 0.655423 0.309735 +vt 0.653423 0.319788 +vt 0.617427 0.319789 +vt 0.373452 0.319789 +vt 0.093482 0.319789 +vt 0.057486 0.319788 +vt 0.413448 0.319789 +vt 0.377452 0.319789 +vt 0.133478 0.319789 +vt 0.097481 0.319789 +vt 0.453444 0.319789 +vt 0.417448 0.319789 +vt 0.173473 0.319789 +vt 0.493440 0.319789 +vt 0.457444 0.319789 +vt 0.213469 0.319789 +vt 0.177473 0.319789 +vt 0.533436 0.319789 +vt 0.497439 0.319789 +vt 0.253465 0.319789 +vt 0.217469 0.319789 +vt 0.030045 0.396325 +vt 0.039516 0.400247 +vt 0.025741 0.433504 +vt 0.202401 0.506679 +vt 0.192931 0.502756 +vt 0.057721 0.367546 +vt 0.064969 0.374794 +vt 0.138144 0.551455 +vt 0.134221 0.541984 +vt 0.167477 0.528209 +vt 0.174726 0.535457 +vt 0.094302 0.351549 +vt 0.098225 0.361019 +vt 0.098225 0.552235 +vt 0.098225 0.541984 +vt 0.134221 0.350769 +vt 0.134221 0.361019 +vt 0.061046 0.537679 +vt 0.064969 0.528209 +vt 0.171400 0.365324 +vt 0.167477 0.374794 +vt 0.032267 0.510004 +vt 0.039516 0.502756 +vt 0.200179 0.392999 +vt 0.192931 0.400247 +vt 0.016270 0.473423 +vt 0.025741 0.469500 +vt 0.216176 0.429581 +vt 0.015490 0.433504 +vt 0.175884 0.491366 +vt 0.156088 0.511163 +vt 0.130222 0.521877 +vt 0.102225 0.521877 +vt 0.076359 0.511163 +vt 0.056562 0.491366 +vt 0.045848 0.465500 +vt 0.045848 0.437503 +vt 0.056562 0.411637 +vt 0.076359 0.391840 +vt 0.102225 0.381126 +vt 0.130222 0.381126 +vt 0.156088 0.391840 +vt 0.175885 0.411637 +vt 0.186598 0.437503 +vt 0.186598 0.465500 +vt 0.654291 0.806500 +vt 0.654291 0.816751 +vt 0.626294 0.816751 +vt 0.432829 0.573428 +vt 0.543069 0.647088 +vt 0.512558 0.692750 +vt 0.458312 0.806500 +vt 0.458312 0.816751 +vt 0.430315 0.816751 +vt 0.682288 0.806500 +vt 0.682288 0.816751 +vt 0.486309 0.806500 +vt 0.486309 0.816751 +vt 0.710286 0.806500 +vt 0.710286 0.816751 +vt 0.514306 0.806500 +vt 0.514306 0.816751 +vt 0.738283 0.806500 +vt 0.738283 0.816751 +vt 0.542303 0.806500 +vt 0.542303 0.816751 +vt 0.766280 0.806500 +vt 0.766280 0.816751 +vt 0.570300 0.806500 +vt 0.570300 0.816751 +vt 0.794277 0.806500 +vt 0.794277 0.816751 +vt 0.598297 0.806500 +vt 0.598297 0.816751 +vt 0.822274 0.806500 +vt 0.822274 0.816751 +vt 0.626294 0.806500 +vt 0.430315 0.806500 +vt 0.402318 0.816751 +vt 0.850271 0.806500 +vt 0.850271 0.816751 +vt 0.622711 0.041116 +vt 0.612460 0.041116 +vt 0.612460 0.028303 +vt 0.622711 0.053930 +vt 0.612460 0.053930 +vt 0.622711 0.066743 +vt 0.612460 0.066743 +vt 0.622711 0.028303 +vt 0.612460 0.015490 +vt 0.164489 0.608841 +vt 0.154238 0.608841 +vt 0.154238 0.596028 +vt 0.635524 0.041116 +vt 0.164489 0.621655 +vt 0.154238 0.621655 +vt 0.164489 0.634468 +vt 0.154238 0.634468 +vt 0.164489 0.596028 +vt 0.154238 0.583215 +vt 0.177302 0.608841 +vt 0.584299 0.588340 +vt 0.574049 0.588340 +vt 0.574049 0.575527 +vt 0.584299 0.601153 +vt 0.574049 0.601153 +vt 0.584299 0.613967 +vt 0.574049 0.613967 +vt 0.584299 0.575527 +vt 0.574049 0.562714 +vt 0.597113 0.588340 +vt 0.568667 0.123349 +vt 0.558416 0.123349 +vt 0.558416 0.110536 +vt 0.568667 0.136162 +vt 0.558416 0.136162 +vt 0.568667 0.148976 +vt 0.558416 0.148976 +vt 0.568667 0.110536 +vt 0.558416 0.097723 +vt 0.581480 0.123349 +vt 0.568667 0.041116 +vt 0.558416 0.041116 +vt 0.558416 0.028303 +vt 0.568667 0.053930 +vt 0.558416 0.053930 +vt 0.568667 0.066743 +vt 0.558416 0.066743 +vt 0.568667 0.028303 +vt 0.558416 0.015490 +vt 0.581480 0.041116 +vt 0.491440 0.212815 +vt 0.211469 0.212815 +vt 0.531436 0.212815 +vt 0.651423 0.212815 +vt 0.527436 0.181835 +vt 0.290661 0.023533 +vt 0.322658 0.023533 +vt 0.354654 0.023533 +vt 0.840785 0.198729 +vt 0.085372 0.741517 +vt 0.910667 0.224052 +vt 0.066175 0.772497 +vt 0.015490 0.905475 +vt 0.984510 0.401453 +vt 0.015490 0.716194 +vt 0.891470 0.065751 +vt 0.085373 0.930798 +vt 0.851531 0.350769 +vt 0.826209 0.420651 +vt 0.823876 0.847731 +vt 0.627071 0.492505 +vt 0.601618 0.517959 +vt 0.568362 0.531734 +vt 0.532366 0.531734 +vt 0.499110 0.517959 +vt 0.473657 0.492505 +vt 0.459881 0.459249 +vt 0.473657 0.389997 +vt 0.499110 0.364544 +vt 0.532366 0.350769 +vt 0.601618 0.364544 +vt 0.627071 0.389997 +vt 0.640846 0.423253 +vt 0.261711 0.389997 +vt 0.287165 0.364544 +vt 0.320421 0.350769 +vt 0.356417 0.350769 +vt 0.415126 0.389997 +vt 0.428901 0.423253 +vt 0.428901 0.459249 +vt 0.389673 0.517959 +vt 0.356417 0.531734 +vt 0.320421 0.531734 +vt 0.261711 0.492505 +vt 0.247936 0.459249 +vt 0.247936 0.423253 +vt 0.732105 0.319789 +vt 0.417048 0.015490 +vt 0.449044 0.015490 +vt 0.225068 0.015490 +vt 0.481041 0.015490 +vt 0.033088 0.015490 +vt 0.622103 0.097723 +vt 0.625059 0.098947 +vt 0.627321 0.101210 +vt 0.628546 0.104166 +vt 0.628546 0.107366 +vt 0.627321 0.110322 +vt 0.625059 0.112584 +vt 0.618903 0.113809 +vt 0.615947 0.112584 +vt 0.613684 0.110322 +vt 0.612460 0.107366 +vt 0.612460 0.104166 +vt 0.615947 0.098947 +vt 0.625244 0.665448 +vt 0.216956 0.433504 +vt 0.257465 0.319789 +vt 0.577431 0.319789 +vt 0.017490 0.319788 +vt 0.337456 0.319789 +vt 0.137477 0.319789 +vt 0.016270 0.429581 +vt 0.216176 0.473423 +vt 0.032267 0.392999 +vt 0.171400 0.537679 +vt 0.200179 0.510004 +vt 0.061046 0.365324 +vt 0.134221 0.552235 +vt 0.098225 0.350769 +vt 0.094302 0.551455 +vt 0.138144 0.351549 +vt 0.057721 0.535457 +vt 0.174726 0.367546 +vt 0.030045 0.506679 +vt 0.202401 0.396325 +vt 0.015490 0.469500 +vt 0.486692 0.703464 +vt 0.458695 0.703464 +vt 0.432829 0.692750 +vt 0.413032 0.672953 +vt 0.402318 0.647088 +vt 0.402318 0.619091 +vt 0.413032 0.593225 +vt 0.458695 0.562714 +vt 0.486692 0.562714 +vt 0.512558 0.573428 +vt 0.532355 0.593225 +vt 0.543069 0.619090 +vt 0.532355 0.672953 +vt 0.402318 0.806500 +vt 0.622711 0.015490 +vt 0.635524 0.028303 +vt 0.164489 0.583215 +vt 0.177302 0.596028 +vt 0.584299 0.562714 +vt 0.597113 0.575527 +vt 0.568667 0.097723 +vt 0.581480 0.110536 +vt 0.568667 0.015490 +vt 0.581480 0.028303 vn 0.000000 1.000000 0.000000 vn 0.880600 -0.440300 0.175200 vn 0.980800 0.000000 -0.195100 @@ -1159,50 +1161,50 @@ f 227/349/1 228/353/1 244/374/1 f 228/353/1 229/357/1 245/375/1 f 230/306/1 246/376/1 245/375/1 f 231/305/1 247/377/1 246/376/1 -f 242/372/9 258/378/9 257/379/9 -f 257/380/1 263/381/1 250/382/1 -f 235/365/13 251/383/13 249/384/13 -f 243/373/12 259/385/12 258/386/12 -f 236/366/15 252/387/15 251/388/15 -f 244/374/14 260/389/14 259/390/14 -f 237/367/17 253/391/17 252/392/17 -f 245/375/16 261/393/16 260/394/16 -f 238/368/3 254/395/3 253/396/3 -f 246/376/18 262/397/18 261/398/18 -f 239/369/5 255/399/5 254/400/5 -f 247/377/4 263/401/4 262/402/4 -f 240/370/7 256/403/7 255/404/7 -f 248/362/6 264/405/6 263/406/6 -f 241/371/10 257/407/10 256/408/10 -f 234/364/11 249/409/11 250/410/11 -f 233/363/8 250/411/8 264/412/8 -f 268/413/57 267/414/57 265/415/57 -f 272/416/56 271/417/56 267/414/56 -f 270/418/55 269/419/55 271/417/55 -f 266/420/58 265/415/58 269/421/58 -f 276/422/57 275/423/57 273/424/57 -f 272/425/1 268/413/1 266/420/1 -f 280/426/56 279/427/56 275/423/56 -f 278/428/55 277/429/55 279/427/55 -f 274/430/58 273/424/58 277/431/58 -f 280/432/1 276/422/1 274/430/1 -f 284/433/57 283/434/57 281/435/57 -f 288/436/56 287/437/56 283/434/56 -f 286/438/55 285/439/55 287/437/55 -f 282/440/58 281/435/58 285/441/58 -f 288/442/1 284/433/1 282/440/1 -f 292/443/57 291/444/57 289/445/57 -f 296/446/56 295/447/56 291/444/56 -f 294/448/55 293/449/55 295/447/55 -f 290/450/58 289/445/58 293/451/58 -f 296/452/1 292/443/1 290/450/1 -f 300/453/57 299/454/57 297/455/57 -f 304/456/56 303/457/56 299/454/56 -f 302/458/55 301/459/55 303/457/55 -f 298/460/58 297/455/58 301/461/58 -f 304/462/1 300/453/1 298/460/1 +f 242/378/9 258/379/9 257/380/9 +f 257/381/1 263/382/1 250/383/1 +f 235/384/13 251/385/13 249/386/13 +f 243/387/12 259/388/12 258/379/12 +f 236/389/15 252/390/15 251/385/15 +f 244/391/14 260/392/14 259/388/14 +f 237/393/17 253/394/17 252/390/17 +f 245/395/16 261/396/16 260/392/16 +f 238/397/3 254/398/3 253/394/3 +f 246/399/18 262/400/18 261/396/18 +f 239/401/5 255/402/5 254/398/5 +f 247/403/4 263/404/4 262/400/4 +f 240/405/7 256/406/7 255/402/7 +f 248/407/6 264/408/6 263/404/6 +f 241/409/10 257/380/10 256/406/10 +f 234/410/11 249/386/11 250/411/11 +f 233/412/8 250/413/8 264/408/8 +f 268/414/57 267/415/57 265/416/57 +f 272/417/56 271/418/56 267/415/56 +f 270/419/55 269/420/55 271/418/55 +f 266/421/58 265/416/58 269/422/58 +f 276/423/57 275/424/57 273/425/57 +f 272/426/1 268/414/1 266/421/1 +f 280/427/56 279/428/56 275/424/56 +f 278/429/55 277/430/55 279/428/55 +f 274/431/58 273/425/58 277/432/58 +f 280/433/1 276/423/1 274/431/1 +f 284/434/57 283/435/57 281/436/57 +f 288/437/56 287/438/56 283/435/56 +f 286/439/55 285/440/55 287/438/55 +f 282/441/58 281/436/58 285/442/58 +f 288/443/1 284/434/1 282/441/1 +f 292/444/57 291/445/57 289/446/57 +f 296/447/56 295/448/56 291/445/56 +f 294/449/55 293/450/55 295/448/55 +f 290/451/58 289/446/58 293/452/58 +f 296/453/1 292/444/1 290/451/1 +f 300/454/57 299/455/57 297/456/57 +f 304/457/56 303/458/56 299/455/56 +f 302/459/55 301/460/55 303/458/55 +f 298/461/58 297/456/58 301/462/58 +f 304/463/1 300/454/1 298/461/1 f 14/12/1 15/1/1 214/3/1 -f 45/463/2 29/4/2 44/6/2 +f 45/464/2 29/4/2 44/6/2 f 14/12/3 13/7/3 30/8/3 f 7/14/4 6/9/4 23/11/4 f 15/1/5 14/12/5 31/13/5 @@ -1220,15 +1222,15 @@ f 5/36/16 4/33/16 21/34/16 f 13/7/17 12/35/17 29/4/17 f 6/9/18 5/36/18 22/10/18 f 35/73/12 33/37/12 51/39/12 -f 38/464/19 22/10/19 37/40/19 -f 46/465/20 30/8/20 45/41/20 +f 38/465/19 22/10/19 37/40/19 +f 46/466/20 30/8/20 45/41/20 f 23/11/21 22/10/21 39/43/21 f 31/13/22 30/8/22 47/45/22 f 24/15/23 23/11/23 40/47/23 f 32/16/24 31/13/24 48/49/24 f 25/18/25 24/15/25 41/51/25 f 17/21/26 18/20/26 33/53/26 -f 34/466/27 18/23/27 48/54/27 +f 34/467/27 18/23/27 48/54/27 f 26/25/28 25/18/28 42/56/28 f 19/27/29 17/21/29 35/58/29 f 27/29/30 26/25/30 43/60/30 @@ -1249,18 +1251,18 @@ f 40/92/6 39/88/6 56/89/6 f 48/96/7 47/90/7 64/91/7 f 41/98/8 40/92/8 57/93/8 f 33/37/9 34/94/9 49/38/9 -f 34/467/10 48/96/10 50/97/10 +f 34/468/10 48/96/10 50/97/10 f 42/70/11 41/98/11 58/71/11 -f 74/468/35 73/99/35 178/101/35 +f 74/469/35 73/99/35 178/101/35 f 80/264/36 64/91/36 79/102/36 f 57/93/37 56/89/37 73/104/37 f 49/38/38 50/95/38 65/106/38 f 50/97/39 64/91/39 66/108/39 -f 74/468/40 58/71/40 73/99/40 +f 74/469/40 58/71/40 73/99/40 f 51/39/41 49/38/41 67/110/41 -f 75/469/42 59/72/42 74/111/42 +f 75/470/42 59/72/42 74/111/42 f 52/74/43 51/39/43 68/113/43 -f 76/470/44 60/76/44 75/114/44 +f 76/471/44 60/76/44 75/114/44 f 53/78/45 52/74/45 69/116/45 f 61/80/46 60/76/46 77/118/46 f 54/82/47 53/78/47 70/120/47 @@ -1271,23 +1273,23 @@ f 99/143/51 100/126/51 107/128/51 f 103/145/52 104/129/52 111/131/52 f 97/156/53 98/132/53 105/134/53 f 101/140/54 102/135/54 109/137/54 -f 88/471/17 96/138/17 104/129/17 -f 87/472/55 86/139/55 101/140/55 +f 88/472/17 96/138/17 104/129/17 +f 87/473/55 86/139/55 101/140/55 f 107/128/3 93/141/3 99/143/3 -f 81/473/56 88/144/56 103/145/56 +f 81/474/56 88/144/56 103/145/56 f 111/131/18 89/146/18 103/145/18 -f 90/474/55 91/148/55 106/133/55 -f 82/475/10 90/149/10 98/132/10 -f 92/476/56 93/150/56 108/127/56 -f 86/477/8 94/151/8 102/135/8 +f 90/475/55 91/148/55 106/133/55 +f 82/476/10 90/149/10 98/132/10 +f 92/477/56 93/150/56 108/127/56 +f 86/478/8 94/151/8 102/135/8 f 110/136/57 94/152/57 109/137/57 f 105/134/11 91/154/11 97/156/11 -f 96/478/58 89/157/58 112/130/58 -f 83/479/57 82/158/57 97/156/57 +f 96/479/58 89/157/58 112/130/58 +f 83/480/57 82/158/57 97/156/57 f 109/137/9 95/159/9 101/140/9 -f 84/480/16 92/161/16 100/126/16 -f 85/481/58 84/162/58 99/143/58 -f 115/482/10 116/163/10 117/165/10 +f 84/481/16 92/161/16 100/126/16 +f 85/482/58 84/162/58 99/143/58 +f 115/483/10 116/163/10 117/165/10 f 117/165/7 118/164/7 119/167/7 f 119/167/5 120/166/5 121/169/5 f 121/169/3 122/168/3 123/171/3 @@ -1301,34 +1303,34 @@ f 135/183/4 136/182/4 137/185/4 f 137/185/18 138/184/18 139/187/18 f 139/187/16 140/186/16 141/189/16 f 141/189/14 142/188/14 143/191/14 -f 120/194/1 118/483/1 116/484/1 -f 116/484/1 146/485/1 120/194/1 -f 144/486/1 142/487/1 140/488/1 -f 140/488/1 138/489/1 136/192/1 -f 136/192/1 134/490/1 128/193/1 -f 132/491/1 130/492/1 128/193/1 -f 128/193/1 126/493/1 124/494/1 -f 124/494/1 122/495/1 120/194/1 -f 120/194/1 146/485/1 144/486/1 -f 144/486/1 140/488/1 120/194/1 -f 134/490/1 132/491/1 128/193/1 -f 128/193/1 124/494/1 120/194/1 -f 120/194/1 140/488/1 136/192/1 +f 120/194/1 118/484/1 116/485/1 +f 116/485/1 146/486/1 120/194/1 +f 144/487/1 142/488/1 140/489/1 +f 140/489/1 138/490/1 136/192/1 +f 136/192/1 134/491/1 128/193/1 +f 132/492/1 130/493/1 128/193/1 +f 128/193/1 126/494/1 124/495/1 +f 124/495/1 122/496/1 120/194/1 +f 120/194/1 146/486/1 144/487/1 +f 144/487/1 140/489/1 120/194/1 +f 134/491/1 132/492/1 128/193/1 +f 128/193/1 124/495/1 120/194/1 +f 120/194/1 140/489/1 136/192/1 f 145/198/9 146/195/9 115/197/9 f 143/191/12 144/190/12 145/198/12 -f 145/496/35 115/497/35 117/498/35 -f 117/498/35 119/499/35 121/201/35 -f 121/201/35 123/500/35 125/501/35 -f 125/501/35 127/502/35 121/201/35 -f 129/199/35 131/503/35 133/504/35 -f 133/504/35 135/505/35 137/200/35 -f 137/200/35 139/506/35 141/507/35 -f 141/507/35 143/508/35 145/496/35 -f 145/496/35 117/498/35 121/201/35 -f 121/201/35 127/502/35 129/199/35 -f 129/199/35 133/504/35 137/200/35 -f 137/200/35 141/507/35 145/496/35 -f 145/496/35 121/201/35 137/200/35 +f 145/497/35 115/498/35 117/499/35 +f 117/499/35 119/500/35 121/201/35 +f 121/201/35 123/501/35 125/502/35 +f 125/502/35 127/503/35 121/201/35 +f 129/199/35 131/504/35 133/505/35 +f 133/505/35 135/506/35 137/200/35 +f 137/200/35 139/507/35 141/508/35 +f 141/508/35 143/509/35 145/497/35 +f 145/497/35 117/499/35 121/201/35 +f 121/201/35 127/503/35 129/199/35 +f 129/199/35 133/505/35 137/200/35 +f 137/200/35 141/508/35 145/497/35 +f 145/497/35 121/201/35 137/200/35 f 158/236/59 150/202/59 157/204/59 f 160/239/60 152/205/60 159/207/60 f 154/226/61 153/208/61 114/210/61 @@ -1339,39 +1341,39 @@ f 148/211/65 164/218/65 147/212/65 f 150/202/66 166/220/66 149/203/66 f 158/236/67 157/204/67 166/223/67 f 160/239/68 159/207/68 168/225/68 -f 161/509/69 153/208/69 162/227/69 +f 161/510/69 153/208/69 162/227/69 f 156/233/70 155/213/70 164/229/70 f 177/280/8 176/241/8 193/243/8 f 67/110/35 65/109/35 171/245/35 -f 75/469/35 74/111/35 179/247/35 +f 75/470/35 74/111/35 179/247/35 f 68/113/35 67/112/35 172/249/35 -f 76/470/35 75/114/35 180/251/35 +f 76/471/35 75/114/35 180/251/35 f 69/116/35 68/115/35 173/253/35 f 77/118/35 76/117/35 181/255/35 f 70/120/35 69/119/35 174/257/35 -f 182/510/35 78/258/35 181/259/35 +f 182/511/35 78/258/35 181/259/35 f 71/123/35 70/122/35 175/261/35 -f 183/511/35 79/125/35 182/262/35 -f 176/512/35 72/69/35 175/263/35 -f 184/513/35 80/264/35 183/265/35 +f 183/512/35 79/125/35 182/262/35 +f 176/513/35 72/69/35 175/263/35 +f 184/514/35 80/264/35 183/265/35 f 73/104/35 72/103/35 177/267/35 -f 169/514/35 65/106/35 170/268/35 +f 169/515/35 65/106/35 170/268/35 f 66/108/35 80/107/35 170/270/35 -f 187/273/35 185/515/35 186/516/35 -f 186/516/35 200/517/35 199/518/35 -f 199/518/35 198/519/35 195/271/35 -f 197/520/35 196/521/35 195/271/35 -f 195/271/35 194/522/35 193/523/35 -f 193/523/35 192/524/35 195/271/35 -f 191/525/35 190/526/35 189/272/35 -f 189/272/35 188/527/35 187/273/35 -f 187/273/35 186/516/35 195/271/35 -f 198/519/35 197/520/35 195/271/35 -f 195/271/35 192/524/35 191/525/35 -f 191/525/35 189/272/35 195/271/35 -f 186/516/35 199/518/35 195/271/35 +f 187/273/35 185/516/35 186/517/35 +f 186/517/35 200/518/35 199/519/35 +f 199/519/35 198/520/35 195/271/35 +f 197/521/35 196/522/35 195/271/35 +f 195/271/35 194/523/35 193/524/35 +f 193/524/35 192/525/35 195/271/35 +f 191/526/35 190/527/35 189/272/35 +f 189/272/35 188/528/35 187/273/35 +f 187/273/35 186/517/35 195/271/35 +f 198/520/35 197/521/35 195/271/35 +f 195/271/35 192/525/35 191/526/35 +f 191/526/35 189/272/35 195/271/35 +f 186/517/35 199/519/35 195/271/35 f 169/282/9 170/274/9 185/276/9 -f 170/528/10 184/277/10 186/279/10 +f 170/529/10 184/277/10 186/279/10 f 178/284/11 177/280/11 194/281/11 f 171/286/12 169/282/12 187/283/12 f 179/289/13 178/284/13 195/285/13 @@ -1385,37 +1387,37 @@ f 175/302/4 174/294/4 191/299/4 f 183/303/5 182/300/5 199/301/5 f 176/241/6 175/302/6 192/242/6 f 184/277/7 183/303/7 200/278/7 -f 214/529/5 215/304/5 230/306/5 -f 207/530/1 7/14/1 208/307/1 -f 215/531/1 15/1/1 216/308/1 +f 214/530/5 215/304/5 230/306/5 +f 207/531/1 7/14/1 208/307/1 +f 215/532/1 15/1/1 216/308/1 f 8/17/1 9/24/1 208/310/1 -f 202/532/1 1/19/1 201/311/1 +f 202/533/1 1/19/1 201/311/1 f 16/22/1 1/312/1 216/314/1 -f 209/533/1 9/24/1 210/315/1 +f 209/534/1 9/24/1 210/315/1 f 2/26/1 3/30/1 201/317/1 f 10/28/1 11/32/1 210/319/1 f 3/30/1 4/33/1 203/321/1 f 11/32/1 12/35/1 211/323/1 -f 204/534/1 4/33/1 205/324/1 +f 204/535/1 4/33/1 205/324/1 f 12/35/1 13/7/1 212/326/1 f 5/36/1 6/9/1 205/328/1 f 13/7/1 14/12/1 213/330/1 f 6/9/1 7/14/1 206/332/1 -f 207/535/6 208/333/6 223/335/6 -f 215/536/7 216/336/7 231/305/7 -f 208/537/8 209/338/8 224/334/8 -f 202/538/9 201/340/9 218/342/9 -f 216/539/10 202/343/10 232/337/10 -f 209/540/11 210/344/11 225/339/11 -f 201/541/12 203/346/12 217/341/12 -f 210/542/13 211/348/13 226/345/13 -f 203/543/14 204/350/14 219/347/14 -f 211/544/15 212/352/15 227/349/15 -f 204/545/16 205/354/16 220/351/16 -f 212/546/17 213/356/17 228/353/17 -f 205/547/18 206/358/18 221/355/18 -f 213/548/3 214/360/3 229/357/3 -f 206/549/4 207/361/4 222/359/4 +f 207/536/6 208/333/6 223/335/6 +f 215/537/7 216/336/7 231/305/7 +f 208/538/8 209/338/8 224/334/8 +f 202/539/9 201/340/9 218/342/9 +f 216/540/10 202/343/10 232/337/10 +f 209/541/11 210/344/11 225/339/11 +f 201/542/12 203/346/12 217/341/12 +f 210/543/13 211/348/13 226/345/13 +f 203/544/14 204/350/14 219/347/14 +f 211/545/15 212/352/15 227/349/15 +f 204/546/16 205/354/16 220/351/16 +f 212/547/17 213/356/17 228/353/17 +f 205/548/18 206/358/18 221/355/18 +f 213/549/3 214/360/3 229/357/3 +f 206/550/4 207/361/4 222/359/4 f 247/377/1 231/305/1 248/362/1 f 232/337/1 218/342/1 248/362/1 f 233/363/1 218/342/1 234/364/1 @@ -1432,57 +1434,57 @@ f 243/373/1 227/349/1 244/374/1 f 244/374/1 228/353/1 245/375/1 f 229/357/1 230/306/1 245/375/1 f 230/306/1 231/305/1 246/376/1 -f 241/371/9 242/372/9 257/379/9 -f 250/382/1 249/550/1 251/551/1 -f 251/551/1 252/552/1 253/553/1 -f 253/553/1 254/554/1 257/380/1 -f 255/555/1 256/556/1 257/380/1 -f 257/380/1 258/557/1 259/558/1 -f 259/558/1 260/559/1 257/380/1 -f 261/560/1 262/561/1 263/381/1 -f 263/381/1 264/562/1 250/382/1 -f 250/382/1 251/551/1 257/380/1 -f 254/554/1 255/555/1 257/380/1 -f 257/380/1 260/559/1 261/560/1 -f 261/560/1 263/381/1 257/380/1 -f 251/551/1 253/553/1 257/380/1 -f 234/364/13 235/365/13 249/384/13 -f 242/372/12 243/373/12 258/386/12 -f 235/365/15 236/366/15 251/388/15 -f 243/373/14 244/374/14 259/390/14 -f 236/366/17 237/367/17 252/392/17 -f 244/374/16 245/375/16 260/394/16 -f 237/367/3 238/368/3 253/396/3 -f 245/375/18 246/376/18 261/398/18 -f 238/368/5 239/369/5 254/400/5 -f 246/376/4 247/377/4 262/402/4 -f 239/369/7 240/370/7 255/404/7 -f 247/377/6 248/362/6 263/406/6 -f 240/370/10 241/371/10 256/408/10 -f 233/363/11 234/364/11 250/410/11 -f 248/362/8 233/363/8 264/412/8 -f 266/420/57 268/413/57 265/415/57 -f 268/413/56 272/416/56 267/414/56 -f 272/416/55 270/418/55 271/417/55 -f 270/563/58 266/420/58 269/421/58 -f 274/430/57 276/422/57 273/424/57 -f 270/564/1 272/425/1 266/420/1 -f 276/422/56 280/426/56 275/423/56 -f 280/426/55 278/428/55 279/427/55 -f 278/565/58 274/430/58 277/431/58 -f 278/566/1 280/432/1 274/430/1 -f 282/440/57 284/433/57 281/435/57 -f 284/433/56 288/436/56 283/434/56 -f 288/436/55 286/438/55 287/437/55 -f 286/567/58 282/440/58 285/441/58 -f 286/568/1 288/442/1 282/440/1 -f 290/450/57 292/443/57 289/445/57 -f 292/443/56 296/446/56 291/444/56 -f 296/446/55 294/448/55 295/447/55 -f 294/569/58 290/450/58 293/451/58 -f 294/570/1 296/452/1 290/450/1 -f 298/460/57 300/453/57 297/455/57 -f 300/453/56 304/456/56 299/454/56 -f 304/456/55 302/458/55 303/457/55 -f 302/571/58 298/460/58 301/461/58 -f 302/572/1 304/462/1 298/460/1 +f 241/409/9 242/378/9 257/380/9 +f 250/383/1 249/551/1 251/552/1 +f 251/552/1 252/553/1 253/554/1 +f 253/554/1 254/555/1 257/381/1 +f 255/556/1 256/557/1 257/381/1 +f 257/381/1 258/558/1 259/559/1 +f 259/559/1 260/560/1 257/381/1 +f 261/561/1 262/562/1 263/382/1 +f 263/382/1 264/563/1 250/383/1 +f 250/383/1 251/552/1 257/381/1 +f 254/555/1 255/556/1 257/381/1 +f 257/381/1 260/560/1 261/561/1 +f 261/561/1 263/382/1 257/381/1 +f 251/552/1 253/554/1 257/381/1 +f 234/410/13 235/384/13 249/386/13 +f 242/378/12 243/387/12 258/379/12 +f 235/384/15 236/389/15 251/385/15 +f 243/387/14 244/391/14 259/388/14 +f 236/389/17 237/393/17 252/390/17 +f 244/391/16 245/395/16 260/392/16 +f 237/393/3 238/397/3 253/394/3 +f 245/395/18 246/399/18 261/396/18 +f 238/397/5 239/401/5 254/398/5 +f 246/399/4 247/403/4 262/400/4 +f 239/401/7 240/405/7 255/402/7 +f 247/403/6 248/407/6 263/404/6 +f 240/405/10 241/409/10 256/406/10 +f 233/564/11 234/410/11 250/411/11 +f 248/407/8 233/412/8 264/408/8 +f 266/421/57 268/414/57 265/416/57 +f 268/414/56 272/417/56 267/415/56 +f 272/417/55 270/419/55 271/418/55 +f 270/565/58 266/421/58 269/422/58 +f 274/431/57 276/423/57 273/425/57 +f 270/566/1 272/426/1 266/421/1 +f 276/423/56 280/427/56 275/424/56 +f 280/427/55 278/429/55 279/428/55 +f 278/567/58 274/431/58 277/432/58 +f 278/568/1 280/433/1 274/431/1 +f 282/441/57 284/434/57 281/436/57 +f 284/434/56 288/437/56 283/435/56 +f 288/437/55 286/439/55 287/438/55 +f 286/569/58 282/441/58 285/442/58 +f 286/570/1 288/443/1 282/441/1 +f 290/451/57 292/444/57 289/446/57 +f 292/444/56 296/447/56 291/445/56 +f 296/447/55 294/449/55 295/448/55 +f 294/571/58 290/451/58 293/452/58 +f 294/572/1 296/453/1 290/451/1 +f 298/461/57 300/454/57 297/456/57 +f 300/454/56 304/457/56 299/455/56 +f 304/457/55 302/459/55 303/458/55 +f 302/573/58 298/461/58 301/462/58 +f 302/574/1 304/463/1 298/461/1 diff --git a/assets/hbm/textures/blocks/ams_base.png b/assets/hbm/textures/blocks/ams_base.png index c0d7101f0..d0d65f51f 100644 Binary files a/assets/hbm/textures/blocks/ams_base.png and b/assets/hbm/textures/blocks/ams_base.png differ diff --git a/assets/hbm/textures/blocks/ams_emitter.png b/assets/hbm/textures/blocks/ams_emitter.png index 799768700..1e8db2566 100644 Binary files a/assets/hbm/textures/blocks/ams_emitter.png and b/assets/hbm/textures/blocks/ams_emitter.png differ diff --git a/assets/hbm/textures/blocks/block_yellowcake.png b/assets/hbm/textures/blocks/block_yellowcake.png new file mode 100644 index 000000000..5b854bd52 Binary files /dev/null and b/assets/hbm/textures/blocks/block_yellowcake.png differ diff --git a/assets/hbm/textures/blocks/coolant_duct.png b/assets/hbm/textures/blocks/coolant_duct.png new file mode 100644 index 000000000..d7ba4a2de Binary files /dev/null and b/assets/hbm/textures/blocks/coolant_duct.png differ diff --git a/assets/hbm/textures/blocks/coolant_duct_icon.png b/assets/hbm/textures/blocks/coolant_duct_icon.png new file mode 100644 index 000000000..bbade3f2b Binary files /dev/null and b/assets/hbm/textures/blocks/coolant_duct_icon.png differ diff --git a/assets/hbm/textures/blocks/coolant_duct_solid.png b/assets/hbm/textures/blocks/coolant_duct_solid.png new file mode 100644 index 000000000..a08eca758 Binary files /dev/null and b/assets/hbm/textures/blocks/coolant_duct_solid.png differ diff --git a/assets/hbm/textures/blocks/machine_transformer.png b/assets/hbm/textures/blocks/machine_transformer.png new file mode 100644 index 000000000..3ba309f73 Binary files /dev/null and b/assets/hbm/textures/blocks/machine_transformer.png differ diff --git a/assets/hbm/textures/blocks/machine_transformer_top.png b/assets/hbm/textures/blocks/machine_transformer_top.png new file mode 100644 index 000000000..4580a6682 Binary files /dev/null and b/assets/hbm/textures/blocks/machine_transformer_top.png differ diff --git a/assets/hbm/textures/blocks/ore_oil_sand.png b/assets/hbm/textures/blocks/ore_oil_sand.png new file mode 100644 index 000000000..2313fc25a Binary files /dev/null and b/assets/hbm/textures/blocks/ore_oil_sand.png differ diff --git a/assets/hbm/textures/blocks/ore_oil_sand_alt.png b/assets/hbm/textures/blocks/ore_oil_sand_alt.png new file mode 100644 index 000000000..1f3e720b9 Binary files /dev/null and b/assets/hbm/textures/blocks/ore_oil_sand_alt.png differ diff --git a/assets/hbm/textures/gui/gui_ams_base.png b/assets/hbm/textures/gui/gui_ams_base.png index b89077159..2c8e6e832 100644 Binary files a/assets/hbm/textures/gui/gui_ams_base.png and b/assets/hbm/textures/gui/gui_ams_base.png differ diff --git a/assets/hbm/textures/gui/gui_ams_base_alt.png b/assets/hbm/textures/gui/gui_ams_base_alt.png new file mode 100644 index 000000000..b89077159 Binary files /dev/null and b/assets/hbm/textures/gui/gui_ams_base_alt.png differ diff --git a/assets/hbm/textures/gui/gui_ams_emitter.png b/assets/hbm/textures/gui/gui_ams_emitter.png index 870b9ae30..e3d6a83b5 100644 Binary files a/assets/hbm/textures/gui/gui_ams_emitter.png and b/assets/hbm/textures/gui/gui_ams_emitter.png differ diff --git a/assets/hbm/textures/items/ams_catalyst_dineutronium.png b/assets/hbm/textures/items/ams_catalyst_dineutronium.png new file mode 100644 index 000000000..8fa308c21 Binary files /dev/null and b/assets/hbm/textures/items/ams_catalyst_dineutronium.png differ diff --git a/assets/hbm/textures/items/ams_catalyst_schrabidium.png b/assets/hbm/textures/items/ams_catalyst_schrabidium.png new file mode 100644 index 000000000..b4c394c8e Binary files /dev/null and b/assets/hbm/textures/items/ams_catalyst_schrabidium.png differ diff --git a/assets/hbm/textures/items/ams_core_eyeofharmony.png b/assets/hbm/textures/items/ams_core_eyeofharmony.png new file mode 100644 index 000000000..25cb6a838 Binary files /dev/null and b/assets/hbm/textures/items/ams_core_eyeofharmony.png differ diff --git a/assets/hbm/textures/items/ams_core_sing.png b/assets/hbm/textures/items/ams_core_sing.png new file mode 100644 index 000000000..a1b22c5dc Binary files /dev/null and b/assets/hbm/textures/items/ams_core_sing.png differ diff --git a/assets/hbm/textures/items/ams_core_thingy.png b/assets/hbm/textures/items/ams_core_thingy.png new file mode 100644 index 000000000..9c05ef5e0 Binary files /dev/null and b/assets/hbm/textures/items/ams_core_thingy.png differ diff --git a/assets/hbm/textures/items/ams_core_wormhole.png b/assets/hbm/textures/items/ams_core_wormhole.png new file mode 100644 index 000000000..36980de82 Binary files /dev/null and b/assets/hbm/textures/items/ams_core_wormhole.png differ diff --git a/assets/hbm/textures/items/ams_focus_booster.png b/assets/hbm/textures/items/ams_focus_booster.png index 7a58f7efb..d3490973c 100644 Binary files a/assets/hbm/textures/items/ams_focus_booster.png and b/assets/hbm/textures/items/ams_focus_booster.png differ diff --git a/assets/hbm/textures/items/ams_muzzle.png b/assets/hbm/textures/items/ams_muzzle.png new file mode 100644 index 000000000..c13af34a8 Binary files /dev/null and b/assets/hbm/textures/items/ams_muzzle.png differ diff --git a/assets/hbm/textures/items/bottle_ashes.png b/assets/hbm/textures/items/bottle_ashes.png new file mode 100644 index 000000000..5c807a17c Binary files /dev/null and b/assets/hbm/textures/items/bottle_ashes.png differ diff --git a/assets/hbm/textures/items/can_luna.png b/assets/hbm/textures/items/can_luna.png new file mode 100644 index 000000000..8aa09db8c Binary files /dev/null and b/assets/hbm/textures/items/can_luna.png differ diff --git a/assets/hbm/textures/items/chem_icon_FC_BITUMEN.png b/assets/hbm/textures/items/chem_icon_FC_BITUMEN.png new file mode 100644 index 000000000..c3466cd85 Binary files /dev/null and b/assets/hbm/textures/items/chem_icon_FC_BITUMEN.png differ diff --git a/assets/hbm/textures/items/chem_icon_OIL_SAND.png b/assets/hbm/textures/items/chem_icon_OIL_SAND.png new file mode 100644 index 000000000..6fc383db8 Binary files /dev/null and b/assets/hbm/textures/items/chem_icon_OIL_SAND.png differ diff --git a/assets/hbm/textures/items/chem_icon_YELLOWCAKE.png b/assets/hbm/textures/items/chem_icon_YELLOWCAKE.png new file mode 100644 index 000000000..980405cf2 Binary files /dev/null and b/assets/hbm/textures/items/chem_icon_YELLOWCAKE.png differ diff --git a/assets/hbm/textures/items/component_emitter.png b/assets/hbm/textures/items/component_emitter.png new file mode 100644 index 000000000..505fa8c2e Binary files /dev/null and b/assets/hbm/textures/items/component_emitter.png differ diff --git a/assets/hbm/textures/items/component_limiter.png b/assets/hbm/textures/items/component_limiter.png new file mode 100644 index 000000000..31f09ef52 Binary files /dev/null and b/assets/hbm/textures/items/component_limiter.png differ diff --git a/assets/hbm/textures/items/ingot_celneutronophyrium.png b/assets/hbm/textures/items/ingot_celneutronophyrium.png new file mode 100644 index 000000000..a277ff976 Binary files /dev/null and b/assets/hbm/textures/items/ingot_celneutronophyrium.png differ diff --git a/assets/hbm/textures/items/ingot_tetraneutronium.png b/assets/hbm/textures/items/ingot_tetraneutronium.png new file mode 100644 index 000000000..d962d79c9 Binary files /dev/null and b/assets/hbm/textures/items/ingot_tetraneutronium.png differ diff --git a/assets/hbm/textures/items/jetpack_boost.png b/assets/hbm/textures/items/jetpack_boost.png new file mode 100644 index 000000000..b5b5ad048 Binary files /dev/null and b/assets/hbm/textures/items/jetpack_boost.png differ diff --git a/assets/hbm/textures/items/jetpack_break.png b/assets/hbm/textures/items/jetpack_break.png new file mode 100644 index 000000000..817032141 Binary files /dev/null and b/assets/hbm/textures/items/jetpack_break.png differ diff --git a/assets/hbm/textures/items/jetpack_fly.png b/assets/hbm/textures/items/jetpack_fly.png new file mode 100644 index 000000000..b83c54718 Binary files /dev/null and b/assets/hbm/textures/items/jetpack_fly.png differ diff --git a/assets/hbm/textures/items/jetpack_hover.png b/assets/hbm/textures/items/jetpack_hover.png new file mode 100644 index 000000000..9e69402de Binary files /dev/null and b/assets/hbm/textures/items/jetpack_hover.png differ diff --git a/assets/hbm/textures/items/ore_cluster_tikite_alt.png b/assets/hbm/textures/items/ore_cluster_tikite_alt.png new file mode 100644 index 000000000..3a68d2046 Binary files /dev/null and b/assets/hbm/textures/items/ore_cluster_tikite_alt.png differ diff --git a/assets/hbm/textures/items/powder_dineutronium.png b/assets/hbm/textures/items/powder_dineutronium.png new file mode 100644 index 000000000..2f6ee9fbc Binary files /dev/null and b/assets/hbm/textures/items/powder_dineutronium.png differ diff --git a/assets/hbm/textures/items/powder_magic.png b/assets/hbm/textures/items/powder_magic.png new file mode 100644 index 000000000..94e50a7ca Binary files /dev/null and b/assets/hbm/textures/items/powder_magic.png differ diff --git a/assets/hbm/textures/items/powder_yellowcake.png b/assets/hbm/textures/items/powder_yellowcake.png new file mode 100644 index 000000000..be32a231a Binary files /dev/null and b/assets/hbm/textures/items/powder_yellowcake.png differ diff --git a/assets/hbm/textures/models/JetPack.png b/assets/hbm/textures/models/JetPack.png new file mode 100644 index 000000000..14b638c26 Binary files /dev/null and b/assets/hbm/textures/models/JetPack.png differ diff --git a/assets/hbm/textures/models/JetPackBlue.png b/assets/hbm/textures/models/JetPackBlue.png new file mode 100644 index 000000000..dd1eb59c3 Binary files /dev/null and b/assets/hbm/textures/models/JetPackBlue.png differ diff --git a/assets/hbm/textures/models/JetPackPurple.png b/assets/hbm/textures/models/JetPackPurple.png new file mode 100644 index 000000000..c1d0faf6f Binary files /dev/null and b/assets/hbm/textures/models/JetPackPurple.png differ diff --git a/assets/hbm/textures/models/JetPackRed.png b/assets/hbm/textures/models/JetPackRed.png new file mode 100644 index 000000000..ec06b6d3e Binary files /dev/null and b/assets/hbm/textures/models/JetPackRed.png differ diff --git a/assets/hbm/textures/models/ams_base.png b/assets/hbm/textures/models/ams_base.png index 069d857a0..0bc8b2ac9 100644 Binary files a/assets/hbm/textures/models/ams_base.png and b/assets/hbm/textures/models/ams_base.png differ diff --git a/assets/hbm/textures/models/ams_destroyed.png b/assets/hbm/textures/models/ams_destroyed.png new file mode 100644 index 000000000..2160120ae Binary files /dev/null and b/assets/hbm/textures/models/ams_destroyed.png differ diff --git a/assets/hbm/textures/models/ams_emitter.png b/assets/hbm/textures/models/ams_emitter.png index eeb2583d5..3f0781cb8 100644 Binary files a/assets/hbm/textures/models/ams_emitter.png and b/assets/hbm/textures/models/ams_emitter.png differ diff --git a/assets/hbm/textures/models/ams_limiter.png b/assets/hbm/textures/models/ams_limiter.png index 931c7e57c..16533c720 100644 Binary files a/assets/hbm/textures/models/ams_limiter.png and b/assets/hbm/textures/models/ams_limiter.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index c5af8a955..c75812ea1 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -75,6 +75,7 @@ public class ModBlocks { public static Block ore_oil; public static Block ore_oil_empty; + public static Block ore_oil_sand; public static Block ore_tikite; @@ -99,6 +100,7 @@ public class ModBlocks { public static Block block_magnetized_tungsten; public static Block block_combine_steel; public static Block block_desh; + public static Block block_yellowcake; public static Block block_australium; public static Block block_weidanium; @@ -264,6 +266,8 @@ public class ModBlocks { public static Block gas_duct; public static Block fluid_duct; + public static Block machine_transformer; + public static Block bomb_multi_large; public static final int guiID_bomb_multi_large = 18; @@ -514,6 +518,7 @@ public class ModBlocks { ore_oil = new BlockOre(Material.rock).setBlockName("ore_oil").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil"); ore_oil_empty = new BlockGeneric(Material.rock).setBlockName("ore_oil_empty").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_empty"); + ore_oil_sand = new BlockGeneric(Material.sand).setBlockName("ore_oil_sand").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeSand).setHardness(0.5F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_sand_alt"); ore_tikite = new BlockGeneric(Material.rock).setBlockName("ore_tikite").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_tikite_alt"); @@ -539,6 +544,7 @@ public class ModBlocks { block_magnetized_tungsten = new BlockGeneric(Material.iron).setBlockName("block_magnetized_tungsten").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(35.0F).setBlockTextureName(RefStrings.MODID + ":block_magnetized_tungsten"); block_combine_steel = new BlockGeneric(Material.iron).setBlockName("block_combine_steel").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_combine_steel"); block_desh = new BlockGeneric(Material.iron).setBlockName("block_desh").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_desh"); + block_yellowcake = new BlockFalling(Material.sand).setBlockName("block_yellowcake").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeSand).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_yellowcake"); block_australium = new BlockGeneric(Material.iron).setBlockName("block_australium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_australium"); block_weidanium = new BlockGeneric(Material.iron).setBlockName("block_weidanium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_weidanium"); @@ -674,6 +680,8 @@ public class ModBlocks { gas_duct_solid = new GasDuctSolid(Material.iron).setBlockName("gas_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":gas_duct_solid"); gas_duct = new BlockGasDuct(Material.iron).setBlockName("gas_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":gas_duct_icon"); fluid_duct = new BlockFluidDuct(Material.iron).setBlockName("fluid_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":fluid_duct_icon"); + + machine_transformer = new MachineTransformer(Material.iron).setBlockName("machine_transformer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_transformer"); factory_titanium_hull = new BlockGeneric(Material.iron).setBlockName("factory_titanium_hull").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":factory_titanium_hull"); factory_titanium_furnace = new FactoryHatch(Material.iron).setBlockName("factory_titanium_furnace").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":factory_titanium_furnace"); @@ -855,6 +863,7 @@ public class ModBlocks { GameRegistry.registerBlock(ore_lead, ore_lead.getUnlocalizedName()); GameRegistry.registerBlock(ore_oil, ore_oil.getUnlocalizedName()); GameRegistry.registerBlock(ore_oil_empty, ore_oil_empty.getUnlocalizedName()); + GameRegistry.registerBlock(ore_oil_sand, ore_oil_sand.getUnlocalizedName()); GameRegistry.registerBlock(ore_schrabidium, ItemSchrabidiumBlock.class, ore_schrabidium.getUnlocalizedName()); //Rare Minerals @@ -891,6 +900,7 @@ public class ModBlocks { GameRegistry.registerBlock(block_beryllium, block_beryllium.getUnlocalizedName()); GameRegistry.registerBlock(block_steel, block_steel.getUnlocalizedName()); GameRegistry.registerBlock(block_lead, block_lead.getUnlocalizedName()); + GameRegistry.registerBlock(block_yellowcake, block_yellowcake.getUnlocalizedName()); GameRegistry.registerBlock(block_scrap, block_scrap.getUnlocalizedName()); GameRegistry.registerBlock(block_electrical_scrap, block_electrical_scrap.getUnlocalizedName()); GameRegistry.registerBlock(block_trinitite, block_trinitite.getUnlocalizedName()); @@ -1045,6 +1055,7 @@ public class ModBlocks { GameRegistry.registerBlock(gas_duct_solid, gas_duct_solid.getUnlocalizedName()); GameRegistry.registerBlock(fluid_duct, fluid_duct.getUnlocalizedName()); GameRegistry.registerBlock(machine_battery, machine_battery.getUnlocalizedName()); + GameRegistry.registerBlock(machine_transformer, machine_transformer.getUnlocalizedName()); GameRegistry.registerBlock(machine_converter_he_rf, machine_converter_he_rf.getUnlocalizedName()); GameRegistry.registerBlock(machine_converter_rf_he, machine_converter_rf_he.getUnlocalizedName()); GameRegistry.registerBlock(machine_electric_furnace_off, machine_electric_furnace_off.getUnlocalizedName()); diff --git a/com/hbm/blocks/machine/MachineTransformer.java b/com/hbm/blocks/machine/MachineTransformer.java new file mode 100644 index 000000000..c48f70587 --- /dev/null +++ b/com/hbm/blocks/machine/MachineTransformer.java @@ -0,0 +1,44 @@ +package com.hbm.blocks.machine; + +import com.hbm.blocks.ModBlocks; +import com.hbm.lib.RefStrings; +import com.hbm.tileentity.machine.TileEntityMachineTransformer; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class MachineTransformer extends BlockContainer { + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + + public MachineTransformer(Material p_i45394_1_) { + super(p_i45394_1_); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_top"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) { + return side == 1 ? this.iconTop : (side == 0 ? this.iconTop : this.blockIcon); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileEntityMachineTransformer(); + } +} diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index 029fc4ec0..1344d91e8 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -3789,8 +3789,12 @@ public class MachineRecipes { case BP_BIOGAS: list.add(new ItemStack(ModItems.biomass, 16)); break; - case UF6: + case YELLOWCAKE: list.add(new ItemStack(ModItems.powder_uranium, 1)); + list.add(new ItemStack(ModItems.sulfur, 2)); + break; + case UF6: + list.add(new ItemStack(ModItems.powder_yellowcake, 1)); list.add(new ItemStack(ModItems.fluorite, 3)); break; case PUF6: @@ -3804,6 +3808,9 @@ public class MachineRecipes { case NITAN: list.add(new ItemStack(ModItems.powder_nitan_mix, 2)); break; + case OIL_SAND: + list.add(new ItemStack(ModBlocks.ore_oil_sand, 16)); + break; default: break; } @@ -3841,6 +3848,10 @@ public class MachineRecipes { input[0] = new FluidStack(800, FluidType.RECLAIMED); input[1] = new FluidStack(200, FluidType.LUBRICANT); break; + case FC_BITUMEN: + input[0] = new FluidStack(1200, FluidType.BITUMEN); + input[1] = new FluidStack(2400, FluidType.STEAM); + break; case FC_I_NAPHTHA: input[0] = new FluidStack(1400, FluidType.SMEAR); input[1] = new FluidStack(800, FluidType.WATER); @@ -3954,6 +3965,9 @@ public class MachineRecipes { case BP_BIOFUEL: input[0] = new FluidStack(2000, FluidType.BIOGAS); break; + case YELLOWCAKE: + input[0] = new FluidStack(500, FluidType.ACID); + break; case UF6: input[0] = new FluidStack(1000, FluidType.WATER); break; @@ -3966,6 +3980,9 @@ public class MachineRecipes { case NITAN: input[0] = new FluidStack(600, FluidType.KEROSENE); break; + case OIL_SAND: + input[0] = new FluidStack(400, FluidType.BITUMEN); + break; default: break; } @@ -4059,6 +4076,9 @@ public class MachineRecipes { case POLYMER: output[0] = new ItemStack(ModItems.ingot_polymer, 1); break; + case YELLOWCAKE: + output[0] = new ItemStack(ModItems.powder_yellowcake, 1); + break; default: break; } @@ -4096,6 +4116,10 @@ public class MachineRecipes { case FR_PETROIL: input[0] = new FluidStack(1000, FluidType.PETROIL); break; + case FC_BITUMEN: + input[0] = new FluidStack(1000, FluidType.OIL); + input[1] = new FluidStack(200, FluidType.PETROLEUM); + break; case FC_I_NAPHTHA: input[0] = new FluidStack(800, FluidType.NAPHTHA); break; @@ -4153,6 +4177,9 @@ public class MachineRecipes { case NITAN: input[0] = new FluidStack(1000, FluidType.NITAN); break; + case OIL_SAND: + input[0] = new FluidStack(1000, FluidType.BITUMEN); + break; default: break; } diff --git a/com/hbm/inventory/container/ContainerAMSBase.java b/com/hbm/inventory/container/ContainerAMSBase.java index 1e265a2ed..7882a24b9 100644 --- a/com/hbm/inventory/container/ContainerAMSBase.java +++ b/com/hbm/inventory/container/ContainerAMSBase.java @@ -15,14 +15,10 @@ public class ContainerAMSBase extends Container { private TileEntityAMSBase amsBase; private int heat; - private int field; - private int efficiency; private int warning; private int mode; public ContainerAMSBase(InventoryPlayer invPlayer, TileEntityAMSBase tedf) { - field = 0; - efficiency = 0; amsBase = tedf; //Cool 1 In @@ -114,21 +110,11 @@ private TileEntityAMSBase amsBase; par1.sendProgressBarUpdate(this, 0, this.amsBase.heat); } - if(this.efficiency != this.amsBase.efficiency) - { - par1.sendProgressBarUpdate(this, 1, this.amsBase.efficiency); - } - if(this.warning != this.amsBase.warning) { par1.sendProgressBarUpdate(this, 2, this.amsBase.warning); } - if(this.field != this.amsBase.field) - { - par1.sendProgressBarUpdate(this, 3, this.amsBase.field); - } - if(this.mode != this.amsBase.mode) { par1.sendProgressBarUpdate(this, 4, this.amsBase.mode); @@ -136,8 +122,6 @@ private TileEntityAMSBase amsBase; } this.heat = this.amsBase.heat; - this.field = this.amsBase.field; - this.efficiency = this.amsBase.efficiency; this.warning = this.amsBase.warning; this.mode = this.amsBase.mode; } diff --git a/com/hbm/inventory/container/ContainerAMSEmitter.java b/com/hbm/inventory/container/ContainerAMSEmitter.java index b599c33d7..84e03ccc1 100644 --- a/com/hbm/inventory/container/ContainerAMSEmitter.java +++ b/com/hbm/inventory/container/ContainerAMSEmitter.java @@ -15,11 +15,9 @@ public class ContainerAMSEmitter extends Container { private TileEntityAMSEmitter amsEmitter; private int heat; - private int efficiency; private int warning; public ContainerAMSEmitter(InventoryPlayer invPlayer, TileEntityAMSEmitter tedf) { - efficiency = 0; amsEmitter = tedf; //Fluid In @@ -96,11 +94,6 @@ private TileEntityAMSEmitter amsEmitter; par1.sendProgressBarUpdate(this, 0, this.amsEmitter.heat); } - if(this.efficiency != this.amsEmitter.efficiency) - { - par1.sendProgressBarUpdate(this, 1, this.amsEmitter.efficiency); - } - if(this.warning != this.amsEmitter.warning) { par1.sendProgressBarUpdate(this, 2, this.amsEmitter.warning); @@ -108,7 +101,6 @@ private TileEntityAMSEmitter amsEmitter; } this.heat = this.amsEmitter.heat; - this.efficiency = this.amsEmitter.efficiency; this.warning = this.amsEmitter.warning; } @@ -118,10 +110,6 @@ private TileEntityAMSEmitter amsEmitter; { amsEmitter.heat = j; } - if(i == 1) - { - amsEmitter.efficiency = j; - } if(i == 2) { amsEmitter.warning = j; diff --git a/com/hbm/inventory/container/ContainerAMSLimiter.java b/com/hbm/inventory/container/ContainerAMSLimiter.java index 501c4d3a8..81b734f9a 100644 --- a/com/hbm/inventory/container/ContainerAMSLimiter.java +++ b/com/hbm/inventory/container/ContainerAMSLimiter.java @@ -16,12 +16,10 @@ public class ContainerAMSLimiter extends Container { private TileEntityAMSLimiter amsLmiter; private int heat; - private int efficiency; private int warning; private int mode; public ContainerAMSLimiter(InventoryPlayer invPlayer, TileEntityAMSLimiter tedf) { - efficiency = 0; amsLmiter = tedf; //Fluid In @@ -98,11 +96,6 @@ private TileEntityAMSLimiter amsLmiter; par1.sendProgressBarUpdate(this, 0, this.amsLmiter.heat); } - if(this.efficiency != this.amsLmiter.efficiency) - { - par1.sendProgressBarUpdate(this, 1, this.amsLmiter.efficiency); - } - if(this.warning != this.amsLmiter.warning) { par1.sendProgressBarUpdate(this, 2, this.amsLmiter.warning); @@ -115,7 +108,6 @@ private TileEntityAMSLimiter amsLmiter; } this.heat = this.amsLmiter.heat; - this.efficiency = this.amsLmiter.efficiency; this.warning = this.amsLmiter.warning; this.mode = this.amsLmiter.mode; } @@ -126,10 +118,6 @@ private TileEntityAMSLimiter amsLmiter; { amsLmiter.heat = j; } - if(i == 1) - { - amsLmiter.efficiency = j; - } if(i == 2) { amsLmiter.warning = j; diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 541eed93f..2bcd6d6f1 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -92,6 +92,7 @@ public class ModItems { public static Item nugget_desh; public static Item ingot_dineutronium; public static Item nugget_dineutronium; + public static Item powder_dineutronium; public static Item nugget_uranium; public static Item nugget_u235; @@ -211,6 +212,8 @@ public class ModItems { public static Item powder_desh_mix; public static Item powder_nitan_mix; public static Item powder_spark_mix; + public static Item powder_yellowcake; + public static Item powder_magic; public static Item fragment_neodymium; public static Item fragment_cobalt; @@ -249,6 +252,8 @@ public class ModItems { public static Item magnet_dee; public static Item magnet_circular; public static Item cyclotron_tower; + public static Item component_limiter; + public static Item component_emitter; public static Item circuit_raw; public static Item circuit_aluminium; @@ -398,13 +403,26 @@ public class ModItems { public static Item ams_catalyst_cerium; public static Item ams_catalyst_cobalt; public static Item ams_catalyst_copper; + public static Item ams_catalyst_dineutronium; public static Item ams_catalyst_euphemium; public static Item ams_catalyst_iron; public static Item ams_catalyst_lithium; public static Item ams_catalyst_niobium; + public static Item ams_catalyst_schrabidium; public static Item ams_catalyst_strontium; public static Item ams_catalyst_thorium; public static Item ams_catalyst_tungsten; + + public static Item ams_focus_blank; + public static Item ams_focus_limiter; + public static Item ams_focus_booster; + + public static Item ams_muzzle; + + public static Item ams_core_sing; + public static Item ams_core_wormhole; + public static Item ams_core_eyeofharmony; + public static Item ams_core_thingy; public static Item cell_empty; public static Item cell_uf6; @@ -469,6 +487,7 @@ public class ModItems { public static Item can_redbomb; public static Item can_mrsugar; public static Item can_overcharge; + public static Item can_luna; public static Item bottle_empty; public static Item bottle_nuka; public static Item bottle_cherry; @@ -812,10 +831,6 @@ public class ModItems { public static Item factory_core_titanium; public static Item factory_core_advanced; - public static Item ams_focus_blank; - public static Item ams_focus_limiter; - public static Item ams_focus_booster; - public static Item upgrade_template; public static Item upgrade_speed_1; public static Item upgrade_speed_2; @@ -887,6 +902,9 @@ public class ModItems { public static Item australium_iv; public static Item australium_v; + public static Item jetpack_boost; + public static Item jetpack_fly; + public static Item schrabidium_sword; public static Item schrabidium_pickaxe; public static Item schrabidium_axe; @@ -1209,6 +1227,7 @@ public class ModItems { nugget_desh = new ItemCustomLore().setUnlocalizedName("nugget_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_desh"); ingot_dineutronium = new ItemCustomLore().setUnlocalizedName("ingot_dineutronium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_dineutronium"); nugget_dineutronium = new ItemCustomLore().setUnlocalizedName("nugget_dineutronium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_dineutronium"); + powder_dineutronium = new ItemCustomLore().setUnlocalizedName("powder_dineutronium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_dineutronium"); ingot_lanthanium = new ItemCustomLore().setUnlocalizedName("ingot_lanthanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_lanthanium"); ingot_actinium = new ItemCustomLore().setUnlocalizedName("ingot_actinium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_actinium"); @@ -1313,6 +1332,8 @@ public class ModItems { powder_lanthanium_tiny = new Item().setUnlocalizedName("powder_lanthanium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lanthanium_tiny"); powder_actinium_tiny = new Item().setUnlocalizedName("powder_actinium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_actinium_tiny"); powder_meteorite_tiny = new Item().setUnlocalizedName("powder_meteorite_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_meteorite_tiny"); + powder_yellowcake = new ItemRadioactive().setUnlocalizedName("powder_yellowcake").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_yellowcake"); + powder_magic = new Item().setUnlocalizedName("powder_magic").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_magic"); fragment_neodymium = new Item().setUnlocalizedName("fragment_neodymium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fragment_neodymium"); fragment_cobalt = new Item().setUnlocalizedName("fragment_cobalt").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fragment_cobalt"); @@ -1349,6 +1370,8 @@ public class ModItems { magnet_circular = new Item().setUnlocalizedName("magnet_circular").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":magnet_circular"); cyclotron_tower = new Item().setUnlocalizedName("cyclotron_tower").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":cyclotron_tower"); pellet_coal = new Item().setUnlocalizedName("pellet_coal").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":pellet_coal"); + component_limiter = new Item().setUnlocalizedName("component_limiter").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":component_limiter"); + component_emitter = new Item().setUnlocalizedName("component_emitter").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":component_emitter"); cap_aluminium = new Item().setUnlocalizedName("cap_aluminium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":cap_aluminium"); hull_small_steel = new Item().setUnlocalizedName("hull_small_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":hull_small_steel"); @@ -1439,19 +1462,21 @@ public class ModItems { rune_thurisaz = new ItemCustomLore().setUnlocalizedName("rune_thurisaz").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_thurisaz"); ams_catalyst_blank = new Item().setUnlocalizedName("ams_catalyst_blank").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_blank"); - ams_catalyst_aluminium = new ItemCatalyst(0xCCCCCC).setUnlocalizedName("ams_catalyst_aluminium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_aluminium"); - ams_catalyst_beryllium = new ItemCatalyst(0x97978B).setUnlocalizedName("ams_catalyst_beryllium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_beryllium"); - ams_catalyst_caesium = new ItemCatalyst(0x6400FF).setUnlocalizedName("ams_catalyst_caesium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_caesium"); - ams_catalyst_cerium = new ItemCatalyst(0x1D3FFF).setUnlocalizedName("ams_catalyst_cerium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_cerium"); - ams_catalyst_cobalt = new ItemCatalyst(0x789BBE).setUnlocalizedName("ams_catalyst_cobalt").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_cobalt"); - ams_catalyst_copper = new ItemCatalyst(0xAADE29).setUnlocalizedName("ams_catalyst_copper").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_copper"); - ams_catalyst_euphemium = new ItemCatalyst(0xFF9CD2).setUnlocalizedName("ams_catalyst_euphemium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_euphemium"); - ams_catalyst_iron = new ItemCatalyst(0xFF7E22).setUnlocalizedName("ams_catalyst_iron").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_iron"); - ams_catalyst_lithium = new ItemCatalyst(0xFF2727).setUnlocalizedName("ams_catalyst_lithium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_lithium"); - ams_catalyst_niobium = new ItemCatalyst(0x3BF1B6).setUnlocalizedName("ams_catalyst_niobium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_niobium"); - ams_catalyst_strontium = new ItemCatalyst(0xDD0D35).setUnlocalizedName("ams_catalyst_strontium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_strontium"); - ams_catalyst_thorium = new ItemCatalyst(0x653B22).setUnlocalizedName("ams_catalyst_thorium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_thorium"); - ams_catalyst_tungsten = new ItemCatalyst(0xF5FF48).setUnlocalizedName("ams_catalyst_tungsten").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_tungsten"); + ams_catalyst_aluminium = new ItemCatalyst(0xCCCCCC, 1000000, 1.15F, 0.85F, 1.0F).setUnlocalizedName("ams_catalyst_aluminium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_aluminium"); + ams_catalyst_beryllium = new ItemCatalyst(0x97978B, 0, 1.25F, 0.95F, 1.0F).setUnlocalizedName("ams_catalyst_beryllium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_beryllium"); + ams_catalyst_caesium = new ItemCatalyst(0x6400FF, 2500000, 1.0F, 0.85F, 1.0F).setUnlocalizedName("ams_catalyst_caesium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_caesium"); + ams_catalyst_cerium = new ItemCatalyst(0x1D3FFF, 1000000, 1.15F, 1.15F, 1.0F).setUnlocalizedName("ams_catalyst_cerium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_cerium"); + ams_catalyst_cobalt = new ItemCatalyst(0x789BBE, 0, 1.25F, 1.05F, 1.0F).setUnlocalizedName("ams_catalyst_cobalt").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_cobalt"); + ams_catalyst_copper = new ItemCatalyst(0xAADE29, 0, 1.25F, 1.0F, 1.0F).setUnlocalizedName("ams_catalyst_copper").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_copper"); + ams_catalyst_dineutronium = new ItemCatalyst(0x334077, 2500000, 1.0F, 1.15F, 1.0F).setUnlocalizedName("ams_catalyst_dineutronium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_dineutronium"); + ams_catalyst_euphemium = new ItemCatalyst(0xFF9CD2, 2500000, 1.0F, 1.0F, 1.0F).setUnlocalizedName("ams_catalyst_euphemium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_euphemium"); + ams_catalyst_iron = new ItemCatalyst(0xFF7E22, 1000000, 1.15F, 0.95F, 1.0F).setUnlocalizedName("ams_catalyst_iron").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_iron"); + ams_catalyst_lithium = new ItemCatalyst(0xFF2727, 0, 1.25F, 0.85F, 1.0F).setUnlocalizedName("ams_catalyst_lithium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_lithium"); + ams_catalyst_niobium = new ItemCatalyst(0x3BF1B6, 1000000, 1.15F, 1.05F, 1.0F).setUnlocalizedName("ams_catalyst_niobium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_niobium"); + ams_catalyst_schrabidium = new ItemCatalyst(0x32FFFF, 2500000, 1.0F, 1.05F, 1.0F).setUnlocalizedName("ams_catalyst_schrabidium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_schrabidium"); + ams_catalyst_strontium = new ItemCatalyst(0xDD0D35, 1000000, 1.15F, 1.0F, 1.0F).setUnlocalizedName("ams_catalyst_strontium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_strontium"); + ams_catalyst_thorium = new ItemCatalyst(0x653B22, 2500000, 1.0F, 0.95F, 1.0F).setUnlocalizedName("ams_catalyst_thorium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_thorium"); + ams_catalyst_tungsten = new ItemCatalyst(0xF5FF48, 0, 1.25F, 1.15F, 1.0F).setUnlocalizedName("ams_catalyst_tungsten").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_tungsten"); cell_empty = new ItemCell().setUnlocalizedName("cell_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":cell_empty"); cell_uf6 = new Item().setUnlocalizedName("cell_uf6").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_uf6"); @@ -1553,6 +1578,7 @@ public class ModItems { can_redbomb = new ItemEnergy().setUnlocalizedName("can_redbomb").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":can_redbomb"); can_mrsugar = new ItemEnergy().setUnlocalizedName("can_mrsugar").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":can_mrsugar"); can_overcharge = new ItemEnergy().setUnlocalizedName("can_overcharge").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":can_overcharge"); + can_luna = new ItemEnergy().setUnlocalizedName("can_luna").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":can_luna"); bottle_empty = new Item().setUnlocalizedName("bottle_empty").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_empty"); bottle_nuka = new ItemEnergy().setUnlocalizedName("bottle_nuka").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_nuka"); bottle_cherry = new ItemEnergy().setUnlocalizedName("bottle_cherry").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_cherry"); @@ -1882,9 +1908,14 @@ public class ModItems { factory_core_titanium = new ItemBattery(70400).setUnlocalizedName("factory_core_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":factory_core_titanium"); factory_core_advanced = new ItemBattery(41600).setUnlocalizedName("factory_core_advanced").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":factory_core_advanced"); - ams_focus_blank = new ItemCustomLore().setUnlocalizedName("ams_focus_blank").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_focus_blank"); + ams_focus_blank = new Item().setUnlocalizedName("ams_focus_blank").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_focus_blank"); ams_focus_limiter = new ItemCustomLore().setUnlocalizedName("ams_focus_limiter").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_focus_limiter"); ams_focus_booster = new ItemCustomLore().setUnlocalizedName("ams_focus_booster").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_focus_booster"); + ams_muzzle = new ItemCustomLore().setUnlocalizedName("ams_muzzle").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_muzzle"); + ams_core_sing = new ItemAMSCore().setUnlocalizedName("ams_core_sing").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_core_sing"); + ams_core_wormhole = new ItemAMSCore().setUnlocalizedName("ams_core_wormhole").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_core_wormhole"); + ams_core_eyeofharmony = new ItemAMSCore().setUnlocalizedName("ams_core_eyeofharmony").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_core_eyeofharmony"); + ams_core_thingy = new ItemAMSCore().setUnlocalizedName("ams_core_thingy").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":ams_core_thingy"); upgrade_template = new ItemCustomLore().setUnlocalizedName("upgrade_template").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_template"); upgrade_speed_1 = new ItemCustomLore().setUnlocalizedName("upgrade_speed_1").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":upgrade_speed_1"); @@ -2081,6 +2112,9 @@ public class ModItems { australium_iii = new ArmorAustralium(MainRegistry.enumArmorMaterialAusIII, 9, 1).setUnlocalizedName("australium_iii").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iii"); australium_iv = new ArmorAustralium(MainRegistry.enumArmorMaterialAusIV, 9, 1).setUnlocalizedName("australium_iv").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iv"); australium_v = new ArmorAustralium(MainRegistry.enumArmorMaterialAusV, 9, 1).setUnlocalizedName("australium_v").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_v"); + + jetpack_boost = new JetpackBooster(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_boost").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost"); + jetpack_fly = new JetpackRegular(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_fly").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly"); cape_test = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_test").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_test"); cape_radiation = new ArmorModel(ArmorMaterial.CHAIN, 9, 1).setUnlocalizedName("cape_radiation").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_radiation"); @@ -2305,6 +2339,7 @@ public class ModItems { GameRegistry.registerItem(powder_aluminium, powder_aluminium.getUnlocalizedName()); GameRegistry.registerItem(powder_steel, powder_steel.getUnlocalizedName()); GameRegistry.registerItem(powder_lead, powder_lead.getUnlocalizedName()); + GameRegistry.registerItem(powder_yellowcake, powder_yellowcake.getUnlocalizedName()); GameRegistry.registerItem(powder_beryllium, powder_beryllium.getUnlocalizedName()); GameRegistry.registerItem(powder_dura_steel, powder_dura_steel.getUnlocalizedName()); GameRegistry.registerItem(powder_polymer, powder_polymer.getUnlocalizedName()); @@ -2331,11 +2366,14 @@ public class ModItems { GameRegistry.registerItem(powder_cerium, powder_cerium.getUnlocalizedName()); GameRegistry.registerItem(powder_lanthanium, powder_lanthanium.getUnlocalizedName()); GameRegistry.registerItem(powder_actinium, powder_actinium.getUnlocalizedName()); + GameRegistry.registerItem(powder_magic, powder_magic.getUnlocalizedName()); GameRegistry.registerItem(powder_desh_mix, powder_desh_mix.getUnlocalizedName()); GameRegistry.registerItem(powder_desh, powder_desh.getUnlocalizedName()); GameRegistry.registerItem(powder_nitan_mix, powder_nitan_mix.getUnlocalizedName()); GameRegistry.registerItem(powder_spark_mix, powder_spark_mix.getUnlocalizedName()); GameRegistry.registerItem(powder_meteorite, powder_meteorite.getUnlocalizedName()); + GameRegistry.registerItem(powder_euphemium, powder_euphemium.getUnlocalizedName()); + GameRegistry.registerItem(powder_dineutronium, powder_dineutronium.getUnlocalizedName()); GameRegistry.registerItem(dust, dust.getUnlocalizedName()); GameRegistry.registerItem(powder_lithium_tiny, powder_lithium_tiny.getUnlocalizedName()); GameRegistry.registerItem(powder_neodymium_tiny, powder_neodymium_tiny.getUnlocalizedName()); @@ -2345,7 +2383,6 @@ public class ModItems { GameRegistry.registerItem(powder_lanthanium_tiny, powder_lanthanium_tiny.getUnlocalizedName()); GameRegistry.registerItem(powder_actinium_tiny, powder_actinium_tiny.getUnlocalizedName()); GameRegistry.registerItem(powder_meteorite_tiny, powder_meteorite_tiny.getUnlocalizedName()); - GameRegistry.registerItem(powder_euphemium, powder_euphemium.getUnlocalizedName()); //Powders GameRegistry.registerItem(powder_fire, powder_fire.getUnlocalizedName()); @@ -2465,6 +2502,10 @@ public class ModItems { GameRegistry.registerItem(telepad, telepad.getUnlocalizedName()); GameRegistry.registerItem(entanglement_kit, entanglement_kit.getUnlocalizedName()); + //AMS Parts + GameRegistry.registerItem(component_limiter, component_limiter.getUnlocalizedName()); + GameRegistry.registerItem(component_emitter, component_emitter.getUnlocalizedName()); + //Bomb Parts GameRegistry.registerItem(cap_aluminium, cap_aluminium.getUnlocalizedName()); GameRegistry.registerItem(hull_small_steel, hull_small_steel.getUnlocalizedName()); @@ -2750,9 +2791,11 @@ public class ModItems { GameRegistry.registerItem(ams_catalyst_cobalt, ams_catalyst_cobalt.getUnlocalizedName()); GameRegistry.registerItem(ams_catalyst_copper, ams_catalyst_copper.getUnlocalizedName()); GameRegistry.registerItem(ams_catalyst_euphemium, ams_catalyst_euphemium.getUnlocalizedName()); + GameRegistry.registerItem(ams_catalyst_dineutronium, ams_catalyst_dineutronium.getUnlocalizedName()); GameRegistry.registerItem(ams_catalyst_iron, ams_catalyst_iron.getUnlocalizedName()); GameRegistry.registerItem(ams_catalyst_lithium, ams_catalyst_lithium.getUnlocalizedName()); GameRegistry.registerItem(ams_catalyst_niobium, ams_catalyst_niobium.getUnlocalizedName()); + GameRegistry.registerItem(ams_catalyst_schrabidium, ams_catalyst_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(ams_catalyst_strontium, ams_catalyst_strontium.getUnlocalizedName()); GameRegistry.registerItem(ams_catalyst_thorium, ams_catalyst_thorium.getUnlocalizedName()); GameRegistry.registerItem(ams_catalyst_tungsten, ams_catalyst_tungsten.getUnlocalizedName()); @@ -2775,6 +2818,11 @@ public class ModItems { GameRegistry.registerItem(ams_focus_blank, ams_focus_blank.getUnlocalizedName()); GameRegistry.registerItem(ams_focus_limiter, ams_focus_limiter.getUnlocalizedName()); GameRegistry.registerItem(ams_focus_booster, ams_focus_booster.getUnlocalizedName()); + GameRegistry.registerItem(ams_muzzle, ams_muzzle.getUnlocalizedName()); + GameRegistry.registerItem(ams_core_sing, ams_core_sing.getUnlocalizedName()); + GameRegistry.registerItem(ams_core_wormhole, ams_core_wormhole.getUnlocalizedName()); + GameRegistry.registerItem(ams_core_eyeofharmony, ams_core_eyeofharmony.getUnlocalizedName()); + GameRegistry.registerItem(ams_core_thingy, ams_core_thingy.getUnlocalizedName()); //Fuel Rods GameRegistry.registerItem(rod_empty, rod_empty.getUnlocalizedName()); @@ -3151,6 +3199,7 @@ public class ModItems { GameRegistry.registerItem(can_redbomb, can_redbomb.getUnlocalizedName()); GameRegistry.registerItem(can_mrsugar, can_mrsugar.getUnlocalizedName()); GameRegistry.registerItem(can_overcharge, can_overcharge.getUnlocalizedName()); + GameRegistry.registerItem(can_luna, can_luna.getUnlocalizedName()); //Cola GameRegistry.registerItem(bottle_empty, bottle_empty.getUnlocalizedName()); @@ -3269,6 +3318,8 @@ public class ModItems { GameRegistry.registerItem(watch, watch.getUnlocalizedName()); GameRegistry.registerItem(mask_of_infamy, mask_of_infamy.getUnlocalizedName()); GameRegistry.registerItem(australium_iii, australium_iii.getUnlocalizedName()); + GameRegistry.registerItem(jetpack_boost, jetpack_boost.getUnlocalizedName()); + GameRegistry.registerItem(jetpack_fly, jetpack_fly.getUnlocalizedName()); //GameRegistry.registerItem(australium_iv, australium_iv.getUnlocalizedName()); //GameRegistry.registerItem(australium_v, australium_v.getUnlocalizedName()); diff --git a/com/hbm/items/food/ItemEnergy.java b/com/hbm/items/food/ItemEnergy.java index 8f07d0675..e678bffcc 100644 --- a/com/hbm/items/food/ItemEnergy.java +++ b/com/hbm/items/food/ItemEnergy.java @@ -58,6 +58,13 @@ public class ItemEnergy extends Item { p_77654_3_.addPotionEffect(new PotionEffect(Potion.resistance.id, 30 * 20, 2)); p_77654_3_.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 30 * 20, 0)); } + if(this == ModItems.can_luna) + { + p_77654_3_.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 30 * 20, 1)); + p_77654_3_.addPotionEffect(new PotionEffect(Potion.resistance.id, 30 * 20, 2)); + p_77654_3_.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 30 * 20, 1)); + p_77654_3_.addPotionEffect(new PotionEffect(Potion.regeneration.id, 30 * 20, 2)); + } if(this == ModItems.chocolate_milk) { ExplosionLarge.explode(p_77654_2_, p_77654_3_.posX, p_77654_3_.posY, p_77654_3_.posZ, 50, true, false, false); @@ -121,7 +128,9 @@ public class ItemEnergy extends Item { if (!p_77654_3_.capabilities.isCreativeMode && this != ModItems.chocolate_milk) { - if(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart) { + if(this == ModItems.can_creature || this == ModItems.can_mrsugar || + this == ModItems.can_overcharge || this == ModItems.can_redbomb || + this == ModItems.can_smart || this == ModItems.can_luna) { p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.ring_pull)); if (p_77654_1_.stackSize <= 0) { @@ -200,7 +209,10 @@ public class ItemEnergy extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart || this == ModItems.chocolate_milk)) + if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || + this == ModItems.can_overcharge || this == ModItems.can_redbomb || + this == ModItems.can_smart || this == ModItems.chocolate_milk || + this == ModItems.can_luna)) if(!p_77659_3_.inventory.hasItem(ModItems.bottle_opener)) return p_77659_1_; @@ -233,6 +245,10 @@ public class ItemEnergy extends Item { { list.add("Possible side effects include heart attacks, seizures or zombification"); } + if(this == ModItems.can_luna) + { + list.add("Contains actual selenium and star metal. Tastes like night."); + } if(this == ModItems.chocolate_milk) { list.add("Regular chocolate milk. Safe to drink."); diff --git a/com/hbm/items/gear/JetpackBooster.java b/com/hbm/items/gear/JetpackBooster.java new file mode 100644 index 000000000..58f5b354b --- /dev/null +++ b/com/hbm/items/gear/JetpackBooster.java @@ -0,0 +1,110 @@ +package com.hbm.items.gear; + +import com.hbm.entity.particle.EntityGasFlameFX; +import com.hbm.items.ModItems; +import com.hbm.render.model.ModelGoggles; +import com.hbm.render.model.ModelJetPack; +import com.hbm.render.model.ModelOxygenMask; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +public class JetpackBooster extends ItemArmor { + + private ModelJetPack model; + + public JetpackBooster(ArmorMaterial p_i45325_1_, int p_i45325_2_, int p_i45325_3_) { + super(p_i45325_1_, p_i45325_2_, p_i45325_3_); + } + + + @Override + public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) { + return armorType == 1; + } + + @Override + @SideOnly(Side.CLIENT) + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { + if (armorSlot == 1) { + if (model == null) { + this.model = new ModelJetPack(); + } + return this.model; + } + + return null; + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return "hbm:textures/models/JetPack.png"; + } + + public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { + + if(player.isSneaking() && this.getBoost(stack) == 0 && this.getCooldown(stack) == 0) { + this.setBoost(stack, 15); + this.setCooldown(stack, 40); + } + + if(this.getBoost(stack) > 0) { + + Vec3 vec = Vec3.createVectorHelper(player.getLookVec().xCoord, 0, player.getLookVec().zCoord); + vec.normalize(); + player.motionY += 0.15; + + this.setBoost(stack, this.getBoost(stack) - 1); + EntityGasFlameFX fx = new EntityGasFlameFX(world); + fx.posX = player.posX - vec.xCoord; + fx.posY = player.posY - 1; + fx.posZ = player.posZ - vec.zCoord; + fx.motionY = -0.1; + world.spawnEntityInWorld(fx); + + if(player.motionY > 0) + player.fallDistance = 0; + } + + if(this.getCooldown(stack) > 0) + this.setCooldown(stack, this.getCooldown(stack) - 1); + } + + public void setBoost(ItemStack stack, int i) { + if(!stack.hasTagCompound()) + stack.stackTagCompound = new NBTTagCompound(); + + stack.stackTagCompound.setInteger("boost", i); + } + + public int getBoost(ItemStack stack) { + if(!stack.hasTagCompound()) + return 0; + + return stack.stackTagCompound.getInteger("boost"); + } + + public void setCooldown(ItemStack stack, int i) { + if(!stack.hasTagCompound()) + stack.stackTagCompound = new NBTTagCompound(); + + stack.stackTagCompound.setInteger("cool", i); + } + + public int getCooldown(ItemStack stack) { + if(!stack.hasTagCompound()) + return 0; + + return stack.stackTagCompound.getInteger("cool"); + } + +} diff --git a/com/hbm/items/gear/JetpackRegular.java b/com/hbm/items/gear/JetpackRegular.java new file mode 100644 index 000000000..5156529fe --- /dev/null +++ b/com/hbm/items/gear/JetpackRegular.java @@ -0,0 +1,72 @@ +package com.hbm.items.gear; + +import com.hbm.entity.particle.EntityGasFlameFX; +import com.hbm.items.ModItems; +import com.hbm.render.model.ModelGoggles; +import com.hbm.render.model.ModelJetPack; +import com.hbm.render.model.ModelOxygenMask; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +public class JetpackRegular extends ItemArmor { + + private ModelJetPack model; + + public JetpackRegular(ArmorMaterial p_i45325_1_, int p_i45325_2_, int p_i45325_3_) { + super(p_i45325_1_, p_i45325_2_, p_i45325_3_); + } + + + @Override + public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) { + return armorType == 1; + } + + @Override + @SideOnly(Side.CLIENT) + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { + if (armorSlot == 1) { + if (model == null) { + this.model = new ModelJetPack(); + } + return this.model; + } + + return null; + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return "hbm:textures/models/JetPackRed.png"; + } + + public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { + + if(player.isSneaking()) { + + Vec3 vec = Vec3.createVectorHelper(player.getLookVec().xCoord, 0, player.getLookVec().zCoord); + vec.normalize(); + player.motionY += 0.1; + + EntityGasFlameFX fx = new EntityGasFlameFX(world); + fx.posX = player.posX - vec.xCoord; + fx.posY = player.posY - 1; + fx.posZ = player.posZ - vec.zCoord; + fx.motionY = -0.1; + world.spawnEntityInWorld(fx); + + player.fallDistance = 0; + } + } + +} diff --git a/com/hbm/items/special/ItemAMSCore.java b/com/hbm/items/special/ItemAMSCore.java new file mode 100644 index 000000000..ac37eff97 --- /dev/null +++ b/com/hbm/items/special/ItemAMSCore.java @@ -0,0 +1,92 @@ +package com.hbm.items.special; + +import java.util.List; + +import com.hbm.items.ModItems; +import com.hbm.main.MainRegistry; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ItemAMSCore extends Item { + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { + + if (this == ModItems.ams_core_sing) { + list.add("A modified undefined state of spacetime"); + list.add("used to aid in inter-gluon fusion and"); + list.add("spacetime annihilation. Yes, this destroys"); + list.add("the universe itself, slowly but steadily,"); + list.add("but at least you can power your toaster with"); + list.add("this, so it's all good."); + } + + if (this == ModItems.ams_core_wormhole) { + list.add("A cloud of billions of nano-wormholes which"); + list.add("deliberately fail at tunneling matter from"); + list.add("another dimension, rather it converts all"); + list.add("that matter into pure energy. That means"); + list.add("you're actively contributing to the destruction"); + list.add("of another dimension, sucking it dry like a"); + list.add("juicebox."); + list.add("That dimension probably sucked, anyways. I"); + list.add("bet it was full of wasps or some crap, man,"); + list.add("I hate these things."); + } + + if (this == ModItems.ams_core_eyeofharmony) { + list.add("A star collapsing in on itself, mere nanoseconds"); + list.add("away from being turned into a black hole,"); + list.add("frozen in time. If I didn't know better I"); + list.add("would say this is some deep space magic"); + list.add("bullcrap some guy made up to sound intellectual."); + list.add("Probably Steve from accounting. You still owe me"); + list.add("ten bucks."); + } + + if (this == ModItems.ams_core_thingy) { + if(MainRegistry.polaroidID == 11) { + list.add("Yeah I'm not even gonna question that one."); + } else { + list.add("..."); + list.add("..."); + list.add("...am I even holding this right?"); + list.add("It's a small metal thing. I dunno where it's from"); + list.add("or what it does, maybe they found it on a"); + list.add("junkyard and sold it as some kind of antique"); + list.add("artifact. If it weren't for the fact that I can"); + list.add("actually stuff this into some great big laser"); + list.add("reactor thing, I'd probably bring it back to where"); + list.add("it belongs. In the trash."); + } + } + } + + @Override + public EnumRarity getRarity(ItemStack p_77613_1_) { + + if(this == ModItems.ams_core_thingy) + { + return EnumRarity.epic; + } + + return EnumRarity.uncommon; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack p_77636_1_) + { + if(this == ModItems.ams_core_thingy && MainRegistry.polaroidID == 11) + { + return true; + } + + return false; + } +} diff --git a/com/hbm/items/special/ItemCatalyst.java b/com/hbm/items/special/ItemCatalyst.java index 9d92e602f..9bf82cefb 100644 --- a/com/hbm/items/special/ItemCatalyst.java +++ b/com/hbm/items/special/ItemCatalyst.java @@ -1,17 +1,48 @@ package com.hbm.items.special; +import java.util.List; + +import com.hbm.items.ModItems; + +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class ItemCatalyst extends Item { - + int color; + int powerAbs; + float powerMod; + float heatMod; + float fuelMod; public ItemCatalyst(int color) { this.color = color; + this.powerAbs = 0; + this.powerMod = 1.0F; + this.heatMod = 1.0F; + this.fuelMod = 1.0F; + } + + public ItemCatalyst(int color, int powerAbs, float powerMod, float heatMod, float fuelMod) { + this.color = color; + this.powerAbs = powerAbs; + this.powerMod = powerMod; + this.heatMod = heatMod; + this.fuelMod = fuelMod; } public int getColor() { return this.color; } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) + { + list.add("Absolute Energy Bonus: " + powerAbs + "HE"); + list.add("Energy Modifier: " + (powerMod >= 1 ? "+" : "") + (Math.round(powerMod * 1000) * .10 - 100) + "%"); + list.add("Heat Modifier: " + (heatMod >= 1 ? "+" : "") + (Math.round(heatMod * 1000) * .10 - 100) + "%"); + list.add("Fuel Modifier: " + (fuelMod >= 1 ? "+" : "") + (Math.round(fuelMod * 1000) * .10 - 100) + "%"); + } } diff --git a/com/hbm/items/special/ItemCustomLore.java b/com/hbm/items/special/ItemCustomLore.java index 62d897002..6f9764038 100644 --- a/com/hbm/items/special/ItemCustomLore.java +++ b/com/hbm/items/special/ItemCustomLore.java @@ -561,6 +561,23 @@ public class ItemCustomLore extends ItemRadioactive { list.add("Enables dimension-shifting via"); list.add("beryllium-enhanced resource scanner."); } + + if(this == ModItems.ams_focus_limiter) + { + list.add("Maximum performance for restriction field:"); + list.add("Standard cooling, no energy bonus."); + } + + if(this == ModItems.ams_focus_booster) + { + list.add("Weaker restriction field and core energy injection:"); + list.add("More heat generation, extra energy."); + } + + if(this == ModItems.ams_muzzle) + { + list.add("...it emits an energy-beam thingy."); + } } @Override diff --git a/com/hbm/items/special/ItemGlitch.java b/com/hbm/items/special/ItemGlitch.java index 308484e40..1b8caebae 100644 --- a/com/hbm/items/special/ItemGlitch.java +++ b/com/hbm/items/special/ItemGlitch.java @@ -93,7 +93,7 @@ public class ItemGlitch extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_sparkle)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.geiger_counter)); - player.addChatMessage(new ChatComponentText("Congratz, you're the wasteland hero now, now throw yourself into some fire or something for this weird achievement. Get going already, I'm not even being paid to tell you this.")); + player.addChatMessage(new ChatComponentText("Congratz, you're the hero now, now throw yourself into some fire or something for this weird achievement. Get going already, I'm not even being paid to tell you this.")); break; case 14: player.inventory.dropAllItems(); diff --git a/com/hbm/items/special/ItemRadioactive.java b/com/hbm/items/special/ItemRadioactive.java index a3c7d7961..825b8f8b1 100644 --- a/com/hbm/items/special/ItemRadioactive.java +++ b/com/hbm/items/special/ItemRadioactive.java @@ -159,7 +159,8 @@ public class ItemRadioactive extends Item { this == ModItems.cell_tritium || this == ModItems.rod_tritium || this == ModItems.rod_dual_tritium || - this == ModItems.rod_quad_tritium) { + this == ModItems.rod_quad_tritium || + this == ModItems.powder_yellowcake) { living.addPotionEffect(new PotionEffect(Potion.poison.id, 5 * 20, 0)); } diff --git a/com/hbm/items/tool/ItemChemistryTemplate.java b/com/hbm/items/tool/ItemChemistryTemplate.java index 835bc5fe7..a288d54f8 100644 --- a/com/hbm/items/tool/ItemChemistryTemplate.java +++ b/com/hbm/items/tool/ItemChemistryTemplate.java @@ -31,6 +31,7 @@ public class ItemChemistryTemplate extends Item { FP_LIGHTOIL, FR_REOIL, FR_PETROIL, + FC_BITUMEN, FC_I_NAPHTHA, FC_GAS_PETROLEUM, FC_DIESEL_KEROSENE, @@ -57,6 +58,7 @@ public class ItemChemistryTemplate extends Item { SF_BIOFUEL, BP_BIOGAS, BP_BIOFUEL, + OIL_SAND, ASPHALT, COOLANT, DESH, @@ -67,6 +69,7 @@ public class ItemChemistryTemplate extends Item { POLYMER, DEUTERIUM, STEAM, + YELLOWCAKE, UF6, PUF6, SAS3; @@ -133,6 +136,10 @@ public class ItemChemistryTemplate extends Item { return 30; case FR_PETROIL: return 30; + case OIL_SAND: + return 200; + case FC_BITUMEN: + return 100; case FC_I_NAPHTHA: return 150; case FC_GAS_PETROLEUM: @@ -205,6 +212,8 @@ public class ItemChemistryTemplate extends Item { return 200; case BP_BIOFUEL: return 100; + case YELLOWCAKE: + return 250; case UF6: return 100; case PUF6: diff --git a/com/hbm/items/tool/ItemGeigerCounter.java b/com/hbm/items/tool/ItemGeigerCounter.java index ff3ad82f0..afc943c3e 100644 --- a/com/hbm/items/tool/ItemGeigerCounter.java +++ b/com/hbm/items/tool/ItemGeigerCounter.java @@ -102,16 +102,16 @@ public class ItemGeigerCounter extends Item { int i = 0; if(b == ModBlocks.waste_trinitite) { - i = 3; - } - if(b == ModBlocks.waste_trinitite_red) { - i = 3; - } - if(b == ModBlocks.ore_uranium) { i = 2; } + if(b == ModBlocks.waste_trinitite_red) { + i = 2; + } + if(b == ModBlocks.ore_uranium) { + i = 1; + } if(b == ModBlocks.ore_nether_plutonium) { - i = 15; + i = 10; } if(b == ModBlocks.block_trinitite) { i = 20; @@ -131,6 +131,9 @@ public class ItemGeigerCounter extends Item { if(b == ModBlocks.yellow_barrel) { i = 30; } + if(b == ModBlocks.block_yellowcake) { + i = 2; + } return i * level; } diff --git a/com/hbm/items/weapon/ItemClip.java b/com/hbm/items/weapon/ItemClip.java index 7e6374599..d88659e2c 100644 --- a/com/hbm/items/weapon/ItemClip.java +++ b/com/hbm/items/weapon/ItemClip.java @@ -1,5 +1,7 @@ package com.hbm.items.weapon; +import java.util.List; + import com.hbm.items.ModItems; import net.minecraft.entity.player.EntityPlayer; @@ -273,4 +275,13 @@ public class ItemClip extends Item { return stack; } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) + { + if(this == ModItems.ammo_container) + { + list.add("Gives ammo for all held weapons."); + } + } } diff --git a/com/hbm/lib/HbmWorldGen.java b/com/hbm/lib/HbmWorldGen.java index eb428852c..c28ff3f51 100644 --- a/com/hbm/lib/HbmWorldGen.java +++ b/com/hbm/lib/HbmWorldGen.java @@ -12,6 +12,7 @@ import com.hbm.world.Dud; import com.hbm.world.Factory; import com.hbm.world.LibraryDungeon; import com.hbm.world.OilBubble; +import com.hbm.world.OilSandBubble; import com.hbm.world.Radio01; import com.hbm.world.Relay; import com.hbm.world.Satellite; @@ -288,6 +289,17 @@ public class HbmWorldGen implements IWorldGenerator { } } } + if (biome == BiomeGenBase.desert) { + if (rand.nextInt(200) == 0) { + for (int a = 0; a < 1; a++) { + int x = i + rand.nextInt(16); + int z = j + rand.nextInt(16); + int y = world.getHeightValue(x, z); + + OilSandBubble.spawnOil(world, x, y, z, 15 + rand.nextInt(31)); + } + } + } if (rand.nextInt(MainRegistry.bunkerStructure) == 0) { int x = i + rand.nextInt(16); diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index 82c31f775..ec5713f21 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -724,14 +724,14 @@ public class Library { slots[index].setItemDamage(slots[index].getItemDamage() - 1); } else break; - /*if(slots[index] != null && slots[index].equals(ItemBattery.getFullBattery(ModItems.dynosphere_desh))) + if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_desh && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index])) slots[index] = new ItemStack(ModItems.dynosphere_desh_charged); - if(slots[index] != null && slots[index].equals(ItemBattery.getFullBattery(ModItems.dynosphere_schrabidium))) + if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_schrabidium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index])) slots[index] = new ItemStack(ModItems.dynosphere_schrabidium_charged); - if(slots[index] != null && slots[index].equals(ItemBattery.getFullBattery(ModItems.dynosphere_euphemium))) + if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_euphemium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index])) slots[index] = new ItemStack(ModItems.dynosphere_euphemium_charged); - if(slots[index] != null && slots[index].equals(ItemBattery.getFullBattery(ModItems.dynosphere_dineutronium))) - slots[index] = new ItemStack(ModItems.dynosphere_dineutronium_charged);*/ + if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_dineutronium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index])) + slots[index] = new ItemStack(ModItems.dynosphere_dineutronium_charged); return power; } diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index e4d814694..9d1460b31 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -120,6 +120,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_desh), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_desh }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_meteor_cobble), 1), new Object[] { "##", "##", '#', ModItems.fragment_meteorite }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_meteor_broken), 1), new Object[] { "###", "###", "###", '#', ModItems.fragment_meteorite }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_yellowcake), 1), new Object[] { "###", "###", "###", '#', ModItems.powder_yellowcake }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 1), new Object[] { "nuggetUranium235", "nuggetUranium235", "nuggetUranium235", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_plutonium_fuel, 1), new Object[] { "nuggetPlutonium238", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium240", "nuggetPlutonium240", "nuggetPlutonium240" })); @@ -156,6 +157,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.ingot_daffergon, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_daffergon) }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_verticium, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_verticium) }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_desh, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_desh) }); + GameRegistry.addRecipe(new ItemStack(ModItems.powder_yellowcake, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_yellowcake) }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_plutonium, 1), new Object[] { "###", "###", "###", '#', ModItems.nugget_plutonium }); GameRegistry.addRecipe(new ItemStack(ModItems.nugget_plutonium, 9), new Object[] { "#", '#', ModItems.ingot_plutonium }); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 9d9bf84bb..e894715ee 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -228,6 +228,7 @@ import com.hbm.tileentity.machine.TileEntityMachineSchrabidiumTransmutator; import com.hbm.tileentity.machine.TileEntityMachineShredder; import com.hbm.tileentity.machine.TileEntityMachineSiren; import com.hbm.tileentity.machine.TileEntityMachineTeleporter; +import com.hbm.tileentity.machine.TileEntityMachineTransformer; import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import com.hbm.tileentity.machine.TileEntityMachineUF6Tank; import com.hbm.tileentity.machine.TileEntityNukeFurnace; @@ -555,6 +556,7 @@ public class MainRegistry GameRegistry.registerTileEntity(TileEntityMachineSPP.class, "tileentity_spp"); GameRegistry.registerTileEntity(TileEntityTurretSpitfire.class, "tileentity_turret_spitfire"); GameRegistry.registerTileEntity(TileEntityMachineRadGen.class, "tileentity_radgen"); + GameRegistry.registerTileEntity(TileEntityMachineTransformer.class, "tileentity_transformer"); EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true); EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true); @@ -678,7 +680,7 @@ public class MainRegistry achievementCraftCentrifuge }));*/ achSacrifice = new Achievement("achievement.sacrifice", "sacrifice", 0, 0, ModItems.burnt_bark, null).initIndependentStat().setSpecial().registerStat(); - achImpossible = new Achievement("achievement.impossible", "impossible", 1, 0, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat(); + achImpossible = new Achievement("achievement.impossible", "impossible", 2, 0, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat(); AchievementPage.registerAchievementPage(new AchievementPage("NTM Achievements", new Achievement[]{ achSacrifice, @@ -802,6 +804,7 @@ public class MainRegistry OreDictionary.registerOre("dustActinium", ModItems.powder_actinium); OreDictionary.registerOre("dustDesh", ModItems.powder_desh); OreDictionary.registerOre("dustEuphemium", ModItems.powder_euphemium); + OreDictionary.registerOre("dustDineutronium", ModItems.powder_dineutronium); OreDictionary.registerOre("dustNeptunium", ModItems.powder_neptunium); OreDictionary.registerOre("dustIodine", ModItems.powder_iodine); @@ -943,6 +946,7 @@ public class MainRegistry recipes.overridePreSetRecipe(new ItemStack(ModItems.fragment_actinium), new ItemStack(ModItems.powder_actinium_tiny, 1)); recipes.overridePreSetRecipe(new ItemStack(ModItems.fragment_meteorite), new ItemStack(ModItems.powder_meteorite_tiny, 1)); recipes.overridePreSetRecipe(new ItemStack(ModBlocks.block_meteor), new ItemStack(ModItems.powder_meteorite, 10)); + recipes.overridePreSetRecipe(new ItemStack(Items.enchanted_book), new ItemStack(ModItems.powder_magic, 1)); recipes.PrintRecipes(); @@ -987,7 +991,7 @@ public class MainRegistry 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)); + FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_oil), new ItemStack(ModBlocks.ore_oil_empty), FluidType.OIL, 250)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 1), new ItemStack(ModItems.tank_waste, 1, 0), FluidType.WATZ, 8000)); FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 2), new ItemStack(ModItems.tank_waste, 1, 1), FluidType.WATZ, 8000)); diff --git a/com/hbm/main/NEIConfig.java b/com/hbm/main/NEIConfig.java index 8934de124..2a176ae35 100644 --- a/com/hbm/main/NEIConfig.java +++ b/com/hbm/main/NEIConfig.java @@ -67,6 +67,7 @@ public class NEIConfig implements IConfigureNEI { if(MainRegistry.polaroidID != 11) { API.hideItem(new ItemStack(ModItems.book_secret)); API.hideItem(new ItemStack(ModItems.burnt_bark)); + API.hideItem(new ItemStack(ModItems.ams_core_thingy)); } API.hideItem(new ItemStack(ModBlocks.dummy_block_assembler)); API.hideItem(new ItemStack(ModBlocks.dummy_block_centrifuge)); diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index c890497b2..1437b9a04 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -86,6 +86,7 @@ public class ResourceManager { public static final ResourceLocation ams_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_base.png"); public static final ResourceLocation ams_emitter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_emitter.png"); public static final ResourceLocation ams_limiter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_limiter.png"); + public static final ResourceLocation ams_destroyed_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_destroyed.png"); diff --git a/com/hbm/packet/AuxGaugePacket.java b/com/hbm/packet/AuxGaugePacket.java index 8bf083a86..828d4ba26 100644 --- a/com/hbm/packet/AuxGaugePacket.java +++ b/com/hbm/packet/AuxGaugePacket.java @@ -65,11 +65,17 @@ public class AuxGaugePacket implements IMessage { if (te instanceof TileEntityAMSLimiter) { TileEntityAMSLimiter limiter = (TileEntityAMSLimiter)te; - limiter.locked = m.value == 1; + if(m.id == 0) + limiter.locked = m.value == 1; + else if(m.id == 1) + limiter.efficiency = m.value; } if (te instanceof TileEntityAMSEmitter) { TileEntityAMSEmitter emitter = (TileEntityAMSEmitter)te; - emitter.locked = m.value == 1; + if(m.id == 0) + emitter.locked = m.value == 1; + else if(m.id == 1) + emitter.efficiency = m.value; } if (te instanceof TileEntityAMSBase) { TileEntityAMSBase base = (TileEntityAMSBase)te; @@ -78,6 +84,10 @@ public class AuxGaugePacket implements IMessage { base.locked = m.value == 1; else if(m.id == 1) base.color = m.value; + else if(m.id == 2) + base.efficiency = m.value; + else if(m.id == 3) + base.field = m.value; } } catch (Exception x) { } diff --git a/com/hbm/packet/TEPylonSenderPacket.java b/com/hbm/packet/TEPylonSenderPacket.java index 92b6ce950..7604ac424 100644 --- a/com/hbm/packet/TEPylonSenderPacket.java +++ b/com/hbm/packet/TEPylonSenderPacket.java @@ -63,12 +63,14 @@ public class TEPylonSenderPacket implements IMessage { @Override public IMessage onMessage(TEPylonSenderPacket m, MessageContext ctx) { TileEntity te = Minecraft.getMinecraft().theWorld.getTileEntity(m.x, m.y, m.z); - + + try { if (te != null && te instanceof TileEntityPylonRedWire) { TileEntityPylonRedWire pyl = (TileEntityPylonRedWire) te; pyl.addTileEntityBasedOnCoords(m.conX, m.conY, m.conZ); } + } catch(Exception x) {} return null; } } diff --git a/com/hbm/potion/PotionEffectTaint.java b/com/hbm/potion/PotionEffectTaint.java index de29a6348..02b169259 100644 --- a/com/hbm/potion/PotionEffectTaint.java +++ b/com/hbm/potion/PotionEffectTaint.java @@ -47,7 +47,7 @@ public class PotionEffectTaint extends Potion { int b = rand.nextInt(5) + (int)entity.posY - 2; int c = rand.nextInt(5) + (int)entity.posZ - 2; if(entity.worldObj.getBlock(a, b, c).isReplaceable(entity.worldObj, a, b, c) && BlockTaint.hasPosNeightbour(entity.worldObj, a, b, c)) - entity.worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(16), 2); + entity.worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(3), 2); } } } diff --git a/com/hbm/render/model/ModelJetPack.java b/com/hbm/render/model/ModelJetPack.java new file mode 100644 index 000000000..841b3a8fb --- /dev/null +++ b/com/hbm/render/model/ModelJetPack.java @@ -0,0 +1,172 @@ +// Date: 29.01.2018 23:31:37 +// Template version 1.1 +// Java generated by Techne +// Keep in mind that you still need to fill in some blanks +// - ZeuX + +package com.hbm.render.model; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemStack; + +public class ModelJetPack extends ModelBiped { + // fields + ModelRenderer Tank1; + ModelRenderer Tank2; + ModelRenderer Tip1; + ModelRenderer Tip2; + ModelRenderer Duct1; + ModelRenderer Duct2; + ModelRenderer Thruster1; + ModelRenderer Thruster2; + ModelRenderer Pack; + ModelRenderer JetPack; + + public ModelJetPack() { + textureWidth = 32; + textureHeight = 32; + + float x = 0F; + float y = 0F; + float z = -2F; + + JetPack = new ModelRenderer(this, 0, 0); + JetPack.setRotationPoint(x, y, z); + + Pack = new ModelRenderer(this, 12, 10); + Pack.addBox(0F, 0F, 0F, 4, 6, 1); + Pack.setRotationPoint(-2F, 3F, 0F); + Pack.setTextureSize(32, 32); + Pack.mirror = true; + convertToChild(JetPack, Pack); + setRotation(Pack, 0F, 0F, 0F); + Tank1 = new ModelRenderer(this, 0, 0); + Tank1.addBox(0F, 0F, 0F, 3, 8, 3); + Tank1.setRotationPoint(0.5F, 2F, 0.5F); + Tank1.setTextureSize(32, 32); + Tank1.mirror = true; + setRotation(Tank1, 0F, 0F, 0F); + convertToChild(JetPack, Tank1); + Tank2 = new ModelRenderer(this, 0, 11); + Tank2.addBox(0F, 0F, 0F, 3, 8, 3); + Tank2.setRotationPoint(-3.5F, 2F, 0.5F); + Tank2.setTextureSize(32, 32); + Tank2.mirror = true; + setRotation(Tank2, 0F, 0F, 0F); + convertToChild(JetPack, Tank2); + Tip1 = new ModelRenderer(this, 0, 22); + Tip1.addBox(0F, 0F, 0F, 2, 1, 2); + Tip1.setRotationPoint(1F, 1F, 1F); + Tip1.setTextureSize(32, 32); + Tip1.mirror = true; + setRotation(Tip1, 0F, 0F, 0F); + convertToChild(JetPack, Tip1); + Tip2 = new ModelRenderer(this, 0, 25); + Tip2.addBox(0F, 0F, 0F, 2, 1, 2); + Tip2.setRotationPoint(-3F, 1F, 1F); + Tip2.setTextureSize(32, 32); + Tip2.mirror = true; + setRotation(Tip2, 0F, 0F, 0F); + convertToChild(JetPack, Tip2); + Duct1 = new ModelRenderer(this, 8, 22); + Duct1.addBox(0F, 0F, 0F, 2, 1, 2); + Duct1.setRotationPoint(1F, 9.5F, 1F); + Duct1.setTextureSize(32, 32); + Duct1.mirror = true; + setRotation(Duct1, 0F, 0F, 0F); + convertToChild(JetPack, Duct1); + Duct2 = new ModelRenderer(this, 8, 25); + Duct2.addBox(0F, 0F, 0F, 2, 1, 2); + Duct2.setRotationPoint(-3F, 9.5F, 1F); + Duct2.setTextureSize(32, 32); + Duct2.mirror = true; + setRotation(Duct2, 0F, 0F, 0F); + convertToChild(JetPack, Duct2); + Thruster1 = new ModelRenderer(this, 12, 0); + Thruster1.addBox(0F, 0F, 0F, 3, 2, 3); + Thruster1.setRotationPoint(0.5F, 10.5F, 0.5F); + Thruster1.setTextureSize(32, 32); + Thruster1.mirror = true; + setRotation(Thruster1, 0F, 0F, 0F); + convertToChild(JetPack, Thruster1); + Thruster2 = new ModelRenderer(this, 12, 5); + Thruster2.addBox(0F, 0F, 0F, 3, 2, 3); + Thruster2.setRotationPoint(-3.5F, 10.5F, 0.5F); + Thruster2.setTextureSize(32, 32); + Thruster2.mirror = true; + setRotation(Thruster2, 0F, 0F, 0F); + convertToChild(JetPack, Thruster2); + } + + 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); + + /*Tank1.render(f5); + Tank2.render(f5); + Tip1.render(f5); + Tip2.render(f5); + Duct1.render(f5); + Duct2.render(f5); + Thruster1.render(f5); + Thruster2.render(f5);*/ + JetPack.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + @Override + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { + if (entity instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) entity; + if (player.isSneaking()) { + this.isSneak = true; + } else { + this.isSneak = false; + } + ItemStack itemstack = player.inventory.getCurrentItem(); + this.heldItemRight = itemstack != null ? 1 : 0; + + if (itemstack != null && player.getItemInUseCount() > 0) { + EnumAction enumaction = itemstack.getItemUseAction(); + + if (enumaction == EnumAction.block) { + this.heldItemRight = 3; + } else if (enumaction == EnumAction.bow) { + this.aimedBow = true; + } + } + } + float s = 1 / 16; + + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.JetPack.rotationPointX = this.bipedBody.rotationPointX; + this.JetPack.rotationPointY = this.bipedBody.rotationPointY; + this.JetPack.rotationPointZ = this.bipedBody.rotationPointZ; + this.JetPack.rotateAngleX = this.bipedBody.rotateAngleX; + this.JetPack.rotateAngleY = this.bipedBody.rotateAngleY; + this.JetPack.rotateAngleZ = this.bipedBody.rotateAngleZ; + } + + protected void convertToChild(ModelRenderer parParent, ModelRenderer parChild) { + parChild.rotationPointX -= parParent.rotationPointX; + parChild.rotationPointY -= parParent.rotationPointY; + parChild.rotationPointZ -= parParent.rotationPointZ; + parChild.rotateAngleX -= parParent.rotateAngleX; + parChild.rotateAngleY -= parParent.rotateAngleY; + parChild.rotateAngleZ -= parParent.rotateAngleZ; + parParent.addChild(parChild); + } + +} diff --git a/com/hbm/render/model/ModelT45Chest.java b/com/hbm/render/model/ModelT45Chest.java index 9654506cf..32d6b0fae 100644 --- a/com/hbm/render/model/ModelT45Chest.java +++ b/com/hbm/render/model/ModelT45Chest.java @@ -4,11 +4,6 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX - - - - - package com.hbm.render.model; import org.lwjgl.opengl.GL11; @@ -20,304 +15,279 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -public class ModelT45Chest extends ModelBiped -{ - //fields - ModelRenderer chest; - ModelRenderer leftarm; - ModelRenderer rightarm; - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; - ModelRenderer Shape14; - ModelRenderer Shape15; - ModelRenderer Shape16; - ModelRenderer Shape17; - ModelRenderer Shape18; - ModelRenderer Shape19; - - public ModelT45Chest() - { - textureWidth = 128; - textureHeight = 64; +public class ModelT45Chest extends ModelBiped { + // fields + ModelRenderer chest; + ModelRenderer leftarm; + ModelRenderer rightarm; + ModelRenderer Shape1; + ModelRenderer Shape2; + ModelRenderer Shape3; + ModelRenderer Shape4; + ModelRenderer Shape5; + ModelRenderer Shape6; + ModelRenderer Shape7; + ModelRenderer Shape8; + ModelRenderer Shape9; + ModelRenderer Shape10; + ModelRenderer Shape11; + ModelRenderer Shape12; + ModelRenderer Shape13; + ModelRenderer Shape14; + ModelRenderer Shape15; + ModelRenderer Shape16; + ModelRenderer Shape17; + ModelRenderer Shape18; + ModelRenderer Shape19; - chest = new ModelRenderer(this, 0, 0); - leftarm = new ModelRenderer(this, 0, 0); - rightarm = new ModelRenderer(this, 0, 0); - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 8, 12, 4); - Shape1.setRotationPoint(-4F, 0F - 0.0625F / 2, -2F); - Shape1.setTextureSize(128, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - convertToChild(chest, Shape1); - Shape2 = new ModelRenderer(this, 0, 16); - Shape2.addBox(0F, 0F, 0F, 7, 5, 2); - Shape2.setRotationPoint(-3.5F, 2F - 0.0625F / 2, -3.5F); - Shape2.setTextureSize(128, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - convertToChild(chest, Shape2); - Shape3 = new ModelRenderer(this, 0, 23); - Shape3.addBox(0F, 0F, 0F, 1, 1, 1); - Shape3.setRotationPoint(-2.5F, 7F - 0.0625F / 2, -3F); - Shape3.setTextureSize(128, 64); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - convertToChild(chest, Shape3); - Shape4 = new ModelRenderer(this, 0, 25); - Shape4.addBox(0F, 0F, 0F, 1, 1, 1); - Shape4.setRotationPoint(1.5F, 7F - 0.0625F / 2, -3F); - Shape4.setTextureSize(128, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - convertToChild(chest, Shape4); - Shape5 = new ModelRenderer(this, 0, 28); - Shape5.addBox(0F, -2F, 0F, 7, 2, 2); - Shape5.setRotationPoint(-3.5F, 2F - 0.0625F / 2, -3.5F); - Shape5.setTextureSize(128, 64); - Shape5.mirror = true; - setRotation(Shape5, -0.6108652F, 0F, 0F); - convertToChild(chest, Shape5); - Shape6 = new ModelRenderer(this, 48, 0); - Shape6.addBox(0F, 0F, 0F, 4, 12, 4); - Shape6.setRotationPoint(4F - 6 + 0.25F, 0F - 3, -2F); - Shape6.setTextureSize(128, 64); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - convertToChild(leftarm, Shape6); - Shape7 = new ModelRenderer(this, 32, 0); - Shape7.addBox(0F, 0F, 0F, 4, 12, 4); - Shape7.setRotationPoint(-8F + 6 - 0.25F, 0F - 3, -2F); - Shape7.setTextureSize(128, 64); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0F); - convertToChild(rightarm, Shape7); - Shape8 = new ModelRenderer(this, 32, 16); - Shape8.addBox(0F, 0F, 0F, 5, 6, 6); - Shape8.setRotationPoint(4F - 6 + 0.25F, 4F - 3, -3F); - Shape8.setTextureSize(128, 64); - Shape8.mirror = true; - setRotation(Shape8, 0F, 0F, 0F); - convertToChild(leftarm, Shape8); - Shape9 = new ModelRenderer(this, 0, 34); - Shape9.addBox(0F, 0F, 0F, 5, 6, 6); - Shape9.setRotationPoint(-9F + 6 - 0.25F, 4F - 3, -3F); - Shape9.setTextureSize(128, 64); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - convertToChild(rightarm, Shape9); - Shape10 = new ModelRenderer(this, 32, 30); - Shape10.addBox(0F, 0F, 0F, 2, 6, 2); - Shape10.setRotationPoint(1F, 4F - 0.0625F / 2, 2F); - Shape10.setTextureSize(128, 64); - Shape10.mirror = true; - setRotation(Shape10, 0F, 0F, 0F); - convertToChild(chest, Shape10); - Shape11 = new ModelRenderer(this, 42, 30); - Shape11.addBox(0F, 0F, 0F, 2, 6, 2); - Shape11.setRotationPoint(-3F, 4F - 0.0625F / 2, 2F); - Shape11.setTextureSize(128, 64); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - convertToChild(chest, Shape11); - Shape12 = new ModelRenderer(this, 26, 9); - Shape12.addBox(0F, 0F, 0F, 1, 6, 1); - Shape12.setRotationPoint(1.5F, -2F - 0.0625F / 2, 2F); - Shape12.setTextureSize(128, 64); - Shape12.mirror = true; - setRotation(Shape12, 0F, 0F, 0F); - convertToChild(chest, Shape12); - Shape13 = new ModelRenderer(this, 26, 0); - Shape13.addBox(0F, 0F, 0F, 1, 6, 1); - Shape13.setRotationPoint(-2.5F, -2F - 0.0625F / 2, 2F); - Shape13.setTextureSize(128, 64); - Shape13.mirror = true; - setRotation(Shape13, 0F, 0F, 0F); - convertToChild(chest, Shape13); - Shape14 = new ModelRenderer(this, 20, 18); - Shape14.addBox(0F, 0F, 0F, 2, 2, 1); - Shape14.setRotationPoint(-1F, 1F - 0.0625F / 2, 2F); - Shape14.setTextureSize(128, 64); - Shape14.mirror = true; - setRotation(Shape14, 0F, 0F, 0F); - convertToChild(chest, Shape14); - Shape15 = new ModelRenderer(this, 21, 23); - Shape15.addBox(-1.5F, -1.5F, 0F, 3, 3, 1); - Shape15.setRotationPoint(0F, 2F - 0.0625F / 2, 3F); - Shape15.setTextureSize(128, 64); - Shape15.mirror = true; - setRotation(Shape15, 0F, 0F, 0.7853982F); - convertToChild(chest, Shape15); - Shape16 = new ModelRenderer(this, 0, 48); - Shape16.addBox(0F, -1F, 0F, 3, 1, 4); - Shape16.setRotationPoint(-8F + 6 - 0.25F, 12F - 3, -2F); - Shape16.setTextureSize(128, 64); - Shape16.mirror = true; - setRotation(Shape16, 0F, 0F, 0.5235988F); - convertToChild(rightarm, Shape16); - Shape17 = new ModelRenderer(this, 0, 55); - Shape17.addBox(-3F, -1F, 0F, 3, 1, 4); - Shape17.setRotationPoint(8F - 6 + 0.25F, 12F - 3, -2F); - Shape17.setTextureSize(128, 64); - Shape17.mirror = true; - setRotation(Shape17, 0F, 0F, -0.5235988F); - convertToChild(leftarm, Shape17); - Shape18 = new ModelRenderer(this, 90, 0); - Shape18.addBox(0F, -3F, 0F, 5, 3, 6); - Shape18.setRotationPoint(4F - 6 + 0.25F, 0F - 3, -3F); - Shape18.setTextureSize(128, 64); - Shape18.mirror = true; - setRotation(Shape18, 0F, 0F, 0.2617994F); - convertToChild(leftarm, Shape18); - Shape19 = new ModelRenderer(this, 66, 0); - Shape19.addBox(-5F, -3F, 0F, 5, 3, 6); - Shape19.setRotationPoint(-4F + 6 - 0.25F, 0F - 3, -3F); - Shape19.setTextureSize(128, 64); - Shape19.mirror = true; - setRotation(Shape19, 0F, 0F, -0.2617994F); - convertToChild(rightarm, Shape19); - } - - /*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); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - Shape7.render(f5); - Shape8.render(f5); - Shape9.render(f5); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - }*/ - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - @Override -public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) - { - if(entity instanceof EntityPlayer) - { - EntityPlayer player = (EntityPlayer)entity; - if(player.isSneaking()) - { - this.isSneak = true; - } else { - this.isSneak = false; - } - ItemStack itemstack = player.inventory.getCurrentItem(); - this.heldItemRight = itemstack != null ? 1 : 0; + public ModelT45Chest() { + textureWidth = 128; + textureHeight = 64; - if (itemstack != null && player.getItemInUseCount() > 0) - { - EnumAction enumaction = itemstack.getItemUseAction(); + chest = new ModelRenderer(this, 0, 0); + leftarm = new ModelRenderer(this, 0, 0); + rightarm = new ModelRenderer(this, 0, 0); + Shape1 = new ModelRenderer(this, 0, 0); + Shape1.addBox(0F, 0F, 0F, 8, 12, 4); + Shape1.setRotationPoint(-4F, 0F - 0.0625F / 2, -2F); + Shape1.setTextureSize(128, 64); + Shape1.mirror = true; + setRotation(Shape1, 0F, 0F, 0F); + convertToChild(chest, Shape1); + Shape2 = new ModelRenderer(this, 0, 16); + Shape2.addBox(0F, 0F, 0F, 7, 5, 2); + Shape2.setRotationPoint(-3.5F, 2F - 0.0625F / 2, -3.5F); + Shape2.setTextureSize(128, 64); + Shape2.mirror = true; + setRotation(Shape2, 0F, 0F, 0F); + convertToChild(chest, Shape2); + Shape3 = new ModelRenderer(this, 0, 23); + Shape3.addBox(0F, 0F, 0F, 1, 1, 1); + Shape3.setRotationPoint(-2.5F, 7F - 0.0625F / 2, -3F); + Shape3.setTextureSize(128, 64); + Shape3.mirror = true; + setRotation(Shape3, 0F, 0F, 0F); + convertToChild(chest, Shape3); + Shape4 = new ModelRenderer(this, 0, 25); + Shape4.addBox(0F, 0F, 0F, 1, 1, 1); + Shape4.setRotationPoint(1.5F, 7F - 0.0625F / 2, -3F); + Shape4.setTextureSize(128, 64); + Shape4.mirror = true; + setRotation(Shape4, 0F, 0F, 0F); + convertToChild(chest, Shape4); + Shape5 = new ModelRenderer(this, 0, 28); + Shape5.addBox(0F, -2F, 0F, 7, 2, 2); + Shape5.setRotationPoint(-3.5F, 2F - 0.0625F / 2, -3.5F); + Shape5.setTextureSize(128, 64); + Shape5.mirror = true; + setRotation(Shape5, -0.6108652F, 0F, 0F); + convertToChild(chest, Shape5); + Shape6 = new ModelRenderer(this, 48, 0); + Shape6.addBox(0F, 0F, 0F, 4, 12, 4); + Shape6.setRotationPoint(4F - 6 + 0.25F, 0F - 3, -2F); + Shape6.setTextureSize(128, 64); + Shape6.mirror = true; + setRotation(Shape6, 0F, 0F, 0F); + convertToChild(leftarm, Shape6); + Shape7 = new ModelRenderer(this, 32, 0); + Shape7.addBox(0F, 0F, 0F, 4, 12, 4); + Shape7.setRotationPoint(-8F + 6 - 0.25F, 0F - 3, -2F); + Shape7.setTextureSize(128, 64); + Shape7.mirror = true; + setRotation(Shape7, 0F, 0F, 0F); + convertToChild(rightarm, Shape7); + Shape8 = new ModelRenderer(this, 32, 16); + Shape8.addBox(0F, 0F, 0F, 5, 6, 6); + Shape8.setRotationPoint(4F - 6 + 0.25F, 4F - 3, -3F); + Shape8.setTextureSize(128, 64); + Shape8.mirror = true; + setRotation(Shape8, 0F, 0F, 0F); + convertToChild(leftarm, Shape8); + Shape9 = new ModelRenderer(this, 0, 34); + Shape9.addBox(0F, 0F, 0F, 5, 6, 6); + Shape9.setRotationPoint(-9F + 6 - 0.25F, 4F - 3, -3F); + Shape9.setTextureSize(128, 64); + Shape9.mirror = true; + setRotation(Shape9, 0F, 0F, 0F); + convertToChild(rightarm, Shape9); + Shape10 = new ModelRenderer(this, 32, 30); + Shape10.addBox(0F, 0F, 0F, 2, 6, 2); + Shape10.setRotationPoint(1F, 4F - 0.0625F / 2, 2F); + Shape10.setTextureSize(128, 64); + Shape10.mirror = true; + setRotation(Shape10, 0F, 0F, 0F); + convertToChild(chest, Shape10); + Shape11 = new ModelRenderer(this, 42, 30); + Shape11.addBox(0F, 0F, 0F, 2, 6, 2); + Shape11.setRotationPoint(-3F, 4F - 0.0625F / 2, 2F); + Shape11.setTextureSize(128, 64); + Shape11.mirror = true; + setRotation(Shape11, 0F, 0F, 0F); + convertToChild(chest, Shape11); + Shape12 = new ModelRenderer(this, 26, 9); + Shape12.addBox(0F, 0F, 0F, 1, 6, 1); + Shape12.setRotationPoint(1.5F, -2F - 0.0625F / 2, 2F); + Shape12.setTextureSize(128, 64); + Shape12.mirror = true; + setRotation(Shape12, 0F, 0F, 0F); + convertToChild(chest, Shape12); + Shape13 = new ModelRenderer(this, 26, 0); + Shape13.addBox(0F, 0F, 0F, 1, 6, 1); + Shape13.setRotationPoint(-2.5F, -2F - 0.0625F / 2, 2F); + Shape13.setTextureSize(128, 64); + Shape13.mirror = true; + setRotation(Shape13, 0F, 0F, 0F); + convertToChild(chest, Shape13); + Shape14 = new ModelRenderer(this, 20, 18); + Shape14.addBox(0F, 0F, 0F, 2, 2, 1); + Shape14.setRotationPoint(-1F, 1F - 0.0625F / 2, 2F); + Shape14.setTextureSize(128, 64); + Shape14.mirror = true; + setRotation(Shape14, 0F, 0F, 0F); + convertToChild(chest, Shape14); + Shape15 = new ModelRenderer(this, 21, 23); + Shape15.addBox(-1.5F, -1.5F, 0F, 3, 3, 1); + Shape15.setRotationPoint(0F, 2F - 0.0625F / 2, 3F); + Shape15.setTextureSize(128, 64); + Shape15.mirror = true; + setRotation(Shape15, 0F, 0F, 0.7853982F); + convertToChild(chest, Shape15); + Shape16 = new ModelRenderer(this, 0, 48); + Shape16.addBox(0F, -1F, 0F, 3, 1, 4); + Shape16.setRotationPoint(-8F + 6 - 0.25F, 12F - 3, -2F); + Shape16.setTextureSize(128, 64); + Shape16.mirror = true; + setRotation(Shape16, 0F, 0F, 0.5235988F); + convertToChild(rightarm, Shape16); + Shape17 = new ModelRenderer(this, 0, 55); + Shape17.addBox(-3F, -1F, 0F, 3, 1, 4); + Shape17.setRotationPoint(8F - 6 + 0.25F, 12F - 3, -2F); + Shape17.setTextureSize(128, 64); + Shape17.mirror = true; + setRotation(Shape17, 0F, 0F, -0.5235988F); + convertToChild(leftarm, Shape17); + Shape18 = new ModelRenderer(this, 90, 0); + Shape18.addBox(0F, -3F, 0F, 5, 3, 6); + Shape18.setRotationPoint(4F - 6 + 0.25F, 0F - 3, -3F); + Shape18.setTextureSize(128, 64); + Shape18.mirror = true; + setRotation(Shape18, 0F, 0F, 0.2617994F); + convertToChild(leftarm, Shape18); + Shape19 = new ModelRenderer(this, 66, 0); + Shape19.addBox(-5F, -3F, 0F, 5, 3, 6); + Shape19.setRotationPoint(-4F + 6 - 0.25F, 0F - 3, -3F); + Shape19.setTextureSize(128, 64); + Shape19.mirror = true; + setRotation(Shape19, 0F, 0F, -0.2617994F); + convertToChild(rightarm, Shape19); + } - if (enumaction == EnumAction.block) - { - this.heldItemRight = 3; - } - else if (enumaction == EnumAction.bow) - { - this.aimedBow = true; - } - } - } - float s = 1/16; - - super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - this.chest.rotationPointX = this.bipedBody.rotationPointX; - this.chest.rotationPointY = this.bipedBody.rotationPointY; - this.chest.rotationPointZ = this.bipedBody.rotationPointZ; - this.chest.rotateAngleX = this.bipedBody.rotateAngleX; - this.chest.rotateAngleY = this.bipedBody.rotateAngleY; - this.chest.rotateAngleZ = this.bipedBody.rotateAngleZ; - this.leftarm.rotationPointX = this.bipedLeftArm.rotationPointX; - this.leftarm.rotationPointY = this.bipedLeftArm.rotationPointY; - this.leftarm.rotationPointZ = this.bipedLeftArm.rotationPointZ; - this.leftarm.rotateAngleX = this.bipedLeftArm.rotateAngleX; - this.leftarm.rotateAngleY = this.bipedLeftArm.rotateAngleY; - this.leftarm.rotateAngleZ = this.bipedLeftArm.rotateAngleZ; - this.rightarm.rotationPointX = this.bipedRightArm.rotationPointX; - this.rightarm.rotationPointY = this.bipedRightArm.rotationPointY; - this.rightarm.rotationPointZ = this.bipedRightArm.rotationPointZ; - this.rightarm.rotateAngleX = this.bipedRightArm.rotateAngleX; - this.rightarm.rotateAngleY = this.bipedRightArm.rotateAngleY; - this.rightarm.rotateAngleZ = this.bipedRightArm.rotateAngleZ; - } - @Override -public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) - { - setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); - GL11.glPushMatrix(); - GL11.glScalef(1.125F, 1.125F, 1.125F); - this.chest.render(par7); - this.aimedBow = false; - GL11.glPopMatrix(); - this.renderLeft(par1Entity, par2, par3, par4, par5, par6, par7); - this.renderRight(par1Entity, par2, par3, par4, par5, par6, par7); - } + /* + * 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); Shape1.render(f5); + * Shape2.render(f5); Shape3.render(f5); Shape4.render(f5); + * Shape5.render(f5); Shape6.render(f5); Shape7.render(f5); + * Shape8.render(f5); Shape9.render(f5); Shape10.render(f5); + * Shape11.render(f5); Shape12.render(f5); Shape13.render(f5); + * Shape14.render(f5); Shape15.render(f5); Shape16.render(f5); + * Shape17.render(f5); Shape18.render(f5); Shape19.render(f5); } + */ - public void renderLeft(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) - { + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + @Override + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { + if (entity instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) entity; + if (player.isSneaking()) { + this.isSneak = true; + } else { + this.isSneak = false; + } + ItemStack itemstack = player.inventory.getCurrentItem(); + this.heldItemRight = itemstack != null ? 1 : 0; + + if (itemstack != null && player.getItemInUseCount() > 0) { + EnumAction enumaction = itemstack.getItemUseAction(); + + if (enumaction == EnumAction.block) { + this.heldItemRight = 3; + } else if (enumaction == EnumAction.bow) { + this.aimedBow = true; + } + } + } + float s = 1 / 16; + + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.chest.rotationPointX = this.bipedBody.rotationPointX; + this.chest.rotationPointY = this.bipedBody.rotationPointY; + this.chest.rotationPointZ = this.bipedBody.rotationPointZ; + this.chest.rotateAngleX = this.bipedBody.rotateAngleX; + this.chest.rotateAngleY = this.bipedBody.rotateAngleY; + this.chest.rotateAngleZ = this.bipedBody.rotateAngleZ; + this.leftarm.rotationPointX = this.bipedLeftArm.rotationPointX; + this.leftarm.rotationPointY = this.bipedLeftArm.rotationPointY; + this.leftarm.rotationPointZ = this.bipedLeftArm.rotationPointZ; + this.leftarm.rotateAngleX = this.bipedLeftArm.rotateAngleX; + this.leftarm.rotateAngleY = this.bipedLeftArm.rotateAngleY; + this.leftarm.rotateAngleZ = this.bipedLeftArm.rotateAngleZ; + this.rightarm.rotationPointX = this.bipedRightArm.rotationPointX; + this.rightarm.rotationPointY = this.bipedRightArm.rotationPointY; + this.rightarm.rotationPointZ = this.bipedRightArm.rotationPointZ; + this.rightarm.rotateAngleX = this.bipedRightArm.rotateAngleX; + this.rightarm.rotateAngleY = this.bipedRightArm.rotateAngleY; + this.rightarm.rotateAngleZ = this.bipedRightArm.rotateAngleZ; + } + + @Override + public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); - GL11.glPushMatrix(); - GL11.glScalef(1.125F, 1.125F, 1.125F); - this.leftarm.render(par7); - this.aimedBow = false; - GL11.glPopMatrix(); - } + GL11.glPushMatrix(); + GL11.glScalef(1.125F, 1.125F, 1.125F); + this.chest.render(par7); + this.aimedBow = false; + GL11.glPopMatrix(); + this.renderLeft(par1Entity, par2, par3, par4, par5, par6, par7); + this.renderRight(par1Entity, par2, par3, par4, par5, par6, par7); + } - public void renderRight(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) - { + public void renderLeft(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); - GL11.glPushMatrix(); - GL11.glScalef(1.125F, 1.125F, 1.125F); - this.rightarm.render(par7); - this.aimedBow = false; - GL11.glPopMatrix(); - } - - //Jabelar, you saved my time! I was about to redo all this crap if you can simply use this method!! - protected void convertToChild(ModelRenderer parParent, ModelRenderer parChild) - { - // move child rotation point to be relative to parent - parChild.rotationPointX -= parParent.rotationPointX; - parChild.rotationPointY -= parParent.rotationPointY; - parChild.rotationPointZ -= parParent.rotationPointZ; - // make rotations relative to parent - parChild.rotateAngleX -= parParent.rotateAngleX; - parChild.rotateAngleY -= parParent.rotateAngleY; - parChild.rotateAngleZ -= parParent.rotateAngleZ; - // create relationship - parParent.addChild(parChild); - } + GL11.glPushMatrix(); + GL11.glScalef(1.125F, 1.125F, 1.125F); + this.leftarm.render(par7); + this.aimedBow = false; + GL11.glPopMatrix(); + } + + public void renderRight(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { + setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); + GL11.glPushMatrix(); + GL11.glScalef(1.125F, 1.125F, 1.125F); + this.rightarm.render(par7); + this.aimedBow = false; + GL11.glPopMatrix(); + } + + // Jabelar, you saved my time! I was about to redo all this crap if you can + // simply use this method!! + protected void convertToChild(ModelRenderer parParent, ModelRenderer parChild) { + // move child rotation point to be relative to parent + parChild.rotationPointX -= parParent.rotationPointX; + parChild.rotationPointY -= parParent.rotationPointY; + parChild.rotationPointZ -= parParent.rotationPointZ; + // make rotations relative to parent + parChild.rotateAngleX -= parParent.rotateAngleX; + parChild.rotateAngleY -= parParent.rotateAngleY; + parChild.rotateAngleZ -= parParent.rotateAngleZ; + // create relationship + parParent.addChild(parChild); + } } diff --git a/com/hbm/render/tileentity/RenderAMSBase.java b/com/hbm/render/tileentity/RenderAMSBase.java index 01ff02556..fe9a032f5 100644 --- a/com/hbm/render/tileentity/RenderAMSBase.java +++ b/com/hbm/render/tileentity/RenderAMSBase.java @@ -41,7 +41,8 @@ public class RenderAMSBase extends TileEntitySpecialRenderer { { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5D, y + 5.5, z + 0.5D); - GL11.glEnable(GL11.GL_LIGHTING); + //GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glRotatef(180, 0F, 1F, 0F); @@ -55,14 +56,18 @@ public class RenderAMSBase extends TileEntitySpecialRenderer { scale += ((((double)base.tanks[2].getFill()) / ((double)base.tanks[2].getMaxFill())) + (((double)base.tanks[3].getFill()) / ((double)base.tanks[3].getMaxFill()))) * ((maxSize - minSize) / 2); GL11.glScaled(scale, scale, scale); - bindTexture(new ResourceLocation(RefStrings.MODID, "textures/models/EMPBlast.png")); + //bindTexture(new ResourceLocation(RefStrings.MODID, "textures/models/EMPBlast.png")); + GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glRotatef(rot, 0F, 1F, 0F); GL11.glScalef(1.1F, 1.1F, 1.1F); + GL11.glColor3ub((byte)(0x20), (byte)(0x20), (byte)(0x40)); ResourceManager.sphere_iuv.renderAll(); GL11.glScalef(1/1.1F, 1/1.1F, 1/1.1F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_CULL_FACE); GL11.glPopMatrix(); @@ -73,7 +78,8 @@ public class RenderAMSBase extends TileEntitySpecialRenderer { { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5D, y + 5.5, z + 0.5D); - GL11.glEnable(GL11.GL_LIGHTING); + //GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glRotatef(180, 0F, 1F, 0F); @@ -123,6 +129,7 @@ public class RenderAMSBase extends TileEntitySpecialRenderer { ResourceManager.sphere_ruv.renderAll(); GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_CULL_FACE); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/com/hbm/render/tileentity/RenderAMSEmitter.java b/com/hbm/render/tileentity/RenderAMSEmitter.java index 9c39ce542..f0e992943 100644 --- a/com/hbm/render/tileentity/RenderAMSEmitter.java +++ b/com/hbm/render/tileentity/RenderAMSEmitter.java @@ -31,7 +31,11 @@ public class RenderAMSEmitter extends TileEntitySpecialRenderer { GL11.glDisable(GL11.GL_CULL_FACE); GL11.glRotatef(180, 0F, 1F, 0F); - bindTexture(ResourceManager.universal); + + if(((TileEntityAMSEmitter)tileEntity).locked) + bindTexture(ResourceManager.ams_destroyed_tex); + else + bindTexture(ResourceManager.ams_emitter_tex); if(((TileEntityAMSEmitter)tileEntity).locked) ResourceManager.ams_emitter_destroyed.renderAll(); @@ -60,7 +64,7 @@ public class RenderAMSEmitter extends TileEntitySpecialRenderer { if(emitter.getWorldObj().getTileEntity(emitter.xCoord, emitter.yCoord - 9, emitter.zCoord) instanceof TileEntityAMSBase && !emitter.locked) { - if(emitter.power > 0) { + if(emitter.efficiency > 0) { double lastPosX = 0; double lastPosZ = 0; diff --git a/com/hbm/render/tileentity/RenderAMSLimiter.java b/com/hbm/render/tileentity/RenderAMSLimiter.java index f037f6df4..882034dbf 100644 --- a/com/hbm/render/tileentity/RenderAMSLimiter.java +++ b/com/hbm/render/tileentity/RenderAMSLimiter.java @@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; import com.hbm.tileentity.machine.TileEntityAMSBase; +import com.hbm.tileentity.machine.TileEntityAMSEmitter; import com.hbm.tileentity.machine.TileEntityAMSLimiter; import net.minecraft.client.renderer.RenderHelper; @@ -36,7 +37,10 @@ public class RenderAMSLimiter extends TileEntitySpecialRenderer { GL11.glRotatef(0, 0F, 1F, 0F); break; } - bindTexture(ResourceManager.ams_limiter_tex); + if(((TileEntityAMSLimiter)tileEntity).locked) + bindTexture(ResourceManager.ams_destroyed_tex); + else + bindTexture(ResourceManager.ams_limiter_tex); if(((TileEntityAMSLimiter)tileEntity).locked) ResourceManager.ams_limiter_destroyed.renderAll(); @@ -119,39 +123,39 @@ public class RenderAMSLimiter extends TileEntitySpecialRenderer { GL11.glDepthMask(false); Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(0, 0, 1F, 0f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f); tessellator.addVertex(posX + length, posY - radius, posZ - radius); tessellator.addVertex(posX + length, posY - radius, posZ + radius); - tessellator.setColorRGBA_F(0, 0, 1F, 1f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1); tessellator.addVertex(posX, posY - radius, posZ + radius); tessellator.addVertex(posX, posY - radius, posZ - radius); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(0, 0, 1F, 0f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f); tessellator.addVertex(posX + length, posY + radius, posZ + radius); tessellator.addVertex(posX + length, posY + radius, posZ - radius); - tessellator.setColorRGBA_F(0, 0, 1F, 1f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1); tessellator.addVertex(posX, posY + radius, posZ - radius); tessellator.addVertex(posX, posY + radius, posZ + radius); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(0, 0, 1F, 0f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f); tessellator.addVertex(posX + length, posY - radius, posZ - radius); tessellator.addVertex(posX + length, posY + radius, posZ - radius); - tessellator.setColorRGBA_F(0, 0, 1F, 1f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1); tessellator.addVertex(posX, posY + radius, posZ - radius); tessellator.addVertex(posX, posY - radius, posZ - radius); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(0, 0, 1F, 0f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f); tessellator.addVertex(posX + length, posY - radius, posZ + radius); tessellator.addVertex(posX + length, posY + radius, posZ + radius); - tessellator.setColorRGBA_F(0, 0, 1F, 1f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1); tessellator.addVertex(posX, posY + radius, posZ + radius); tessellator.addVertex(posX, posY - radius, posZ + radius); tessellator.draw(); - if(limiter.power > 0) { + if(limiter.efficiency > 0) { radius *= 2; RenderHelper.disableStandardItemLighting(); @@ -163,34 +167,37 @@ public class RenderAMSLimiter extends TileEntitySpecialRenderer { GL11.glDisable(GL11.GL_CULL_FACE); GL11.glDepthMask(false); tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(0, 0, 1F, 0f); + //tessellator.setColorRGBA_F(0.494F, 0.8F, 0.796F, 0f); + //tessellator.setColorRGBA_F(0, 0.627F, 0.627F, 0f); + //tessellator.setColorRGBA_F(0, 0.765F, 0.765F, 0f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f); tessellator.addVertex(posX + length, posY - radius, posZ - radius); tessellator.addVertex(posX + length, posY - radius, posZ + radius); - tessellator.setColorRGBA_F(0, 0, 1F, 1f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1); tessellator.addVertex(posX, posY - radius, posZ + radius); tessellator.addVertex(posX, posY - radius, posZ - radius); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(0, 0, 1F, 0f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f); tessellator.addVertex(posX + length, posY + radius, posZ + radius); tessellator.addVertex(posX + length, posY + radius, posZ - radius); - tessellator.setColorRGBA_F(0, 0, 1F, 1f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1); tessellator.addVertex(posX, posY + radius, posZ - radius); tessellator.addVertex(posX, posY + radius, posZ + radius); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(0, 0, 1F, 0f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f); tessellator.addVertex(posX + length, posY - radius, posZ - radius); tessellator.addVertex(posX + length, posY + radius, posZ - radius); - tessellator.setColorRGBA_F(0, 0, 1F, 1f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1); tessellator.addVertex(posX, posY + radius, posZ - radius); tessellator.addVertex(posX, posY - radius, posZ - radius); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(0, 0, 1F, 0f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f); tessellator.addVertex(posX + length, posY - radius, posZ + radius); tessellator.addVertex(posX + length, posY + radius, posZ + radius); - tessellator.setColorRGBA_F(0, 0, 1F, 1f); + tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1); tessellator.addVertex(posX, posY + radius, posZ + radius); tessellator.addVertex(posX, posY - radius, posZ + radius); tessellator.draw(); diff --git a/com/hbm/tileentity/machine/TileEntityAMSBase.java b/com/hbm/tileentity/machine/TileEntityAMSBase.java index 49dbb682e..8f93e8bc4 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -13,6 +13,7 @@ import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.ISource; import com.hbm.inventory.FluidTank; import com.hbm.items.ModItems; +import com.hbm.items.special.ItemAMSCore; import com.hbm.items.special.ItemCatalyst; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -296,9 +297,10 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS this.color = -1; - if(slots[8] != null && slots[9] != null && slots[10] != null && slots[11] != null && + if(slots[8] != null && slots[9] != null && slots[10] != null && slots[11] != null && slots[12] != null && slots[8].getItem() instanceof ItemCatalyst && slots[9].getItem() instanceof ItemCatalyst && - slots[10].getItem() instanceof ItemCatalyst && slots[11].getItem() instanceof ItemCatalyst) { + slots[10].getItem() instanceof ItemCatalyst && slots[11].getItem() instanceof ItemCatalyst && + slots[12].getItem() instanceof ItemAMSCore) { int a = ((ItemCatalyst)slots[8].getItem()).getColor(); int b = ((ItemCatalyst)slots[9].getItem()).getColor(); int c = ((ItemCatalyst)slots[10].getItem()).getColor(); @@ -312,6 +314,21 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS this.color = g; } + if(heat > 0 && tanks[0].getFill() > 0 && tanks[1].getFill() > 0) { + heat -= (this.getCoolingStrength(tanks[0].getTankType()) * this.getCoolingStrength(tanks[1].getTankType())); + + tanks[0].setFill(tanks[0].getFill() - 10); + tanks[1].setFill(tanks[1].getFill() - 10); + + if(tanks[0].getFill() < 0) + tanks[0].setFill(0); + if(tanks[1].getFill() < 0) + tanks[1].setFill(0); + + if(heat < 0) + heat = 0; + } + } else { field = 0; efficiency = 0; @@ -322,6 +339,34 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, locked ? 1 : 0, 0)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, color, 1)); + PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, efficiency, 2)); + PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, field, 3)); + } + } + + private int getCoolingStrength(FluidType type) { + switch(type) { + case WATER: + return 50; + case OIL: + return 150; + case COOLANT: + return this.heat / 50; + case CRYOGEL: + return this.heat > heat/2 ? 200 : 50; + default: + return 0; + } + } + + private int getFuelPower(FluidType type) { + switch(type) { + case DEUTERIUM: + return 50000; + case TRITIUM: + return 75000; + default: + return 0; } } @@ -338,8 +383,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS } private float calcField(int a, int b, int c, int d) { - //return (float)Math.sqrt((Math.pow(a, 2) + Math.pow(b, 2) + Math.pow(c, 2) + Math.pow(d, 2)) / 4); - return (float)(a + b + c + d) / 4; + return (float)(a + b + c + d) * (a * 25 + b * 25 + c * 25 + d * 25) / 40000; } private int calcAvgHex(int h1, int h2) { diff --git a/com/hbm/tileentity/machine/TileEntityAMSEmitter.java b/com/hbm/tileentity/machine/TileEntityAMSEmitter.java index c6087a416..0c66dcd25 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSEmitter.java +++ b/com/hbm/tileentity/machine/TileEntityAMSEmitter.java @@ -29,7 +29,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, private ItemStack slots[]; public long power = 0; - public static final long maxPower = 1000000; + public static final long maxPower = 100000000; public int efficiency = 0; public static final int maxEfficiency = 100; public int heat = 0; @@ -292,6 +292,16 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, warning = 2; } + if(slots[2] != null) { + if(slots[2].getItem() != ModItems.ams_muzzle) { + this.efficiency = 0; + this.warning = 2; + } + } else { + this.efficiency = 0; + this.warning = 2; + } + if(tank.getFill() <= 5 || heat > maxHeat * 0.9) warning = 2; @@ -320,6 +330,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, locked ? 1 : 0, 0)); + PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, efficiency, 1)); } } diff --git a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java index 01f02b7fa..d7179850f 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java +++ b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java @@ -34,7 +34,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, private ItemStack slots[]; public long power = 0; - public static final long maxPower = 1000000; + public static final long maxPower = 10000000; public int efficiency = 0; public static final int maxEfficiency = 100; public int heat = 0; @@ -304,10 +304,14 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, mode = 1; else if(slots[2].getItem() == ModItems.ams_focus_booster) mode = 2; - else + else { this.efficiency = 0; - } else + this.warning = 2; + } + } else { this.efficiency = 0; + this.warning = 2; + } if(tank.getFill() <= 5 || heat > maxHeat * 0.9) warning = 2; @@ -344,6 +348,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, locked ? 1 : 0, 0)); + PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, efficiency, 1)); } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineTransformer.java b/com/hbm/tileentity/machine/TileEntityMachineTransformer.java new file mode 100644 index 000000000..d4b40d7c3 --- /dev/null +++ b/com/hbm/tileentity/machine/TileEntityMachineTransformer.java @@ -0,0 +1,100 @@ +package com.hbm.tileentity.machine; + +import java.util.ArrayList; +import java.util.List; + +import com.hbm.interfaces.IConsumer; +import com.hbm.interfaces.ISource; +import com.hbm.items.ModItems; +import com.hbm.lib.Library; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; + +public class TileEntityMachineTransformer extends TileEntity implements ISource, IConsumer { + + public long power; + public static final long maxPower = 1000000000000000L; + public List list = new ArrayList(); + boolean tact; + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + this.power = nbt.getLong("powerTime"); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + nbt.setLong("powerTime", power); + } + + + @Override + public void updateEntity() { + tact = true; + ffgeuaInit(); + tact = false; + ffgeuaInit(); + } + + @Override + public void ffgeua(int x, int y, int z, boolean newTact) { + + Library.ffgeua(x, y, z, newTact, this, worldObj); + } + + @Override + public void ffgeuaInit() { + ffgeua(this.xCoord + 1, this.yCoord, this.zCoord, getTact()); + ffgeua(this.xCoord - 1, this.yCoord, this.zCoord, getTact()); + ffgeua(this.xCoord, this.yCoord + 1, this.zCoord, getTact()); + ffgeua(this.xCoord, this.yCoord - 1, this.zCoord, getTact()); + ffgeua(this.xCoord, this.yCoord, this.zCoord + 1, getTact()); + ffgeua(this.xCoord, this.yCoord, this.zCoord - 1, getTact()); + } + + @Override + public long getSPower() { + return power; + } + + @Override + public void setSPower(long i) { + this.power = i; + } + + @Override + public List getList() { + return list; + } + + @Override + public void clearList() { + this.list.clear(); + } + + @Override + public boolean getTact() { + return this.tact; + } + + @Override + public void setPower(long i) { + power = i; + } + + @Override + public long getPower() { + return power; + } + + @Override + public long getMaxPower() { + return maxPower; + } +} diff --git a/com/hbm/world/Meteorite.java b/com/hbm/world/Meteorite.java index 046119064..ceb79c06d 100644 --- a/com/hbm/world/Meteorite.java +++ b/com/hbm/world/Meteorite.java @@ -5,8 +5,12 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; +import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.explosion.ExplosionLarge; +import com.hbm.explosion.ExplosionParticle; +import com.hbm.explosion.ExplosionParticleB; import com.hbm.lib.ModDamageSource; +import com.hbm.main.MainRegistry; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -27,7 +31,7 @@ public class Meteorite { e.attackEntityFrom(ModDamageSource.meteorite, 1000); } - switch(rand.nextInt(500)) { + switch(rand.nextInt(300)) { case 0: //Meteor-only tiny meteorite List list0 = new ArrayList(); @@ -93,6 +97,46 @@ public class Meteorite { generateSphere7x7(world, rand, x, y, z, list7); generateSphere5x5(world, rand, x, y, z, list8); return; + case 9: + //Giant ore meteorite + List list9 = new ArrayList(); + list9.add(new ItemStack(ModBlocks.block_meteor_broken)); + generateSphere9x9(world, rand, x, y, z, list9); + generateSphere7x7(world, rand, x, y, z, this.getRandomOre(rand)); + return; + case 10: + //Tainted Meteorite + List list10 = new ArrayList(); + list10.add(new ItemStack(ModBlocks.block_meteor_broken)); + generateSphere5x5(world, rand, x, y, z, list10); + world.setBlock(x, y, z, ModBlocks.taint); + return; + case 11: + //Atomic meteorite + EntityNukeExplosionMK3 entity0 = new EntityNukeExplosionMK3(world); + entity0.posX = x + 0.5D; + entity0.posY = y + 0.5D; + entity0.posZ = z + 0.5D; + entity0.destructionRange = MainRegistry.fatmanRadius; + entity0.speed = MainRegistry.blastSpeed; + entity0.coefficient = 10.0F; + + world.spawnEntityInWorld(entity0); + if(MainRegistry.polaroidID == 11) + if(rand.nextInt(100) >= 0) + { + ExplosionParticleB.spawnMush(world, x, y - 3, z); + } else { + ExplosionParticle.spawnMush(world, x, y - 3, z); + } + else + if(rand.nextInt(100) == 0) + { + ExplosionParticleB.spawnMush(world, x, y - 3, z); + } else { + ExplosionParticle.spawnMush(world, x, y - 3, z); + } + return; } switch(rand.nextInt(3)) { @@ -542,6 +586,65 @@ public class Meteorite { world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2); } } + + public void generateSphere9x9(World world, Random rand, int x, int y, int z, List set) { + for(int a = -4; a < 5; a++) + for(int b = -1; b < 2; b++) + for(int c = -1; c < 2; c++) { + ItemStack stack = set.get(rand.nextInt(set.size())); + world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2); + } + for(int a = -1; a < 2; a++) + for(int b = -4; b < 5; b++) + for(int c = -1; c < 2; c++) { + ItemStack stack = set.get(rand.nextInt(set.size())); + world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2); + } + for(int a = -1; a < 2; a++) + for(int b = -1; b < 2; b++) + for(int c = -4; c < 5; c++) { + ItemStack stack = set.get(rand.nextInt(set.size())); + world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2); + } + + for(int a = -1; a < 2; a++) + for(int b = -3; b < 4; b++) + for(int c = -3; c < 4; c++) { + ItemStack stack = set.get(rand.nextInt(set.size())); + world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2); + } + for(int a = -3; a < 4; a++) + for(int b = -1; b < 2; b++) + for(int c = -3; c < 4; c++) { + ItemStack stack = set.get(rand.nextInt(set.size())); + world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2); + } + for(int a = -3; a < 4; a++) + for(int b = -3; b < 4; b++) + for(int c = -1; c < 2; c++) { + ItemStack stack = set.get(rand.nextInt(set.size())); + world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2); + } + + for(int a = -3; a < 4; a++) + for(int b = -2; b < 3; b++) + for(int c = -2; c < 3; c++) { + ItemStack stack = set.get(rand.nextInt(set.size())); + world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2); + } + for(int a = -2; a < 3; a++) + for(int b = -3; b < 4; b++) + for(int c = -2; c < 3; c++) { + ItemStack stack = set.get(rand.nextInt(set.size())); + world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2); + } + for(int a = -2; a < 3; a++) + for(int b = -2; b < 3; b++) + for(int c = -3; c < 4; c++) { + ItemStack stack = set.get(rand.nextInt(set.size())); + world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2); + } + } public void generateBox(World world, Random rand, int x, int y, int z, List set) { for(int a = -1; a < 2; a++) diff --git a/com/hbm/world/OilSandBubble.java b/com/hbm/world/OilSandBubble.java new file mode 100644 index 000000000..15d8c3e08 --- /dev/null +++ b/com/hbm/world/OilSandBubble.java @@ -0,0 +1,37 @@ +package com.hbm.world; + +import java.util.Random; + +import com.hbm.blocks.ModBlocks; + +import net.minecraft.init.Blocks; +import net.minecraft.world.World; + +public class OilSandBubble { + + private final static Random field_149933_a = new Random(); + + public static void spawnOil(World world, int x, int y, int z, int radius) { + int r = radius; + int r2 = r * r; + int r22 = r2 / 2; + + for (int xx = -r; xx < r; xx++) { + int X = xx + x; + int XX = xx * xx; + for (int yy = -r; yy < r; yy++) { + int Y = yy + y; + int YY = XX + yy * yy * 3; + for (int zz = -r; zz < r; zz++) { + int Z = zz + z; + int ZZ = YY + zz * zz; + if (ZZ < r22 + field_149933_a.nextInt(r22 / 3)) { + if(world.getBlock(X, Y, Z) == Blocks.sand) + world.setBlock(X, Y, Z, ModBlocks.ore_oil_sand); + } + } + } + } + } + +}