diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index 65d18b3ca..60a0df8f5 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -40,6 +40,8 @@ achievement.sacrifice.desc=Sterbe im Feuer, aber irgendwie auch nicht. achievement.sacrifice=Sororizid achievement.selenium.desc=Lange nicht gesehen! achievement.selenium=Und täglich grüßt der Mond +achievement.stratum.desc=Steig' auf die Bremse, Mitts. +achievement.stratum=Stratum achievement.soyuz.desc=Werde knusprig achievement.soyuz=Gebackene Kartoffel achievement.space.desc=Scheitere in jeder möglichen Weise und verschwende 90 Millionen Dollar an Forschungsgeldern. @@ -527,6 +529,10 @@ item.battery_trixite.name=Billige Spark-Batterie-Nachmache item.big_sword.name=Großes Schwert item.biomass.name=Biomasse item.biomass_compressed.name=Verdichtete Biomasse +item.bj_boots.name=Lunare Beschlagene Stiefel +item.bj_helmet.name=Augenklappe mit Infrarot-Sensor +item.bj_legs.name=Lunare Kybernetischer Beinersatz +item.bj_plate.name=Lunare Kybernetische Panzerung item.black_hole.name=Miniatur Schwarzes Loch item.blade_titanium.name=Titanturbinenschaufel item.blade_tungsten.name=Wolframverstärktes Turbinenblatt @@ -1244,6 +1250,7 @@ item.missile_soyuz_lander.name=Orbitalmodul item.missile_strong.name=Starke HE Rakete item.missile_taint.name=Verdorbene Rakete item.motor.name=Motor +item.motor_desh.name=Desh-Motor item.mp_c_1.name=Stufe 1 Zielsucher-Schaltkreis item.mp_c_2.name=Stufe 2 Zielsucher-Schaltkreis item.mp_c_3.name=Stufe 3 Zielsucher-Schaltkreis @@ -1427,6 +1434,7 @@ item.padlock.name=Vorhängeschloss item.padlock_reinforced.name=Verstärktes Vorhängeschloss item.padlock_rusty.name=Rostiges Vorhängeschloss item.padlock_unbreakable.name=Unzerstörbares Vorhängeschloss +item.pancake.name=Pfannkuchen aus Altmetall, Nägeln und Edelsteinpulver item.part_beryllium.name=Berylliumstaubkiste item.part_carbon.name=Kohlenstoffstaubkiste item.part_copper.name=Kupferstaubkiste @@ -2211,6 +2219,7 @@ tile.machine_minirtg.name=Radioisotopenzelle tile.machine_missile_assembly.name=Raketenmontagestation tile.machine_nuke_furnace_off.name=Atombetriebener Ofen tile.machine_nuke_furnace_on.name=Atombetriebener Ofen +tile.machine_powerrtg.name=PT-Isotopenzelle tile.machine_press.name=Befeuerte Presse tile.machine_puf6_tank.name=Plutoniumhexafluorit-Tank tile.machine_pumpjack.name=Pferdekopfpumpe @@ -2288,6 +2297,15 @@ tile.ore_beryllium.name=Berylliumerz tile.ore_copper.name=Kupfererz tile.ore_daffergon.name=Dellit tile.ore_fluorite.name=Fluoriterz +tile.ore_gneiss_asbestos.name=Schiefer-Asbesterz +tile.ore_gneiss_copper.name=Schiefer-Kupfererz +tile.ore_gneiss_gold.name=Schiefer-Golderz +tile.ore_gneiss_iron.name=Schiefer-Eisenerz +tile.ore_gneiss_lithium.name=Schifer-Lithiumerz +tile.ore_gneiss_rare.name=Schiefer-Seltenerden-Erz +tile.ore_gneiss_schrabidium.name=Schiefer-Schrabidiumerz +tile.ore_gneiss_uranium.name=Schiefer-Uranerz +tile.ore_gneiss_uranium_scorched.name=Verschmortes Schiefer-Uranerz tile.ore_lead.name=Bleierz tile.ore_lignite.name=Braunkohleerz tile.ore_meteor_aluminium.name=Meteoriten-Aluminiumerz @@ -2386,6 +2404,7 @@ tile.steel_poles.name=Stahlmasten tile.steel_roof.name=Flaches Stachldach tile.steel_scaffold.name=Stahlgerüst tile.steel_wall.name=Stahlwand +tile.stone_gneiss.name=Graphitschiefer tile.struct_iter_core.name=Fusionsreaktor-Kernkomponente tile.struct_launcher.name=Startrampe-Komponentenblock tile.struct_launcher_core.name=Kompaktrampe-Kernkomponente diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index f3f17eb98..8baf02f29 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -40,6 +40,8 @@ achievement.sacrifice.desc=Face the fire and live. achievement.sacrifice=Sororicide achievement.selenium.desc=Yeah. achievement.selenium=XVIII The Moon +achievement.stratum.desc=Hit the brakes, Mitts. +achievement.stratum=Stratum achievement.soyuz.desc=Become crunchy. achievement.soyuz=Baked Potato achievement.space.desc=Fail in every way possible and waste funds worth 90 million dollars. @@ -527,6 +529,10 @@ item.battery_trixite.name=Off-Brand Spark Battery item.big_sword.name=Great Sword item.biomass.name=Biomass item.biomass_compressed.name=Compressed Biomass +item.bj_boots.name=Lunar Studded Boots +item.bj_helmet.name=Eyepatch with Thermal Sensor +item.bj_legs.name=Lunar Cybernetic Leg Replacements +item.bj_plate.name=Lunar Cybernetic Plating item.black_hole.name=Miniature Black Hole item.blade_titanium.name=Titanium Blade item.blade_tungsten.name=Tungsten Reinforced Blade @@ -1244,6 +1250,7 @@ item.missile_soyuz_lander.name=Orbital Module item.missile_strong.name=Strong HE Missile item.missile_taint.name=Taint-Tipped Missile item.motor.name=Motor +item.motor_desh.name=Desh Motor item.mp_c_1.name=Tier 1 Missile Targeting Circuit item.mp_c_2.name=Tier 2 Missile Targeting Circuit item.mp_c_3.name=Tier 3 Missile Targeting Circuit @@ -1427,6 +1434,7 @@ item.padlock.name=Padlock item.padlock_reinforced.name=Reinforced Padlock item.padlock_rusty.name=Rusty Padlock item.padlock_unbreakable.name=Unbreakable Padlock +item.pancake.name=Pancake made from Scrap Metal, Nails and Gem Dust item.part_beryllium.name=Box of Beryllium Dust item.part_carbon.name=Box of Carbon Dust item.part_copper.name=Box of Copper Dust @@ -2211,6 +2219,7 @@ tile.machine_minirtg.name=Radio Isotope Cell tile.machine_missile_assembly.name=Missile Assembly Station tile.machine_nuke_furnace_off.name=Nuclear Furnace tile.machine_nuke_furnace_on.name=Nuclear Furnace +tile.machine_powerrtg.name=PT Isotope Cell tile.machine_press.name=Burner Press tile.machine_puf6_tank.name=Plutonium Hexafluoride Tank tile.machine_pumpjack.name=Pumpjack @@ -2288,6 +2297,15 @@ tile.ore_beryllium.name=Beryllium Ore tile.ore_copper.name=Copper Ore tile.ore_daffergon.name=Dellite tile.ore_fluorite.name=Fluorite Ore +tile.ore_gneiss_asbestos.name=Schist Asbestos Ore +tile.ore_gneiss_copper.name=Schist Copper Ore +tile.ore_gneiss_gold.name=Schist Gold Ore +tile.ore_gneiss_iron.name=Schist Iron Ore +tile.ore_gneiss_lithium.name=Schist Lithium Ore +tile.ore_gneiss_rare.name=Schist Rare Earth Ore +tile.ore_gneiss_schrabidium.name=Schist Schrabidium Ore +tile.ore_gneiss_uranium.name=Schist Uranium Ore +tile.ore_gneiss_uranium_scorched.name=Scorched Schist Uranium Ore tile.ore_lead.name=Lead Ore tile.ore_lignite.name=Lignite Ore tile.ore_meteor_aluminium.name=Meteor Aluminium Ore @@ -2386,6 +2404,7 @@ tile.steel_poles.name=Steel Pole tile.steel_roof.name=Flat Steel Roof tile.steel_scaffold.name=Steel Scaffold tile.steel_wall.name=Steel Wall +tile.stone_gneiss.name=Graphitic Schist tile.struct_iter_core.name=Fusion Reactor Core Component tile.struct_launcher.name=Launch Pad Component Block tile.struct_launcher_core.name=Compact Launcher Core Component diff --git a/src/main/java/assets/hbm/models/armor/BJ.obj b/src/main/java/assets/hbm/models/armor/BJ.obj index 5833a207b..fd3a578db 100644 --- a/src/main/java/assets/hbm/models/armor/BJ.obj +++ b/src/main/java/assets/hbm/models/armor/BJ.obj @@ -1,5 +1,981 @@ -# Blender v2.79 (sub 0) OBJ File: 'BJ.blend' +# Blender v2.79 (sub 0) OBJ File: 'BJ_winged.blend' # www.blender.org +o Jetpack +v -0.500000 1.000000 5.000000 +v -0.500000 7.500000 5.000000 +v -0.500000 1.000000 3.000000 +v -0.500000 7.500000 3.000000 +v 0.500000 1.000000 5.000000 +v 0.500000 7.500000 5.000000 +v 0.500000 1.000000 3.000000 +v 0.500000 7.500000 3.000000 +v -2.000000 1.500000 4.500000 +v -2.000000 7.000000 4.500000 +v -2.000000 1.500000 4.000000 +v -2.000000 7.000000 4.000000 +v 2.000000 1.500000 4.500000 +v 2.000000 7.000000 4.500000 +v 2.000000 1.500000 4.000000 +v 2.000000 7.000000 4.000000 +v -8.000000 3.000000 5.500000 +v -8.000000 7.000000 5.500000 +v -8.000000 7.000000 5.000000 +v -8.000000 3.000000 5.000000 +v 8.000000 3.000000 5.000000 +v 8.000000 7.000000 5.000000 +v 8.000000 7.000000 5.500000 +v 8.000000 3.000000 5.500000 +v -14.000000 7.000000 7.500000 +v -14.000000 9.500000 7.500000 +v -14.000000 9.500000 7.000000 +v -14.000000 7.000000 7.000000 +v 14.000000 7.000000 7.000000 +v 14.000000 9.500000 7.000000 +v 14.000000 9.500000 7.500000 +v 14.000000 7.000000 7.500000 +v 15.000000 9.500000 11.500000 +v 15.000000 7.000000 11.500000 +v -15.000000 7.000000 11.500000 +v -15.000000 9.500000 11.500000 +v 2.000000 1.250000 6.500000 +v 2.000000 7.250000 6.500000 +v 2.000000 1.250000 4.500000 +v 2.000000 7.250000 4.500000 +v 3.000000 1.250000 6.500000 +v 3.000000 7.250000 6.500000 +v 3.000000 1.250000 4.500000 +v 3.000000 7.250000 4.500000 +v 3.500000 1.250000 6.000000 +v 3.500000 7.250000 6.000000 +v 1.500000 1.250000 6.000000 +v 1.500000 7.250000 6.000000 +v 3.500000 1.250000 5.000000 +v 3.500000 7.250000 5.000000 +v 1.500000 1.250000 5.000000 +v 1.500000 7.250000 5.000000 +v 2.000000 -0.750000 5.250000 +v 2.000000 -0.750000 5.750000 +v 2.750000 -0.750000 5.000000 +v 2.250000 -0.750000 5.000000 +v 2.250000 -0.750000 6.000000 +v 2.750000 -0.750000 6.000000 +v 3.000000 -0.750000 5.750000 +v 3.000000 -0.750000 5.250000 +v 2.250000 7.250000 6.000000 +v 2.250000 7.250000 5.000000 +v 2.750000 7.250000 6.000000 +v 2.750000 7.250000 5.000000 +v 3.000000 7.250000 5.750000 +v 2.000000 7.250000 5.750000 +v 3.000000 7.250000 5.250000 +v 2.000000 7.250000 5.250000 +v 1.500000 9.250000 6.000000 +v 1.500000 9.250000 5.000000 +v 2.000000 9.250000 4.500000 +v 3.000000 9.250000 4.500000 +v 3.000000 9.250000 6.500000 +v 2.000000 9.250000 6.500000 +v 3.500000 9.250000 5.000000 +v 3.500000 9.250000 6.000000 +v -3.000000 1.250000 6.500000 +v -3.000000 7.250000 6.500000 +v -3.000000 1.250000 4.500000 +v -3.000000 7.250000 4.500000 +v -2.000000 1.250000 6.500000 +v -2.000000 7.250000 6.500000 +v -2.000000 1.250000 4.500000 +v -2.000000 7.250000 4.500000 +v -1.500000 1.250000 6.000000 +v -1.500000 7.250000 6.000000 +v -3.500000 1.250000 6.000000 +v -3.500000 7.250000 6.000000 +v -1.500000 1.250000 5.000000 +v -1.500000 7.250000 5.000000 +v -3.500000 1.250000 5.000000 +v -3.500000 7.250000 5.000000 +v -3.000000 -0.750000 5.250000 +v -3.000000 -0.750000 5.750000 +v -2.250000 -0.750000 5.000000 +v -2.750000 -0.750000 5.000000 +v -2.750000 -0.750000 6.000000 +v -2.250000 -0.750000 6.000000 +v -2.000000 -0.750000 5.750000 +v -2.000000 -0.750000 5.250000 +v -2.750000 7.250000 6.000000 +v -2.750000 7.250000 5.000000 +v -2.250000 7.250000 6.000000 +v -2.250000 7.250000 5.000000 +v -2.000000 7.250000 5.750000 +v -3.000000 7.250000 5.750000 +v -2.000000 7.250000 5.250000 +v -3.000000 7.250000 5.250000 +v -3.500000 9.250000 6.000000 +v -3.500000 9.250000 5.000000 +v -3.000000 9.250000 4.500000 +v -2.000000 9.250000 4.500000 +v -2.000000 9.250000 6.500000 +v -3.000000 9.250000 6.500000 +v -1.500000 9.250000 5.000000 +v -1.500000 9.250000 6.000000 +vt 0.511111 0.711864 +vt 0.555556 0.932203 +vt 0.511111 0.932203 +vt 0.444444 0.711864 +vt 0.488889 0.932203 +vt 0.444444 0.932203 +vt 0.488889 0.711864 +vt 0.488889 1.000000 +vt 0.511111 1.000000 +vt 0.511111 0.644068 +vt 0.488889 0.644068 +vt 0.677778 0.440678 +vt 0.811111 0.440678 +vt 0.677778 0.576271 +vt 0.544444 0.440678 +vt 0.455556 0.627119 +vt 0.544444 0.627119 +vt 0.100000 0.355932 +vt -0.000000 0.440678 +vt -0.000000 0.355932 +vt 0.455556 0.440678 +vt 0.544444 0.627119 +vt 0.455556 0.627119 +vt 0.455556 0.644068 +vt 0.544444 0.644068 +vt 0.455556 0.355932 +vt 0.544444 0.338983 +vt 0.544444 0.355932 +vt 0.544444 0.440678 +vt 0.322222 0.355932 +vt 0.455556 0.338983 +vt 0.677778 0.576271 +vt 0.677778 0.644068 +vt 0.455556 0.440678 +vt 0.322222 0.576271 +vt 0.677778 0.355932 +vt 0.322222 0.576271 +vt 0.322222 0.644068 +vt 0.188889 0.355932 +vt 0.322222 0.338983 +vt 0.811111 0.440678 +vt 0.677778 0.440678 +vt 0.677778 0.627119 +vt 0.811111 0.644068 +vt 0.188889 0.440678 +vt 0.188889 0.355932 +vt 0.322222 0.440678 +vt 0.188889 0.440678 +vt 0.677778 0.338983 +vt 0.811111 0.355932 +vt 0.322222 0.440678 +vt 0.188889 0.644068 +vt 0.322222 0.627119 +vt 0.188889 0.627119 +vt 0.100000 0.627119 +vt 0.811111 0.338983 +vt 0.900000 0.338983 +vt 0.811111 0.355932 +vt 0.900000 0.440678 +vt 1.000000 0.355932 +vt 1.000000 0.440678 +vt 0.811111 0.627119 +vt 0.900000 0.627119 +vt 0.188889 0.338983 +vt 0.100000 0.338983 +vt 0.555556 0.271186 +vt 0.566667 0.067797 +vt 0.566667 0.271186 +vt 0.433333 0.067797 +vt 0.455556 0.271186 +vt 0.433333 0.271186 +vt 0.455556 0.067797 +vt 0.466667 0.271186 +vt 0.500000 0.067797 +vt 0.522222 0.271186 +vt 0.500000 0.271186 +vt 0.466667 0.067797 +vt 0.488889 0.271186 +vt 0.533333 0.067797 +vt 0.533333 0.271186 +vt 0.522222 0.067797 +vt 0.488889 0.067797 +vt 0.466667 0.338983 +vt 0.433333 0.237288 +vt 0.422222 0.288136 +vt 0.388889 0.271186 +vt 0.433333 0.305085 +vt 0.422222 0.338983 +vt 0.400000 0.322034 +vt 0.500000 0.338983 +vt 0.555556 0.338983 +vt 0.455556 0.338983 +vt 0.433333 0.338983 +vt 0.533333 0.338983 +vt 0.488889 0.338983 +vt 0.522222 0.338983 +vt 0.611111 0.288136 +vt 0.600000 0.338983 +vt 0.566667 0.322034 +vt 0.500000 0.067797 +vt 0.488889 -0.000000 +vt 0.500000 -0.000000 +vt 0.555556 0.067797 +vt 0.566667 -0.000000 +vt 0.566667 0.067797 +vt 0.466667 0.067797 +vt 0.477778 0.067797 +vt 0.433333 0.067797 +vt 0.455556 -0.000000 +vt 0.444444 0.067797 +vt 0.522222 0.067797 +vt 0.533333 0.000000 +vt 0.533333 0.067797 +vt 0.455556 0.067797 +vt 0.466667 -0.000000 +vt 0.522222 -0.000000 +vt 0.511111 0.067797 +vt 0.555556 -0.000000 +vt 0.544444 0.067797 +vt 0.555556 0.271186 +vt 0.566667 0.067797 +vt 0.566667 0.271186 +vt 0.433333 0.067797 +vt 0.455556 0.271186 +vt 0.433333 0.271186 +vt 0.455556 0.067797 +vt 0.466667 0.271186 +vt 0.500000 0.067797 +vt 0.522222 0.271186 +vt 0.500000 0.271186 +vt 0.466667 0.067797 +vt 0.488889 0.271186 +vt 0.533333 0.067797 +vt 0.533333 0.271186 +vt 0.522222 0.067797 +vt 0.488889 0.067797 +vt 0.466667 0.338983 +vt 0.433333 0.237288 +vt 0.422222 0.288136 +vt 0.388889 0.271186 +vt 0.433333 0.305085 +vt 0.422222 0.338983 +vt 0.400000 0.322034 +vt 0.500000 0.338983 +vt 0.555556 0.338983 +vt 0.455556 0.338983 +vt 0.433333 0.338983 +vt 0.533333 0.338983 +vt 0.488889 0.338983 +vt 0.522222 0.338983 +vt 0.611111 0.288136 +vt 0.600000 0.338983 +vt 0.566667 0.322034 +vt 0.488889 0.067797 +vt 0.500000 -0.000000 +vt 0.500000 0.067797 +vt 0.555556 0.067797 +vt 0.566667 -0.000000 +vt 0.566667 0.067797 +vt 0.466667 0.067797 +vt 0.488889 -0.000000 +vt 0.477778 0.067797 +vt 0.433333 0.067797 +vt 0.455556 -0.000000 +vt 0.444444 0.067797 +vt 0.522222 0.067797 +vt 0.533333 0.000000 +vt 0.533333 0.067797 +vt 0.455556 0.067797 +vt 0.466667 -0.000000 +vt 0.522222 -0.000000 +vt 0.511111 0.067797 +vt 0.555556 -0.000000 +vt 0.544444 0.067797 +vt 0.555556 0.711864 +vt 0.100000 0.440678 +vt 0.811111 0.355932 +vt 0.188889 0.355932 +vt 0.900000 0.355932 +vt 0.555556 0.067797 +vt 0.477778 0.338983 +vt 0.388889 0.237288 +vt 0.400000 0.220339 +vt 0.422222 0.220339 +vt 0.433333 0.271186 +vt 0.400000 0.288136 +vt 0.400000 0.305085 +vt 0.411111 0.288136 +vt 0.422222 0.288136 +vt 0.433333 0.322034 +vt 0.411111 0.338983 +vt 0.511111 0.338983 +vt 0.566667 0.338983 +vt 0.444444 0.338983 +vt 0.544444 0.338983 +vt 0.566667 0.288136 +vt 0.577778 0.271186 +vt 0.600000 0.271186 +vt 0.611111 0.322034 +vt 0.577778 0.338983 +vt 0.488889 0.067797 +vt 0.433333 -0.000000 +vt 0.555556 0.067797 +vt 0.477778 0.338983 +vt 0.388889 0.237288 +vt 0.400000 0.220339 +vt 0.422222 0.220339 +vt 0.433333 0.271186 +vt 0.400000 0.288136 +vt 0.400000 0.305085 +vt 0.411111 0.288136 +vt 0.422222 0.288136 +vt 0.433333 0.322034 +vt 0.411111 0.338983 +vt 0.511111 0.338983 +vt 0.566667 0.338983 +vt 0.444444 0.338983 +vt 0.544444 0.338983 +vt 0.566667 0.288136 +vt 0.577778 0.271186 +vt 0.600000 0.271186 +vt 0.611111 0.322034 +vt 0.577778 0.338983 +vt 0.433333 -0.000000 +vn -1.0000 0.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 0.3162 0.0000 0.9487 +vn 0.0000 0.0000 -1.0000 +vn 0.9762 0.0000 -0.2169 +vn 0.1644 0.0000 0.9864 +vn -0.1644 0.0000 -0.9864 +vn -0.2425 -0.9701 0.0000 +vn 0.1644 0.0000 -0.9864 +vn -0.1644 0.0000 0.9864 +vn 0.2425 -0.9701 0.0000 +vn 0.3846 0.9231 0.0000 +vn -0.3162 0.0000 -0.9487 +vn -0.5547 -0.8321 0.0000 +vn -0.9701 0.0000 0.2425 +vn 0.3162 0.0000 -0.9487 +vn -0.3846 0.9231 0.0000 +vn -0.3162 0.0000 0.9487 +vn 0.5547 -0.8321 0.0000 +vn 0.9701 0.0000 0.2425 +vn -0.9762 0.0000 -0.2169 +vn -0.7071 0.0000 -0.7071 +vn 0.7071 0.0000 -0.7071 +vn -0.7071 0.0000 0.7071 +vn 0.7071 0.0000 0.7071 +vn 0.9701 -0.2425 0.0000 +vn 0.0000 -0.2425 0.9701 +vn -0.6835 -0.2563 -0.6835 +vn 0.6835 -0.2563 -0.6835 +vn 0.0000 -0.2425 -0.9701 +vn -0.9701 -0.2425 0.0000 +vn 0.6835 -0.2563 0.6835 +vn -0.6835 -0.2563 0.6835 +s off +f 2/1/1 3/2/1 1/3/1 +f 8/4/2 5/5/2 7/6/2 +f 6/7/3 1/3/3 5/5/3 +f 7/8/4 1/3/4 3/9/4 +f 4/10/5 6/7/5 8/11/5 +f 18/12/6 25/13/6 17/14/6 +f 12/15/7 15/16/7 11/17/7 +f 33/18/8 29/19/8 30/20/8 +f 14/21/3 9/22/3 13/23/3 +f 15/24/4 9/22/4 11/25/4 +f 12/26/5 14/27/5 16/28/5 +f 10/29/9 17/14/9 9/22/9 +f 19/30/5 10/31/5 12/26/5 +f 20/32/10 12/15/10 11/17/10 +f 9/22/11 20/33/11 11/25/11 +f 16/34/12 21/35/12 15/16/12 +f 14/27/5 22/36/5 16/28/5 +f 24/37/13 14/21/13 13/23/13 +f 21/38/14 13/23/14 15/24/14 +f 27/39/15 18/40/15 19/30/15 +f 28/41/16 19/42/16 20/32/16 +f 17/43/17 28/44/17 20/33/17 +f 32/45/18 33/18/18 31/46/18 +f 22/47/19 29/48/19 21/35/19 +f 23/49/20 30/50/20 22/36/20 +f 32/45/21 23/51/21 24/37/21 +f 29/52/22 24/53/22 21/38/22 +f 32/54/4 29/52/4 34/55/4 +f 30/50/5 31/56/5 33/57/5 +f 26/58/23 35/59/23 25/13/23 +f 35/59/24 27/60/24 28/61/24 +f 28/44/4 25/62/4 35/63/4 +f 26/64/5 27/39/5 36/65/5 +f 51/66/25 40/67/25 39/68/25 +f 40/69/7 43/70/7 39/71/7 +f 44/72/26 49/73/26 43/70/26 +f 42/74/3 37/75/3 41/76/3 +f 50/77/2 45/78/2 49/73/2 +f 48/79/1 51/66/1 47/80/1 +f 38/81/27 47/80/27 37/75/27 +f 46/82/28 41/76/28 45/78/28 +f 45/78/29 60/83/29 49/73/29 +f 46/84/5 44/85/5 52/86/5 +f 60/87/4 58/88/4 54/89/4 +f 37/75/30 58/90/30 41/76/30 +f 39/68/31 53/91/31 51/66/31 +f 49/73/32 55/92/32 43/70/32 +f 43/70/33 56/93/33 39/71/33 +f 51/66/34 54/94/34 47/80/34 +f 41/76/35 59/95/35 45/78/35 +f 47/80/36 57/96/36 37/75/36 +f 76/97/5 72/98/5 70/99/5 +f 63/100/35 76/101/35 73/102/35 +f 68/103/31 71/104/31 62/105/31 +f 67/106/29 76/101/29 65/107/29 +f 62/108/33 72/109/33 64/110/33 +f 61/111/36 69/112/36 66/113/36 +f 64/114/32 75/115/32 67/106/32 +f 63/100/30 74/116/30 61/117/30 +f 66/113/34 70/118/34 68/119/34 +f 91/120/25 80/121/25 79/122/25 +f 80/123/7 83/124/7 79/125/7 +f 84/126/26 89/127/26 83/124/26 +f 82/128/3 77/129/3 81/130/3 +f 90/131/2 85/132/2 89/127/2 +f 88/133/1 91/120/1 87/134/1 +f 78/135/27 87/134/27 77/129/27 +f 86/136/28 81/130/28 85/132/28 +f 85/132/29 100/137/29 89/127/29 +f 86/138/5 84/139/5 92/140/5 +f 100/141/4 98/142/4 94/143/4 +f 77/129/30 98/144/30 81/130/30 +f 79/122/31 93/145/31 91/120/31 +f 89/127/32 95/146/32 83/124/32 +f 83/124/33 96/147/33 79/125/33 +f 91/120/34 94/148/34 87/134/34 +f 81/130/35 99/149/35 85/132/35 +f 87/134/36 97/150/36 77/129/36 +f 116/151/5 112/152/5 110/153/5 +f 105/154/35 113/155/35 103/156/35 +f 108/157/31 111/158/31 102/159/31 +f 107/160/29 116/161/29 105/162/29 +f 102/163/33 112/164/33 104/165/33 +f 101/166/36 109/167/36 106/168/36 +f 104/169/32 115/170/32 107/160/32 +f 103/156/30 114/171/30 101/172/30 +f 106/168/34 110/173/34 108/174/34 +f 2/1/1 4/175/1 3/2/1 +f 8/4/2 6/7/2 5/5/2 +f 6/7/3 2/1/3 1/3/3 +f 7/8/4 5/5/4 1/3/4 +f 4/10/5 2/1/5 6/7/5 +f 18/12/6 26/58/6 25/13/6 +f 12/15/7 16/34/7 15/16/7 +f 33/18/8 34/176/8 29/19/8 +f 14/21/3 10/29/3 9/22/3 +f 15/24/4 13/23/4 9/22/4 +f 12/26/5 10/31/5 14/27/5 +f 10/29/9 18/12/9 17/14/9 +f 19/30/5 18/40/5 10/31/5 +f 20/32/10 19/42/10 12/15/10 +f 9/22/11 17/43/11 20/33/11 +f 16/34/12 22/47/12 21/35/12 +f 14/27/5 23/49/5 22/36/5 +f 24/37/13 23/51/13 14/21/13 +f 21/38/14 24/53/14 13/23/14 +f 27/39/15 26/64/15 18/40/15 +f 28/41/16 27/177/16 19/42/16 +f 17/43/17 25/62/17 28/44/17 +f 32/45/18 34/176/18 33/18/18 +f 22/47/19 30/178/19 29/48/19 +f 23/49/20 31/56/20 30/50/20 +f 32/45/21 31/46/21 23/51/21 +f 29/52/22 32/54/22 24/53/22 +f 26/58/23 36/179/23 35/59/23 +f 35/59/24 36/179/24 27/60/24 +f 51/66/25 52/180/25 40/67/25 +f 40/69/7 44/72/7 43/70/7 +f 44/72/26 50/77/26 49/73/26 +f 42/74/3 38/81/3 37/75/3 +f 50/77/2 46/82/2 45/78/2 +f 48/79/1 52/180/1 51/66/1 +f 38/81/27 48/79/27 47/80/27 +f 46/82/28 42/74/28 41/76/28 +f 45/78/29 59/181/29 60/83/29 +f 52/86/5 48/182/5 38/183/5 +f 38/183/5 42/184/5 46/84/5 +f 46/84/5 50/185/5 44/85/5 +f 44/85/5 40/186/5 52/86/5 +f 52/86/5 38/183/5 46/84/5 +f 54/89/4 53/187/4 56/188/4 +f 56/188/4 55/189/4 60/87/4 +f 60/87/4 59/190/4 58/88/4 +f 58/88/4 57/191/4 54/89/4 +f 54/89/4 56/188/4 60/87/4 +f 37/75/30 57/192/30 58/90/30 +f 39/68/31 56/193/31 53/91/31 +f 49/73/32 60/83/32 55/92/32 +f 43/70/33 55/194/33 56/93/33 +f 51/66/34 53/195/34 54/94/34 +f 41/76/35 58/90/35 59/95/35 +f 47/80/36 54/94/36 57/96/36 +f 70/99/5 69/196/5 74/197/5 +f 74/197/5 73/198/5 76/97/5 +f 76/97/5 75/199/5 72/98/5 +f 72/98/5 71/200/5 70/99/5 +f 70/99/5 74/197/5 76/97/5 +f 63/100/35 65/201/35 76/101/35 +f 68/103/31 70/118/31 71/104/31 +f 67/106/29 75/115/29 76/101/29 +f 62/108/33 71/202/33 72/109/33 +f 61/111/36 74/116/36 69/112/36 +f 64/114/32 72/109/32 75/115/32 +f 63/100/30 73/102/30 74/116/30 +f 66/113/34 69/112/34 70/118/34 +f 91/120/25 92/203/25 80/121/25 +f 80/123/7 84/126/7 83/124/7 +f 84/126/26 90/131/26 89/127/26 +f 82/128/3 78/135/3 77/129/3 +f 90/131/2 86/136/2 85/132/2 +f 88/133/1 92/203/1 91/120/1 +f 78/135/27 88/133/27 87/134/27 +f 86/136/28 82/128/28 81/130/28 +f 85/132/29 99/204/29 100/137/29 +f 92/140/5 88/205/5 78/206/5 +f 78/206/5 82/207/5 86/138/5 +f 86/138/5 90/208/5 84/139/5 +f 84/139/5 80/209/5 92/140/5 +f 92/140/5 78/206/5 86/138/5 +f 94/143/4 93/210/4 96/211/4 +f 96/211/4 95/212/4 100/141/4 +f 100/141/4 99/213/4 98/142/4 +f 98/142/4 97/214/4 94/143/4 +f 94/143/4 96/211/4 100/141/4 +f 77/129/30 97/215/30 98/144/30 +f 79/122/31 96/216/31 93/145/31 +f 89/127/32 100/137/32 95/146/32 +f 83/124/33 95/217/33 96/147/33 +f 91/120/34 93/218/34 94/148/34 +f 81/130/35 98/144/35 99/149/35 +f 87/134/36 94/148/36 97/150/36 +f 110/153/5 109/219/5 114/220/5 +f 114/220/5 113/221/5 116/151/5 +f 116/151/5 115/222/5 112/152/5 +f 112/152/5 111/223/5 110/153/5 +f 110/153/5 114/220/5 116/151/5 +f 105/154/35 116/161/35 113/155/35 +f 108/157/31 110/173/31 111/158/31 +f 107/160/29 115/170/29 116/161/29 +f 102/163/33 111/224/33 112/164/33 +f 101/166/36 114/171/36 109/167/36 +f 104/169/32 112/164/32 115/170/32 +f 103/156/30 113/155/30 114/171/30 +f 106/168/34 109/167/34 110/173/34 +o RightFoot +v -4.499988 24.500004 -2.500003 +v -4.499991 24.500004 2.499997 +v 0.500011 24.500000 -2.500000 +v 0.500008 24.500000 2.500000 +v -3.874987 24.500004 -3.750003 +v -0.124987 24.500000 -3.750000 +v -3.874989 22.333336 -3.750003 +v -0.124990 22.333334 -3.750000 +v -4.499991 21.250004 -2.500003 +v 0.500009 21.250000 -2.500000 +v -4.499988 24.500004 -2.500003 +v 0.500012 24.500000 -2.500000 +v -2.624990 22.333336 -2.500002 +v -2.624989 22.333336 -3.125002 +v -3.874989 22.333336 -3.125003 +v -4.499990 22.333336 -2.500003 +v -1.999990 22.333336 -2.500001 +v -1.999989 22.333336 -3.125001 +v -1.374990 22.333336 -3.125001 +v -1.374990 22.333336 -2.500001 +v -0.749991 22.333336 -2.500001 +v -0.749990 22.333336 -3.125001 +v -0.124990 22.333334 -3.125000 +v 0.500009 22.333334 -2.500000 +v 1.125012 24.500000 -2.499999 +v 1.125008 24.500000 3.125001 +v -5.124991 24.500004 3.124997 +v -5.124988 24.500004 -2.500003 +v 1.125011 23.416664 -1.874999 +v 1.125008 23.416664 3.125001 +v -5.124992 23.416670 3.124997 +v -5.124990 23.416670 -1.875003 +v 0.500012 24.500000 -2.500000 +v 0.500010 23.416666 -1.875000 +v -4.499988 24.500004 -2.500003 +v -4.499990 23.416668 -1.875003 +v -4.499992 23.416668 2.499997 +v 0.500007 23.416666 2.500000 +v 0.500009 24.500000 2.500000 +v -4.499991 24.500004 2.499997 +v -4.499990 21.250000 -2.500003 +v -0.749991 21.250000 -2.500001 +v -1.374991 21.250000 -3.125001 +v -4.499990 21.250000 -2.500003 +v 0.500009 21.250000 -2.500000 +v -0.749991 21.250000 -3.125001 +v 0.500009 21.250002 -2.500000 +v -4.499993 21.249998 2.499997 +v -1.999990 21.250000 -2.500001 +v -3.874990 21.250000 -3.125003 +v -1.374991 21.250000 -2.500001 +v -1.999990 21.250000 -3.125001 +v -0.124991 21.250000 -3.125000 +v -2.624990 21.250000 -2.500002 +v 0.500006 21.250002 2.500000 +v -2.624990 21.250000 -3.125002 +vt 0.500000 0.245614 +vt 0.250000 0.140351 +vt 0.500000 0.140351 +vt 0.000000 0.245614 +vt 0.000000 0.140351 +vt 1.000000 0.245614 +vt 0.750000 0.140351 +vt 1.000000 0.140351 +vt 0.750000 0.245614 +vt 0.750000 0.000000 +vt 0.500000 0.000000 +vt 0.593750 0.842105 +vt 0.375000 0.807018 +vt 0.562500 0.807018 +vt 0.375000 0.736842 +vt 0.562500 0.736842 +vt 0.593750 0.701754 +vt 0.312500 0.736842 +vt 0.312500 0.824561 +vt 0.625000 0.736842 +vt 0.625000 0.824561 +vt 0.625000 0.982456 +vt 0.312500 0.947368 +vt 0.625000 0.947368 +vt 0.875000 0.982456 +vt 0.906250 0.947368 +vt 0.062500 0.982456 +vt 0.031250 0.947368 +vt -0.000000 1.000000 +vt -0.000000 0.982456 +vt 0.937500 0.982456 +vt 0.875000 1.000000 +vt 0.281250 1.000000 +vt 0.312500 0.982456 +vt 0.343750 1.000000 +vt 0.656250 1.000000 +vt 0.656250 0.929825 +vt 0.281250 0.929825 +vt 0.593750 0.929825 +vt 0.031250 0.596491 +vt 0.093750 0.561404 +vt 0.093750 0.596491 +vt 0.125000 0.596491 +vt 0.156250 0.561404 +vt 0.156250 0.596491 +vt 0.187500 0.596491 +vt 0.218750 0.561404 +vt 0.218750 0.596491 +vt 0.250000 0.596491 +vt 0.281250 0.561404 +vt 0.281250 0.596491 +vt 0.125000 0.561404 +vt 0.125000 0.596491 +vt 0.000000 0.561404 +vt 0.031250 0.561404 +vt 0.187500 0.561404 +vt 0.218750 0.596491 +vt 0.250000 0.561404 +vt 0.312500 0.596491 +vt 0.312500 0.561404 +vt 0.250000 0.245614 +vt 0.343750 0.842105 +vt 0.343750 0.701754 +vt 0.062500 1.000000 +vt 0.937500 1.000000 +vt 0.593750 1.000000 +vt 0.906250 0.929825 +vt 0.031250 0.929825 +vt 0.343750 0.929825 +vt 0.125000 0.561404 +vt 0.000000 0.596491 +vt 0.218750 0.561404 +vn -1.0000 0.0000 -0.0000 +vn -0.0000 0.0000 1.0000 +vn 1.0000 -0.0000 0.0000 +vn 0.0000 -0.0000 -1.0000 +vn 0.0000 1.0000 -0.0000 +vn -0.0000 -0.7557 -0.6549 +vn -0.8944 0.0000 -0.4472 +vn 0.8944 -0.0000 -0.4472 +vn 0.0000 -0.4997 -0.8662 +vn -0.0000 -1.0000 0.0000 +vn -0.7071 0.0000 -0.7071 +vn 0.7071 -0.0000 -0.7071 +s off +f 160/225/37 118/226/37 117/227/37 +f 118/226/38 171/228/38 120/229/38 +f 171/230/39 119/231/39 120/232/39 +f 163/233/40 117/227/40 119/231/40 +f 120/234/41 117/227/41 118/235/41 +f 126/236/42 123/237/42 124/238/42 +f 124/238/40 121/239/40 122/240/40 +f 121/239/41 128/241/41 122/240/41 +f 127/242/43 123/237/43 125/243/43 +f 124/238/44 128/244/44 126/245/44 +f 147/246/38 142/247/38 143/248/38 +f 148/249/37 143/248/37 144/250/37 +f 142/247/39 145/251/39 141/252/39 +f 145/251/45 149/253/45 141/254/45 +f 144/255/45 152/256/45 148/249/45 +f 154/257/46 145/251/46 146/258/46 +f 147/246/46 154/259/46 146/258/46 +f 148/249/46 153/260/46 147/246/46 +f 156/261/41 144/250/41 143/248/41 +f 141/252/41 155/262/41 142/247/41 +f 142/247/41 156/263/41 143/248/41 +f 166/264/40 130/265/40 172/266/40 +f 165/267/37 134/268/37 168/269/37 +f 159/270/39 136/271/39 167/272/39 +f 162/273/40 139/274/40 169/275/40 +f 172/266/39 129/276/39 170/277/39 +f 166/264/47 132/278/47 131/279/47 +f 159/270/40 134/268/40 135/280/40 +f 158/281/37 138/282/37 162/273/37 +f 161/283/48 139/274/48 140/284/48 +f 160/225/37 164/285/37 118/226/37 +f 118/226/38 164/285/38 171/228/38 +f 171/230/39 163/233/39 119/231/39 +f 163/233/40 160/225/40 117/227/40 +f 120/234/41 119/231/41 117/227/41 +f 126/236/42 125/286/42 123/237/42 +f 124/238/40 123/237/40 121/239/40 +f 121/239/41 127/287/41 128/241/41 +f 127/242/43 121/239/43 123/237/43 +f 124/238/44 122/240/44 128/244/44 +f 147/246/38 146/258/38 142/247/38 +f 148/249/37 147/246/37 143/248/37 +f 142/247/39 146/258/39 145/251/39 +f 145/251/45 150/288/45 149/253/45 +f 144/255/45 151/289/45 152/256/45 +f 154/257/46 150/288/46 145/251/46 +f 147/246/46 153/290/46 154/259/46 +f 148/249/46 152/256/46 153/260/46 +f 156/261/41 151/291/41 144/250/41 +f 141/252/41 149/292/41 155/262/41 +f 142/247/41 155/293/41 156/263/41 +f 166/264/40 131/279/40 130/265/40 +f 165/267/37 133/294/37 134/268/37 +f 159/270/39 135/280/39 136/271/39 +f 162/273/40 138/282/40 139/274/40 +f 172/266/39 130/265/39 129/276/39 +f 166/264/47 157/295/47 132/278/47 +f 159/270/40 168/269/40 134/268/40 +f 158/281/37 137/296/37 138/282/37 +f 161/283/48 169/275/48 139/274/48 +o LeftFoot +v -0.499988 24.500000 -2.500000 +v -0.499991 24.500000 2.500000 +v 4.500012 24.499996 -2.499997 +v 4.500009 24.499996 2.500003 +v 3.874988 24.500004 -3.750003 +v 0.124988 24.500000 -3.750001 +v 3.874988 22.333336 -3.750003 +v 0.124989 22.333334 -3.750001 +v 4.499991 21.250004 -2.500003 +v -0.500009 21.250000 -2.500000 +v 4.499988 24.500004 -2.500003 +v -0.500012 24.500000 -2.500000 +v 2.624990 22.333336 -2.500002 +v 2.624990 22.333336 -3.125002 +v 3.874990 22.333336 -3.125003 +v 4.499990 22.333336 -2.500003 +v 1.999990 22.333336 -2.500002 +v 1.999990 22.333336 -3.125002 +v 1.374990 22.333336 -3.125001 +v 1.374990 22.333336 -2.500001 +v 0.749990 22.333336 -2.500001 +v 0.749990 22.333336 -3.125001 +v 0.124990 22.333334 -3.125001 +v -0.500010 22.333334 -2.500000 +v -1.125012 24.500000 -2.499999 +v -1.125009 24.500000 3.125001 +v 5.124991 24.500004 3.124996 +v 5.124988 24.500004 -2.500004 +v -1.125010 23.416664 -1.874999 +v -1.125008 23.416664 3.125001 +v 5.124992 23.416670 3.124996 +v 5.124990 23.416670 -1.875003 +v -0.500012 24.500000 -2.500000 +v -0.500010 23.416666 -1.875000 +v 4.499988 24.500004 -2.500003 +v 4.499990 23.416668 -1.875003 +v 4.499993 23.416668 2.499997 +v -0.500007 23.416666 2.500000 +v -0.500008 24.500000 2.500000 +v 4.499992 24.500004 2.499997 +v 4.499990 21.250000 -2.500003 +v 2.624990 21.250000 -3.125002 +v 4.500007 21.250000 2.500003 +v 0.749991 21.250000 -2.500001 +v 1.374991 21.250000 -3.125001 +v -0.499990 21.250000 -2.500000 +v -0.500009 21.250000 -2.500000 +v 0.749991 21.250000 -3.125001 +v 4.500010 21.250000 -2.499997 +v 3.874990 21.250000 -3.125003 +v 1.999991 21.250000 -2.500002 +v -0.499993 21.250000 2.500000 +v 1.374991 21.250000 -2.500001 +v 1.999991 21.250000 -3.125002 +v 0.124991 21.250000 -3.125001 +v 2.624991 21.250000 -2.500002 +vt 0.500000 0.245614 +vt 0.250000 0.140351 +vt 0.500000 0.140351 +vt 0.250000 0.245614 +vt 0.000000 0.140351 +vt 1.000000 0.245614 +vt 0.750000 0.140351 +vt 1.000000 0.140351 +vt 0.750000 0.245614 +vt 0.750000 0.000000 +vt 0.500000 0.000000 +vt 0.375000 0.807018 +vt 0.593750 0.842105 +vt 0.562500 0.807018 +vt 0.562500 0.736842 +vt 0.343750 0.701754 +vt 0.375000 0.736842 +vt 0.312500 0.736842 +vt 0.312500 0.824561 +vt 0.625000 0.736842 +vt 0.625000 0.824561 +vt 0.625000 0.947368 +vt 0.312500 0.982456 +vt 0.625000 0.982456 +vt 0.875000 0.982456 +vt 0.906250 0.947368 +vt 0.312500 0.947368 +vt 0.062500 0.982456 +vt -0.000000 1.000000 +vt -0.000000 0.982456 +vt 0.937500 1.000000 +vt 0.937500 0.982456 +vt 0.281250 1.000000 +vt 0.343750 1.000000 +vt 0.656250 1.000000 +vt 0.656250 0.929825 +vt 0.031250 0.947368 +vt 0.281250 0.929825 +vt 0.031250 0.929825 +vt 0.593750 0.929825 +vt 0.031250 0.596491 +vt 0.093750 0.561404 +vt 0.031250 0.561404 +vt 0.156250 0.596491 +vt 0.125000 0.561404 +vt 0.125000 0.596491 +vt 0.218750 0.596491 +vt 0.187500 0.561404 +vt 0.187500 0.596491 +vt 0.250000 0.596491 +vt 0.281250 0.561404 +vt 0.250000 0.561404 +vt 0.125000 0.596491 +vt 0.093750 0.596491 +vt 0.000000 0.561404 +vt 0.000000 0.596491 +vt 0.156250 0.561404 +vt 0.218750 0.561404 +vt 0.218750 0.596491 +vt 0.312500 0.596491 +vt 0.281250 0.596491 +vt 0.000000 0.245614 +vt 0.343750 0.842105 +vt 0.593750 0.701754 +vt 0.062500 1.000000 +vt 0.875000 1.000000 +vt 0.593750 1.000000 +vt 0.906250 0.929825 +vt 0.343750 0.929825 +vt 0.218750 0.561404 +vt 0.125000 0.561404 +vt 0.312500 0.561404 +vn -1.0000 0.0000 -0.0000 +vn -0.0000 0.0000 1.0000 +vn 1.0000 -0.0000 0.0000 +vn 0.0000 -0.0000 -1.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 -0.7557 -0.6549 +vn 0.8944 0.0000 -0.4472 +vn -0.8944 -0.0000 -0.4472 +vn -0.0000 -0.4997 -0.8662 +vn 0.0000 -1.0000 -0.0000 +vn 0.7071 0.0000 -0.7071 +vn -0.7071 -0.0000 -0.7071 +s off +f 218/297/49 174/298/49 173/299/49 +f 224/300/50 176/301/50 174/298/50 +f 215/302/51 175/303/51 176/304/51 +f 221/305/52 173/299/52 175/303/52 +f 176/306/53 173/299/53 174/307/53 +f 179/308/54 182/309/54 180/310/54 +f 178/311/52 179/308/52 180/310/52 +f 178/311/53 183/312/53 177/313/53 +f 179/308/55 183/314/55 181/315/55 +f 184/316/56 180/310/56 182/317/56 +f 199/318/50 202/319/50 203/320/50 +f 199/318/51 204/321/51 200/322/51 +f 198/323/49 201/324/49 202/319/49 +f 205/325/57 201/324/57 197/326/57 +f 204/321/57 207/327/57 200/328/57 +f 201/324/58 210/329/58 202/319/58 +f 210/330/58 203/320/58 202/319/58 +f 209/331/58 204/321/58 203/320/58 +f 200/322/53 212/332/53 199/318/53 +f 197/333/53 211/334/53 205/335/53 +f 212/336/53 198/323/53 199/318/53 +f 222/337/52 186/338/52 187/339/52 +f 226/340/51 189/341/51 223/342/51 +f 225/343/49 191/344/49 217/345/49 +f 220/346/52 195/347/52 194/348/52 +f 228/349/49 186/338/49 214/350/49 +f 222/337/59 188/351/59 213/352/59 +f 217/345/52 190/353/52 226/340/52 +f 220/346/51 193/354/51 216/355/51 +f 219/356/60 195/347/60 227/357/60 +f 218/297/49 224/300/49 174/298/49 +f 224/300/50 215/358/50 176/301/50 +f 215/302/51 221/305/51 175/303/51 +f 221/305/52 218/297/52 173/299/52 +f 176/306/53 175/303/53 173/299/53 +f 179/308/54 181/359/54 182/309/54 +f 178/311/52 177/313/52 179/308/52 +f 178/311/53 184/360/53 183/312/53 +f 179/308/55 177/313/55 183/314/55 +f 184/316/56 178/311/56 180/310/56 +f 199/318/50 198/323/50 202/319/50 +f 199/318/51 203/320/51 204/321/51 +f 198/323/49 197/333/49 201/324/49 +f 205/325/57 206/361/57 201/324/57 +f 204/321/57 208/362/57 207/327/57 +f 201/324/58 206/361/58 210/329/58 +f 210/330/58 209/363/58 203/320/58 +f 209/331/58 208/362/58 204/321/58 +f 200/322/53 207/364/53 212/332/53 +f 197/333/53 198/323/53 211/334/53 +f 212/336/53 211/365/53 198/323/53 +f 222/337/52 214/350/52 186/338/52 +f 226/340/51 190/353/51 189/341/51 +f 225/343/49 192/366/49 191/344/49 +f 220/346/52 227/357/52 195/347/52 +f 228/349/49 185/367/49 186/338/49 +f 222/337/59 187/339/59 188/351/59 +f 217/345/52 191/344/52 190/353/52 +f 220/346/51 194/348/51 193/354/51 +f 219/356/60 196/368/60 195/347/60 o Head v 3.374979 -4.000002 -4.500000 v 1.124979 -4.000002 -4.500000 @@ -36,20 +1012,20 @@ vn 1.0000 -0.0000 0.0000 vn -0.0000 0.0000 1.0000 vn -1.0000 0.0000 -0.0000 s off -f 1/1/1 4/2/1 3/3/1 -f 2/4/1 5/5/1 6/6/1 -f 1/1/1 8/7/1 5/5/1 -f 7/8/2 10/9/2 8/7/2 -f 10/10/3 11/11/3 12/12/3 -f 11/11/4 14/13/4 12/12/4 -f 6/6/1 13/14/1 2/4/1 -f 1/1/1 2/4/1 4/2/1 -f 2/4/1 1/1/1 5/5/1 -f 1/1/1 7/8/1 8/7/1 -f 7/8/2 9/15/2 10/9/2 -f 10/10/3 9/16/3 11/11/3 -f 11/11/4 13/14/4 14/13/4 -f 6/6/1 14/13/1 13/14/1 +f 229/369/61 232/370/61 231/371/61 +f 230/372/61 233/373/61 234/374/61 +f 229/369/61 236/375/61 233/373/61 +f 235/376/62 238/377/62 236/375/62 +f 238/378/63 239/379/63 240/380/63 +f 239/379/64 242/381/64 240/380/64 +f 234/374/61 241/382/61 230/372/61 +f 229/369/61 230/372/61 232/370/61 +f 230/372/61 229/369/61 233/373/61 +f 229/369/61 235/376/61 236/375/61 +f 235/376/62 237/383/62 238/377/62 +f 238/378/63 237/384/63 239/379/63 +f 239/379/64 241/382/64 242/381/64 +f 234/374/61 242/381/61 241/382/61 o RightArm v -8.500006 12.500003 -2.500003 v -8.500016 -0.499996 -2.500003 @@ -244,102 +1220,102 @@ vn -0.5450 0.8384 -0.0000 vn -0.2425 0.0000 -0.9701 vn -0.2425 0.0000 0.9701 s off -f 16/17/5 17/18/5 15/19/5 -f 18/20/6 21/21/6 17/18/6 -f 22/22/7 19/23/7 21/24/7 -f 20/25/8 15/19/8 19/23/8 -f 21/26/9 15/19/9 17/27/9 -f 22/28/10 16/17/10 20/25/10 -f 32/29/10 36/30/10 31/31/10 -f 31/32/10 35/33/10 33/34/10 -f 33/35/10 38/36/10 34/37/10 -f 34/38/10 37/39/10 32/40/10 -f 28/41/5 37/39/5 29/42/5 -f 24/43/9 28/41/9 29/42/9 -f 25/44/9 28/41/9 23/45/9 -f 30/46/9 25/47/9 26/48/9 -f 29/42/9 26/49/9 24/50/9 -f 28/41/8 35/33/8 36/30/8 -f 38/36/7 27/51/7 30/46/7 -f 29/42/6 38/52/6 30/53/6 -f 51/54/11 58/55/11 57/56/11 -f 55/57/12 51/54/12 57/58/12 -f 56/59/13 52/60/13 55/61/13 -f 56/62/14 54/63/14 53/64/14 -f 44/65/5 53/64/5 45/66/5 -f 39/67/9 45/66/9 40/68/9 -f 41/69/9 44/65/9 39/70/9 -f 46/71/9 41/72/9 42/73/9 -f 45/66/9 42/74/9 40/75/9 -f 43/76/8 52/60/8 44/65/8 -f 54/77/7 43/76/7 46/71/7 -f 53/64/6 46/78/6 45/66/6 -f 47/79/10 49/80/10 48/81/10 -f 48/81/15 59/82/15 47/79/15 -f 60/83/5 61/84/5 59/82/5 -f 61/84/16 64/85/16 63/86/16 -f 63/86/9 66/87/9 65/88/9 -f 65/89/7 49/90/7 50/91/7 -f 59/82/8 63/92/8 47/93/8 -f 63/92/8 50/94/8 47/93/8 -f 64/95/6 60/83/6 48/96/6 -f 49/90/6 64/95/6 48/96/6 -f 69/97/9 68/98/9 67/99/9 -f 72/100/10 73/101/10 71/102/10 -f 68/103/7 71/102/7 67/99/7 -f 67/99/8 73/101/8 69/97/8 -f 69/97/5 74/104/5 70/105/5 -f 76/106/17 77/107/17 75/108/17 -f 77/107/18 80/109/18 79/110/18 -f 75/108/19 77/111/19 79/112/19 -f 78/113/20 76/106/20 80/114/20 -f 16/17/5 18/20/5 17/18/5 -f 18/20/6 22/115/6 21/21/6 -f 22/22/7 20/25/7 19/23/7 -f 20/25/8 16/17/8 15/19/8 -f 21/26/9 19/23/9 15/19/9 -f 22/28/10 18/116/10 16/17/10 -f 32/29/10 37/39/10 36/30/10 -f 31/32/10 36/30/10 35/33/10 -f 33/35/10 35/33/10 38/36/10 -f 34/38/10 38/52/10 37/39/10 -f 28/41/5 36/30/5 37/39/5 -f 24/43/9 23/117/9 28/41/9 -f 25/44/9 27/51/9 28/41/9 -f 30/46/9 27/51/9 25/47/9 -f 29/42/9 30/53/9 26/49/9 -f 28/41/8 27/51/8 35/33/8 -f 38/36/7 35/33/7 27/51/7 -f 29/42/6 37/39/6 38/52/6 -f 51/54/11 54/77/11 58/55/11 -f 55/57/12 52/60/12 51/54/12 -f 56/59/13 53/64/13 52/60/13 -f 56/62/14 58/118/14 54/63/14 -f 44/65/5 52/60/5 53/64/5 -f 39/67/9 44/65/9 45/66/9 -f 41/69/9 43/76/9 44/65/9 -f 46/71/9 43/76/9 41/72/9 -f 45/66/9 46/78/9 42/74/9 -f 43/76/8 51/54/8 52/60/8 -f 54/77/7 51/54/7 43/76/7 -f 53/64/6 54/63/6 46/78/6 -f 47/79/10 50/119/10 49/80/10 -f 48/81/15 60/83/15 59/82/15 -f 60/83/5 62/120/5 61/84/5 -f 61/84/16 62/120/16 64/85/16 -f 63/86/9 64/85/9 66/87/9 -f 65/89/7 66/121/7 49/90/7 -f 59/82/8 61/84/8 63/92/8 -f 63/92/8 65/122/8 50/94/8 -f 64/95/6 62/120/6 60/83/6 -f 49/90/6 66/121/6 64/95/6 -f 69/97/9 70/123/9 68/98/9 -f 72/100/10 74/124/10 73/101/10 -f 68/103/7 72/125/7 71/102/7 -f 67/99/8 71/102/8 73/101/8 -f 69/97/5 73/101/5 74/104/5 -f 76/106/17 78/126/17 77/107/17 -f 77/107/18 78/126/18 80/109/18 +f 244/385/65 245/386/65 243/387/65 +f 246/388/66 249/389/66 245/386/66 +f 250/390/67 247/391/67 249/392/67 +f 248/393/68 243/387/68 247/391/68 +f 249/394/69 243/387/69 245/395/69 +f 250/396/70 244/385/70 248/393/70 +f 260/397/70 264/398/70 259/399/70 +f 259/400/70 263/401/70 261/402/70 +f 261/403/70 266/404/70 262/405/70 +f 262/406/70 265/407/70 260/408/70 +f 256/409/65 265/407/65 257/410/65 +f 252/411/69 256/409/69 257/410/69 +f 253/412/69 256/409/69 251/413/69 +f 258/414/69 253/415/69 254/416/69 +f 257/410/69 254/417/69 252/418/69 +f 256/409/68 263/401/68 264/398/68 +f 266/404/67 255/419/67 258/414/67 +f 257/410/66 266/420/66 258/421/66 +f 279/422/71 286/423/71 285/424/71 +f 283/425/72 279/422/72 285/426/72 +f 284/427/73 280/428/73 283/429/73 +f 284/430/74 282/431/74 281/432/74 +f 272/433/65 281/432/65 273/434/65 +f 267/435/69 273/434/69 268/436/69 +f 269/437/69 272/433/69 267/438/69 +f 274/439/69 269/440/69 270/441/69 +f 273/434/69 270/442/69 268/443/69 +f 271/444/68 280/428/68 272/433/68 +f 282/445/67 271/444/67 274/439/67 +f 281/432/66 274/446/66 273/434/66 +f 275/447/70 277/448/70 276/449/70 +f 276/449/75 287/450/75 275/447/75 +f 288/451/65 289/452/65 287/450/65 +f 289/452/76 292/453/76 291/454/76 +f 291/454/69 294/455/69 293/456/69 +f 293/457/67 277/458/67 278/459/67 +f 287/450/68 291/460/68 275/461/68 +f 291/460/68 278/462/68 275/461/68 +f 292/463/66 288/451/66 276/464/66 +f 277/458/66 292/463/66 276/464/66 +f 297/465/69 296/466/69 295/467/69 +f 300/468/70 301/469/70 299/470/70 +f 296/471/67 299/470/67 295/467/67 +f 295/467/68 301/469/68 297/465/68 +f 297/465/65 302/472/65 298/473/65 +f 304/474/77 305/475/77 303/476/77 +f 305/475/78 308/477/78 307/478/78 +f 303/476/79 305/479/79 307/480/79 +f 306/481/80 304/474/80 308/482/80 +f 244/385/65 246/388/65 245/386/65 +f 246/388/66 250/483/66 249/389/66 +f 250/390/67 248/393/67 247/391/67 +f 248/393/68 244/385/68 243/387/68 +f 249/394/69 247/391/69 243/387/69 +f 250/396/70 246/484/70 244/385/70 +f 260/397/70 265/407/70 264/398/70 +f 259/400/70 264/398/70 263/401/70 +f 261/403/70 263/401/70 266/404/70 +f 262/406/70 266/420/70 265/407/70 +f 256/409/65 264/398/65 265/407/65 +f 252/411/69 251/485/69 256/409/69 +f 253/412/69 255/419/69 256/409/69 +f 258/414/69 255/419/69 253/415/69 +f 257/410/69 258/421/69 254/417/69 +f 256/409/68 255/419/68 263/401/68 +f 266/404/67 263/401/67 255/419/67 +f 257/410/66 265/407/66 266/420/66 +f 279/422/71 282/445/71 286/423/71 +f 283/425/72 280/428/72 279/422/72 +f 284/427/73 281/432/73 280/428/73 +f 284/430/74 286/486/74 282/431/74 +f 272/433/65 280/428/65 281/432/65 +f 267/435/69 272/433/69 273/434/69 +f 269/437/69 271/444/69 272/433/69 +f 274/439/69 271/444/69 269/440/69 +f 273/434/69 274/446/69 270/442/69 +f 271/444/68 279/422/68 280/428/68 +f 282/445/67 279/422/67 271/444/67 +f 281/432/66 282/431/66 274/446/66 +f 275/447/70 278/487/70 277/448/70 +f 276/449/75 288/451/75 287/450/75 +f 288/451/65 290/488/65 289/452/65 +f 289/452/76 290/488/76 292/453/76 +f 291/454/69 292/453/69 294/455/69 +f 293/457/67 294/489/67 277/458/67 +f 287/450/68 289/452/68 291/460/68 +f 291/460/68 293/490/68 278/462/68 +f 292/463/66 290/488/66 288/451/66 +f 277/458/66 294/489/66 292/463/66 +f 297/465/69 298/491/69 296/466/69 +f 300/468/70 302/492/70 301/469/70 +f 296/471/67 300/493/67 299/470/67 +f 295/467/68 299/470/68 301/469/68 +f 297/465/65 301/469/65 302/472/65 +f 304/474/77 306/494/77 305/475/77 +f 305/475/78 306/494/78 308/477/78 o LeftArm v 3.499995 12.500000 -2.500000 v 3.499986 -0.500000 -2.500000 @@ -534,102 +1510,102 @@ vn 0.5450 0.8384 -0.0000 vn 0.2425 0.0000 -0.9701 vn 0.2425 0.0000 0.9701 s off -f 82/127/21 83/128/21 81/129/21 -f 84/130/22 87/131/22 83/128/22 -f 88/132/23 85/133/23 87/134/23 -f 86/135/24 81/129/24 85/133/24 -f 87/136/25 81/129/25 83/137/25 -f 88/138/26 82/127/26 86/135/26 -f 98/139/26 102/140/26 103/141/26 -f 97/142/26 101/143/26 102/140/26 -f 104/144/26 99/145/26 100/146/26 -f 103/141/26 100/147/26 98/148/26 -f 103/141/23 94/149/23 95/150/23 -f 90/151/25 94/149/25 89/152/25 -f 94/149/25 91/153/25 89/154/25 -f 91/155/25 96/156/25 92/157/25 -f 92/158/25 95/150/25 90/159/25 -f 94/149/24 101/143/24 93/160/24 -f 93/160/21 104/144/21 96/156/21 -f 96/161/22 103/141/22 95/150/22 -f 124/162/27 117/163/27 123/164/27 -f 117/163/28 121/165/28 123/166/28 -f 118/167/29 122/168/29 121/169/29 -f 119/170/30 124/171/30 122/172/30 -f 119/170/23 110/173/23 111/174/23 -f 111/174/25 105/175/25 106/176/25 -f 110/173/25 107/177/25 105/178/25 -f 107/179/25 112/180/25 108/181/25 -f 108/182/25 111/174/25 106/183/25 -f 118/167/24 109/184/24 110/173/24 -f 109/184/21 120/185/21 112/180/21 -f 112/186/22 119/170/22 111/174/22 -f 113/187/26 115/188/26 116/189/26 -f 114/190/31 125/191/31 126/192/31 -f 127/193/23 126/192/23 125/191/23 -f 127/193/32 130/194/32 128/195/32 -f 129/196/25 132/197/25 130/194/25 -f 115/198/21 131/199/21 116/200/21 -f 125/191/24 129/201/24 127/193/24 -f 116/202/24 129/201/24 113/203/24 -f 126/192/22 130/204/22 114/205/22 -f 115/198/22 130/204/22 132/206/22 -f 133/207/25 136/208/25 135/209/25 -f 137/210/26 140/211/26 138/212/26 -f 137/210/21 134/213/21 133/207/21 -f 135/209/24 137/210/24 133/207/24 -f 140/214/23 135/209/23 136/215/23 -f 143/216/33 142/217/33 141/218/33 -f 143/216/34 146/219/34 144/220/34 -f 141/218/35 145/221/35 143/222/35 -f 144/223/36 146/224/36 142/217/36 -f 82/127/21 84/130/21 83/128/21 -f 84/130/22 88/225/22 87/131/22 -f 88/132/23 86/135/23 85/133/23 -f 86/135/24 82/127/24 81/129/24 -f 87/136/25 85/133/25 81/129/25 -f 88/138/26 84/226/26 82/127/26 -f 98/139/26 97/227/26 102/140/26 -f 97/142/26 99/228/26 101/143/26 -f 104/144/26 101/143/26 99/145/26 -f 103/141/26 104/229/26 100/147/26 -f 103/141/23 102/140/23 94/149/23 -f 90/151/25 95/150/25 94/149/25 -f 94/149/25 93/160/25 91/153/25 -f 91/155/25 93/160/25 96/156/25 -f 92/158/25 96/161/25 95/150/25 -f 94/149/24 102/140/24 101/143/24 -f 93/160/21 101/143/21 104/144/21 -f 96/161/22 104/229/22 103/141/22 -f 124/162/27 120/185/27 117/163/27 -f 117/163/28 118/167/28 121/165/28 -f 118/167/29 119/170/29 122/168/29 -f 119/170/30 120/230/30 124/171/30 -f 119/170/23 118/167/23 110/173/23 -f 111/174/25 110/173/25 105/175/25 -f 110/173/25 109/184/25 107/177/25 -f 107/179/25 109/184/25 112/180/25 -f 108/182/25 112/186/25 111/174/25 -f 118/167/24 117/163/24 109/184/24 -f 109/184/21 117/163/21 120/185/21 -f 112/186/22 120/230/22 119/170/22 -f 113/187/26 114/190/26 115/188/26 -f 114/190/31 113/187/31 125/191/31 -f 127/193/23 128/195/23 126/192/23 -f 127/193/32 129/196/32 130/194/32 -f 129/196/25 131/231/25 132/197/25 -f 115/198/21 132/206/21 131/199/21 -f 125/191/24 113/203/24 129/201/24 -f 116/202/24 131/232/24 129/201/24 -f 126/192/22 128/195/22 130/204/22 -f 115/198/22 114/205/22 130/204/22 -f 133/207/25 134/233/25 136/208/25 -f 137/210/26 139/234/26 140/211/26 -f 137/210/21 138/235/21 134/213/21 -f 135/209/24 139/234/24 137/210/24 -f 140/214/23 139/234/23 135/209/23 -f 143/216/33 144/220/33 142/217/33 -f 143/216/34 145/236/34 146/219/34 +f 310/495/81 311/496/81 309/497/81 +f 312/498/82 315/499/82 311/496/82 +f 316/500/83 313/501/83 315/502/83 +f 314/503/84 309/497/84 313/501/84 +f 315/504/85 309/497/85 311/505/85 +f 316/506/86 310/495/86 314/503/86 +f 326/507/86 330/508/86 331/509/86 +f 325/510/86 329/511/86 330/508/86 +f 332/512/86 327/513/86 328/514/86 +f 331/509/86 328/515/86 326/516/86 +f 331/509/83 322/517/83 323/518/83 +f 318/519/85 322/517/85 317/520/85 +f 322/517/85 319/521/85 317/522/85 +f 319/523/85 324/524/85 320/525/85 +f 320/526/85 323/518/85 318/527/85 +f 322/517/84 329/511/84 321/528/84 +f 321/528/81 332/512/81 324/524/81 +f 324/529/82 331/509/82 323/518/82 +f 352/530/87 345/531/87 351/532/87 +f 345/531/88 349/533/88 351/534/88 +f 346/535/89 350/536/89 349/537/89 +f 347/538/90 352/539/90 350/540/90 +f 347/538/83 338/541/83 339/542/83 +f 339/542/85 333/543/85 334/544/85 +f 338/541/85 335/545/85 333/546/85 +f 335/547/85 340/548/85 336/549/85 +f 336/550/85 339/542/85 334/551/85 +f 346/535/84 337/552/84 338/541/84 +f 337/552/81 348/553/81 340/548/81 +f 340/554/82 347/538/82 339/542/82 +f 341/555/86 343/556/86 344/557/86 +f 342/558/91 353/559/91 354/560/91 +f 355/561/83 354/560/83 353/559/83 +f 355/561/92 358/562/92 356/563/92 +f 357/564/85 360/565/85 358/562/85 +f 343/566/81 359/567/81 344/568/81 +f 353/559/84 357/569/84 355/561/84 +f 344/570/84 357/569/84 341/571/84 +f 354/560/82 358/572/82 342/573/82 +f 343/566/82 358/572/82 360/574/82 +f 361/575/85 364/576/85 363/577/85 +f 365/578/86 368/579/86 366/580/86 +f 365/578/81 362/581/81 361/575/81 +f 363/577/84 365/578/84 361/575/84 +f 368/582/83 363/577/83 364/583/83 +f 371/584/93 370/585/93 369/586/93 +f 371/584/94 374/587/94 372/588/94 +f 369/586/95 373/589/95 371/590/95 +f 372/591/96 374/592/96 370/585/96 +f 310/495/81 312/498/81 311/496/81 +f 312/498/82 316/593/82 315/499/82 +f 316/500/83 314/503/83 313/501/83 +f 314/503/84 310/495/84 309/497/84 +f 315/504/85 313/501/85 309/497/85 +f 316/506/86 312/594/86 310/495/86 +f 326/507/86 325/595/86 330/508/86 +f 325/510/86 327/596/86 329/511/86 +f 332/512/86 329/511/86 327/513/86 +f 331/509/86 332/597/86 328/515/86 +f 331/509/83 330/508/83 322/517/83 +f 318/519/85 323/518/85 322/517/85 +f 322/517/85 321/528/85 319/521/85 +f 319/523/85 321/528/85 324/524/85 +f 320/526/85 324/529/85 323/518/85 +f 322/517/84 330/508/84 329/511/84 +f 321/528/81 329/511/81 332/512/81 +f 324/529/82 332/597/82 331/509/82 +f 352/530/87 348/553/87 345/531/87 +f 345/531/88 346/535/88 349/533/88 +f 346/535/89 347/538/89 350/536/89 +f 347/538/90 348/598/90 352/539/90 +f 347/538/83 346/535/83 338/541/83 +f 339/542/85 338/541/85 333/543/85 +f 338/541/85 337/552/85 335/545/85 +f 335/547/85 337/552/85 340/548/85 +f 336/550/85 340/554/85 339/542/85 +f 346/535/84 345/531/84 337/552/84 +f 337/552/81 345/531/81 348/553/81 +f 340/554/82 348/598/82 347/538/82 +f 341/555/86 342/558/86 343/556/86 +f 342/558/91 341/555/91 353/559/91 +f 355/561/83 356/563/83 354/560/83 +f 355/561/92 357/564/92 358/562/92 +f 357/564/85 359/599/85 360/565/85 +f 343/566/81 360/574/81 359/567/81 +f 353/559/84 341/571/84 357/569/84 +f 344/570/84 359/600/84 357/569/84 +f 354/560/82 356/563/82 358/572/82 +f 343/566/82 342/573/82 358/572/82 +f 361/575/85 362/601/85 364/576/85 +f 365/578/86 367/602/86 368/579/86 +f 365/578/81 366/603/81 362/581/81 +f 363/577/84 367/602/84 365/578/84 +f 368/582/83 367/602/83 363/577/83 +f 371/584/93 372/588/93 370/585/93 +f 371/584/94 373/604/94 374/587/94 o Body v -4.250004 12.500003 -2.500003 v -4.250013 -0.499996 -2.500003 @@ -900,215 +1876,177 @@ vn 0.9712 -0.2381 0.0000 vn -0.5070 0.0000 0.8619 vn 0.5070 0.0000 0.8619 s off -f 148/237/37 149/238/37 147/239/37 -f 150/240/38 153/241/38 149/238/38 -f 154/242/39 151/243/39 153/244/39 -f 152/245/40 147/239/40 151/243/40 -f 149/246/41 151/243/41 147/239/41 -f 150/247/42 152/245/42 154/248/42 -f 156/249/40 157/250/40 155/251/40 -f 155/251/43 160/252/43 156/249/43 -f 158/253/42 161/254/42 157/250/42 -f 166/255/39 169/256/39 165/257/39 -f 165/257/40 168/258/40 164/259/40 -f 164/259/37 167/260/37 163/261/37 -f 168/258/42 170/262/42 167/263/42 -f 174/264/39 177/265/39 173/266/39 -f 173/266/40 176/267/40 172/268/40 -f 172/268/37 175/269/37 171/270/37 -f 176/267/42 178/271/42 175/272/42 -f 156/249/39 162/273/39 158/253/39 -f 161/274/37 155/251/37 157/250/37 -f 203/275/44 186/276/44 183/277/44 -f 180/278/40 185/279/40 181/280/40 -f 185/279/39 182/281/39 181/280/39 -f 184/282/45 188/283/45 185/279/45 -f 204/284/46 203/275/46 183/277/46 -f 193/285/40 189/286/40 190/287/40 -f 194/288/45 190/287/45 191/289/45 -f 193/285/47 195/290/47 192/291/47 -f 194/288/48 196/292/48 193/285/48 -f 197/293/37 190/287/37 189/286/37 -f 198/294/40 203/275/40 199/295/40 -f 199/295/45 204/284/45 200/296/45 -f 201/297/39 199/295/39 200/298/39 -f 179/299/37 184/282/37 180/278/37 -f 207/300/42 208/301/42 206/302/42 -f 208/301/38 211/303/38 210/304/38 -f 210/304/49 213/305/49 212/306/49 -f 210/304/37 206/307/37 208/301/37 -f 207/308/39 211/303/39 209/309/39 -f 216/310/37 214/311/37 215/312/37 -f 214/311/50 219/313/50 215/312/50 -f 218/314/42 221/315/42 219/316/42 -f 220/317/51 223/318/51 221/315/51 -f 216/310/49 225/319/49 217/320/49 -f 219/316/38 223/321/38 215/312/38 -f 223/321/38 216/310/38 215/312/38 -f 224/322/39 222/323/39 226/324/39 -f 224/322/51 226/324/51 225/325/51 -f 229/326/52 230/327/52 239/328/52 -f 227/329/52 232/330/52 228/331/52 -f 231/332/42 234/333/42 232/330/42 -f 233/334/53 236/335/53 234/336/53 -f 237/337/49 230/338/49 229/339/49 -f 234/333/38 228/340/38 232/330/38 -f 236/335/38 229/339/38 228/340/38 -f 227/329/37 229/326/37 239/328/37 -f 235/341/39 237/337/39 236/335/39 -f 241/342/42 242/343/42 240/344/42 -f 242/343/38 245/345/38 244/346/38 -f 245/345/41 246/347/41 244/346/41 -f 242/343/54 249/348/54 248/349/54 -f 242/343/42 248/350/42 240/344/42 -f 244/346/41 246/347/41 249/351/41 -f 243/352/55 251/353/55 245/345/55 -f 241/342/42 250/354/42 243/352/42 -f 245/345/41 251/355/41 247/356/41 -f 148/237/37 150/240/37 149/238/37 -f 150/240/38 154/357/38 153/241/38 -f 154/242/39 152/245/39 151/243/39 -f 152/245/40 148/237/40 147/239/40 -f 149/246/41 153/358/41 151/243/41 -f 150/247/42 148/237/42 152/245/42 -f 156/249/40 158/253/40 157/250/40 -f 155/251/43 159/359/43 160/252/43 -f 158/253/42 162/360/42 161/254/42 -f 166/255/39 170/361/39 169/256/39 -f 165/257/40 169/256/40 168/258/40 -f 164/259/37 168/258/37 167/260/37 -f 168/258/42 169/256/42 170/262/42 -f 174/264/39 178/362/39 177/265/39 -f 173/266/40 177/265/40 176/267/40 -f 172/268/37 176/267/37 175/269/37 -f 176/267/42 177/265/42 178/271/42 -f 156/249/39 160/363/39 162/273/39 -f 161/274/37 159/364/37 155/251/37 -f 203/275/44 202/365/44 186/276/44 -f 180/278/40 184/282/40 185/279/40 -f 185/279/39 188/366/39 182/281/39 -f 184/282/45 187/367/45 188/283/45 -f 193/285/40 192/291/40 189/286/40 -f 194/288/45 193/285/45 190/287/45 -f 193/285/47 196/292/47 195/290/47 -f 197/293/37 191/368/37 190/287/37 -f 198/294/40 202/365/40 203/275/40 -f 199/295/45 203/275/45 204/284/45 -f 201/297/39 198/294/39 199/295/39 -f 179/299/37 187/369/37 184/282/37 -f 207/300/42 209/309/42 208/301/42 -f 208/301/38 209/309/38 211/303/38 -f 210/304/49 211/303/49 213/305/49 -f 210/304/37 212/370/37 206/307/37 -f 207/308/39 213/371/39 211/303/39 -f 216/310/37 217/372/37 214/311/37 -f 214/311/50 218/373/50 219/313/50 -f 218/314/42 220/374/42 221/315/42 -f 220/317/51 222/323/51 223/318/51 -f 216/310/49 224/375/49 225/319/49 -f 219/316/38 221/315/38 223/321/38 -f 223/321/38 224/375/38 216/310/38 -f 224/322/39 223/318/39 222/323/39 -f 227/329/52 231/376/52 232/330/52 -f 231/332/42 233/377/42 234/333/42 -f 233/334/53 235/341/53 236/335/53 -f 237/337/49 238/378/49 230/338/49 -f 234/333/38 236/335/38 228/340/38 -f 236/335/38 237/337/38 229/339/38 -f 227/329/37 228/331/37 229/326/37 -f 235/341/39 238/379/39 237/337/39 -f 241/342/42 243/352/42 242/343/42 -f 242/343/38 243/352/38 245/345/38 -f 245/345/41 247/356/41 246/347/41 -f 242/343/54 244/346/54 249/348/54 -f 243/352/55 250/380/55 251/353/55 -l 202 205 +f 376/605/97 377/606/97 375/607/97 +f 378/608/98 381/609/98 377/606/98 +f 382/610/99 379/611/99 381/612/99 +f 380/613/100 375/607/100 379/611/100 +f 377/614/101 379/611/101 375/607/101 +f 378/615/102 380/613/102 382/616/102 +f 384/617/100 385/618/100 383/619/100 +f 383/619/103 388/620/103 384/617/103 +f 386/621/102 389/622/102 385/618/102 +f 394/623/99 397/624/99 393/625/99 +f 393/625/100 396/626/100 392/627/100 +f 392/627/97 395/628/97 391/629/97 +f 396/626/102 398/630/102 395/631/102 +f 402/632/99 405/633/99 401/634/99 +f 401/634/100 404/635/100 400/636/100 +f 400/636/97 403/637/97 399/638/97 +f 404/635/102 406/639/102 403/640/102 +f 384/617/99 390/641/99 386/621/99 +f 389/642/97 383/619/97 385/618/97 +f 431/643/104 414/644/104 411/645/104 +f 408/646/100 413/647/100 409/648/100 +f 413/647/99 410/649/99 409/648/99 +f 412/650/105 416/651/105 413/647/105 +f 432/652/106 431/643/106 411/645/106 +f 421/653/100 417/654/100 418/655/100 +f 422/656/105 418/655/105 419/657/105 +f 421/653/107 423/658/107 420/659/107 +f 422/656/108 424/660/108 421/653/108 +f 425/661/97 418/655/97 417/654/97 +f 426/662/100 431/643/100 427/663/100 +f 427/663/105 432/652/105 428/664/105 +f 429/665/99 427/663/99 428/666/99 +f 407/667/97 412/650/97 408/646/97 +f 435/668/102 436/669/102 434/670/102 +f 436/669/98 439/671/98 438/672/98 +f 438/672/109 441/673/109 440/674/109 +f 438/672/97 434/675/97 436/669/97 +f 435/676/99 439/671/99 437/677/99 +f 444/678/97 442/679/97 443/680/97 +f 442/679/110 447/681/110 443/680/110 +f 446/682/102 449/683/102 447/684/102 +f 448/685/111 451/686/111 449/683/111 +f 444/678/109 453/687/109 445/688/109 +f 447/684/98 451/689/98 443/680/98 +f 451/689/98 444/678/98 443/680/98 +f 452/690/99 450/691/99 454/692/99 +f 452/690/111 454/692/111 453/693/111 +f 457/694/112 458/695/112 467/696/112 +f 455/697/112 460/698/112 456/699/112 +f 459/700/102 462/701/102 460/698/102 +f 461/702/113 464/703/113 462/704/113 +f 465/705/109 458/706/109 457/707/109 +f 462/701/98 456/708/98 460/698/98 +f 464/703/98 457/707/98 456/708/98 +f 455/697/97 457/694/97 467/696/97 +f 463/709/99 465/705/99 464/703/99 +f 469/710/102 470/711/102 468/712/102 +f 470/711/98 473/713/98 472/714/98 +f 473/713/101 474/715/101 472/714/101 +f 470/711/114 477/716/114 476/717/114 +f 470/711/102 476/718/102 468/712/102 +f 472/714/101 474/715/101 477/719/101 +f 471/720/115 479/721/115 473/713/115 +f 469/710/102 478/722/102 471/720/102 +f 473/713/101 479/723/101 475/724/101 +f 376/605/97 378/608/97 377/606/97 +f 378/608/98 382/725/98 381/609/98 +f 382/610/99 380/613/99 379/611/99 +f 380/613/100 376/605/100 375/607/100 +f 377/614/101 381/726/101 379/611/101 +f 378/615/102 376/605/102 380/613/102 +f 384/617/100 386/621/100 385/618/100 +f 383/619/103 387/727/103 388/620/103 +f 386/621/102 390/728/102 389/622/102 +f 394/623/99 398/729/99 397/624/99 +f 393/625/100 397/624/100 396/626/100 +f 392/627/97 396/626/97 395/628/97 +f 396/626/102 397/624/102 398/630/102 +f 402/632/99 406/730/99 405/633/99 +f 401/634/100 405/633/100 404/635/100 +f 400/636/97 404/635/97 403/637/97 +f 404/635/102 405/633/102 406/639/102 +f 384/617/99 388/731/99 390/641/99 +f 389/642/97 387/732/97 383/619/97 +f 431/643/104 430/733/104 414/644/104 +f 408/646/100 412/650/100 413/647/100 +f 413/647/99 416/734/99 410/649/99 +f 412/650/105 415/735/105 416/651/105 +f 421/653/100 420/659/100 417/654/100 +f 422/656/105 421/653/105 418/655/105 +f 421/653/107 424/660/107 423/658/107 +f 425/661/97 419/736/97 418/655/97 +f 426/662/100 430/733/100 431/643/100 +f 427/663/105 431/643/105 432/652/105 +f 429/665/99 426/662/99 427/663/99 +f 407/667/97 415/737/97 412/650/97 +f 435/668/102 437/677/102 436/669/102 +f 436/669/98 437/677/98 439/671/98 +f 438/672/109 439/671/109 441/673/109 +f 438/672/97 440/738/97 434/675/97 +f 435/676/99 441/739/99 439/671/99 +f 444/678/97 445/740/97 442/679/97 +f 442/679/110 446/741/110 447/681/110 +f 446/682/102 448/742/102 449/683/102 +f 448/685/111 450/691/111 451/686/111 +f 444/678/109 452/743/109 453/687/109 +f 447/684/98 449/683/98 451/689/98 +f 451/689/98 452/743/98 444/678/98 +f 452/690/99 451/686/99 450/691/99 +f 455/697/112 459/744/112 460/698/112 +f 459/700/102 461/745/102 462/701/102 +f 461/702/113 463/709/113 464/703/113 +f 465/705/109 466/746/109 458/706/109 +f 462/701/98 464/703/98 456/708/98 +f 464/703/98 465/705/98 457/707/98 +f 455/697/97 456/699/97 457/694/97 +f 463/709/99 466/747/99 465/705/99 +f 469/710/102 471/720/102 470/711/102 +f 470/711/98 471/720/98 473/713/98 +f 473/713/101 475/724/101 474/715/101 +f 470/711/114 472/714/114 477/716/114 +f 471/720/115 478/748/115 479/721/115 +l 430 433 o RightLeg -v -4.499988 24.500004 -2.500003 v -4.499999 11.500003 -2.500003 -v -4.499991 24.500004 2.499997 v -4.500002 11.500003 2.499997 -v 0.500011 24.500000 -2.500000 v 0.500001 11.500000 -2.500000 -v 0.500008 24.500000 2.500000 v 0.499998 11.500000 2.500000 -v -3.874988 24.500004 -3.750003 -v -0.124988 24.500000 -3.750000 -v -3.874989 22.333336 -3.750003 -v -0.124989 22.333334 -3.750000 -v -4.499991 21.250004 -2.500003 -v 0.500009 21.250000 -2.500000 v -3.874993 19.083336 -2.500003 v -0.124993 19.083332 -2.500000 v -3.874995 15.833335 -2.500003 v -0.124995 15.833332 -2.500000 v -3.249993 16.916670 -3.750002 -v -0.749994 16.916668 -3.750001 +v -0.749993 16.916668 -3.750001 v -3.249993 18.000002 -3.750002 v -0.749993 18.000000 -3.750001 -v -4.499988 24.500004 -2.500003 -v 0.500012 24.500000 -2.500000 -v -2.624990 22.333336 -2.500002 -v -2.624998 11.500002 -2.500002 -v -2.624990 22.333336 -3.125002 +v -2.624999 11.500002 -2.500002 v -2.624998 11.500002 -3.125002 -v -3.874990 22.333336 -3.125003 v -3.874998 11.500003 -3.125003 -v -4.499990 22.333336 -2.500003 v -4.499999 11.500003 -2.500003 -v -1.999990 22.333336 -2.500001 -v -1.999998 11.500001 -2.500001 -v -1.999990 22.333336 -3.125001 +v -1.999999 11.500001 -2.500001 v -1.999998 11.500001 -3.125001 -v -1.374990 22.333336 -3.125001 v -1.374998 11.500001 -3.125001 -v -1.374990 22.333336 -2.500001 -v -1.374998 11.500001 -2.500001 -v -0.749990 22.333336 -2.500001 -v -0.749998 11.500001 -2.500001 -v -0.749990 22.333336 -3.125001 +v -1.374999 11.500001 -2.500001 +v -0.749999 11.500001 -2.500001 v -0.749998 11.500001 -3.125001 -v -0.124990 22.333334 -3.125000 v -0.124998 11.500000 -3.125000 -v 0.500010 22.333334 -2.500000 v 0.500001 11.500000 -2.500000 -v 1.125012 24.500000 -2.499999 -v 1.125008 24.500000 3.125001 -v -5.124991 24.500004 3.124997 -v -5.124988 24.500004 -2.500003 -v 1.125010 23.416664 -1.874999 -v 1.125007 23.416664 3.125001 -v -5.124993 23.416670 3.124997 -v -5.124990 23.416670 -1.875003 -v 0.500012 24.500000 -2.500000 -v 0.500010 23.416666 -1.875000 -v -4.499988 24.500004 -2.500003 -v -4.499990 23.416668 -1.875003 -v -4.499992 23.416668 2.499997 -v 0.500007 23.416666 2.500000 -v 0.500008 24.500000 2.500000 -v -4.499991 24.500004 2.499997 -vt 0.500000 0.561404 -vt 0.250000 0.140351 -vt 0.500000 0.140351 -vt 0.250000 0.561404 -vt 0.000000 0.140351 -vt 1.000000 0.561404 -vt 0.750000 0.140351 -vt 1.000000 0.140351 -vt 0.750000 0.561404 -vt 0.750000 0.000000 -vt 0.500000 0.000000 +v -4.499990 21.250000 -2.500003 +v -0.749991 21.250000 -2.500001 +v -1.374991 21.250000 -3.125001 +v -4.499990 21.250000 -2.500003 +v 0.500009 21.250000 -2.500000 +v -0.749991 21.250000 -3.125001 +v 0.500009 21.250002 -2.500000 +v -4.499993 21.249998 2.499997 +v -1.999990 21.250000 -2.500001 +v -3.874990 21.250000 -3.125003 +v -1.374991 21.250000 -2.500001 +v -1.999990 21.250000 -3.125001 +v -0.124991 21.250000 -3.125000 +v -2.624990 21.250000 -2.500002 +v 0.500006 21.250002 2.500000 +v -2.624990 21.250000 -3.125002 vt 0.500000 0.701754 +vt 0.750000 0.561404 vt 0.750000 0.701754 -vt 0.593750 0.842105 -vt 0.375000 0.807018 -vt 0.562500 0.807018 -vt 0.375000 0.736842 -vt 0.562500 0.736842 +vt 0.656250 0.807018 +vt 0.812500 0.771930 vt 0.843750 0.807018 vt 0.687500 0.771930 -vt 0.812500 0.771930 vt 0.812500 0.736842 vt 0.843750 0.701754 vt 0.687500 0.736842 @@ -1116,408 +2054,250 @@ vt 0.656250 0.701754 vt 0.625000 0.736842 vt 0.875000 0.736842 vt 0.875000 0.771930 -vt 0.593750 0.701754 -vt 0.312500 0.736842 -vt 0.312500 0.824561 -vt 0.625000 0.736842 -vt 0.625000 0.824561 vt 0.093750 0.912281 -vt 0.125000 0.561404 +vt 0.125000 0.596491 vt 0.125000 0.912281 -vt 0.031250 0.561404 -vt 0.093750 0.561404 -vt -0.000000 0.912281 vt 0.031250 0.912281 -vt 0.125000 0.561404 +vt 0.093750 0.596491 +vt -0.000000 0.912281 +vt 0.031250 0.596491 +vt 0.125000 0.596491 vt 0.156250 0.912281 vt 0.125000 0.912281 -vt 0.156250 0.561404 +vt 0.156250 0.596491 vt 0.187500 0.912281 -vt 0.187500 0.561404 +vt 0.187500 0.596491 vt 0.218750 0.912281 -vt 0.218750 0.561404 +vt 0.218750 0.596491 vt 0.250000 0.912281 vt 0.218750 0.912281 -vt 0.250000 0.561404 +vt 0.250000 0.596491 vt 0.281250 0.912281 -vt 0.281250 0.561404 +vt 0.281250 0.596491 vt 0.312500 0.912281 vt 0.093750 0.929825 vt 0.156250 0.929825 vt 0.250000 0.929825 -vt 0.625000 0.947368 -vt 0.312500 0.982456 -vt 0.312500 0.947368 -vt 0.875000 0.982456 -vt 0.906250 0.947368 -vt 0.062500 0.982456 -vt 0.031250 0.947368 -vt -0.000000 1.000000 -vt -0.000000 0.982456 -vt 0.937500 0.982456 -vt 0.875000 1.000000 -vt 0.281250 1.000000 -vt 0.593750 1.000000 -vt 0.343750 1.000000 -vt 0.656250 1.000000 -vt 0.625000 0.982456 -vt 0.656250 0.929825 -vt 0.281250 0.929825 -vt 0.593750 0.929825 +vt 0.250000 0.245614 vt 0.000000 0.561404 -vt 0.343750 0.842105 -vt 0.656250 0.807018 +vt 0.000000 0.245614 +vt 0.500000 0.245614 +vt 0.500000 0.561404 +vt 0.250000 0.561404 +vt 1.000000 0.245614 +vt 0.750000 0.245614 vt 0.625000 0.771930 -vt 0.343750 0.701754 -vt 0.000000 0.561404 -vt 0.218750 0.561404 -vt 0.312500 0.561404 +vt 0.000000 0.596491 +vt 0.218750 0.596491 +vt 0.312500 0.596491 vt 0.000000 0.929825 vt 0.187500 0.929825 vt 0.312500 0.929825 -vt 0.062500 1.000000 -vt 0.937500 1.000000 -vt 0.906250 0.929825 -vt 0.031250 0.929825 -vt 0.343750 0.929825 -vn -1.0000 0.0000 -0.0000 -vn -0.0000 0.0000 1.0000 -vn 1.0000 -0.0000 0.0000 -vn 0.0000 -0.0000 -1.0000 -vn 0.0000 1.0000 0.0000 -vn -0.0000 -1.0000 -0.0000 +vt 1.000000 0.561404 +vn -0.0000 -1.0000 0.0000 vn -0.0000 -0.7557 -0.6549 +vn 0.0000 -0.0000 -1.0000 vn 0.0000 0.7557 -0.6549 vn -0.8944 0.0000 -0.4472 vn 0.8944 -0.0000 -0.4472 +vn 1.0000 -0.0000 0.0000 vn -0.7071 0.0000 -0.7071 +vn -1.0000 0.0000 -0.0000 vn 0.7071 -0.0000 -0.7071 -vn 0.0000 -0.4997 -0.8662 +vn -0.0000 0.0000 1.0000 s off -f 253/381/56 254/382/56 252/383/56 -f 255/384/57 258/385/57 254/382/57 -f 259/386/58 256/387/58 258/388/58 -f 257/389/59 252/383/59 256/387/59 -f 258/390/60 252/383/60 254/391/60 -f 255/392/61 257/389/61 259/393/61 -f 265/394/62 262/395/62 263/396/62 -f 263/396/59 260/397/59 261/398/59 -f 269/399/62 270/400/62 271/401/62 -f 270/400/59 273/402/59 271/401/59 -f 267/403/63 272/404/63 266/405/63 -f 270/400/64 266/406/64 272/404/64 -f 271/401/65 267/407/65 269/408/65 -f 260/397/60 275/409/60 261/398/60 -f 274/410/64 262/395/64 264/411/64 -f 263/396/65 275/412/65 265/413/65 -f 279/414/58 276/415/58 277/416/58 -f 279/414/59 280/417/59 278/418/59 -f 283/419/66 280/417/66 281/420/66 -f 284/421/56 287/422/56 285/423/56 -f 286/424/59 289/425/59 287/422/59 -f 288/426/58 291/427/58 289/425/58 -f 292/428/56 295/429/56 293/430/56 -f 294/431/59 297/432/59 295/429/59 -f 296/433/67 299/434/67 297/432/67 -f 277/435/61 281/420/61 279/414/61 -f 289/425/61 285/436/61 287/422/61 -f 297/432/61 293/437/61 295/429/61 -f 302/438/57 305/439/57 301/440/57 -f 307/441/56 302/438/56 303/442/56 -f 301/440/58 304/443/58 300/444/58 -f 304/443/68 308/445/68 300/446/68 -f 303/447/68 311/448/68 307/441/68 -f 313/449/61 304/443/61 305/439/61 -f 305/439/61 312/450/61 313/451/61 -f 307/441/61 312/452/61 306/453/61 -f 315/454/60 303/442/60 302/438/60 -f 300/444/60 314/455/60 301/440/60 -f 301/440/60 315/456/60 302/438/60 -f 253/381/56 255/384/56 254/382/56 -f 255/384/57 259/457/57 258/385/57 -f 259/386/58 257/389/58 256/387/58 -f 257/389/59 253/381/59 252/383/59 -f 258/390/60 256/387/60 252/383/60 -f 255/392/61 253/381/61 257/389/61 -f 265/394/62 264/458/62 262/395/62 -f 263/396/59 262/395/59 260/397/59 -f 269/399/62 268/459/62 270/400/62 -f 270/400/59 272/404/59 273/402/59 -f 267/403/63 273/402/63 272/404/63 -f 270/400/64 268/460/64 266/406/64 -f 271/401/65 273/402/65 267/407/65 -f 260/397/60 274/461/60 275/409/60 -f 274/410/64 260/397/64 262/395/64 -f 263/396/65 261/398/65 275/412/65 -f 279/414/58 278/418/58 276/415/58 -f 279/414/59 281/420/59 280/417/59 -f 283/419/66 282/462/66 280/417/66 -f 284/421/56 286/424/56 287/422/56 -f 286/424/59 288/426/59 289/425/59 -f 288/426/58 290/463/58 291/427/58 -f 292/428/56 294/431/56 295/429/56 -f 294/431/59 296/433/59 297/432/59 -f 296/433/67 298/464/67 299/434/67 -f 277/435/61 283/465/61 281/420/61 -f 289/425/61 291/466/61 285/436/61 -f 297/432/61 299/467/61 293/437/61 -f 302/438/57 306/453/57 305/439/57 -f 307/441/56 306/453/56 302/438/56 -f 301/440/58 305/439/58 304/443/58 -f 304/443/68 309/468/68 308/445/68 -f 303/447/68 310/469/68 311/448/68 -f 313/449/61 309/468/61 304/443/61 -f 305/439/61 306/453/61 312/450/61 -f 307/441/61 311/448/61 312/452/61 -f 315/454/60 310/470/60 303/442/60 -f 300/444/60 308/471/60 314/455/60 -f 301/440/60 314/472/60 315/456/60 +f 481/749/116 482/750/116 483/751/116 +f 486/752/117 489/753/117 487/754/117 +f 488/755/118 491/756/118 489/753/118 +f 485/757/119 490/758/119 484/759/119 +f 488/755/120 484/760/120 490/758/120 +f 489/753/121 485/761/121 487/762/121 +f 493/763/122 517/764/122 492/765/122 +f 494/766/118 519/767/118 493/763/118 +f 495/768/123 513/769/123 494/766/123 +f 512/770/124 497/771/124 496/772/124 +f 515/773/118 498/774/118 497/771/118 +f 506/775/122 499/776/122 498/774/122 +f 505/777/124 501/778/124 500/779/124 +f 509/780/118 502/781/118 501/778/118 +f 516/782/125 503/783/125 502/781/125 +f 492/784/116 494/766/116 493/763/116 +f 498/774/116 496/785/116 497/771/116 +f 502/781/116 500/786/116 501/778/116 +f 511/787/126 483/788/126 518/789/126 +f 507/790/118 482/750/118 480/791/118 +f 507/790/124 481/792/124 511/787/124 +f 518/793/122 482/750/122 510/794/122 +f 481/749/116 480/791/116 482/750/116 +f 486/752/117 488/755/117 489/753/117 +f 488/755/118 490/758/118 491/756/118 +f 485/757/119 491/756/119 490/758/119 +f 488/755/120 486/795/120 484/760/120 +f 489/753/121 491/756/121 485/761/121 +f 493/763/122 519/767/122 517/764/122 +f 494/766/118 513/769/118 519/767/118 +f 495/768/123 504/796/123 513/769/123 +f 512/770/124 515/773/124 497/771/124 +f 515/773/118 506/775/118 498/774/118 +f 506/775/122 514/797/122 499/776/122 +f 505/777/124 509/780/124 501/778/124 +f 509/780/118 516/782/118 502/781/118 +f 516/782/125 508/798/125 503/783/125 +f 492/784/116 495/799/116 494/766/116 +f 498/774/116 499/800/116 496/785/116 +f 502/781/116 503/801/116 500/786/116 +f 511/787/126 481/792/126 483/788/126 +f 507/790/118 510/794/118 482/750/118 +f 507/790/124 480/791/124 481/792/124 +f 518/793/122 483/802/122 482/750/122 o LeftLeg -v -0.499988 24.500000 -2.500000 v -0.499998 11.499999 -2.500000 -v -0.499991 24.500000 2.500000 v -0.500001 11.499999 2.500000 -v 4.500012 24.499996 -2.499997 v 4.500001 11.499997 -2.499997 -v 4.500009 24.499996 2.500003 v 4.499998 11.499997 2.500003 -v 3.874987 24.500004 -3.750003 -v 0.124988 24.500000 -3.750001 -v 3.874989 22.333336 -3.750003 -v 0.124989 22.333334 -3.750001 -v 4.499991 21.250004 -2.500003 -v -0.500009 21.250000 -2.500000 v 3.874993 19.083338 -2.500003 v 0.124993 19.083332 -2.500001 -v 3.874995 15.833334 -2.500003 -v 0.124995 15.833332 -2.500001 +v 3.874996 15.833334 -2.500003 +v 0.124996 15.833332 -2.500001 v 3.249993 16.916670 -3.750002 -v 0.749994 16.916670 -3.750001 +v 0.749993 16.916670 -3.750001 v 3.249993 18.000002 -3.750002 v 0.749993 18.000002 -3.750001 -v 4.499988 24.500004 -2.500003 -v -0.500012 24.500000 -2.500000 -v 2.624990 22.333336 -2.500002 v 2.624999 11.500002 -2.500002 -v 2.624989 22.333336 -3.125002 v 2.624998 11.500002 -3.125002 -v 3.874989 22.333336 -3.125003 v 3.874998 11.500002 -3.125003 -v 4.499990 22.333336 -2.500003 v 4.499998 11.500003 -2.500003 -v 1.999990 22.333336 -2.500002 -v 1.999999 11.500002 -2.500002 -v 1.999990 22.333336 -3.125002 +v 1.999998 11.500002 -2.500002 v 1.999998 11.500002 -3.125002 -v 1.374990 22.333336 -3.125001 v 1.374998 11.500001 -3.125001 -v 1.374990 22.333336 -2.500001 v 1.374998 11.500001 -2.500001 -v 0.749990 22.333336 -2.500001 v 0.749998 11.500000 -2.500001 -v 0.749990 22.333336 -3.125001 v 0.749998 11.500000 -3.125001 -v 0.124990 22.333334 -3.125001 v 0.124998 11.500000 -3.125001 -v -0.500010 22.333334 -2.500000 -v -0.500001 11.499999 -2.500000 -v -1.125012 24.500000 -2.499999 -v -1.125008 24.500000 3.125001 -v 5.124991 24.500004 3.124996 -v 5.124988 24.500004 -2.500004 -v -1.125010 23.416664 -1.874999 -v -1.125007 23.416664 3.125001 -v 5.124993 23.416670 3.124996 -v 5.124989 23.416670 -1.875003 -v -0.500012 24.500000 -2.500000 -v -0.500010 23.416666 -1.875000 -v 4.499988 24.500004 -2.500003 -v 4.499989 23.416668 -1.875003 -v 4.499992 23.416668 2.499997 -v -0.500007 23.416666 2.500000 -v -0.500008 24.500000 2.500000 -v 4.499992 24.500004 2.499997 -vt 0.500000 0.561404 -vt 0.250000 0.140351 -vt 0.500000 0.140351 -vt 0.250000 0.561404 -vt 0.000000 0.140351 -vt 1.000000 0.561404 -vt 0.750000 0.140351 -vt 1.000000 0.140351 -vt 0.750000 0.561404 -vt 0.750000 0.000000 -vt 0.500000 0.000000 +v -0.500002 11.499999 -2.500000 +v 4.499990 21.250000 -2.500003 +v 2.624990 21.250000 -3.125002 +v 4.500007 21.250000 2.500003 +v 0.749991 21.250000 -2.500001 +v 1.374991 21.250000 -3.125001 +v -0.499990 21.250000 -2.500000 +v -0.500009 21.250000 -2.500000 +v 0.749991 21.250000 -3.125001 +v 4.500010 21.250000 -2.499997 +v 3.874990 21.250000 -3.125003 +v 1.999991 21.250000 -2.500002 +v -0.499993 21.250000 2.500000 +v 1.374991 21.250000 -2.500001 +v 1.999991 21.250000 -3.125002 +v 0.124991 21.250000 -3.125001 +v 2.624991 21.250000 -2.500002 vt 0.750000 0.701754 -vt 0.375000 0.807018 -vt 0.593750 0.842105 -vt 0.562500 0.807018 -vt 0.562500 0.736842 -vt 0.812500 0.771930 -vt 0.656250 0.807018 +vt 0.500000 0.561404 +vt 0.750000 0.561404 vt 0.843750 0.807018 -vt 0.687500 0.736842 vt 0.687500 0.771930 +vt 0.656250 0.807018 +vt 0.812500 0.771930 +vt 0.687500 0.736842 vt 0.656250 0.701754 vt 0.812500 0.736842 vt 0.843750 0.701754 vt 0.625000 0.736842 vt 0.625000 0.771930 vt 0.875000 0.736842 -vt 0.593750 0.701754 -vt 0.375000 0.736842 -vt 0.312500 0.736842 -vt 0.312500 0.824561 -vt 0.625000 0.736842 -vt 0.625000 0.824561 -vt 0.125000 0.561404 +vt 0.125000 0.596491 vt 0.093750 0.912281 vt 0.125000 0.912281 -vt 0.093750 0.561404 +vt 0.093750 0.596491 vt 0.031250 0.912281 -vt 0.000000 0.561404 +vt 0.000000 0.596491 vt -0.000000 0.912281 vt 0.156250 0.912281 -vt 0.125000 0.561404 +vt 0.125000 0.596491 vt 0.125000 0.912281 vt 0.187500 0.912281 -vt 0.156250 0.561404 +vt 0.156250 0.596491 vt 0.218750 0.912281 -vt 0.187500 0.561404 +vt 0.187500 0.596491 vt 0.250000 0.912281 -vt 0.218750 0.561404 +vt 0.218750 0.596491 vt 0.218750 0.912281 vt 0.281250 0.912281 -vt 0.250000 0.561404 +vt 0.250000 0.596491 vt 0.312500 0.912281 -vt 0.281250 0.561404 +vt 0.281250 0.596491 vt 0.093750 0.929825 vt 0.156250 0.929825 vt 0.250000 0.929825 -vt 0.625000 0.947368 -vt 0.312500 0.982456 -vt 0.625000 0.982456 -vt 0.875000 0.982456 -vt 0.906250 0.947368 -vt 0.312500 0.947368 -vt 0.062500 0.982456 -vt -0.000000 0.982456 -vt 0.062500 1.000000 -vt 0.937500 1.000000 -vt 0.937500 0.982456 -vt 0.281250 1.000000 -vt 0.343750 1.000000 -vt 0.656250 1.000000 -vt 0.656250 0.929825 -vt 0.031250 0.947368 -vt 0.281250 0.929825 -vt 0.031250 0.929825 -vt 0.593750 0.929825 +vt 0.250000 0.245614 vt -0.000000 0.561404 +vt 0.000000 0.245614 +vt 0.750000 0.245614 +vt 0.500000 0.245614 +vt 0.250000 0.561404 +vt 1.000000 0.245614 vt 0.500000 0.701754 -vt 0.343750 0.842105 vt 0.875000 0.771930 -vt 0.343750 0.701754 -vt 0.031250 0.561404 -vt 0.218750 0.561404 -vt 0.312500 0.561404 +vt 0.031250 0.596491 +vt 0.218750 0.596491 +vt 0.312500 0.596491 vt 0.000000 0.929825 vt 0.187500 0.929825 vt 0.312500 0.929825 -vt -0.000000 1.000000 -vt 0.875000 1.000000 -vt 0.593750 1.000000 -vt 0.906250 0.929825 -vt 0.343750 0.929825 -vn -1.0000 0.0000 -0.0000 -vn -0.0000 0.0000 1.0000 -vn 1.0000 -0.0000 0.0000 -vn 0.0000 -0.0000 -1.0000 -vn 0.0000 1.0000 0.0000 +vt 1.000000 0.561404 vn -0.0000 -1.0000 0.0000 vn 0.0000 -0.7557 -0.6549 +vn -0.0000 -0.0000 -1.0000 vn -0.0000 0.7557 -0.6549 vn 0.8944 0.0000 -0.4472 vn -0.8944 -0.0000 -0.4472 +vn -1.0000 -0.0000 0.0000 vn 0.7071 0.0000 -0.7071 +vn 1.0000 0.0000 -0.0000 vn -0.7071 -0.0000 -0.7071 -vn 0.0000 -0.4997 -0.8662 +vn -0.0000 0.0000 1.0000 s off -f 317/473/69 318/474/69 316/475/69 -f 319/476/70 322/477/70 318/474/70 -f 323/478/71 320/479/71 322/480/71 -f 321/481/72 316/475/72 320/479/72 -f 322/482/73 316/475/73 318/483/73 -f 323/484/74 317/473/74 321/481/74 -f 326/485/75 329/486/75 327/487/75 -f 325/488/72 326/485/72 327/487/72 -f 335/489/75 332/490/75 333/491/75 -f 335/489/72 336/492/72 334/493/72 -f 330/494/76 337/495/76 331/496/76 -f 334/493/77 330/497/77 332/498/77 -f 335/489/78 331/499/78 337/495/78 -f 339/500/73 324/501/73 325/488/73 -f 326/485/77 338/502/77 328/503/77 -f 339/504/78 327/487/78 329/505/78 -f 340/506/69 343/507/69 341/508/69 -f 342/509/72 345/510/72 343/507/72 -f 345/510/79 346/511/79 347/512/79 -f 351/513/71 348/514/71 349/515/71 -f 353/516/72 350/517/72 351/513/72 -f 355/518/69 352/519/69 353/516/69 -f 359/520/71 356/521/71 357/522/71 -f 361/523/72 358/524/72 359/520/72 -f 363/525/80 360/526/80 361/523/80 -f 345/510/74 341/527/74 343/507/74 -f 349/528/74 353/516/74 351/513/74 -f 357/529/74 361/523/74 359/520/74 -f 366/530/70 369/531/70 370/532/70 -f 366/530/71 371/533/71 367/534/71 -f 365/535/69 368/536/69 369/531/69 -f 364/537/81 373/538/81 368/536/81 -f 371/533/81 374/539/81 367/540/81 -f 368/536/74 377/541/74 369/531/74 -f 377/542/74 370/532/74 369/531/74 -f 376/543/74 371/533/74 370/532/74 -f 367/534/73 379/544/73 366/530/73 -f 364/545/73 378/546/73 372/547/73 -f 379/548/73 365/535/73 366/530/73 -f 317/473/69 319/476/69 318/474/69 -f 319/476/70 323/549/70 322/477/70 -f 323/478/71 321/481/71 320/479/71 -f 321/481/72 317/473/72 316/475/72 -f 322/482/73 320/479/73 316/475/73 -f 323/484/74 319/550/74 317/473/74 -f 326/485/75 328/551/75 329/486/75 -f 325/488/72 324/501/72 326/485/72 -f 335/489/75 334/493/75 332/490/75 -f 335/489/72 337/495/72 336/492/72 -f 330/494/76 336/492/76 337/495/76 -f 334/493/77 336/492/77 330/497/77 -f 335/489/78 333/552/78 331/499/78 -f 339/500/73 338/553/73 324/501/73 -f 326/485/77 324/501/77 338/502/77 -f 339/504/78 325/488/78 327/487/78 -f 340/506/69 342/509/69 343/507/69 -f 342/509/72 344/554/72 345/510/72 -f 345/510/79 344/554/79 346/511/79 -f 351/513/71 350/517/71 348/514/71 -f 353/516/72 352/519/72 350/517/72 -f 355/518/69 354/555/69 352/519/69 -f 359/520/71 358/524/71 356/521/71 -f 361/523/72 360/526/72 358/524/72 -f 363/525/80 362/556/80 360/526/80 -f 345/510/74 347/557/74 341/527/74 -f 349/528/74 355/558/74 353/516/74 -f 357/529/74 363/559/74 361/523/74 -f 366/530/70 365/535/70 369/531/70 -f 366/530/71 370/532/71 371/533/71 -f 365/535/69 364/545/69 368/536/69 -f 364/537/81 372/560/81 373/538/81 -f 371/533/81 375/561/81 374/539/81 -f 368/536/74 373/538/74 377/541/74 -f 377/542/74 376/562/74 370/532/74 -f 376/543/74 375/561/74 371/533/74 -f 367/534/73 374/563/73 379/544/73 -f 364/545/73 365/535/73 378/546/73 -f 379/548/73 378/564/73 365/535/73 +f 523/803/127 520/804/127 522/805/127 +f 527/806/128 528/807/128 526/808/128 +f 529/809/129 530/810/129 528/807/129 +f 524/811/130 531/812/130 525/813/130 +f 528/807/131 524/814/131 526/815/131 +f 529/809/132 525/816/132 531/812/132 +f 559/817/133 533/818/133 532/819/133 +f 545/820/129 534/821/129 533/818/129 +f 534/821/134 544/822/134 535/823/134 +f 537/824/135 554/825/135 536/826/135 +f 538/827/129 557/828/129 537/824/129 +f 539/829/133 548/830/133 538/827/133 +f 541/831/135 547/832/135 540/833/135 +f 542/834/129 551/835/129 541/831/129 +f 543/836/136 558/837/136 542/834/136 +f 534/821/127 532/838/127 533/818/127 +f 536/839/127 538/827/127 537/824/127 +f 540/840/127 542/834/127 541/831/127 +f 555/841/137 523/842/137 546/843/137 +f 552/844/129 520/804/129 549/845/129 +f 549/845/133 521/846/133 555/841/133 +f 546/847/135 522/805/135 552/844/135 +f 523/803/127 521/848/127 520/804/127 +f 527/806/128 529/809/128 528/807/128 +f 529/809/129 531/812/129 530/810/129 +f 524/811/130 530/810/130 531/812/130 +f 528/807/131 530/810/131 524/814/131 +f 529/809/132 527/849/132 525/816/132 +f 559/817/133 545/820/133 533/818/133 +f 545/820/129 553/850/129 534/821/129 +f 534/821/134 553/850/134 544/822/134 +f 537/824/135 557/828/135 554/825/135 +f 538/827/129 548/830/129 557/828/129 +f 539/829/133 556/851/133 548/830/133 +f 541/831/135 551/835/135 547/832/135 +f 542/834/129 558/837/129 551/835/129 +f 543/836/136 550/852/136 558/837/136 +f 534/821/127 535/853/127 532/838/127 +f 536/839/127 539/854/127 538/827/127 +f 540/840/127 543/855/127 542/834/127 +f 555/841/137 521/846/137 523/842/137 +f 552/844/129 522/805/129 520/804/129 +f 549/845/133 520/804/133 521/846/133 +f 546/847/135 523/856/135 522/805/135 diff --git a/src/main/java/assets/hbm/textures/armor/asbestos_1.png b/src/main/java/assets/hbm/textures/armor/asbestos_1.png index 210d33513..c8c6cd415 100644 Binary files a/src/main/java/assets/hbm/textures/armor/asbestos_1.png and b/src/main/java/assets/hbm/textures/armor/asbestos_1.png differ diff --git a/src/main/java/assets/hbm/textures/armor/bj_chest.png b/src/main/java/assets/hbm/textures/armor/bj_chest.png index 17ca4d8dc..938a0702f 100644 Binary files a/src/main/java/assets/hbm/textures/armor/bj_chest.png and b/src/main/java/assets/hbm/textures/armor/bj_chest.png differ diff --git a/src/main/java/assets/hbm/textures/armor/bj_jetpack.png b/src/main/java/assets/hbm/textures/armor/bj_jetpack.png new file mode 100644 index 000000000..2a2c3b019 Binary files /dev/null and b/src/main/java/assets/hbm/textures/armor/bj_jetpack.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_gneiss_asbestos.png b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_asbestos.png new file mode 100644 index 000000000..5dd344caa Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_asbestos.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_gneiss_copper.png b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_copper.png new file mode 100644 index 000000000..672b21b1d Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_copper.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_gneiss_gold.png b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_gold.png new file mode 100644 index 000000000..5558c7233 Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_gold.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_gneiss_iron.png b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_iron.png new file mode 100644 index 000000000..409fa125d Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_iron.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_gneiss_lithium.png b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_lithium.png new file mode 100644 index 000000000..b7bc46af2 Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_lithium.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_gneiss_rare.png b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_rare.png new file mode 100644 index 000000000..7d9e0442a Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_rare.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_gneiss_schrabidium.png b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_schrabidium.png new file mode 100644 index 000000000..69db48e0c Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_schrabidium.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_gneiss_uranium.png b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_uranium.png new file mode 100644 index 000000000..e0dd3c406 Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_uranium.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_gneiss_uranium_scorched.png b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_uranium_scorched.png new file mode 100644 index 000000000..e7265391c Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/ore_gneiss_uranium_scorched.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/stone_gneiss.png b/src/main/java/assets/hbm/textures/blocks/stone_gneiss.png new file mode 100644 index 000000000..210e3fbfa Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/stone_gneiss.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/stone_gneiss_alt.png b/src/main/java/assets/hbm/textures/blocks/stone_gneiss_alt.png new file mode 100644 index 000000000..917235d4f Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/stone_gneiss_alt.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/stone_gneiss_base.png b/src/main/java/assets/hbm/textures/blocks/stone_gneiss_base.png new file mode 100644 index 000000000..ff6148144 Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/stone_gneiss_base.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/stone_gneiss_overlay.png b/src/main/java/assets/hbm/textures/blocks/stone_gneiss_overlay.png new file mode 100644 index 000000000..24576b9d3 Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/stone_gneiss_overlay.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/stone_gneiss_var.png b/src/main/java/assets/hbm/textures/blocks/stone_gneiss_var.png new file mode 100644 index 000000000..70eccf5b8 Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/stone_gneiss_var.png differ diff --git a/src/main/java/assets/hbm/textures/items/asbestos_helmet.png b/src/main/java/assets/hbm/textures/items/asbestos_helmet.png index 501c0e263..6e37c2d21 100644 Binary files a/src/main/java/assets/hbm/textures/items/asbestos_helmet.png and b/src/main/java/assets/hbm/textures/items/asbestos_helmet.png differ diff --git a/src/main/java/assets/hbm/textures/items/bj_legs.png b/src/main/java/assets/hbm/textures/items/bj_legs.png index eeeffa658..41961a957 100644 Binary files a/src/main/java/assets/hbm/textures/items/bj_legs.png and b/src/main/java/assets/hbm/textures/items/bj_legs.png differ diff --git a/src/main/java/assets/hbm/textures/items/bj_plate.png b/src/main/java/assets/hbm/textures/items/bj_plate.png index 6c43793ff..49a569d00 100644 Binary files a/src/main/java/assets/hbm/textures/items/bj_plate.png and b/src/main/java/assets/hbm/textures/items/bj_plate.png differ diff --git a/src/main/java/assets/hbm/textures/items/coil_gold.png b/src/main/java/assets/hbm/textures/items/coil_gold.png index 77f4bb17e..6d22668a3 100644 Binary files a/src/main/java/assets/hbm/textures/items/coil_gold.png and b/src/main/java/assets/hbm/textures/items/coil_gold.png differ diff --git a/src/main/java/assets/hbm/textures/items/coil_gold_torus.png b/src/main/java/assets/hbm/textures/items/coil_gold_torus.png index 588db3529..fc2d16806 100644 Binary files a/src/main/java/assets/hbm/textures/items/coil_gold_torus.png and b/src/main/java/assets/hbm/textures/items/coil_gold_torus.png differ diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index a42228acd..06dc98aca 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -46,7 +46,6 @@ public class ModBlocks { public static Block ore_titanium; public static Block ore_sulfur; public static Block ore_thorium; - public static Block ore_niter; public static Block ore_copper; public static Block ore_tungsten; @@ -55,6 +54,13 @@ public class ModBlocks { public static Block ore_lead; public static Block ore_schrabidium; public static Block ore_beryllium; + public static Block ore_australium; + public static Block ore_weidanium; + public static Block ore_reiium; + public static Block ore_unobtainium; + public static Block ore_daffergon; + public static Block ore_verticium; + public static Block ore_rare; public static Block ore_nether_uranium; public static Block ore_nether_uranium_scorched; @@ -74,14 +80,17 @@ public class ModBlocks { public static Block ore_meteor_lead; public static Block ore_meteor_lithium; public static Block ore_meteor_starmetal; - - public static Block ore_australium; - public static Block ore_weidanium; - public static Block ore_reiium; - public static Block ore_unobtainium; - public static Block ore_daffergon; - public static Block ore_verticium; - public static Block ore_rare; + + public static Block stone_gneiss; + public static Block ore_gneiss_iron; + public static Block ore_gneiss_gold; + public static Block ore_gneiss_uranium; + public static Block ore_gneiss_uranium_scorched; + public static Block ore_gneiss_copper; + public static Block ore_gneiss_asbestos; + public static Block ore_gneiss_lithium; + public static Block ore_gneiss_schrabidium; + public static Block ore_gneiss_rare; public static Block ore_oil; public static Block ore_oil_empty; @@ -872,6 +881,17 @@ public class ModBlocks { ore_meteor_lead = new BlockOre(Material.rock).setBlockName("ore_meteor_lead").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_meteor_lead"); ore_meteor_lithium = new BlockOre(Material.rock).setBlockName("ore_meteor_lithium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_meteor_lithium"); ore_meteor_starmetal = new BlockOre(Material.rock).setBlockName("ore_meteor_starmetal").setCreativeTab(MainRegistry.blockTab).setHardness(10.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":ore_meteor_starmetal"); + + stone_gneiss = new BlockGeneric(Material.rock).setBlockName("stone_gneiss").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":stone_gneiss_var"); + ore_gneiss_iron = new BlockOre(Material.rock).setBlockName("ore_gneiss_iron").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_iron"); + ore_gneiss_gold = new BlockOre(Material.rock).setBlockName("ore_gneiss_gold").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_gold"); + ore_gneiss_uranium = new BlockOre(Material.rock).setBlockName("ore_gneiss_uranium").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_uranium"); + ore_gneiss_uranium_scorched = new BlockOre(Material.rock).setBlockName("ore_gneiss_uranium_scorched").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_uranium_scorched"); + ore_gneiss_copper = new BlockOre(Material.rock).setBlockName("ore_gneiss_copper").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_copper"); + ore_gneiss_asbestos = new BlockOre(Material.rock).setBlockName("ore_gneiss_asbestos").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_asbestos"); + ore_gneiss_lithium = new BlockOre(Material.rock).setBlockName("ore_gneiss_lithium").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_lithium"); + ore_gneiss_schrabidium = new BlockOre(Material.rock).setBlockName("ore_gneiss_schrabidium").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_schrabidium"); + ore_gneiss_rare = new BlockOre(Material.rock).setBlockName("ore_gneiss_rare").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_rare"); ore_australium = new BlockGeneric(Material.rock).setBlockName("ore_australium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_australium"); ore_weidanium = new BlockGeneric(Material.rock).setBlockName("ore_weidanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_weidanium"); @@ -1543,9 +1563,23 @@ public class ModBlocks { GameRegistry.registerBlock(ore_meteor_lithium, ore_meteor_lithium.getUnlocalizedName()); GameRegistry.registerBlock(ore_meteor_starmetal, ore_meteor_starmetal.getUnlocalizedName()); + //Gneiss Ores + GameRegistry.registerBlock(ore_gneiss_iron, ore_gneiss_iron.getUnlocalizedName()); + GameRegistry.registerBlock(ore_gneiss_gold, ore_gneiss_gold.getUnlocalizedName()); + GameRegistry.registerBlock(ore_gneiss_uranium, ore_gneiss_uranium.getUnlocalizedName()); + GameRegistry.registerBlock(ore_gneiss_uranium_scorched, ore_gneiss_uranium_scorched.getUnlocalizedName()); + GameRegistry.registerBlock(ore_gneiss_copper, ore_gneiss_copper.getUnlocalizedName()); + GameRegistry.registerBlock(ore_gneiss_asbestos, ore_gneiss_asbestos.getUnlocalizedName()); + GameRegistry.registerBlock(ore_gneiss_lithium, ore_gneiss_lithium.getUnlocalizedName()); + GameRegistry.registerBlock(ore_gneiss_schrabidium, ItemBlockLore.class, ore_gneiss_schrabidium.getUnlocalizedName()); + GameRegistry.registerBlock(ore_gneiss_rare, ItemOreBlock.class, ore_gneiss_rare.getUnlocalizedName()); + //End Ores GameRegistry.registerBlock(ore_tikite, ore_tikite.getUnlocalizedName()); + //Stone Variants + GameRegistry.registerBlock(stone_gneiss, stone_gneiss.getUnlocalizedName()); + //Blocks GameRegistry.registerBlock(block_uranium, block_uranium.getUnlocalizedName()); GameRegistry.registerBlock(block_u233, block_u233.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/generic/BlockOre.java b/src/main/java/com/hbm/blocks/generic/BlockOre.java index f55f02279..62c96743a 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockOre.java +++ b/src/main/java/com/hbm/blocks/generic/BlockOre.java @@ -129,7 +129,7 @@ public class BlockOre extends Block { case 35: return ModItems.glitch; } } - if(this == ModBlocks.ore_rare) + if(this == ModBlocks.ore_rare || this == ModBlocks.ore_gneiss_rare) { switch(rand.nextInt(6)) { case 0: return ModItems.fragment_actinium; @@ -199,7 +199,7 @@ public class BlockOre extends Block { { return 2 + p_149745_1_.nextInt(3); } - if(this == ModBlocks.ore_rare) + if(this == ModBlocks.ore_rare || this == ModBlocks.ore_gneiss_rare) { return 4 + p_149745_1_.nextInt(8); } diff --git a/src/main/java/com/hbm/config/WorldConfig.java b/src/main/java/com/hbm/config/WorldConfig.java index 2f87259b7..8ff8f570a 100644 --- a/src/main/java/com/hbm/config/WorldConfig.java +++ b/src/main/java/com/hbm/config/WorldConfig.java @@ -18,6 +18,8 @@ public class WorldConfig { public static int berylliumSpawn = 6; public static int ligniteSpawn = 2; public static int asbestosSpawn = 4; + public static int rareSpawn = 6; + public static int lithiumSpawn = 6; public static int radioStructure = 500; public static int antennaStructure = 250; @@ -64,6 +66,8 @@ public class WorldConfig { thoriumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.10_thoriumSpawnrate", "Ammount of thorium ore veins per chunk", 7); ligniteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.11_ligniteSpawnrate", "Ammount of lignite ore veins per chunk", 2); asbestosSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.12_asbestosSpawnRate", "Ammount of asbestos ore veins per chunk", 2); + lithiumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.13_lithiumSpawnRate", "Ammount of schist lithium ore veins per chunk", 6); + rareSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.14_rareEarthSpawnRate", "Ammount of rare earth ore veins per chunk", 6); final String CATEGORY_DUNGEON = "04_dungeons"; radioStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.00_radioSpawn", "Spawn radio station on every nTH chunk", 500); diff --git a/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java b/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java index e2d34d870..e804a555a 100644 --- a/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java +++ b/src/main/java/com/hbm/entity/effect/EntityFalloutRain.java @@ -190,6 +190,14 @@ public class EntityFalloutRain extends Entity { else worldObj.setBlock(x, y, z, ModBlocks.ore_nether_uranium_scorched); return; + } + + else if(b == ModBlocks.ore_gneiss_uranium) { + if(rand.nextInt(VersatileConfig.getSchrabOreChance()) == 0) + worldObj.setBlock(x, y, z, ModBlocks.ore_gneiss_schrabidium); + else + worldObj.setBlock(x, y, z, ModBlocks.ore_gneiss_uranium_scorched); + return; //this piece stops the "stomp" from reaching below ground } else if(b.isNormalCube()) { diff --git a/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java b/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java index 08b8019fb..edfca1e1b 100644 --- a/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java +++ b/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java @@ -485,6 +485,15 @@ public class ExplosionNukeGeneric { } } + else if (b == ModBlocks.ore_gneiss_uranium) { + rand = random.nextInt(VersatileConfig.getSchrabOreChance()); + if (rand == 1) { + world.setBlock(x, y, z, ModBlocks.ore_gneiss_schrabidium); + } else { + world.setBlock(x, y, z, ModBlocks.ore_gneiss_uranium_scorched); + } + } + } } diff --git a/src/main/java/com/hbm/inventory/CrystallizerRecipes.java b/src/main/java/com/hbm/inventory/CrystallizerRecipes.java index a6cd29e52..6cc0988ad 100644 --- a/src/main/java/com/hbm/inventory/CrystallizerRecipes.java +++ b/src/main/java/com/hbm/inventory/CrystallizerRecipes.java @@ -43,8 +43,8 @@ public class CrystallizerRecipes { recipes.put("oreSchrabidium", new ItemStack(ModItems.crystal_schrabidium)); recipes.put("oreLithium", new ItemStack(ModItems.crystal_lithium)); recipes.put("oreStarmetal", new ItemStack(ModItems.crystal_starmetal)); + recipes.put("oreRareEarth", new ItemStack(ModItems.crystal_rare)); - recipes.put(new ComparableStack(ModBlocks.ore_rare), new ItemStack(ModItems.crystal_rare)); recipes.put(new ComparableStack(ModBlocks.ore_nether_fire), new ItemStack(ModItems.crystal_phosphorus)); recipes.put(new ComparableStack(ModBlocks.ore_tikite), new ItemStack(ModItems.crystal_trixite)); recipes.put(new ComparableStack(ModBlocks.gravel_diamond), new ItemStack(ModItems.crystal_diamond)); diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 4d963e840..ae7d53f27 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -197,6 +197,16 @@ public class OreDictManager { OreDictionary.registerOre("oreVerticium", ModBlocks.ore_verticium); OreDictionary.registerOre("oreRareEarth", ModBlocks.ore_rare); + OreDictionary.registerOre("oreIron", ModBlocks.ore_gneiss_iron); + OreDictionary.registerOre("oreGold", ModBlocks.ore_gneiss_gold); + OreDictionary.registerOre("oreUranium", ModBlocks.ore_gneiss_uranium); + OreDictionary.registerOre("oreUranium", ModBlocks.ore_gneiss_uranium_scorched); + OreDictionary.registerOre("oreCopper", ModBlocks.ore_gneiss_copper); + OreDictionary.registerOre("oreAsbestos", ModBlocks.ore_gneiss_asbestos); + OreDictionary.registerOre("oreLithium", ModBlocks.ore_gneiss_lithium); + OreDictionary.registerOre("oreRareEarth", ModBlocks.ore_gneiss_rare); + OreDictionary.registerOre("oreSchrabidium", ModBlocks.ore_gneiss_schrabidium); + OreDictionary.registerOre("oreUranium", ModBlocks.ore_nether_uranium); OreDictionary.registerOre("oreUranium", ModBlocks.ore_nether_uranium_scorched); OreDictionary.registerOre("orePlutonium", ModBlocks.ore_nether_plutonium); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 2e2c50593..56a53659d 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -17,6 +17,7 @@ import com.hbm.items.weapon.*; import com.hbm.items.weapon.ItemMissile.*; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.potion.HbmPotion; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.creativetab.CreativeTabs; @@ -1383,6 +1384,7 @@ public class ModItems { public static Item twinkie; public static Item static_sandwich; public static Item pudding; + public static Item pancake; public static Item med_ipecac; public static Item med_ptsd; @@ -3261,6 +3263,7 @@ public class ModItems { pudding = new ItemLemon(6, 15, false).setUnlocalizedName("pudding").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pudding"); canteen_13 = new ItemCanteen(1 * 60 * 20).setUnlocalizedName("canteen_13").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_13"); canteen_vodka = new ItemCanteen(3 * 60 * 20).setUnlocalizedName("canteen_vodka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_vodka"); + pancake = new ItemPancake(20, 20, false).setUnlocalizedName("pancake").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pancake"); defuser = new Item().setUnlocalizedName("defuser").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":defuser"); @@ -3612,18 +3615,21 @@ public class ModItems { starmetal_legs = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_legs").setTextureName(RefStrings.MODID + ":starmetal_legs"); starmetal_boots = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_boots").setTextureName(RefStrings.MODID + ":starmetal_boots"); - bj_helmet = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000, 100, 10).setMod(0.5F).setCap(15F) + bj_helmet = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000).setMod(0.25F).setCap(7.5F) .setFireproof(true) .enableThermalSight(true) .addEffect(new PotionEffect(Potion.jump.id, 20, 0)) + .addEffect(new PotionEffect(Potion.field_76443_y.id, 20, 0)) + .addEffect(new PotionEffect(HbmPotion.radx.id, 20, 0)) + .setBlastProtection(0.5F) .setGravity(0.02D) .setStep("hbm:step.metal") .setJump("hbm:step.iron_jump") .setFall("hbm:step.iron_land") .addResistance("fall", 0).setUnlocalizedName("bj_helmet").setTextureName(RefStrings.MODID + ":bj_helmet"); - bj_plate = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000, 100, 10).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_plate").setTextureName(RefStrings.MODID + ":bj_plate"); - bj_legs = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 10000, 100, 10).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_legs").setTextureName(RefStrings.MODID + ":bj_legs"); - bj_boots = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000, 100, 10).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_boots").setTextureName(RefStrings.MODID + ":bj_boots"); + bj_plate = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_plate").setTextureName(RefStrings.MODID + ":bj_plate"); + bj_legs = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 10000000, 10000, 1000).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_legs").setTextureName(RefStrings.MODID + ":bj_legs"); + bj_boots = new ArmorBJ(MainRegistry.aMatStarmetal, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_boots").setTextureName(RefStrings.MODID + ":bj_boots"); jackt = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt").setTextureName(RefStrings.MODID + ":jackt"); jackt2 = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt2").setTextureName(RefStrings.MODID + ":jackt2"); @@ -5645,6 +5651,7 @@ public class ModItems { GameRegistry.registerItem(twinkie, twinkie.getUnlocalizedName()); GameRegistry.registerItem(static_sandwich, static_sandwich.getUnlocalizedName()); GameRegistry.registerItem(pudding, pudding.getUnlocalizedName()); + GameRegistry.registerItem(pancake, pancake.getUnlocalizedName()); GameRegistry.registerItem(med_ipecac, med_ipecac.getUnlocalizedName()); GameRegistry.registerItem(med_ptsd, med_ptsd.getUnlocalizedName()); //GameRegistry.registerItem(med_schizophrenia, med_schizophrenia.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/armor/ArmorFSB.java b/src/main/java/com/hbm/items/armor/ArmorFSB.java index f3ce0596b..1cd5ec4ac 100644 --- a/src/main/java/com/hbm/items/armor/ArmorFSB.java +++ b/src/main/java/com/hbm/items/armor/ArmorFSB.java @@ -31,11 +31,8 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.sound.PlaySoundEvent17; import net.minecraftforge.event.entity.living.LivingAttackEvent; -import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.event.entity.player.PlayerFlyableFallEvent; //Armor with full set bonus public class ArmorFSB extends ItemArmor { @@ -80,6 +77,11 @@ public class ArmorFSB extends ItemArmor { return this; } + public ArmorFSB setBlastProtection(float blastProtection) { + this.blastProtection = blastProtection; + return this; + } + public ArmorFSB setFireproof(boolean fire) { this.fireproof = fire; return this; @@ -127,6 +129,7 @@ public class ArmorFSB extends ItemArmor { this.resistance = original.resistance; this.damageCap = original.damageCap; this.damageMod = original.damageMod; + this.blastProtection = original.blastProtection; this.fireproof = original.fireproof; this.noHelmet = original.noHelmet; this.thermal = original.thermal; @@ -151,36 +154,44 @@ public class ArmorFSB extends ItemArmor { if(!effects.isEmpty()) { for(PotionEffect effect : effects) { - list.add(" " + I18n.format(Potion.potionTypes[effect.getPotionID()].getName())); + list.add(EnumChatFormatting.AQUA + " " + I18n.format(Potion.potionTypes[effect.getPotionID()].getName())); } } if(!resistance.isEmpty()) { for(Entry struct : resistance.entrySet()) { - list.add(" Damage modifier of " + struct.getValue() + " against " + I18n.format(struct.getKey())); + + if(struct.getValue() != 0) + list.add(EnumChatFormatting.YELLOW + " Damage modifier of " + struct.getValue() + " against " + I18n.format(struct.getKey())); + else + list.add(EnumChatFormatting.RED + " Nullifies all damage from " + I18n.format(struct.getKey())); } } if(blastProtection != -1) { - list.add(" Damage modifier of " + blastProtection + " against explosions"); + list.add(EnumChatFormatting.YELLOW + " Damage modifier of " + blastProtection + " against explosions"); } if(damageCap != -1) { - list.add(" Hard damage cap of " + damageCap); + list.add(EnumChatFormatting.YELLOW + " Hard damage cap of " + damageCap); } if(damageMod != -1) { - list.add(" General damage modifier of " + damageMod); + list.add(EnumChatFormatting.YELLOW + " General damage modifier of " + damageMod); } if(fireproof) { - list.add(" Fireproof"); + list.add(EnumChatFormatting.RED + " Fireproof"); } if(thermal) { - list.add(" Thermal Sight"); + list.add(EnumChatFormatting.RED + " Thermal Sight"); + } + + if(gravity != 0) { + list.add(EnumChatFormatting.BLUE + " Gravity modifier of " + gravity); } } diff --git a/src/main/java/com/hbm/items/block/ItemBlockLore.java b/src/main/java/com/hbm/items/block/ItemBlockLore.java index 16547a8f4..1393ac9aa 100644 --- a/src/main/java/com/hbm/items/block/ItemBlockLore.java +++ b/src/main/java/com/hbm/items/block/ItemBlockLore.java @@ -106,7 +106,7 @@ public class ItemBlockLore extends ItemBlock { if(this.field_150939_a == ModBlocks.ore_schrabidium || this.field_150939_a == ModBlocks.ore_nether_schrabidium || this.field_150939_a == ModBlocks.block_schrabidium || this.field_150939_a == ModBlocks.block_schrabidium_cluster || this.field_150939_a == ModBlocks.block_schrabidium_fuel || this.field_150939_a == ModBlocks.block_solinium || - this.field_150939_a == ModBlocks.gravel_diamond) + this.field_150939_a == ModBlocks.gravel_diamond || this.field_150939_a == ModBlocks.ore_gneiss_schrabidium) return EnumRarity.rare; if(this.field_150939_a == ModBlocks.block_euphemium || this.field_150939_a == ModBlocks.block_euphemium_cluster || diff --git a/src/main/java/com/hbm/items/food/ItemPancake.java b/src/main/java/com/hbm/items/food/ItemPancake.java new file mode 100644 index 000000000..63ff8ff19 --- /dev/null +++ b/src/main/java/com/hbm/items/food/ItemPancake.java @@ -0,0 +1,59 @@ +package com.hbm.items.food; + +import java.util.List; + +import com.hbm.items.ModItems; +import com.hbm.items.armor.ArmorFSB; + +import api.hbm.energy.IBatteryItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; + +public class ItemPancake extends ItemFood { + + public ItemPancake(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) { + super(p_i45339_1_, p_i45339_2_, p_i45339_3_); + this.setAlwaysEdible(); + } + + + @Override + protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { + + for(ItemStack st : player.inventory.armorInventory) { + + if(st == null) + continue; + + if(st.getItem() instanceof IBatteryItem) { + ((IBatteryItem)st.getItem()).setCharge(st, ((IBatteryItem)st.getItem()).getMaxCharge()); + } + } + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + + if(ArmorFSB.hasFSBArmor(player) && player.inventory.armorInventory[3].getItem() == ModItems.bj_helmet) { + return super.onItemRightClick(stack, world, player); + } + + if(!world.isRemote) + player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Your teeth are too soft to eat this.")); + + return stack; + } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { + list.add("Can be eaten to recharge lunar cybernetic armor"); + list.add("Not for people with weak molars"); + list.add(""); + list.add("Half burnt and smells horrible"); + } + +} diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index 898b245c0..16f027778 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -30,7 +30,10 @@ import com.hbm.world.feature.OilBubble; import com.hbm.world.feature.OilSandBubble; import com.hbm.world.feature.Sellafield; import com.hbm.world.generator.CellularDungeonFactory; +import com.hbm.world.generator.DungeonToolbox; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityChest; @@ -39,6 +42,8 @@ import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.gen.NoiseGeneratorOctaves; +import net.minecraft.world.gen.NoiseGeneratorPerlin; import net.minecraft.world.gen.feature.WorldGenMinable; import cpw.mods.fml.common.IWorldGenerator; @@ -60,100 +65,86 @@ public class HbmWorldGen implements IWorldGenerator { } } + + NoiseGeneratorOctaves octaves = new NoiseGeneratorOctaves(new Random(0x706f6e6379756dL), 1); + + /** + * Fake noise generator "unruh" ("unrest", the motion of a clockwork), using a bunch of layered, scaaled and offset + * sine functions to simulate a simple noise generator that runs somewhat efficiently + * @param long the random function seed used for this operation + * @param x the exact x-coord of the height you want + * @param z the exact z-coord of the height you want + * @param scale how much the x/z coords should be amplified + * @param depth the resolution of the operation, higher numbers call more sine functions + * @return the height value + */ + private double generateUnruh(long seed, int x, int z, double scale, int depth) { + + scale = 1/scale; + + double result = 1; + + Random rand = new Random(seed); + + for(int i = 0; i < depth; i++) { + + double offsetX = rand.nextDouble() * Math.PI * 2; + double offsetZ = rand.nextDouble() * Math.PI * 2; + + result += Math.sin(x / Math.pow(2, depth) * scale + offsetX) * Math.sin(z / Math.pow(2, depth) * scale + offsetZ); + } + + return result / depth; + } private void generateSurface(World world, Random rand, int i, int j) { - // Ore stains per chunk - for (int k = 0; k < WorldConfig.uraniumSpawn; k++) { - int randPosX = i + rand.nextInt(16); - // Max height of generation - int randPosY = rand.nextInt(25); - int randPosZ = j + rand.nextInt(16); - - // Ore, amount of ore in one stain - (new WorldGenMinable(ModBlocks.ore_uranium, 5)).generate(world, rand, randPosX, randPosY, randPosZ); + + for(int x = 0; x < 16; x++) { + + for(int z = 0; z < 16; z++) { + + double unruh = Math.abs(generateUnruh(world.getSeed(), i + x, j + z, 4, 4)) * 1.5; + double thresh = 0.8D; + + if(unruh >= thresh) { + + int span = (int)(Math.floor((unruh - thresh) * 7)); + + for(int s = -span; s <= span; s++) { + + int y = 35 + s; + + Block b = world.getBlock(x, y, z); + + if(b.getMaterial() == Material.rock || b == Blocks.dirt) + world.setBlock(i + x, (int) (y), j + z, ModBlocks.stone_gneiss, 0, 2); + } + } + } } - for (int k = 0; k < WorldConfig.thoriumSpawn; k++) { - int randPosX = i + rand.nextInt(16); - // Max height of generation - int randPosY = rand.nextInt(30); - int randPosZ = j + rand.nextInt(16); + DungeonToolbox.generateOre(world, rand, i, j, 25, 6, 30, 10, ModBlocks.ore_gneiss_iron, ModBlocks.stone_gneiss); + DungeonToolbox.generateOre(world, rand, i, j, 10, 6, 30, 10, ModBlocks.ore_gneiss_gold, ModBlocks.stone_gneiss); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.uraniumSpawn * 3, 6, 30, 10, ModBlocks.ore_gneiss_uranium, ModBlocks.stone_gneiss); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.copperSpawn * 3, 6, 30, 10, ModBlocks.ore_gneiss_copper, ModBlocks.stone_gneiss); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.asbestosSpawn * 3, 6, 30, 10, ModBlocks.ore_gneiss_asbestos, ModBlocks.stone_gneiss); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.lithiumSpawn, 6, 30, 10, ModBlocks.ore_gneiss_lithium, ModBlocks.stone_gneiss); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.rareSpawn, 6, 30, 10, ModBlocks.ore_gneiss_asbestos, ModBlocks.stone_gneiss); - // Ore, amount of ore in one stain - (new WorldGenMinable(ModBlocks.ore_thorium, 5)).generate(world, rand, randPosX, randPosY, randPosZ); - } - - for (int k = 0; k < WorldConfig.titaniumSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(35); - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_titanium, 6)).generate(world, rand, randPosX, randPosY, randPosZ); - } - - for (int k = 0; k < WorldConfig.sulfurSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(35); - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_sulfur, 8)).generate(world, rand, randPosX, randPosY, randPosZ); - } - - for (int k = 0; k < WorldConfig.aluminiumSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(45); - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_aluminium, 6)).generate(world, rand, randPosX, randPosY, randPosZ); - } - - for (int k = 0; k < WorldConfig.copperSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(50); - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_copper, 6)).generate(world, rand, randPosX, randPosY, randPosZ); - } - - for (int k = 0; k < WorldConfig.fluoriteSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(40); - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_fluorite, 4)).generate(world, rand, randPosX, randPosY, randPosZ); - } - - for (int k = 0; k < WorldConfig.niterSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(35); - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_niter, 6)).generate(world, rand, randPosX, randPosY, randPosZ); - } - - for (int k = 0; k < WorldConfig.tungstenSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(35); - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_tungsten, 8)).generate(world, rand, randPosX, randPosY, randPosZ); - } - - for (int k = 0; k < WorldConfig.leadSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(35); - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_lead, 9)).generate(world, rand, randPosX, randPosY, randPosZ); - } - - for (int k = 0; k < WorldConfig.berylliumSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(35); - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_beryllium, 4)).generate(world, rand, randPosX, randPosY, randPosZ); - } + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.uraniumSpawn, 5, 5, 20, ModBlocks.ore_uranium); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.thoriumSpawn, 5, 5, 25, ModBlocks.ore_thorium); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.titaniumSpawn, 6, 5, 30, ModBlocks.ore_titanium); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.sulfurSpawn, 8, 5, 30, ModBlocks.ore_sulfur); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.aluminiumSpawn, 6, 5, 40, ModBlocks.ore_aluminium); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.copperSpawn, 6, 5, 45, ModBlocks.ore_copper); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.fluoriteSpawn, 4, 5, 45, ModBlocks.ore_fluorite); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.niterSpawn, 6, 5, 30, ModBlocks.ore_niter); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.tungstenSpawn, 8, 5, 30, ModBlocks.ore_tungsten); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.leadSpawn, 9, 5, 30, ModBlocks.ore_lead); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.berylliumSpawn, 4, 5, 30, ModBlocks.ore_beryllium); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.rareSpawn, 5, 5, 20, ModBlocks.ore_rare); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.ligniteSpawn, 24, 35, 25, ModBlocks.ore_lignite); + DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.asbestosSpawn, 4, 16, 16, ModBlocks.ore_asbestos); for (int k = 0; k < 6; k++) { int randPosX = i + rand.nextInt(16); @@ -209,30 +200,6 @@ public class HbmWorldGen implements IWorldGenerator { (new WorldGenMinable(ModBlocks.ore_verticium, 16)).generate(world, rand, randPosX, randPosY, randPosZ); } - for (int k = 0; k < WorldConfig.niterSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(25); - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_rare, 5)).generate(world, rand, randPosX, randPosY, randPosZ); - } - - for (int k = 0; k < WorldConfig.ligniteSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(25) + 35; - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_lignite, 24)).generate(world, rand, randPosX, randPosY, randPosZ); - } - - for (int k = 0; k < WorldConfig.asbestosSpawn; k++) { - int randPosX = i + rand.nextInt(16); - int randPosY = rand.nextInt(16) + 16; - int randPosZ = j + rand.nextInt(16); - - (new WorldGenMinable(ModBlocks.ore_asbestos, 4)).generate(world, rand, randPosX, randPosY, randPosZ); - } - if (GeneralConfig.enableDungeons) { BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(i, j); diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 1b06f749b..9693f4120 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3654)"; + public static final String VERSION = "1.0.27 BETA (3668)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index acb4ca720..9569b9b5f 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -517,6 +517,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.tank_steel, 1), new Object[] { "STS", "S S", "STS", 'S', "plateSteel", 'T', "plateTitanium" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.motor, 2), new Object[] { " R ", "ICI", "ITI", 'R', ModItems.wire_red_copper, 'T', ModItems.coil_copper_torus, 'I', "plateIron", 'C', ModItems.coil_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.motor, 2), new Object[] { " R ", "ICI", " T ", 'R', ModItems.wire_red_copper, 'T', ModItems.coil_copper_torus, 'I', "plateSteel", 'C', ModItems.coil_copper })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.motor_desh, 1), new Object[] { "PCP", "DMD", "PCP", 'P', ModItems.ingot_polymer, 'C', ModItems.coil_gold_torus, 'D', "ingotDesh", 'M', ModItems.motor })); //GameRegistry.addRecipe(new ItemStack(ModItems.centrifuge_element, 1), new Object[] { " T ", "WTW", "RMR", 'R', ModItems.wire_red_copper, 'T', ModItems.tank_steel, 'M', ModItems.motor, 'W', ModItems.coil_tungsten }); //GameRegistry.addRecipe(new ItemStack(ModItems.centrifuge_tower, 1), new Object[] { "LL", "EE", "EE", 'E', ModItems.centrifuge_element, 'L', new ItemStack(Items.dye, 1, 4) }); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.reactor_core, 1), new Object[] { "LNL", "N N", "LNL", 'N', "plateDenseLead", 'L', "plateLead" })); @@ -719,12 +720,7 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_corner)), new Object[] { Item.getItemFromBlock(ModBlocks.steel_wall), Item.getItemFromBlock(ModBlocks.steel_wall) }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_roof), 2), new Object[] { "SSS", 'S', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_scaffold), 8), new Object[] { "SSS", " S ", "SSS", 'S', "ingotSteel" })); - - reg2(); - } - - public static void reg2() { - + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg, 1), new Object[] { "SSW", " MW", 'S', ModItems.hull_small_steel, 'W', "plateIron", 'M', ModItems.mechanism_launcher_1 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_panzerschreck, 1), new Object[] { "SSS", " MW", 'S', ModItems.hull_small_steel, 'W', "plateCopper", 'M', ModItems.mechanism_launcher_1 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_karl, 1), new Object[] { "SSW", " MW", 'S', ModItems.hull_small_steel, 'W', "plateAdvanced", 'M', ModItems.mechanism_launcher_2 })); @@ -743,6 +739,12 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_nightmare, 1), new Object[] { "SEM", " RW", 'S', "plateSteel", 'W', "plankWood", 'R', ModItems.wire_aluminium, 'E', ModItems.powder_power, 'M', ModItems.mechanism_revolver_2 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_nightmare2, 1), new Object[] { "SSM", "RRW", 'S', "plateDenseLead", 'W', "ingotTungsten", 'R', ModItems.wire_gold, 'M', ModItems.mechanism_special })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_fatman, 1), new Object[] { "SSI", "IIM", "WPH", 'S', "plateSteel", 'I', "ingotSteel", 'W', ModItems.wire_aluminium, 'H', ModItems.hull_small_steel, 'P', Item.getItemFromBlock(Blocks.piston), 'M', ModItems.mechanism_launcher_2 })); + + reg2(); + } + + public static void reg2() { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mirv, 1), new Object[] { "LLL", "WFW", "SSS", 'S', "plateSteel", 'L', "plateLead", 'W', ModItems.wire_gold, 'F', ModItems.gun_fatman })); GameRegistry.addRecipe(new ItemStack(ModItems.gun_proto, 1), new Object[] { "LLL", "WFW", "SSS", 'S', ModItems.plate_polymer, 'L', ModItems.plate_desh, 'W', ModItems.wire_tungsten, 'F', ModItems.gun_fatman }); GameRegistry.addRecipe(new ItemStack(ModItems.gun_bf_ammo, 1), new Object[] { " S ", "EBE", " S ", 'S', ModItems.hull_small_steel, 'E', ModItems.powder_power, 'B', ModItems.egg_balefire_shard }); @@ -1030,6 +1032,8 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.balefire_and_ham, 1), new Object[] { ModItems.balefire_scrambled, Items.cooked_beef }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.med_ipecac, 1), new Object[] { Items.glass_bottle, Items.nether_wart }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.med_ptsd, 1), new Object[] { ModItems.med_ipecac }); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pancake, 1), new Object[] { "dustRedstone", "dustDiamond", Items.wheat, ModItems.bolt_tungsten, ModItems.wire_copper, "plateSteel" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pancake, 1), new Object[] { "dustRedstone", "dustEmerald", Items.wheat, ModItems.bolt_tungsten, ModItems.wire_copper, "plateSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.can_empty, 1), new Object[] { "P", "P", 'P', "plateAluminum" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.can_smart, 1), new Object[] { ModItems.can_empty, Items.potionitem, Items.sugar, ModItems.niter }); @@ -1258,6 +1262,11 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_cobalt }); GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_cobalt }); GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.ingot_cobalt }); + + GameRegistry.addRecipe(new ItemStack(ModItems.bj_helmet, 1), new Object[] { "SBS", " C ", " I ", 'S', Items.string, 'B', new ItemStack(Blocks.wool, 1, 15), 'C', ModItems.circuit_targeting_tier4, 'I', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bj_plate, 1), new Object[] { "N N", "MSM", "NCN", 'N', "plateDenseLead", 'M', ModItems.motor_desh, 'S', ModItems.starmetal_plate, 'C', ModItems.circuit_targeting_tier5 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bj_legs, 1), new Object[] { "NBN", "MSM", "N N", 'N', "plateDenseLead", 'M', ModItems.motor_desh, 'S', ModItems.starmetal_legs, 'B', ModBlocks.block_starmetal })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bj_boots, 1), new Object[] { "N N", "BSB", 'N', "plateDenseLead", 'S', ModItems.starmetal_boots, 'B', ModBlocks.block_starmetal })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.drax, 1), new Object[] { "BCF", "DDM", "BCC", 'B', ModItems.blades_advanced_alloy, 'C', "ingotCobalt", 'F', ItemBattery.getFullBattery(ModItems.fusion_core), 'D', "ingotDesh", 'M', ModItems.motor })); GameRegistry.addRecipe(new ItemStack(ModItems.drax_mk2, 1), new Object[] { "SCS", "IDI", "FEF", 'S', ModItems.ingot_starmetal, 'C', ModItems.crystal_trixite, 'I', ModItems.ingot_saturnite, 'D', ModItems.drax, 'F', ItemBattery.getFullBattery(ModItems.fusion_core), 'E', ModItems.circuit_targeting_tier5 }); @@ -1480,6 +1489,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModBlocks.vent_chlorine_seal), new Object[] { "ISI", "SCS", "ISI", 'I', ModItems.ingot_saturnite, 'S', ModItems.ingot_starmetal, 'C', ModItems.chlorine_pinwheel }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.vent_cloud), new Object[] { "IGI", "ICI", "IDI", 'I', "plateIron", 'G', Blocks.iron_bars, 'C', ModItems.grenade_cloud, 'D', Blocks.dispenser })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.vent_pink_cloud), new Object[] { "IGI", "ICI", "IDI", 'I', "plateIron", 'G', Blocks.iron_bars, 'C', ModItems.grenade_pink_cloud, 'D', Blocks.dispenser })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.spikes, 4), new Object[] { "FFF", "BBB", "TTT", 'F', Items.flint, 'B', ModItems.bolt_tungsten, 'T', "ingotTungsten" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.mine_ap, 4), new Object[] { "C", "P", "T", 'C', ModItems.circuit_targeting_tier2, 'P', "plateIron", 'T', ModItems.ingot_semtex })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.mine_he, 1), new Object[] { " C ", "PTP", 'C', ModItems.circuit_targeting_tier2, 'P', "plateSteel", 'T', ModItems.ingot_semtex })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.mine_shrap, 2), new Object[] { "LLL", " C ", "PTP", 'C', ModItems.circuit_targeting_tier2, 'P', "plateSteel", 'T', ModBlocks.det_cord, 'L', ModItems.pellet_buckshot })); @@ -1507,6 +1517,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_amgen, 1), new Object[] { "ITI", "TAT", "ITI", 'I', "ingotAdvanced", 'T', ModItems.thermo_element, 'A', ModBlocks.absorber })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_geo, 1), new Object[] { "ITI", "PCP", "ITI", 'I', "ingotDuraSteel", 'T', ModItems.thermo_element, 'P', ModItems.board_copper, 'C', ModBlocks.red_wire_coated })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_minirtg, 1), new Object[] { "LLL", "PPP", "TRT", 'L', "plateLead", 'P', "Pu238", 'T', ModItems.thermo_element, 'R', ModItems.rtg_unit })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_powerrtg, 1), new Object[] { "SRS", "PTP", "SRS", 'S', ModItems.ingot_starmetal, 'R', ModItems.rtg_unit, 'P', "ingotPolonium", 'T', ModItems.powder_tennessine })); GameRegistry.addRecipe(new ItemStack(ModBlocks.pink_planks, 4), new Object[] { "W", 'W', ModBlocks.pink_log }); GameRegistry.addRecipe(new ItemStack(ModBlocks.pink_slab, 6), new Object[] { "WWW", 'W', ModBlocks.pink_planks }); @@ -1656,6 +1667,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModBlocks.ore_uranium, 8), new Object[] { "OOO", "OBO", "OOO", 'O', ModBlocks.ore_uranium_scorched, 'B', Items.water_bucket }); GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.ore_nether_uranium, 1), new Object[] { ModBlocks.ore_nether_uranium_scorched, Items.water_bucket }); GameRegistry.addRecipe(new ItemStack(ModBlocks.ore_nether_uranium, 8), new Object[] { "OOO", "OBO", "OOO", 'O', ModBlocks.ore_nether_uranium_scorched, 'B', Items.water_bucket }); + GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.ore_gneiss_uranium, 1), new Object[] { ModBlocks.ore_gneiss_uranium_scorched, Items.water_bucket }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.ore_gneiss_uranium, 8), new Object[] { "OOO", "OBO", "OOO", 'O', ModBlocks.ore_gneiss_uranium_scorched, 'B', Items.water_bucket }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_iron, 4), new Object[] { "##", "##", '#', "ingotIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_gold, 4), new Object[] { "##", "##", '#', "ingotGold" })); @@ -1709,6 +1722,14 @@ public class CraftingManager { GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_meteor_lithium), new ItemStack(ModItems.lithium), 20.0F); GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_meteor_starmetal), new ItemStack(ModItems.ingot_starmetal), 50.0F); + GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_gneiss_iron), new ItemStack(Items.iron_ingot), 5.0F); + GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_gneiss_gold), new ItemStack(Items.gold_ingot), 5.0F); + GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_gneiss_uranium), new ItemStack(ModItems.ingot_uranium), 12.0F); + GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_gneiss_uranium_scorched), new ItemStack(ModItems.ingot_uranium), 12.0F); + GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_gneiss_copper), new ItemStack(ModItems.ingot_copper), 5F); + GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_gneiss_lithium), new ItemStack(ModItems.lithium), 10F); + GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_gneiss_schrabidium), new ItemStack(ModItems.ingot_schrabidium), 256.0F); + GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_australium), new ItemStack(ModItems.nugget_australium), 2.5F); GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_weidanium), new ItemStack(ModItems.nugget_weidanium, 6), 16.0F); GameRegistry.addSmelting(Item.getItemFromBlock(ModBlocks.ore_reiium), new ItemStack(ModItems.ingot_reiium), 24.0F); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index d06f3ff7e..f7a7fd7f6 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -170,6 +170,7 @@ public class MainRegistry { public static Achievement achSoyuz; public static Achievement achRadPoison; public static Achievement achRadDeath; + public static Achievement achStratum; public static Achievement bobMetalworks; public static Achievement bobAssembly; public static Achievement bobChemistry; @@ -205,17 +206,18 @@ public class MainRegistry { polaroidID = rand.nextInt(18) + 1; } + loadConfig(PreEvent); + HbmPotion.init(); + ModBlocks.mainRegistry(); ModItems.mainRegistry(); proxy.registerRenderInfo(); HbmWorld.mainRegistry(); GameRegistry.registerFuelHandler(new FuelHandler()); - HbmPotion.init(); BulletConfigSyncingUtil.loadConfigsForSync(); CellularDungeonFactory.init(); Satellite.register(); HTTPHandler.loadStats(); - loadConfig(PreEvent); CraftingManager.mainRegistry(); AssemblerRecipes.preInit(PreEvent.getModConfigurationDirectory()); @@ -861,6 +863,7 @@ public class MainRegistry { achFiend = new Achievement("achievement.fiend", "fiend", 6, -2, ModItems.shimmer_sledge, null).initIndependentStat().setSpecial().registerStat(); achFiend2 = new Achievement("achievement.fiend2", "fiend2", 6, 0, ModItems.shimmer_axe, null).initIndependentStat().setSpecial().registerStat(); achSoyuz = new Achievement("achievement.soyuz", "soyuz", -2, 0, Items.baked_potato, null).initIndependentStat().setSpecial().registerStat(); + achStratum = new Achievement("achievement.stratum", "stratum", -4, -2, new ItemStack(ModBlocks.stone_gneiss), null).initIndependentStat().setSpecial().registerStat(); bobMetalworks = new Achievement("achievement.metalworks", "metalworks", -2, 2, ModItems.bob_metalworks, null).initIndependentStat().registerStat(); bobAssembly = new Achievement("achievement.assembly", "assembly", 0, 2, ModItems.bob_assembly, bobMetalworks).initIndependentStat().registerStat(); @@ -890,6 +893,7 @@ public class MainRegistry { achFiend, achFiend2, achSoyuz, + achStratum, bobMetalworks, bobAssembly, bobChemistry, @@ -1001,6 +1005,11 @@ public class MainRegistry { HazmatRegistry.instance.registerHazmat(ModItems.t45_legs, 0.6F); HazmatRegistry.instance.registerHazmat(ModItems.t45_boots, 0.2F); + HazmatRegistry.instance.registerHazmat(ModItems.bj_helmet, 0.4F); + HazmatRegistry.instance.registerHazmat(ModItems.bj_plate, 0.8F); + HazmatRegistry.instance.registerHazmat(ModItems.bj_legs, 0.6F); + HazmatRegistry.instance.registerHazmat(ModItems.bj_boots, 0.2F); + HazmatRegistry.instance.registerHazmat(ModItems.paa_plate, 0.8F); HazmatRegistry.instance.registerHazmat(ModItems.paa_legs, 0.6F); HazmatRegistry.instance.registerHazmat(ModItems.paa_boots, 0.2F); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index dae053461..be8951c79 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -74,6 +74,7 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.event.entity.player.PlayerFlyableFallEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; +import net.minecraftforge.event.world.BlockEvent.BreakEvent; public class ModEventHandler { @@ -562,6 +563,18 @@ public class ModEventHandler e.player.addStat(MainRegistry.bobNuclear, 1); } } + + @SubscribeEvent + public void onBlockBreak(BreakEvent event) { + + if(!(event.getPlayer() instanceof EntityPlayerMP)) + return; + + if(event.block == ModBlocks.stone_gneiss && !((EntityPlayerMP) event.getPlayer()).func_147099_x().hasAchievementUnlocked(MainRegistry.achStratum)) { + event.getPlayer().triggerAchievement(MainRegistry.achStratum); + event.setExpToDrop(500); + } + } private static final String hash = "a4e6e2d37cc6bae3b19a925569c008d8f98b867e62ecb72398ee6fd5d7ee535a"; diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index 5cd49fa9c..7644b1b04 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -531,6 +531,7 @@ public class ResourceManager { public static final ResourceLocation bj_eyepatch = new ResourceLocation(RefStrings.MODID, "textures/armor/bj_eyepatch.png"); public static final ResourceLocation bj_leg = new ResourceLocation(RefStrings.MODID, "textures/armor/bj_leg.png"); public static final ResourceLocation bj_chest = new ResourceLocation(RefStrings.MODID, "textures/armor/bj_chest.png"); + public static final ResourceLocation bj_jetpack = new ResourceLocation(RefStrings.MODID, "textures/armor/bj_jetpack.png"); public static final ResourceLocation bj_arm = new ResourceLocation(RefStrings.MODID, "textures/armor/bj_arm.png"); diff --git a/src/main/java/com/hbm/render/loader/ModelRendererObj.java b/src/main/java/com/hbm/render/loader/ModelRendererObj.java index b13fa566a..5a7212ed3 100644 --- a/src/main/java/com/hbm/render/loader/ModelRendererObj.java +++ b/src/main/java/com/hbm/render/loader/ModelRendererObj.java @@ -39,6 +39,19 @@ public class ModelRendererObj { this.rotationPointZ = z; return this; } + + public void copyTo(ModelRendererObj obj) { + + obj.offsetX = offsetX; + obj.offsetY = offsetY; + obj.offsetZ = offsetZ; + obj.rotateAngleX = rotateAngleX; + obj.rotateAngleY = rotateAngleY; + obj.rotateAngleZ = rotateAngleZ; + obj.rotationPointX = rotationPointX; + obj.rotationPointY = rotationPointY; + obj.rotationPointZ = rotationPointZ; + } @SideOnly(Side.CLIENT) public void render(float scale) { diff --git a/src/main/java/com/hbm/render/model/ModelArmorBJ.java b/src/main/java/com/hbm/render/model/ModelArmorBJ.java index dcf00a2de..1084a6e37 100644 --- a/src/main/java/com/hbm/render/model/ModelArmorBJ.java +++ b/src/main/java/com/hbm/render/model/ModelArmorBJ.java @@ -2,43 +2,36 @@ package com.hbm.render.model; import org.lwjgl.opengl.GL11; -import com.hbm.interfaces.IHoldableWeapon; import com.hbm.main.ResourceManager; import com.hbm.render.loader.ModelRendererObj; import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.util.MathHelper; -public class ModelArmorBJ extends ModelBiped { +public class ModelArmorBJ extends ModelArmorBase { - int type; - - ModelRendererObj head; - ModelRendererObj body; - ModelRendererObj leftArm; - ModelRendererObj rightArm; - ModelRendererObj leftLeg; - ModelRendererObj rightLeg; + ModelRendererObj jetpack; public ModelArmorBJ(int type) { - this.type = type; - } - - @Override - public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { + super(type); head = new ModelRendererObj(ResourceManager.armor_bj, "Head"); body = new ModelRendererObj(ResourceManager.armor_bj, "Body"); + jetpack = new ModelRendererObj(ResourceManager.armor_bj, "Jetpack"); leftArm = new ModelRendererObj(ResourceManager.armor_bj, "LeftArm").setRotationPoint(-5.0F, 2.0F, 0.0F); rightArm = new ModelRendererObj(ResourceManager.armor_bj, "RightArm").setRotationPoint(5.0F, 2.0F, 0.0F); leftLeg = new ModelRendererObj(ResourceManager.armor_bj, "LeftLeg").setRotationPoint(1.9F, 12.0F, 0.0F); rightLeg = new ModelRendererObj(ResourceManager.armor_bj, "RightLeg").setRotationPoint(-1.9F, 12.0F, 0.0F); + leftFoot = new ModelRendererObj(ResourceManager.armor_bj, "LeftFoot").setRotationPoint(1.9F, 12.0F, 0.0F); + rightFoot = new ModelRendererObj(ResourceManager.armor_bj, "RightFoot").setRotationPoint(-1.9F, 12.0F, 0.0F); + } + @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); + body.copyTo(jetpack); + GL11.glPushMatrix(); if(type == 0) { @@ -48,6 +41,8 @@ public class ModelArmorBJ extends ModelBiped { if(type == 1) { Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.bj_chest); body.render(par7); + //Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.bj_jetpack); + //jetpack.render(par7); Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.bj_arm); leftArm.render(par7); rightArm.render(par7); @@ -57,143 +52,12 @@ public class ModelArmorBJ extends ModelBiped { leftLeg.render(par7); rightLeg.render(par7); } + if(type == 3) { + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.bj_leg); + leftFoot.render(par7); + rightFoot.render(par7); + } GL11.glPopMatrix(); } - - public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity entity) { - - head.rotateAngleY = p_78087_4_ / (180F / (float)Math.PI); - head.rotateAngleX = p_78087_5_ / (180F / (float)Math.PI); - rightArm.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F + (float)Math.PI) * 2.0F * p_78087_2_ * 0.5F; - leftArm.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F) * 2.0F * p_78087_2_ * 0.5F; - rightArm.rotateAngleZ = 0.0F; - leftArm.rotateAngleZ = 0.0F; - rightLeg.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F) * 1.4F * p_78087_2_; - leftLeg.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F + (float)Math.PI) * 1.4F * p_78087_2_; - rightLeg.rotateAngleY = 0.0F; - leftLeg.rotateAngleY = 0.0F; - - if(entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer)entity; - - this.aimedBow = false; - - if(player.getHeldItem() != null) { - - int hold = 1; - - if(player.getItemInUseCount() > 0) { - - EnumAction action = player.getHeldItem().getItemUseAction(); - - if(action == EnumAction.block) - hold = 3; - - if(action == EnumAction.bow) - this.aimedBow = true; - } - - if(player.getHeldItem().getItem() instanceof IHoldableWeapon) - this.aimedBow = true; - - rightArm.rotateAngleX = rightArm.rotateAngleX * 0.5F - ((float)Math.PI / 10F) * hold; - } - - this.isSneak = player.isSneaking(); - this.isRiding = player.isRiding(); - } - - if (this.isRiding) - { - rightArm.rotateAngleX += -((float)Math.PI / 5F); - leftArm.rotateAngleX += -((float)Math.PI / 5F); - rightLeg.rotateAngleX = -((float)Math.PI * 2F / 5F); - leftLeg.rotateAngleX = -((float)Math.PI * 2F / 5F); - rightLeg.rotateAngleY = ((float)Math.PI / 10F); - leftLeg.rotateAngleY = -((float)Math.PI / 10F); - } - - if (this.heldItemLeft != 0) - { - leftArm.rotateAngleX = leftArm.rotateAngleX * 0.5F - ((float)Math.PI / 10F) * (float)this.heldItemLeft; - } - - if (this.heldItemRight != 0) - { - rightArm.rotateAngleX = rightArm.rotateAngleX * 0.5F - ((float)Math.PI / 10F) * (float)this.heldItemRight; - } - - rightArm.rotateAngleY = 0.0F; - leftArm.rotateAngleY = 0.0F; - float f6; - float f7; - - if (this.onGround > -9990.0F) - { - f6 = this.onGround; - body.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f6) * (float)Math.PI * 2.0F) * 0.2F; - rightArm.rotationPointZ = MathHelper.sin(body.rotateAngleY) * 5.0F; - rightArm.rotationPointX = -MathHelper.cos(body.rotateAngleY) * 5.0F; - leftArm.rotationPointZ = -MathHelper.sin(body.rotateAngleY) * 5.0F; - leftArm.rotationPointX = MathHelper.cos(body.rotateAngleY) * 5.0F; - rightArm.rotateAngleY += body.rotateAngleY; - leftArm.rotateAngleY += body.rotateAngleY; - leftArm.rotateAngleX += body.rotateAngleY; - f6 = 1.0F - this.onGround; - f6 *= f6; - f6 *= f6; - f6 = 1.0F - f6; - f7 = MathHelper.sin(f6 * (float)Math.PI); - float f8 = MathHelper.sin(this.onGround * (float)Math.PI) * -(head.rotateAngleX - 0.7F) * 0.75F; - rightArm.rotateAngleX = (float)((double)rightArm.rotateAngleX - ((double)f7 * 1.2D + (double)f8)); - rightArm.rotateAngleY += body.rotateAngleY * 2.0F; - rightArm.rotateAngleZ = MathHelper.sin(this.onGround * (float)Math.PI) * -0.4F; - } - - if (this.isSneak) - { - body.rotateAngleX = 0.5F; - rightArm.rotateAngleX += 0.4F; - leftArm.rotateAngleX += 0.4F; - rightLeg.offsetZ = 4.0F; - leftLeg.offsetZ = 4.0F; - rightLeg.offsetY = -3.0F; - leftLeg.offsetY = -3.0F; - head.offsetY = 1.0F; - } - else - { - body.rotateAngleX = 0.0F; - rightLeg.rotationPointZ = 0.1F; - leftLeg.rotationPointZ = 0.1F; - rightLeg.rotationPointY = 12.0F; - leftLeg.rotationPointY = 12.0F; - head.rotationPointY = 0.0F; - } - - rightArm.rotateAngleZ += MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F; - leftArm.rotateAngleZ -= MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F; - rightArm.rotateAngleX += MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F; - leftArm.rotateAngleX -= MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F; - - if (this.aimedBow) - { - f6 = 0.0F; - f7 = 0.0F; - rightArm.rotateAngleZ = 0.0F; - leftArm.rotateAngleZ = 0.0F; - rightArm.rotateAngleY = -(0.1F - f6 * 0.6F) + head.rotateAngleY; - leftArm.rotateAngleY = 0.1F - f6 * 0.6F + head.rotateAngleY + 0.4F; - rightArm.rotateAngleX = -((float)Math.PI / 2F) + head.rotateAngleX; - leftArm.rotateAngleX = -((float)Math.PI / 2F) + head.rotateAngleX; - rightArm.rotateAngleX -= f6 * 1.2F - f7 * 0.4F; - leftArm.rotateAngleX -= f6 * 1.2F - f7 * 0.4F; - rightArm.rotateAngleZ += MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F; - leftArm.rotateAngleZ -= MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F; - rightArm.rotateAngleX += MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F; - leftArm.rotateAngleX -= MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F; - } - } - } diff --git a/src/main/java/com/hbm/render/model/ModelArmorBase.java b/src/main/java/com/hbm/render/model/ModelArmorBase.java new file mode 100644 index 000000000..aaa601e76 --- /dev/null +++ b/src/main/java/com/hbm/render/model/ModelArmorBase.java @@ -0,0 +1,163 @@ +package com.hbm.render.model; + +import com.hbm.interfaces.IHoldableWeapon; +import com.hbm.render.loader.ModelRendererObj; + +import net.minecraft.client.model.ModelBiped; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.util.MathHelper; + +public class ModelArmorBase extends ModelBiped { + + int type; + + ModelRendererObj head; + ModelRendererObj body; + ModelRendererObj leftArm; + ModelRendererObj rightArm; + ModelRendererObj leftLeg; + ModelRendererObj rightLeg; + ModelRendererObj leftFoot; + ModelRendererObj rightFoot; + + public ModelArmorBase(int type) { + this.type = type; + } + + public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity entity) { + + head.rotateAngleY = p_78087_4_ / (180F / (float)Math.PI); + head.rotateAngleX = p_78087_5_ / (180F / (float)Math.PI); + rightArm.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F + (float)Math.PI) * 2.0F * p_78087_2_ * 0.5F; + leftArm.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F) * 2.0F * p_78087_2_ * 0.5F; + rightArm.rotateAngleZ = 0.0F; + leftArm.rotateAngleZ = 0.0F; + rightFoot.rotateAngleX = rightLeg.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F) * 1.4F * p_78087_2_; + leftFoot.rotateAngleX = leftLeg.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F + (float)Math.PI) * 1.4F * p_78087_2_; + rightFoot.rotateAngleY = rightLeg.rotateAngleY = 0.0F; + leftFoot.rotateAngleY = leftLeg.rotateAngleY = 0.0F; + + if(entity instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer)entity; + + this.aimedBow = false; + + if(player.getHeldItem() != null) { + + int hold = 1; + + if(player.getItemInUseCount() > 0) { + + EnumAction action = player.getHeldItem().getItemUseAction(); + + if(action == EnumAction.block) + hold = 3; + + if(action == EnumAction.bow) + this.aimedBow = true; + } + + if(player.getHeldItem().getItem() instanceof IHoldableWeapon) + this.aimedBow = true; + + rightArm.rotateAngleX = rightArm.rotateAngleX * 0.5F - ((float)Math.PI / 10F) * hold; + } + + this.isSneak = player.isSneaking(); + this.isRiding = player.isRiding(); + } + + if (this.isRiding) + { + rightArm.rotateAngleX += -((float)Math.PI / 5F); + leftArm.rotateAngleX += -((float)Math.PI / 5F); + rightFoot.rotateAngleX = rightLeg.rotateAngleX = -((float)Math.PI * 2F / 5F); + leftFoot.rotateAngleX = leftLeg.rotateAngleX = -((float)Math.PI * 2F / 5F); + rightFoot.rotateAngleY = rightLeg.rotateAngleY = ((float)Math.PI / 10F); + leftFoot.rotateAngleY = leftLeg.rotateAngleY = -((float)Math.PI / 10F); + } + + if (this.heldItemLeft != 0) + { + leftArm.rotateAngleX = leftArm.rotateAngleX * 0.5F - ((float)Math.PI / 10F) * (float)this.heldItemLeft; + } + + if (this.heldItemRight != 0) + { + rightArm.rotateAngleX = rightArm.rotateAngleX * 0.5F - ((float)Math.PI / 10F) * (float)this.heldItemRight; + } + + rightArm.rotateAngleY = 0.0F; + leftArm.rotateAngleY = 0.0F; + float f6; + float f7; + + if (this.onGround > -9990.0F) + { + f6 = this.onGround; + body.rotateAngleY = MathHelper.sin(MathHelper.sqrt_float(f6) * (float)Math.PI * 2.0F) * 0.2F; + rightArm.rotationPointZ = MathHelper.sin(body.rotateAngleY) * 5.0F; + rightArm.rotationPointX = -MathHelper.cos(body.rotateAngleY) * 5.0F; + leftArm.rotationPointZ = -MathHelper.sin(body.rotateAngleY) * 5.0F; + leftArm.rotationPointX = MathHelper.cos(body.rotateAngleY) * 5.0F; + rightArm.rotateAngleY += body.rotateAngleY; + leftArm.rotateAngleY += body.rotateAngleY; + leftArm.rotateAngleX += body.rotateAngleY; + f6 = 1.0F - this.onGround; + f6 *= f6; + f6 *= f6; + f6 = 1.0F - f6; + f7 = MathHelper.sin(f6 * (float)Math.PI); + float f8 = MathHelper.sin(this.onGround * (float)Math.PI) * -(head.rotateAngleX - 0.7F) * 0.75F; + rightArm.rotateAngleX = (float)((double)rightArm.rotateAngleX - ((double)f7 * 1.2D + (double)f8)); + rightArm.rotateAngleY += body.rotateAngleY * 2.0F; + rightArm.rotateAngleZ = MathHelper.sin(this.onGround * (float)Math.PI) * -0.4F; + } + + if (this.isSneak) + { + body.rotateAngleX = 0.5F; + rightArm.rotateAngleX += 0.4F; + leftArm.rotateAngleX += 0.4F; + rightFoot.offsetZ = rightLeg.offsetZ = 4.0F; + leftFoot.offsetZ = leftLeg.offsetZ = 4.0F; + rightFoot.offsetY = rightLeg.offsetY = -3.0F; + leftFoot.offsetY = leftLeg.offsetY = -3.0F; + head.offsetY = 1.0F; + } + else + { + body.rotateAngleX = 0.0F; + rightFoot.rotationPointZ = rightLeg.rotationPointZ = 0.1F; + leftFoot.rotationPointZ = leftLeg.rotationPointZ = 0.1F; + rightFoot.rotationPointY = rightLeg.rotationPointY = 12.0F; + leftFoot.rotationPointY = leftLeg.rotationPointY = 12.0F; + head.rotationPointY = 0.0F; + } + + rightArm.rotateAngleZ += MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F; + leftArm.rotateAngleZ -= MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F; + rightArm.rotateAngleX += MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F; + leftArm.rotateAngleX -= MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F; + + if (this.aimedBow) + { + f6 = 0.0F; + f7 = 0.0F; + rightArm.rotateAngleZ = 0.0F; + leftArm.rotateAngleZ = 0.0F; + rightArm.rotateAngleY = -(0.1F - f6 * 0.6F) + head.rotateAngleY; + leftArm.rotateAngleY = 0.1F - f6 * 0.6F + head.rotateAngleY + 0.4F; + rightArm.rotateAngleX = -((float)Math.PI / 2F) + head.rotateAngleX; + leftArm.rotateAngleX = -((float)Math.PI / 2F) + head.rotateAngleX; + rightArm.rotateAngleX -= f6 * 1.2F - f7 * 0.4F; + leftArm.rotateAngleX -= f6 * 1.2F - f7 * 0.4F; + rightArm.rotateAngleZ += MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F; + leftArm.rotateAngleZ -= MathHelper.cos(p_78087_3_ * 0.09F) * 0.05F + 0.05F; + rightArm.rotateAngleX += MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F; + leftArm.rotateAngleX -= MathHelper.sin(p_78087_3_ * 0.067F) * 0.05F; + } + } +} diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java index df8ecfc10..5e7d6e6e8 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java @@ -287,6 +287,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen Item.getItemFromBlock(Blocks.sand), Item.getItemFromBlock(Blocks.sandstone), Item.getItemFromBlock(Blocks.gravel), + Item.getItemFromBlock(ModBlocks.stone_gneiss), Items.flint, Items.snowball, Items.wheat_seeds diff --git a/src/main/java/com/hbm/world/generator/DungeonToolbox.java b/src/main/java/com/hbm/world/generator/DungeonToolbox.java index 1c5094542..ac2631dbd 100644 --- a/src/main/java/com/hbm/world/generator/DungeonToolbox.java +++ b/src/main/java/com/hbm/world/generator/DungeonToolbox.java @@ -3,11 +3,14 @@ package com.hbm.world.generator; import java.util.List; import java.util.Random; +import com.hbm.blocks.ModBlocks; import com.hbm.inventory.RecipesCommon.MetaBlock; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenMinable; public class DungeonToolbox { @@ -61,4 +64,28 @@ public class DungeonToolbox { return list.get(rand.nextInt(list.size())); } + + public static void generateOre(World world, Random rand, int chunkX, int chunkZ, int veinCount, int amount, int minHeight, int variance, Block ore) { + generateOre(world, rand, chunkX, chunkZ, veinCount, amount, minHeight, variance, ore, 0, Blocks.stone); + } + + public static void generateOre(World world, Random rand, int chunkX, int chunkZ, int veinCount, int amount, int minHeight, int variance, Block ore, int meta) { + generateOre(world, rand, chunkX, chunkZ, veinCount, amount, minHeight, variance, ore, meta, Blocks.stone); + } + + public static void generateOre(World world, Random rand, int chunkX, int chunkZ, int veinCount, int amount, int minHeight, int variance, Block ore, Block target) { + generateOre(world, rand, chunkX, chunkZ, veinCount, amount, minHeight, variance, ore, 0, target); + } + + public static void generateOre(World world, Random rand, int chunkX, int chunkZ, int veinCount, int amount, int minHeight, int variance, Block ore, int meta, Block target) { + + for(int i = 0; i < veinCount; i++) { + + int x = chunkX + rand.nextInt(16); + int y = minHeight + (variance > 0 ? rand.nextInt(variance) : 0); + int z = chunkZ + rand.nextInt(16); + + (new WorldGenMinable(ore, meta, amount, target)).generate(world, rand, x, y, z); + } + } }