press redstone toggle, KS23, isotope blocks

This commit is contained in:
HbmMods 2020-05-10 01:45:49 +02:00
parent 9c5af4faa8
commit dc7f5ef785
57 changed files with 1612 additions and 349 deletions

View File

@ -33,6 +33,12 @@ achievement.fiend=Unhold
achievement.fiend.desc=Sei gemein.
achievement.fiend2=Unhold 2: Noch unholdiger
achievement.fiend2.desc=Sei gemeiner.
achievement.soyuz=Gebackene Kartoffel
achievement.soyuz.desc=Werde knusprig
achievement.radPoison=Yay, Strahlung!
achievement.radPoison.desc=Leide an Strahlenkrankheit.
achievement.radDeath=Au, Strahlung!
achievement.radDeath.desc=Marie Curie entdeckte den Nutzen der radioaktiven Strahlung, sowie den Tod durch radioaktive Strahlung.
achievement.metalworks=Metallurgie
achievement.metalworks.desc=Bobmazon Level 1 (Hochofen)
achievement.assembly=Fertigung
@ -45,12 +51,12 @@ achievement.nuclear=Atomwissenschaft
achievement.nuclear.desc=Bobmazon Level 5 (Urankernbrennstoff)
achievement.hidden=Versteckter Katalog
achievement.hidden.desc=Töte einen Enderman mit einem fallenden Güterwagon wärend du brennst und mehr als 250 RADs hast.
achievement.horizonsStart=The Horizons?
achievement.horizonsStart=Apogäum
achievement.horizonsStart.desc=Sende einen netten Typen zum Mond.
achievement.horizonsEnd=The Horizons.
achievement.horizonsEnd=The Horizons
achievement.horizonsEnd.desc=Bring Tom nach Hause.
achievement.horizonsBonus=The Horizons!
achievement.horizonsBonus.desc=mist kacke mist kacke mist kacke mist kacke mist kacke mist kacke mist kacke mist kacke mist kacke mist kacke mist kacke mist kacke mist kacke mist kacke mist kacke
achievement.horizonsBonus=Slam-Dunk-Durchfall
achievement.horizonsBonus.desc=junge was ist denn mit dir verkehrt
potion.hbm_taint=Verdorben
potion.hbm_mutation=Verdorbenes Herz
@ -1428,6 +1434,7 @@ item.gun_uzi_silencer.name=IMI Uzi mit Schalldämpfer
item.gun_uzi_saturnite.name=Saturnit-Uzi
item.gun_uzi_saturnite_silencer.name=Saturnit-Uzi mit Schalldämpfer
item.gun_uboinik.name=Ubojnik
item.gun_ks23.name=Samuel die dicke Flinte
item.gun_lever_action.name=Mare's Leg (Original)
item.gun_bolt_action.name=Dream-Repetiergewehr (Original)
item.gun_lever_action_dark.name=Mare's Leg (Dunkel)
@ -1503,6 +1510,9 @@ item.ammo_20gauge_shock.name=Kaliber 20 Schrot (Schock)
item.ammo_20gauge_caustic.name=Kaliber 20 Schrot (Ätzend)
item.ammo_20gauge_explosive.name=Kaliber 20 Schrot (Explosiv)
item.ammo_20gauge_wither.name=Kaliber 20 Schrot (Wither)
item.ammo_4gauge.name=Kaliber 20 Schrot
item.ammo_4gauge_slug.name=Kaliber 4 Brenneke
item.ammo_4gauge_explosive.name=23mm Granate
item.ammo_5mm.name=5mm Patrone
item.ammo_5mm_explosive.name=5mm Patrone (Explosiv)
item.ammo_5mm_du.name=5mm Patrone (DU)
@ -1634,6 +1644,10 @@ item.med_ipecac.name=Ipecac-Sirup
item.med_ptsd.name=PTBS-Medikament
item.med_schiziphrenia.name=Schizophrenie-Medikament
item.gas_mask_filter.name=Gasmaskenfilter
item.cladding_paint.name=Bleifarbe
item.cladding_rubber.name=Gummibeschlag
item.cladding_lead.name=Bleibeschlag
item.cladding_desh.name=Deshbeschlag
item.stealth_boy.name=Mobile Tarnkappe

View File

@ -33,6 +33,12 @@ achievement.fiend=Delinquent
achievement.fiend.desc=Be mean.
achievement.fiend2=Delinquent 2: Delinquent Harder
achievement.fiend2.desc=Be meaner.
achievement.soyuz=Baked Potato
achievement.soyuz.desc=Become crunchy.
achievement.radPoison=Yay, Radiation!
achievement.radPoison.desc=Suffer the effects of radiation poisoning.
achievement.radDeath=Ouch, Radiation!
achievement.radDeath.desc=Marie Curie invented the theory of radioactivity, the treatment of radioactivity, and dying of radioactivity.
achievement.metalworks=Metalworks
achievement.metalworks.desc=Bobmazon Level 1 (Blast Furnace)
achievement.assembly=Fabrication
@ -45,12 +51,12 @@ achievement.nuclear=Atomic Science
achievement.nuclear.desc=Bobmazon Level 5 (Uranium Fuel)
achievement.hidden=Hidden Catalog
achievement.hidden.desc=Kill an enderman with a falling boxcar while being on fire and having more than 250 RADs.
achievement.horizonsStart=The Horizons?
achievement.horizonsStart=Apogee
achievement.horizonsStart.desc=Send a lad to the moon.
achievement.horizonsEnd=The Horizons.
achievement.horizonsEnd=The Horizons
achievement.horizonsEnd.desc=Send Tom home.
achievement.horizonsBonus=The Horizons!
achievement.horizonsBonus.desc=oh poop oh crap oh poop oh crap oh poop oh crap oh poop oh crap oh poop oh crap oh poop oh crap oh poop oh crap oh poop oh crap oh poop oh crap oh poop oh crap
achievement.horizonsBonus=Slam Dunk Diarrhea
achievement.horizonsBonus.desc=honest to god what the hell is wrong with you
potion.hbm_taint=Tainted
potion.hbm_mutation=Tainted Heart
@ -1428,6 +1434,7 @@ item.gun_uzi_silencer.name=IMI Uzi with Silencer
item.gun_uzi_saturnite.name=Saturnite Uzi
item.gun_uzi_saturnite_silencer.name=Saturnite Uzi with Silencer
item.gun_uboinik.name=Uboinik
item.gun_ks23.name=Samuel the Big Shotgun
item.gun_lever_action.name=Mare's Leg (Original)
item.gun_bolt_action.name=Dream Bolt-Action Rifle (Original)
item.gun_lever_action_dark.name=Mare's Leg (Dark)
@ -1503,6 +1510,9 @@ item.ammo_20gauge_shock.name=20 Gauge Buckshot (Shock)
item.ammo_20gauge_caustic.name=20 Gauge Buckshot (Caustic)
item.ammo_20gauge_explosive.name=20 Gauge Buckshot (Explosive)
item.ammo_20gauge_wither.name=20 Gauge Buckshot (Withering)
item.ammo_4gauge.name=4 Gauge Buckshot
item.ammo_4gauge_slug.name=4 Gauge Solid Steel Slug
item.ammo_4gauge_explosive.name=23mm Grenade
item.ammo_5mm.name=5mm Round
item.ammo_5mm_explosive.name=5mm Round (Explosive)
item.ammo_5mm_du.name=5mm Round (DU)
@ -1634,6 +1644,10 @@ item.med_ipecac.name=Ipecac Syrup
item.med_ptsd.name=PTSD Medication
item.med_schiziphrenia.name=Schizophrenia Medication
item.gas_mask_filter.name=Gas Mask Filter
item.cladding_paint.name=Lead Paint
item.cladding_rubber.name=Rubber Cladding
item.cladding_lead.name=Lead Cladding
item.cladding_desh.name=Desh Cladding
item.stealth_boy.name=Stealth Device

View File

@ -97,9 +97,16 @@ v 0.025000 0.450000 -0.585000
v 0.025000 0.450000 -0.535000
v -0.025000 0.450000 -0.585000
v -0.025000 0.450000 -0.535000
vt 0.760870 0.130435
vt 0.456522 0.217391
vt 0.326087 0.130435
vt 0.108696 0.891304
vt 0.239130 0.891304
vt 0.239130 0.956522
vt 0.326087 0.391304
vt 0.456522 0.304348
vt 0.760870 0.391304
vt 0.760870 0.043478
vt 0.217391 0.847826
vt 0.130435 0.847826
vt 0.130435 0.782609
@ -163,6 +170,11 @@ vt 0.043478 0.521739
vt 0.347826 0.978261
vt 0.260870 0.978261
vt 0.369565 0.956522
vt 0.326087 0.173913
vt 0.760870 0.217391
vt 0.760870 0.304348
vt 0.326087 0.347826
vt 0.326087 0.043478
vt 0.217391 0.782609
vt 0.100650 0.472674
vt 0.054183 0.499502
@ -178,18 +190,9 @@ vt 0.760870 0.239130
vt 0.065217 0.717391
vt 0.108696 0.543478
vt 0.000000 0.521739
vt 0.760870 0.130435
vt 0.456522 0.217391
vt 0.326087 0.130435
vt 0.326087 0.391304
vt 0.456522 0.304348
vt 0.760870 0.391304
vt 0.239130 0.217391
vt 0.326087 0.217391
vt 0.326087 0.304348
vt 0.760870 0.217391
vt 0.760870 0.304348
vt 0.760870 0.043478
vt 0.108696 0.586957
vt 0.108696 0.521739
vt 0.760870 0.521739
@ -227,10 +230,7 @@ vt 0.152174 0.260870
vt -0.000000 0.347826
vt -0.000000 0.391304
vt 0.152174 0.347826
vt 0.326087 0.173913
vt 0.326087 0.347826
vt 0.239130 0.304348
vt 0.326087 0.043478
vt 0.760870 0.782609
vt 0.760870 0.543478
vt 0.760870 0.739130
@ -240,28 +240,25 @@ vt 0.217391 0.217391
vt 0.217391 -0.000000
vt 0.152174 0.217391
vt 0.152174 0.391304
vn -1.000000 -0.000000 0.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 -1.000000
vn 1.000000 0.000000 0.000000
vn -1.000000 0.000000 0.000000
vn 0.000000 1.000000 0.000000
vn 0.000000 0.000000 -1.000000
vn 0.000000 -0.707100 -0.707100
vn 0.000000 0.707100 0.707100
vn 0.000000 -1.000000 0.000000
vn 0.000000 -0.274700 0.961500
vn 0.000000 0.274700 -0.961500
vn 0.000000 1.000000 0.000000
vn 0.894400 0.447200 0.000000
vn -0.894400 0.447200 0.000000
vn -0.707100 0.707100 0.000000
vn -0.672700 -0.730300 0.118500
vn -0.577300 0.577300 0.577300
vn 0.577300 0.577300 0.577300
vn 0.672700 -0.730300 0.118500
vn 0.707100 0.707100 0.000000
vn -0.596200 -0.469400 0.651300
vn 0.596200 -0.469400 0.651300
vn -0.707100 -0.707100 0.000000
vn 0.707100 -0.707100 0.000000
vn 0.672700 -0.730300 0.118500
vn -0.672700 -0.730300 0.118500
vn 0.000000 0.792400 0.610000
vn 0.686200 0.396200 0.610000
vn 0.866000 0.500000 0.000000
@ -302,6 +299,7 @@ vn -0.630200 0.297100 -0.717300
vn -0.630200 -0.297100 -0.717300
vn 0.630200 -0.297100 -0.717300
vn 0.546900 -0.773400 0.320400
vn 0.577300 0.577300 0.577300
vn -0.418300 0.676800 0.605700
vn -0.577300 -0.577300 0.577300
vn -0.487100 0.670900 -0.559100
@ -309,132 +307,132 @@ vn -0.182400 -0.282500 -0.941700
vn -0.546900 0.773400 0.320400
vn -0.546900 -0.773400 0.320400
s off
f 29/1/1 30/2/1 32/3/1
f 25/4/1 26/5/1 12/6/1
f 26/5/1 25/4/1 30/2/1
f 24/7/1 22/8/1 18/9/1
f 27/10/1 28/11/1 31/12/1
f 39/13/2 40/2/2 35/14/2
f 34/15/2 36/16/2 35/14/2
f 46/17/3 44/18/3 50/19/3
f 49/20/4 43/21/4 45/22/4
f 53/23/1 54/24/1 52/25/1
f 58/26/3 56/27/3 52/25/3
f 51/28/4 55/29/4 57/30/4
f 68/31/2 70/32/2 69/33/2
f 70/32/5 74/34/5 73/35/5
f 71/36/6 72/37/6 68/31/6
f 72/38/3 74/39/3 70/32/3
f 69/33/4 73/40/4 71/41/4
f 80/42/7 82/43/7 81/44/7
f 81/45/8 82/43/8 78/46/8
f 76/47/9 80/42/9 79/48/9
f 81/49/4 77/50/4 75/51/4
f 76/47/3 78/46/3 82/43/3
f 87/52/10 89/53/10 90/54/10
f 88/55/4 90/54/4 85/56/4
f 89/53/3 87/52/3 84/57/3
f 94/58/11 93/59/11 91/60/11
f 91/60/12 95/61/12 96/62/12
f 93/63/2 95/60/2 91/59/2
f 94/63/1 92/61/1 96/60/1
f 38/64/2 37/65/2 42/3/2
f 41/66/2 42/3/2 40/2/2
f 31/12/1 29/1/1 32/3/1
f 11/67/1 25/4/1 12/6/1
f 29/1/1 26/5/1 30/2/1
f 18/9/1 16/68/1 14/69/1
f 14/69/1 24/7/1 18/9/1
f 22/8/1 20/70/1 18/9/1
f 32/3/1 27/10/1 31/12/1
f 36/16/2 39/13/2 35/14/2
f 33/71/2 34/15/2 35/14/2
f 48/72/3 46/17/3 50/19/3
f 47/73/4 49/20/4 45/22/4
f 51/74/1 53/23/1 52/25/1
f 54/24/3 58/26/3 52/25/3
f 53/75/4 51/28/4 57/30/4
f 67/76/2 68/31/2 69/33/2
f 69/33/5 70/32/5 73/35/5
f 67/76/6 71/36/6 68/31/6
f 68/31/3 72/38/3 70/32/3
f 67/76/4 69/33/4 71/41/4
f 79/77/7 80/42/7 81/44/7
f 77/78/8 81/45/8 78/46/8
f 75/51/9 76/47/9 79/48/9
f 79/48/4 81/49/4 75/51/4
f 80/42/3 76/47/3 82/43/3
f 88/55/10 87/52/10 90/54/10
f 83/79/4 88/55/4 85/56/4
f 86/80/3 89/53/3 84/57/3
f 92/81/11 94/58/11 91/60/11
f 92/81/12 91/60/12 96/62/12
f 41/66/2 38/64/2 42/3/2
f 39/13/2 41/66/2 40/2/2
f 4/1/1 9/2/1 2/3/1
f 29/4/2 30/5/2 32/6/2
f 6/7/3 10/8/3 8/9/3
f 8/10/4 4/1/4 2/3/4
f 25/11/2 26/12/2 12/13/2
f 26/12/2 25/11/2 30/5/2
f 24/14/2 22/15/2 18/16/2
f 27/17/2 28/18/2 31/19/2
f 39/20/5 40/5/5 35/21/5
f 34/22/5 36/23/5 35/21/5
f 46/24/3 44/25/3 50/26/3
f 49/27/1 43/28/1 45/29/1
f 53/30/2 54/31/2 52/32/2
f 58/33/3 56/34/3 52/32/3
f 51/35/1 55/36/1 57/37/1
f 68/38/5 70/39/5 69/40/5
f 70/39/6 74/41/6 73/42/6
f 71/43/7 72/44/7 68/38/7
f 72/45/3 74/46/3 70/39/3
f 69/40/1 73/47/1 71/48/1
f 80/49/8 82/50/8 81/51/8
f 81/52/9 82/50/9 78/53/9
f 76/54/10 80/49/10 79/55/10
f 81/56/1 77/57/1 75/58/1
f 76/54/3 78/53/3 82/50/3
f 87/59/4 89/60/4 90/61/4
f 88/62/1 90/61/1 85/63/1
f 89/60/3 87/59/3 84/64/3
f 94/65/11 93/66/11 91/67/11
f 91/67/12 95/68/12 96/69/12
f 93/70/5 95/67/5 91/66/5
f 94/70/2 92/68/2 96/67/2
f 38/71/5 37/72/5 42/6/5
f 41/73/5 42/6/5 40/5/5
f 1/74/1 2/3/1 9/2/1
f 4/1/1 3/75/1 9/2/1
f 31/19/2 29/4/2 32/6/2
f 7/76/3 8/9/3 10/8/3
f 6/7/3 5/77/3 10/8/3
f 6/78/4 8/10/4 2/3/4
f 11/79/2 25/11/2 12/13/2
f 29/4/2 26/12/2 30/5/2
f 18/16/2 16/80/2 14/81/2
f 14/81/2 24/14/2 18/16/2
f 22/15/2 20/82/2 18/16/2
f 32/6/2 27/17/2 31/19/2
f 36/23/5 39/20/5 35/21/5
f 33/83/5 34/22/5 35/21/5
f 48/84/3 46/24/3 50/26/3
f 47/85/1 49/27/1 45/29/1
f 51/86/2 53/30/2 52/32/2
f 54/31/3 58/33/3 52/32/3
f 53/87/1 51/35/1 57/37/1
f 67/88/5 68/38/5 69/40/5
f 69/40/6 70/39/6 73/42/6
f 67/88/7 71/43/7 68/38/7
f 68/38/3 72/45/3 70/39/3
f 67/88/1 69/40/1 71/48/1
f 79/89/8 80/49/8 81/51/8
f 77/90/9 81/52/9 78/53/9
f 75/58/10 76/54/10 79/55/10
f 79/55/1 81/56/1 75/58/1
f 80/49/3 76/54/3 82/50/3
f 88/62/4 87/59/4 90/61/4
f 83/91/1 88/62/1 85/63/1
f 86/92/3 89/60/3 84/64/3
f 92/93/11 94/65/11 91/67/11
f 92/93/12 91/67/12 96/69/12
f 41/73/5 38/71/5 42/6/5
f 39/20/5 41/73/5 40/5/5
s 1
f 4/82/13 9/83/14 2/84/15
f 6/85/16 10/86/17 8/87/18
f 2/88/15 1/89/19 5/90/20
f 3/91/21 7/92/22 10/86/17
f 8/93/18 4/82/13 2/84/15
f 9/83/14 10/86/17 5/90/20
f 14/94/23 16/95/24 15/96/25
f 16/95/24 18/97/26 17/98/27
f 17/98/27 18/97/26 20/99/28
f 20/100/28 22/56/29 21/101/30
f 24/54/31 14/94/23 13/102/10
f 22/56/29 24/54/31 23/103/32
f 27/104/33 37/105/34 38/106/35
f 32/107/36 42/17/37 37/105/34
f 40/108/38 42/17/37 32/107/36
f 35/109/39 40/108/38 30/110/40
f 33/18/41 35/109/39 25/92/42
f 34/111/43 33/112/41 11/113/44
f 26/114/45 36/115/46 34/111/43
f 29/116/47 39/117/48 36/115/46
f 31/118/49 41/119/50 39/117/48
f 38/106/35 41/119/50 31/118/49
f 46/120/51 48/72/52 47/73/53
f 48/72/52 50/19/54 49/20/55
f 49/20/55 50/19/54 44/121/56
f 52/122/57 56/27/58 55/29/59
f 57/30/60 58/26/61 54/123/62
f 56/27/58 58/26/61 57/30/60
f 59/124/10 60/125/10 62/126/3
f 61/127/3 62/126/3 64/74/7
f 66/128/4 60/125/10 59/124/10
f 64/129/7 66/128/4 65/130/4
f 1/131/19 2/84/15 9/83/14
f 4/82/13 3/91/21 9/83/14
f 7/92/22 8/87/18 10/86/17
f 6/85/16 5/132/20 10/86/17
f 6/133/16 2/88/15 5/90/20
f 9/83/14 3/91/21 10/86/17
f 6/134/16 8/93/18 2/84/15
f 1/89/19 9/83/14 5/90/20
f 13/102/10 14/94/23 15/96/25
f 15/96/25 16/95/24 17/98/27
f 19/87/7 17/98/27 20/99/28
f 19/135/7 20/100/28 21/101/30
f 23/103/32 24/54/31 13/102/10
f 21/101/30 22/56/29 23/103/32
f 28/136/63 27/104/33 38/106/35
f 27/104/33 32/107/36 37/105/34
f 30/110/40 40/108/38 32/107/36
f 25/92/42 35/109/39 30/110/40
f 11/78/44 33/18/41 25/92/42
f 12/137/64 34/111/43 11/113/44
f 12/137/64 26/114/45 34/111/43
f 26/114/45 29/116/47 36/115/46
f 29/116/47 31/118/49 39/117/48
f 28/136/63 38/106/35 31/118/49
f 45/138/65 46/120/51 47/73/53
f 47/73/53 48/72/52 49/20/55
f 43/139/66 49/20/55 44/121/56
f 51/140/67 52/122/57 55/29/59
f 53/141/68 57/30/60 54/123/62
f 55/29/59 56/27/58 57/30/60
f 61/127/3 59/124/10 62/126/3
f 63/142/7 61/127/3 64/74/7
f 65/130/4 66/128/4 59/124/10
f 63/143/7 64/129/7 65/130/4
f 2/94/13 1/95/14 5/96/15
f 3/75/16 7/76/17 10/8/18
f 9/2/19 10/8/18 5/96/15
f 14/97/20 16/98/21 15/99/22
f 16/98/21 18/100/23 17/101/24
f 17/101/24 18/100/23 20/102/25
f 20/103/25 22/63/26 21/104/27
f 24/61/28 14/97/20 13/105/4
f 22/63/26 24/61/28 23/106/29
f 27/107/30 37/108/31 38/109/32
f 32/110/33 42/24/34 37/108/31
f 40/111/35 42/24/34 32/110/33
f 35/112/36 40/111/35 30/113/37
f 33/25/38 35/112/36 25/76/39
f 34/114/40 33/115/38 11/116/41
f 26/117/42 36/118/43 34/114/40
f 29/119/44 39/120/45 36/118/43
f 31/121/46 41/122/47 39/120/45
f 38/109/32 41/122/47 31/121/46
f 46/123/48 48/84/49 47/85/50
f 48/84/49 50/26/51 49/27/52
f 49/27/52 50/26/51 44/124/53
f 52/125/54 56/34/55 55/36/56
f 57/37/57 58/33/58 54/126/59
f 56/34/55 58/33/58 57/37/57
f 59/127/4 60/128/4 62/129/3
f 61/130/3 62/129/3 64/86/8
f 66/131/1 60/128/4 59/127/4
f 64/132/8 66/131/1 65/133/1
f 6/134/60 2/94/13 5/96/15
f 9/2/19 3/75/16 10/8/18
f 1/95/14 9/2/19 5/96/15
f 13/105/4 14/97/20 15/99/22
f 15/99/22 16/98/21 17/101/24
f 19/9/8 17/101/24 20/102/25
f 19/135/8 20/103/25 21/104/27
f 23/106/29 24/61/28 13/105/4
f 21/104/27 22/63/26 23/106/29
f 28/136/61 27/107/30 38/109/32
f 27/107/30 32/110/33 37/108/31
f 30/113/37 40/111/35 32/110/33
f 25/76/39 35/112/36 30/113/37
f 11/90/41 33/25/38 25/76/39
f 12/137/62 34/114/40 11/116/41
f 12/137/62 26/117/42 34/114/40
f 26/117/42 29/119/44 36/118/43
f 29/119/44 31/121/46 39/120/45
f 28/136/61 38/109/32 31/121/46
f 45/138/63 46/123/48 47/85/50
f 47/85/50 48/84/49 49/27/52
f 43/139/64 49/27/52 44/124/53
f 51/140/65 52/125/54 55/36/56
f 53/141/66 57/37/57 54/126/59
f 55/36/56 56/34/55 57/37/57
f 61/130/3 59/127/4 62/129/3
f 63/142/8 61/130/3 64/86/8
f 65/133/1 66/131/1 59/127/4
f 63/143/8 64/132/8 65/133/1

View File

@ -0,0 +1,828 @@
# Blender v2.76 (sub 0) OBJ File: 'ks23.blend'
# www.blender.org
o Cube_Cube.001
v 0.000000 0.051195 -0.995077
v 0.000000 0.051195 -0.439226
v 0.035947 0.027480 -0.439226
v 0.035947 0.027480 -0.995077
v 0.055074 -0.032570 -0.439226
v 0.055074 -0.032570 -0.995077
v 0.048431 -0.100856 -0.439226
v 0.048431 -0.100856 -0.995077
v 0.019127 -0.145426 -0.439226
v 0.019127 -0.145426 -0.995077
v -0.019127 -0.145426 -0.439226
v -0.019127 -0.145426 -0.995077
v -0.048431 -0.100856 -0.439226
v -0.048431 -0.100856 -0.995077
v -0.055074 -0.032570 -0.439226
v -0.055074 -0.032570 -0.995077
v -0.035947 0.027480 -0.439226
v -0.035947 0.027480 -0.995077
v 0.055074 -0.030161 -0.439430
v 0.055074 -0.030161 0.168751
v 0.048431 -0.098447 0.168751
v 0.048431 -0.098447 -0.439430
v 0.033226 -0.143018 0.168751
v 0.033226 -0.143018 -0.439430
v -0.033226 -0.143018 0.168751
v -0.033226 -0.143018 -0.439430
v -0.048431 -0.098447 0.168751
v -0.048431 -0.098447 -0.439430
v -0.055074 -0.030161 0.168751
v -0.055074 -0.030161 -0.439430
v 0.035947 -0.027581 0.168751
v 0.000000 -0.027206 0.168751
v -0.035947 -0.028896 0.168751
v 0.000000 -0.026166 -0.439430
v 0.035947 -0.029377 -0.439430
v -0.035947 -0.028599 -0.439430
v 0.000000 -0.032788 0.169660
v 0.000000 -0.032788 0.270254
v 0.024426 -0.041679 0.270254
v 0.024426 -0.041679 0.169660
v 0.037423 -0.064190 0.270254
v 0.037423 -0.064190 0.169660
v 0.032909 -0.089788 0.270254
v 0.032909 -0.089788 0.169660
v 0.012997 -0.106497 0.270254
v 0.012997 -0.106497 0.169660
v -0.012997 -0.106497 0.270254
v -0.012997 -0.106497 0.169660
v -0.032909 -0.089788 0.270254
v -0.032909 -0.089788 0.169660
v -0.037423 -0.064190 0.270254
v -0.037423 -0.064190 0.169660
v -0.024426 -0.041679 0.270254
v -0.024426 -0.041679 0.169660
v 0.045638 -0.267367 -1.168768
v 0.045638 -0.185019 -1.159611
v 0.000000 -0.200900 -1.115964
v 0.000000 -0.271969 -1.122427
v -0.045638 -0.185019 -1.159611
v -0.045638 -0.267367 -1.168768
v 0.000000 -0.024476 -1.209323
v 0.045638 -0.057997 -1.178368
v 0.045638 -0.125040 -1.116457
v 0.000000 -0.158562 -1.085502
v -0.045638 -0.125040 -1.116457
v -0.045638 -0.057997 -1.178368
v 0.000000 0.039277 -1.082707
v 0.045638 -0.004206 -1.071536
v 0.045638 -0.091172 -1.049193
v 0.000000 -0.134654 -1.038021
v -0.045638 -0.091172 -1.049193
v -0.045638 -0.004206 -1.071536
v 0.000000 0.039277 -0.994713
v 0.045638 -0.004206 -0.995884
v 0.045638 -0.091172 -0.994727
v 0.000000 -0.134654 -0.994398
v -0.045638 -0.091172 -0.994727
v -0.045638 -0.004206 -0.995884
v 0.045638 -0.262584 -1.266073
v -0.045638 -0.262584 -1.266073
v 0.000000 -0.263015 -1.265873
v 0.000000 -0.263015 -1.265873
v 0.000000 -0.263015 -1.265873
v 0.000000 0.038000 -0.450000
v 0.000000 0.038000 0.450000
v 0.024426 0.029110 0.450000
v 0.024426 0.029110 -0.450000
v 0.037423 0.006599 0.450000
v 0.037423 0.006599 -0.450000
v 0.032909 -0.019000 0.450000
v 0.032909 -0.019000 -0.450000
v 0.012997 -0.035708 0.450000
v 0.012997 -0.035708 -0.450000
v -0.012997 -0.035708 0.450000
v -0.012997 -0.035708 -0.450000
v -0.032909 -0.019000 0.450000
v -0.032909 -0.019000 -0.450000
v -0.037423 0.006599 0.450000
v -0.037423 0.006599 -0.450000
v -0.024426 0.029110 0.450000
v -0.024426 0.029110 -0.450000
v 0.000000 0.050535 0.186427
v 0.000000 0.050535 0.240183
v 0.035947 0.026819 0.240183
v 0.035947 0.026819 0.186427
v 0.055074 -0.033230 0.240183
v 0.055074 -0.033230 0.186427
v 0.048431 -0.101516 0.240183
v 0.048431 -0.101516 0.186427
v 0.019127 -0.146087 0.240183
v 0.019127 -0.146087 0.186427
v -0.019127 -0.146087 0.240183
v -0.019127 -0.146087 0.186427
v -0.048431 -0.101516 0.240183
v -0.048431 -0.101516 0.186427
v -0.055074 -0.033230 0.240183
v -0.055074 -0.033230 0.186427
v -0.035947 0.026819 0.240183
v -0.035947 0.026819 0.186427
v -0.045638 -0.105627 -1.862637
v 0.045638 -0.105627 -1.862637
v 0.047930 -0.403808 -1.849285
v 0.047930 -0.403160 -1.887097
v 0.047930 -0.385775 -1.913782
v 0.045638 -0.105627 -1.212637
v -0.045638 -0.105627 -1.212637
v -0.047689 -0.135775 -1.913782
v 0.047930 -0.135775 -1.913782
v -0.047689 -0.403771 -1.849295
v -0.047689 -0.245696 -1.226544
v -0.047689 -0.385775 -1.913782
v -0.047689 -0.403147 -1.887080
v -0.047689 -0.245696 -1.226544
v 0.000567 -0.173091 -1.013883
v -0.000423 -0.133554 -1.059987
v 0.009128 -0.130670 -1.053770
v 0.010020 -0.166304 -1.012216
v 0.005563 -0.126223 -1.043488
v 0.006298 -0.155542 -1.009298
v -0.006191 -0.126358 -1.043351
v -0.005457 -0.155677 -1.009161
v -0.009891 -0.130888 -1.053548
v -0.008998 -0.166523 -1.011995
v 0.000000 -0.210000 -1.020000
v 0.000000 -0.183644 -1.074728
v 0.009511 -0.179336 -1.069326
v 0.009511 -0.203090 -1.020000
v 0.005878 -0.172365 -1.060585
v 0.005878 -0.191910 -1.020000
v -0.005878 -0.172365 -1.060585
v -0.005878 -0.191910 -1.020000
v -0.009511 -0.179336 -1.069326
v -0.009511 -0.203090 -1.020000
v 0.000000 -0.124424 -1.088245
v 0.009511 -0.125961 -1.081508
v 0.005878 -0.128449 -1.070608
v -0.005878 -0.128449 -1.070608
v -0.009511 -0.125961 -1.081508
v 0.000000 -0.124424 -0.951755
v 0.009511 -0.125961 -0.958492
v 0.005878 -0.128449 -0.969392
v -0.005878 -0.128449 -0.969392
v -0.009511 -0.125961 -0.958492
v 0.000000 -0.183644 -0.965272
v 0.009511 -0.179336 -0.970674
v 0.005878 -0.172365 -0.979415
v -0.005878 -0.172365 -0.979415
v -0.009511 -0.179336 -0.970674
v 0.000000 -0.105627 -1.272637
vt 0.842220 0.216357
vt 0.813955 0.216356
vt 0.819355 0.199742
vt 0.836824 0.199742
vt 0.828089 0.226624
vt 0.151673 0.278323
vt 0.175796 0.304446
vt 0.225136 0.241205
vt 0.103426 0.226077
vt 0.178379 0.241205
vt 0.137056 0.179336
vt 0.220021 0.118890
vt 0.143189 0.149122
vt 0.143189 0.077827
vt 0.106992 0.113475
vt 0.674740 0.150724
vt 0.674732 0.076037
vt 0.219192 0.077827
vt 0.685161 0.077827
vt 0.725110 0.076037
vt 0.725110 0.150724
vt 0.724582 0.217412
vt 0.650353 0.217412
vt 0.650353 0.023338
vt 0.704253 0.150724
vt 0.704266 0.076037
vt 0.813562 0.227656
vt 0.815131 0.221705
vt 0.843795 0.221706
vt 0.817671 0.216099
vt 0.841256 0.216099
vt 0.817672 0.209944
vt 0.815131 0.204338
vt 0.843795 0.204337
vt 0.813562 0.198386
vt 0.764961 0.227865
vt 0.766573 0.221755
vt 0.796000 0.221754
vt 0.769180 0.215999
vt 0.793392 0.215999
vt 0.769180 0.209680
vt 0.793392 0.209680
vt 0.766573 0.203924
vt 0.796000 0.203925
vt 0.764961 0.197814
vt 0.740750 0.227865
vt 0.742361 0.221755
vt 0.771788 0.221755
vt 0.744968 0.215999
vt 0.744968 0.209680
vt 0.742361 0.203924
vt 0.771788 0.203924
vt 0.740750 0.197814
vt 0.846035 0.227865
vt 0.813386 0.227864
vt 0.814997 0.221755
vt 0.844424 0.221755
vt 0.817605 0.215999
vt 0.817605 0.209680
vt 0.841817 0.209680
vt 0.814997 0.203924
vt 0.844424 0.203924
vt 0.813386 0.197815
vt 0.846035 0.197814
vt 0.821823 0.227865
vt 0.789174 0.227864
vt 0.790785 0.221754
vt 0.820212 0.221755
vt 0.790785 0.203925
vt 0.820212 0.203924
vt 0.789174 0.197815
vt 0.821823 0.197814
vt 0.685161 0.149122
vt 0.177454 0.149122
vt 0.224319 0.113475
vt 0.177454 0.077827
vt 0.684917 0.241205
vt 0.724774 0.217711
vt 0.674520 0.008864
vt 0.674512 0.008836
vt 0.144192 0.115163
vt 0.219192 0.149122
vt 0.724582 0.023338
vt 0.845365 0.227657
vt 0.841256 0.209944
vt 0.845365 0.198386
vt 0.797611 0.227864
vt 0.797611 0.197815
vt 0.773399 0.227864
vt 0.773399 0.197815
vt 0.841817 0.215999
vt 0.724774 0.022889
vt 0.703966 0.009351
vt 0.703979 0.009341
vt 0.578109 0.464875
vt 0.526515 0.386402
vt 0.407568 0.464875
vt 0.589806 0.585103
vt 0.763013 0.649950
vt 0.780066 0.599960
vt 0.871651 0.649950
vt 0.763013 0.649367
vt 0.871651 0.649367
vt 0.817332 0.730436
vt 0.601446 0.495440
vt 0.601442 0.476263
vt 0.929745 0.495432
vt 0.755631 0.075624
vt 0.793355 0.043970
vt 0.880324 0.075624
vt 0.669891 0.731779
vt 0.694513 0.592137
vt 0.732237 0.623791
vt 0.753695 0.280227
vt 0.778707 0.242184
vt 0.836370 0.280227
vt 0.842040 0.338511
vt 0.395872 0.585104
vt 0.429548 0.690831
vt 0.492839 0.732585
vt 0.556129 0.690831
vt 0.459163 0.386402
vt 0.879102 0.726538
vt 0.857649 0.729432
vt 0.817332 0.729852
vt 0.777014 0.727957
vt 0.755562 0.726538
vt 0.854597 0.599960
vt 0.857649 0.727707
vt 0.777014 0.726834
vt 0.755562 0.725955
vt 0.780066 0.599377
vt 0.854597 0.599377
vt 0.879102 0.725955
vt 0.929742 0.524889
vt 0.601444 0.524863
vt 0.929743 0.514652
vt 0.601445 0.514637
vt 0.601455 0.465968
vt 0.929742 0.465968
vt 0.929742 0.476180
vt 0.888876 0.124121
vt 0.864253 0.166769
vt 0.817978 0.183612
vt 0.771702 0.166769
vt 0.747080 0.124121
vt 0.842600 0.043970
vt 0.740789 0.672288
vt 0.716166 0.714936
vt 0.623615 0.714936
vt 0.598993 0.672288
vt 0.607544 0.623791
vt 0.645268 0.592137
vt 0.825715 0.389765
vt 0.748025 0.338511
vt 0.795033 0.410007
vt 0.764351 0.389765
vt 0.811358 0.242184
vt 0.384948 0.389328
vt 0.384948 0.418753
vt 0.005160 0.418753
vt 0.384948 0.461813
vt 0.005160 0.461813
vt 0.384948 0.508690
vt 0.005160 0.508690
vt 0.384948 0.545135
vt 0.005160 0.545135
vt 0.384948 0.571273
vt 0.005160 0.571273
vt 0.384948 0.607718
vt 0.005160 0.607718
vt 0.384948 0.654595
vt 0.005160 0.654595
vt 0.384948 0.697655
vt 0.005160 0.697655
vt 0.384948 0.727080
vt 0.005160 0.727080
vt 0.601502 0.576619
vt 0.601502 0.539583
vt 0.929802 0.539583
vt 0.601502 0.514162
vt 0.929802 0.514162
vt 0.601502 0.478291
vt 0.929802 0.478291
vt 0.601502 0.452870
vt 0.929802 0.452869
vt 0.601502 0.415834
vt 0.929802 0.415834
vt -0.000061 0.740000
vt 0.111694 0.740000
vt 0.111695 0.768878
vt 0.111695 0.797756
vt -0.000061 0.797756
vt 0.111695 0.826633
vt -0.000061 0.826633
vt 0.111695 0.855511
vt -0.000061 0.855511
vt 0.111695 0.884389
vt -0.000061 0.884389
vt 0.111694 0.913267
vt -0.000061 0.913267
vt 0.111694 0.942145
vt -0.000061 0.942145
vt 0.111694 0.971022
vt 0.111694 0.999900
vt -0.000061 0.999900
vt 0.103042 0.166960
vt 0.079303 0.199954
vt 0.077125 0.354128
vt 0.068420 0.320242
vt 0.051008 0.252470
vt 0.042302 0.218585
vt 0.008552 0.354128
vt 0.009465 0.320242
vt 0.008563 0.252470
vt 0.008307 0.218585
vt 0.999874 0.740093
vt 0.999874 0.768971
vt 0.000010 0.768971
vt 0.999874 0.797849
vt 0.000010 0.797849
vt 0.999874 0.826727
vt 0.000010 0.826727
vt 0.999874 0.855605
vt 0.000010 0.855605
vt 0.999874 0.884483
vt 0.000010 0.884482
vt 0.999874 0.913360
vt 0.000010 0.913360
vt 0.999874 0.942239
vt 0.000010 0.942238
vt 0.999874 0.971116
vt 0.000010 0.971116
vt 0.999874 0.999994
vt 0.000010 0.999993
vt 0.999203 0.741143
vt 0.999203 0.763560
vt 0.971220 0.763560
vt 0.999203 0.796367
vt 0.971220 0.796367
vt 0.999203 0.832081
vt 0.971220 0.832081
vt 0.999203 0.859849
vt 0.971220 0.859849
vt 0.999203 0.879762
vt 0.971220 0.879762
vt 0.999203 0.907530
vt 0.971220 0.907530
vt 0.999203 0.943244
vt 0.971220 0.943244
vt 0.999203 0.976051
vt 0.971220 0.976051
vt 0.999203 0.998469
vt 0.005160 0.389328
vt 0.929802 0.576619
vt -0.000061 0.768878
vt -0.000061 0.971022
vt 0.108079 0.111577
vt 0.000010 0.740093
vt 0.971220 0.741142
vt 0.971220 0.998469
vn 0.014200 -0.257100 0.966300
vn -0.904200 0.330100 -0.271100
vn 0.000000 0.769700 -0.638400
vn 0.000000 0.601800 -0.798700
vn -0.943700 -0.250800 0.215700
vn -0.969800 0.142400 -0.197900
vn -0.946300 -0.115600 0.302000
vn -1.000000 0.001000 0.000300
vn 0.000000 -0.997800 -0.065800
vn 0.000000 -0.995100 -0.098800
vn -0.000400 -0.993900 0.110200
vn -0.000300 -0.993900 0.109900
vn -0.000000 -0.995500 0.094200
vn 0.000000 0.963900 -0.266400
vn 0.000000 0.489900 -0.871800
vn 0.000000 0.490600 -0.871400
vn 0.904200 0.330100 -0.271100
vn 0.000000 -0.476500 -0.879200
vn -0.000300 -0.956300 -0.292400
vn -0.000100 -0.476700 -0.879000
vn -0.000100 -0.956100 -0.292900
vn 0.001100 -0.759100 -0.651000
vn 0.877000 -0.355300 -0.323500
vn 0.877000 -0.355200 -0.323500
vn 0.640100 0.589900 0.492200
vn 0.640200 0.589900 0.492100
vn -0.641900 0.575200 0.507100
vn -0.875900 -0.375400 -0.303100
vn 0.000000 -0.623500 -0.781800
vn 0.896300 -0.276400 -0.346700
vn 0.896300 -0.443400 -0.000000
vn 0.679900 0.457200 0.573300
vn 0.679900 0.733300 -0.000000
vn -0.679900 0.457200 0.573300
vn -0.679900 0.733300 -0.000000
vn -0.896300 -0.276400 -0.346700
vn -0.896300 -0.443400 -0.000000
vn -0.000000 -0.222500 -0.974900
vn 0.876600 -0.107100 -0.469200
vn 0.641100 0.170800 0.748200
vn -0.641100 0.170800 0.748200
vn -0.876600 -0.107100 -0.469200
vn 0.000000 -0.222500 0.974900
vn 0.000000 -0.623500 0.781800
vn 0.896300 -0.276400 0.346700
vn 0.876600 -0.107100 0.469200
vn 0.679900 0.457200 -0.573300
vn -0.679900 0.457200 -0.573300
vn -0.641100 0.170800 -0.748200
vn -0.896300 -0.276400 0.346700
vn -0.876600 -0.107100 0.469200
vn -0.000000 -1.000000 -0.000000
vn 0.969800 0.142400 -0.197900
vn 0.000000 0.964000 -0.266000
vn 0.000000 1.000000 0.000000
vn -0.999900 0.006900 0.015500
vn -0.999500 0.007500 0.031200
vn -1.000000 0.003900 0.003200
vn 0.943700 -0.250800 0.215700
vn 0.946300 -0.115600 0.302000
vn 1.000000 0.001100 0.000300
vn 1.000000 0.004300 0.003600
vn 0.999800 0.007700 0.017300
vn -0.927800 -0.037300 0.371100
vn 0.000000 -0.995600 0.094200
vn 0.001200 -0.759100 -0.651000
vn -0.641900 0.575200 0.507000
vn 0.641100 0.170800 -0.748200
vn -1.000000 -0.000000 0.000000
vn 0.927800 -0.037300 0.371100
vn 0.999400 0.008400 0.034800
vn 1.000000 0.000000 0.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 -1.000000
vn 0.010400 0.999900 0.001700
vn -0.081400 0.996700 0.000000
vn -0.047000 0.998900 0.001700
vn 0.133700 0.991000 0.000000
vn 0.041000 0.999200 -0.003000
vn -0.066000 0.997800 0.000500
vn 0.089000 0.996000 -0.002900
vn -0.067500 0.997700 0.000500
vn 0.797300 0.603600 0.000000
vn 0.994400 0.105500 0.000000
vn 0.943000 -0.332800 -0.000000
vn 0.474700 -0.880200 -0.000000
vn -0.474700 -0.880200 -0.000000
vn -0.943000 -0.332800 -0.000000
vn -0.994400 0.105500 0.000000
vn -0.797300 0.603600 0.000000
vn 0.995300 -0.096800 -0.000000
vn 0.977400 -0.211300 -0.000000
vn 0.581900 -0.813300 -0.000000
vn -0.581900 -0.813300 -0.000000
vn -0.977400 -0.211300 -0.000000
vn -0.995300 -0.096800 -0.000000
vn 0.642800 0.766000 0.000000
vn 0.984800 0.173600 0.000000
vn 0.866000 -0.500000 -0.000000
vn 0.342000 -0.939700 -0.000000
vn -0.342000 -0.939700 -0.000000
vn -0.866000 -0.500000 -0.000000
vn -0.984800 0.173600 0.000000
vn -0.642800 0.766000 0.000000
vn 0.000000 -0.357300 0.934000
vn -0.000000 -0.763700 0.645600
vn 0.000000 0.972500 -0.232700
vn 0.901300 0.421600 -0.099200
vn 0.942000 -0.326400 0.078100
vn 0.000000 -0.973400 0.229000
vn -0.942000 -0.326400 0.078100
vn -0.901300 0.421600 -0.099200
vn 0.918900 0.394500 0.000000
vn 0.918200 -0.396200 0.000000
vn -0.918200 -0.396200 0.000000
vn -0.918900 0.394500 0.000000
vn 0.642800 0.766100 0.000000
vn -0.642800 0.766100 0.000000
vn 0.000000 -0.090600 0.995900
s off
f 137/1/1 141/2/1 143/3/1
f 143/3/1 134/4/1 137/1/1
f 137/1/1 139/5/1 141/2/1
s 1
f 66/6/2 61/7/3 169/8/4
f 65/9/5 66/6/2 126/10/6
f 59/11/7 126/10/6 80/12/8
f 60/13/9 55/14/9 58/15/10
f 129/16/11 122/17/12 79/18/13
f 121/19/14 128/20/15 127/21/16
f 62/6/17 169/8/4 61/7/3
f 127/22/16 128/23/15 124/24/18
f 122/17/12 129/16/11 132/25/19
f 131/21/20 124/20/18 123/26/21
f 135/27/22 136/28/23 137/29/24
f 137/29/24 136/28/23 138/30/25
f 139/31/26 138/30/25 140/32/27
f 140/32/27 142/33/28 143/34/28
f 143/34/28 142/33/28 135/35/22
f 145/36/29 146/37/30 147/38/31
f 146/37/30 148/39/32 149/40/33
f 148/39/32 150/41/34 151/42/35
f 151/42/35 150/41/34 152/43/36
f 153/44/37 152/43/36 145/45/29
f 154/46/38 155/47/39 146/48/30
f 155/47/39 156/49/40 148/39/32
f 156/49/40 157/50/41 150/41/34
f 150/41/34 157/50/41 158/51/42
f 152/52/36 158/51/42 154/53/38
f 159/54/43 164/55/44 165/56/45
f 160/57/46 165/56/45 166/58/47
f 166/58/47 167/59/48 162/60/49
f 167/59/48 168/61/50 163/62/51
f 168/61/50 164/63/44 159/64/43
f 164/65/44 144/66/52 147/67/31
f 165/68/45 147/67/31 149/40/33
f 149/40/33 151/42/35 167/59/48
f 151/42/35 153/69/37 168/70/50
f 153/69/37 144/71/52 164/72/44
f 169/8/4 62/6/17 125/10/53
f 66/6/2 169/8/4 126/10/6
f 120/73/54 126/74/55 169/75/55
f 125/76/55 121/19/14 169/75/55
f 121/19/14 120/73/54 169/75/55
f 79/18/13 55/14/9 60/13/9
f 120/77/56 127/78/57 129/79/58
f 63/9/59 56/11/60 125/10/53
f 79/12/61 125/10/53 56/11/60
f 79/12/61 122/80/62 121/77/63
f 59/11/7 65/9/5 126/10/6
f 60/81/64 59/11/7 80/12/8
f 80/82/65 129/16/11 79/18/13
f 120/73/54 121/19/14 127/21/16
f 131/83/20 127/22/16 124/24/18
f 123/26/21 122/17/12 132/25/19
f 132/25/19 131/21/20 123/26/21
f 134/84/66 135/27/22 137/29/24
f 139/31/26 137/29/24 138/30/25
f 141/85/67 139/31/26 140/32/27
f 141/85/67 140/32/27 143/34/28
f 134/86/66 143/34/28 135/35/22
f 144/87/52 145/36/29 147/38/31
f 147/38/31 146/37/30 149/40/33
f 149/40/33 148/39/32 151/42/35
f 153/44/37 151/42/35 152/43/36
f 144/88/52 153/44/37 145/45/29
f 145/89/29 154/46/38 146/48/30
f 146/48/30 155/47/39 148/39/32
f 148/39/32 156/49/40 150/41/34
f 152/52/36 150/41/34 158/51/42
f 145/90/29 152/52/36 154/53/38
f 160/57/46 159/54/43 165/56/45
f 161/91/68 160/57/46 166/58/47
f 161/91/68 166/58/47 162/60/49
f 162/60/49 167/59/48 163/62/51
f 163/62/51 168/61/50 159/64/43
f 165/68/45 164/65/44 147/67/31
f 166/58/47 165/68/45 149/40/33
f 166/58/47 149/40/33 167/59/48
f 167/59/48 151/42/35 168/70/50
f 168/70/50 153/69/37 164/72/44
f 80/82/65 79/18/13 60/13/9
f 129/79/58 80/12/8 120/77/56
f 126/10/6 120/77/56 80/12/8
f 127/78/57 131/92/69 129/79/58
f 132/93/69 129/79/58 131/92/69
f 62/6/17 63/9/59 125/10/53
f 55/81/70 79/12/61 56/11/60
f 128/78/71 121/77/63 122/80/62
f 125/10/53 79/12/61 121/77/63
f 122/80/62 123/94/72 124/92/72
f 124/92/72 128/78/71 122/80/62
s off
f 13/95/73 11/96/73 7/97/73
f 8/97/74 14/95/74 16/98/74
f 27/99/73 25/100/73 21/101/73
f 22/102/74 28/103/74 34/104/74
f 32/105/75 31/106/75 34/107/75
f 49/108/73 47/109/73 43/110/73
f 85/111/73 92/112/73 90/113/73
f 114/114/73 112/115/73 108/116/73
f 109/114/74 115/116/74 117/117/74
f 5/118/73 3/119/73 15/98/73
f 2/120/73 17/121/73 3/119/73
f 15/98/73 13/95/73 7/97/73
f 11/96/73 9/122/73 7/97/73
f 7/97/73 5/118/73 15/98/73
f 17/121/73 15/98/73 3/119/73
f 18/121/74 1/120/74 4/119/74
f 4/119/74 6/118/74 16/98/74
f 8/97/74 10/122/74 12/96/74
f 12/96/74 14/95/74 8/97/74
f 16/98/74 18/121/74 4/119/74
f 6/118/74 8/97/74 16/98/74
f 20/123/73 31/124/73 21/101/73
f 32/125/73 33/126/73 27/99/73
f 29/127/73 27/99/73 33/126/73
f 25/100/73 23/128/73 21/101/73
f 21/101/73 31/124/73 32/125/73
f 32/125/73 27/99/73 21/101/73
f 36/129/74 34/104/74 28/103/74
f 35/130/74 19/131/74 22/102/74
f 22/102/74 24/132/74 26/133/74
f 26/133/74 28/103/74 22/102/74
f 30/134/74 36/129/74 28/103/74
f 35/130/74 22/102/74 34/104/74
f 30/135/76 29/136/76 36/137/76
f 33/138/77 32/105/77 34/107/77
f 31/106/78 20/139/78 19/140/78
f 19/140/79 35/141/79 31/106/79
f 36/137/80 29/136/80 33/138/80
f 31/106/81 35/141/81 34/107/81
f 34/107/82 36/137/82 33/138/82
f 41/142/73 39/143/73 43/110/73
f 38/144/73 53/145/73 39/143/73
f 51/146/73 49/108/73 53/145/73
f 47/109/73 45/147/73 43/110/73
f 43/110/73 39/143/73 53/145/73
f 53/145/73 49/108/73 43/110/73
f 88/148/73 86/149/73 90/113/73
f 85/111/73 100/150/73 98/151/73
f 98/151/73 96/152/73 85/111/73
f 94/153/73 92/112/73 85/111/73
f 90/113/73 86/149/73 85/111/73
f 85/111/73 96/152/73 94/153/73
f 106/117/73 104/154/73 116/155/73
f 103/156/73 118/157/73 104/154/73
f 116/155/73 114/114/73 108/116/73
f 112/115/73 110/158/73 108/116/73
f 108/116/73 106/117/73 116/155/73
f 118/157/73 116/155/73 104/154/73
f 119/154/74 102/156/74 105/157/74
f 105/157/74 107/155/74 117/117/74
f 109/114/74 111/115/74 113/158/74
f 113/158/74 115/116/74 109/114/74
f 117/117/74 119/154/74 105/157/74
f 107/155/74 109/114/74 117/117/74
s 1
f 2/159/55 3/160/83 4/161/83
f 3/160/83 5/162/84 6/163/84
f 5/162/84 7/164/85 8/165/85
f 7/164/85 9/166/86 10/167/86
f 9/166/86 11/168/87 12/169/87
f 11/168/87 13/170/88 14/171/88
f 13/170/88 15/172/89 16/173/89
f 15/172/89 17/174/90 18/175/90
f 17/174/90 2/176/55 1/177/55
f 20/178/91 21/179/92 22/180/92
f 21/179/92 23/181/93 24/182/93
f 23/181/93 25/183/94 26/184/94
f 25/183/94 27/185/95 28/186/95
f 27/185/95 29/187/96 30/188/96
f 37/189/55 38/190/55 39/191/97
f 39/191/97 41/192/98 42/193/98
f 41/192/98 43/194/99 44/195/99
f 43/194/99 45/196/100 46/197/100
f 45/196/100 47/198/101 48/199/101
f 48/199/101 47/198/101 49/200/102
f 50/201/102 49/200/102 51/202/103
f 52/203/103 51/202/103 53/204/104
f 53/204/104 38/205/55 37/206/55
f 55/81/70 56/11/60 57/207/105
f 57/207/105 59/11/7 60/81/64
f 63/9/59 64/208/106 57/207/105
f 57/207/105 64/208/106 65/9/5
f 67/209/107 68/210/108 62/6/17
f 68/210/108 69/211/109 63/9/59
f 69/211/109 70/212/110 64/208/106
f 64/208/106 70/212/110 71/211/111
f 65/9/5 71/211/111 72/210/112
f 66/6/2 72/210/112 67/209/107
f 73/213/55 74/214/113 68/210/108
f 74/214/113 75/215/114 69/211/109
f 75/215/114 76/216/52 70/212/110
f 70/212/110 76/216/52 77/215/115
f 71/211/111 77/215/115 78/214/116
f 72/210/112 78/214/116 73/213/55
f 85/217/55 86/218/117 87/219/117
f 86/218/117 88/220/98 89/221/98
f 88/220/98 90/222/99 91/223/99
f 90/222/99 92/224/100 93/225/100
f 92/224/100 94/226/101 95/227/101
f 94/226/101 96/228/102 97/229/102
f 96/228/102 98/230/103 99/231/103
f 98/230/103 100/232/118 101/233/118
f 100/232/118 85/234/55 84/235/55
f 103/236/55 104/237/83 105/238/83
f 104/237/83 106/239/84 107/240/84
f 106/239/84 108/241/85 109/242/85
f 108/241/85 110/243/86 111/244/86
f 110/243/86 112/245/87 113/246/87
f 112/245/87 114/247/88 115/248/88
f 114/247/88 116/249/89 117/250/89
f 117/250/89 116/249/89 118/251/90
f 119/252/90 118/251/90 103/253/55
f 1/254/55 2/159/55 4/161/83
f 4/161/83 3/160/83 6/163/84
f 6/163/84 5/162/84 8/165/85
f 8/165/85 7/164/85 10/167/86
f 10/167/86 9/166/86 12/169/87
f 12/169/87 11/168/87 14/171/88
f 14/171/88 13/170/88 16/173/89
f 16/173/89 15/172/89 18/175/90
f 18/175/90 17/174/90 1/177/55
f 19/255/91 20/178/91 22/180/92
f 22/180/92 21/179/92 24/182/93
f 24/182/93 23/181/93 26/184/94
f 26/184/94 25/183/94 28/186/95
f 28/186/95 27/185/95 30/188/96
f 40/256/97 37/189/55 39/191/97
f 40/256/97 39/191/97 42/193/98
f 42/193/98 41/192/98 44/195/99
f 44/195/99 43/194/99 46/197/100
f 46/197/100 45/196/100 48/199/101
f 50/201/102 48/199/101 49/200/102
f 52/203/103 50/201/102 51/202/103
f 54/257/104 52/203/103 53/204/104
f 54/257/104 53/204/104 37/206/55
f 58/258/119 55/81/70 57/207/105
f 58/258/119 57/207/105 60/81/64
f 56/11/60 63/9/59 57/207/105
f 59/11/7 57/207/105 65/9/5
f 61/7/3 67/209/107 62/6/17
f 62/6/17 68/210/108 63/9/59
f 63/9/59 69/211/109 64/208/106
f 65/9/5 64/208/106 71/211/111
f 66/6/2 65/9/5 72/210/112
f 61/7/3 66/6/2 67/209/107
f 67/209/107 73/213/55 68/210/108
f 68/210/108 74/214/113 69/211/109
f 69/211/109 75/215/114 70/212/110
f 71/211/111 70/212/110 77/215/115
f 72/210/112 71/211/111 78/214/116
f 67/209/107 72/210/112 73/213/55
f 84/259/55 85/217/55 87/219/117
f 87/219/117 86/218/117 89/221/98
f 89/221/98 88/220/98 91/223/99
f 91/223/99 90/222/99 93/225/100
f 93/225/100 92/224/100 95/227/101
f 95/227/101 94/226/101 97/229/102
f 97/229/102 96/228/102 99/231/103
f 99/231/103 98/230/103 101/233/118
f 101/233/118 100/232/118 84/235/55
f 102/260/55 103/236/55 105/238/83
f 105/238/83 104/237/83 107/240/84
f 107/240/84 106/239/84 109/242/85
f 109/242/85 108/241/85 111/244/86
f 111/244/86 110/243/86 113/246/87
f 113/246/87 112/245/87 115/248/88
f 115/248/88 114/247/88 117/250/89
f 119/252/90 117/250/89 118/251/90
f 102/261/55 119/252/90 103/253/55
l 81 82
l 81 83
l 130 133

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 300 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 482 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 587 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 615 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 638 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 623 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 622 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 373 B

After

Width:  |  Height:  |  Size: 602 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 388 B

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 814 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 649 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 652 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 645 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 808 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 378 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 367 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 347 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 341 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -92,7 +92,18 @@ public class ModBlocks {
public static Block ore_tikite;
public static Block block_thorium;
public static Block block_thorium_fuel;
public static Block block_uranium;
public static Block block_u233;
public static Block block_u235;
public static Block block_u238;
public static Block block_uranium_fuel;
public static Block block_neptunium;
public static Block block_plutonium;
public static Block block_pu238;
public static Block block_pu239;
public static Block block_pu240;
public static Block block_plutonium_fuel;
public static Block block_titanium;
public static Block block_sulfur;
public static Block block_niter;
@ -109,6 +120,8 @@ public class ModBlocks {
public static Block block_electrical_scrap;
public static Block block_beryllium;
public static Block block_schrabidium;
public static Block block_solinium;
public static Block block_schrabidium_fuel;
public static Block block_euphemium;
public static Block block_schrabidium_cluster;
public static Block block_euphemium_cluster;
@ -811,7 +824,18 @@ public class ModBlocks {
ore_tikite = new BlockGeneric(Material.rock).setBlockName("ore_tikite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_tikite_alt");
block_uranium = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_uranium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium");
block_u233 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_u233").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_u233");
block_u235 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_u235").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_u235");
block_u238 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_u238").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_u238");
block_uranium_fuel = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_uranium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium_fuel");
block_thorium = new BlockGeneric(Material.iron).setBlockName("block_thorium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_thorium");
block_thorium_fuel = new BlockGeneric(Material.iron).setBlockName("block_thorium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_thorium_fuel");
block_neptunium = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_neptunium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_neptunium");
block_plutonium = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_plutonium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_plutonium");
block_pu238 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_pu238").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu238");
block_pu239 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_pu239").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu239");
block_pu240 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_pu240").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu240");
block_plutonium_fuel = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_plutonium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_plutonium_fuel");
block_titanium = new BlockGeneric(Material.iron).setBlockName("block_titanium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_titanium");
block_sulfur = new BlockGeneric(Material.iron).setBlockName("block_sulfur").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_sulfur");
block_niter = new BlockGeneric(Material.iron).setBlockName("block_niter").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_niter");
@ -828,6 +852,8 @@ public class ModBlocks {
block_electrical_scrap = new BlockFalling(Material.iron).setBlockName("block_electrical_scrap").setCreativeTab(MainRegistry.blockTab).setHardness(2.5F).setResistance(5.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName(RefStrings.MODID + ":electrical_scrap_alt2");
block_beryllium = new BlockGeneric(Material.iron).setBlockName("block_beryllium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_beryllium");
block_schrabidium = new BlockGeneric(Material.iron).setBlockName("block_schrabidium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_schrabidium");
block_solinium = new BlockGeneric(Material.iron).setBlockName("block_solinium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_solinium");
block_schrabidium_fuel = new BlockGeneric(Material.iron).setBlockName("block_schrabidium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_schrabidium_fuel");
block_euphemium = new BlockGeneric(Material.iron).setBlockName("block_euphemium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(60000.0F).setBlockTextureName(RefStrings.MODID + ":block_euphemium");
block_schrabidium_cluster = new BlockGenericPillar(Material.rock).setBlockName("block_schrabidium_cluster").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(60000.0F);
block_euphemium_cluster = new BlockGenericPillar(Material.rock).setBlockName("block_euphemium_cluster").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(60000.0F);
@ -1356,7 +1382,7 @@ public class ModBlocks {
GameRegistry.registerBlock(ore_fluorite, ore_fluorite.getUnlocalizedName());
GameRegistry.registerBlock(ore_beryllium, ore_beryllium.getUnlocalizedName());
GameRegistry.registerBlock(ore_lead, ore_lead.getUnlocalizedName());
GameRegistry.registerBlock(ore_oil, ore_oil.getUnlocalizedName());
GameRegistry.registerBlock(ore_oil, ItemBlockLore.class, ore_oil.getUnlocalizedName());
GameRegistry.registerBlock(ore_oil_empty, ore_oil_empty.getUnlocalizedName());
GameRegistry.registerBlock(ore_oil_sand, ore_oil_sand.getUnlocalizedName());
GameRegistry.registerBlock(ore_lignite, ore_lignite.getUnlocalizedName());
@ -1397,7 +1423,18 @@ public class ModBlocks {
//Blocks
GameRegistry.registerBlock(block_uranium, block_uranium.getUnlocalizedName());
GameRegistry.registerBlock(block_u233, block_u233.getUnlocalizedName());
GameRegistry.registerBlock(block_u235, block_u235.getUnlocalizedName());
GameRegistry.registerBlock(block_u238, block_u238.getUnlocalizedName());
GameRegistry.registerBlock(block_uranium_fuel, block_uranium_fuel.getUnlocalizedName());
GameRegistry.registerBlock(block_neptunium, block_neptunium.getUnlocalizedName());
GameRegistry.registerBlock(block_plutonium, block_plutonium.getUnlocalizedName());
GameRegistry.registerBlock(block_pu238, block_pu238.getUnlocalizedName());
GameRegistry.registerBlock(block_pu239, block_pu239.getUnlocalizedName());
GameRegistry.registerBlock(block_pu240, block_pu240.getUnlocalizedName());
GameRegistry.registerBlock(block_plutonium_fuel, block_plutonium_fuel.getUnlocalizedName());
GameRegistry.registerBlock(block_thorium, block_thorium.getUnlocalizedName());
GameRegistry.registerBlock(block_thorium_fuel, block_thorium_fuel.getUnlocalizedName());
GameRegistry.registerBlock(block_titanium, block_titanium.getUnlocalizedName());
GameRegistry.registerBlock(block_sulfur, block_sulfur.getUnlocalizedName());
GameRegistry.registerBlock(block_niter, block_niter.getUnlocalizedName());
@ -1418,6 +1455,8 @@ public class ModBlocks {
GameRegistry.registerBlock(block_trinitite, block_trinitite.getUnlocalizedName());
GameRegistry.registerBlock(block_waste, block_waste.getUnlocalizedName());
GameRegistry.registerBlock(block_schrabidium, ItemBlockLore.class, block_schrabidium.getUnlocalizedName());
GameRegistry.registerBlock(block_solinium, ItemBlockLore.class, block_solinium.getUnlocalizedName());
GameRegistry.registerBlock(block_schrabidium_fuel, ItemBlockLore.class, block_schrabidium_fuel.getUnlocalizedName());
GameRegistry.registerBlock(block_euphemium, ItemBlockLore.class, block_euphemium.getUnlocalizedName());
GameRegistry.registerBlock(block_schrabidium_cluster, ItemBlockLore.class, block_schrabidium_cluster.getUnlocalizedName());
GameRegistry.registerBlock(block_euphemium_cluster, ItemBlockLore.class, block_euphemium_cluster.getUnlocalizedName());

View File

@ -55,9 +55,13 @@ public class EntitySoyuz extends Entity {
e.setFire(15);
e.attackEntityFrom(ModDamageSource.exhaust, 100.0F);
if(!memed && e instanceof EntityPlayer) {
memed = true;
worldObj.playSoundEffect(posX, posY, posZ, "hbm:alarm.soyuzed", 100, 1.0F);
if(e instanceof EntityPlayer) {
if(!memed) {
memed = true;
worldObj.playSoundEffect(posX, posY, posZ, "hbm:alarm.soyuzed", 100, 1.0F);
}
((EntityPlayer)e).triggerAchievement(MainRegistry.achSoyuz);
}
}
}

View File

@ -112,6 +112,10 @@ public class BulletConfigSyncingUtil {
public static int AE50_DU = i++;
public static int AE50_STAR = i++;
public static int G4_NORMAL = i++;
public static int G4_SLUG = i++;
public static int G4_EXPLOSIVE = i++;
public static int SPECIAL_OSIPR = i++;
public static int SPECIAL_GAUSS = i++;
public static int SPECIAL_GAUSS_CHARGED = i++;
@ -220,6 +224,10 @@ public class BulletConfigSyncingUtil {
configSet.add(new ConfigKeyPair(Gun50AEFactory.get50DUConfig(), AE50_DU));
configSet.add(new ConfigKeyPair(Gun50AEFactory.get50StarConfig(), AE50_STAR));
configSet.add(new ConfigKeyPair(Gun4GaugeFactory.get4GaugeConfig(), G4_NORMAL));
configSet.add(new ConfigKeyPair(Gun4GaugeFactory.get4GaugeSlugConfig(), G4_SLUG));
configSet.add(new ConfigKeyPair(Gun4GaugeFactory.get4GaugeExplosiveConfig(), G4_EXPLOSIVE));
configSet.add(new ConfigKeyPair(GunOSIPRFactory.getPulseConfig(), SPECIAL_OSIPR));
configSet.add(new ConfigKeyPair(GunGaussFactory.getGaussConfig(), SPECIAL_GAUSS));
configSet.add(new ConfigKeyPair(GunGaussFactory.getAltConfig(), SPECIAL_GAUSS_CHARGED));

View File

@ -1,17 +1,17 @@
package com.hbm.handler;
import java.util.ArrayList;
import java.util.List;
import java.util.HashMap;
import com.hbm.potion.HbmPotion;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class HazmatRegistry {
public static final HazmatRegistry instance = new HazmatRegistry();
private static List<HazmatEntry> entries = new ArrayList();
private static HashMap<Item, Float> entries = new HashMap();
private class HazmatEntry {
@ -26,18 +26,30 @@ public class HazmatRegistry {
public void registerHazmat(Item item, float resistance) {
entries.add(new HazmatEntry(item, resistance));
entries.put(item, resistance);
}
public float getResistance(Item item) {
public float getResistance(ItemStack stack) {
for(HazmatEntry entry : entries) {
if(entry.item == item)
return entry.resistance;
}
if(stack == null)
return 0;
return 0.0F;
float cladding = getCladding(stack);
Float f = entries.get(stack.getItem());
if(f != null)
return f + cladding;
return cladding;
}
public float getCladding(ItemStack stack) {
if(stack.hasTagCompound() && stack.stackTagCompound.getFloat("hfr_cladding") > 0)
return stack.stackTagCompound.getFloat("hfr_cladding");
return 0;
}
public float getResistance(EntityPlayer player) {
@ -45,9 +57,7 @@ public class HazmatRegistry {
float res = 0.0F;
for(int i = 0; i < 4; i++) {
if(player.inventory.armorInventory[i] != null) {
res += getResistance(player.inventory.armorInventory[i].getItem());
}
res += getResistance(player.inventory.armorInventory[i]);
}
if(player.isPotionActive(HbmPotion.radx))

View File

@ -70,6 +70,7 @@ public class Gun12GaugeFactory {
config.durability = 3000;
config.reloadType = GunConfiguration.RELOAD_NONE;
config.allowsInfinity = true;
config.hasSights = true;
config.crosshair = Crosshair.L_CIRCLE;
config.reloadSound = GunConfiguration.RSOUND_REVOLVER;
config.firingSound = "hbm:weapon.shottyShoot";

View File

@ -0,0 +1,95 @@
package com.hbm.handler.guncfg;
import java.util.ArrayList;
import com.hbm.handler.BulletConfigSyncingUtil;
import com.hbm.handler.BulletConfiguration;
import com.hbm.handler.GunConfiguration;
import com.hbm.items.ModItems;
import com.hbm.render.util.RenderScreenOverlay.Crosshair;
public class Gun4GaugeFactory {
private static GunConfiguration getShotgunConfig() {
GunConfiguration config = new GunConfiguration();
config.rateOfFire = 15;
config.roundsPerCycle = 1;
config.gunMode = GunConfiguration.MODE_NORMAL;
config.firingMode = GunConfiguration.FIRE_MANUAL;
config.hasReloadAnim = false;
config.hasFiringAnim = false;
config.hasSpinup = false;
config.hasSpindown = false;
config.reloadDuration = 10;
config.firingDuration = 0;
config.ammoCap = 4;
config.reloadType = GunConfiguration.RELOAD_SINGLE;
config.allowsInfinity = true;
config.hasSights = true;
config.crosshair = Crosshair.L_CIRCLE;
config.reloadSound = GunConfiguration.RSOUND_SHOTGUN;
return config;
}
public static GunConfiguration getKS23Config() {
GunConfiguration config = getShotgunConfig();
config.durability = 3000;
config.reloadSound = GunConfiguration.RSOUND_SHOTGUN;
config.firingSound = "hbm:weapon.revolverShootAlt";
config.firingPitch = 0.65F;
config.name = "KS-23";
config.manufacturer = "Tulsky Oruzheiny Zavod";
config.config = new ArrayList<Integer>();
config.config.add(BulletConfigSyncingUtil.G4_NORMAL);
config.config.add(BulletConfigSyncingUtil.G4_SLUG);
config.config.add(BulletConfigSyncingUtil.G4_EXPLOSIVE);
return config;
}
public static BulletConfiguration get4GaugeConfig() {
BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig();
bullet.ammo = ModItems.ammo_4gauge;
bullet.dmgMin = 3;
bullet.dmgMax = 6;
return bullet;
}
public static BulletConfiguration get4GaugeSlugConfig() {
BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig();
bullet.ammo = ModItems.ammo_4gauge_slug;
bullet.dmgMin = 15;
bullet.dmgMax = 20;
bullet.wear = 7;
bullet.style = BulletConfiguration.STYLE_NORMAL;
return bullet;
}
public static BulletConfiguration get4GaugeExplosiveConfig() {
BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig();
bullet.ammo = ModItems.ammo_4gauge_explosive;
bullet.velocity *= 2;
bullet.gravity *= 2;
bullet.dmgMin = 10;
bullet.dmgMax = 15;
bullet.wear = 25;
bullet.trail = 1;
return bullet;
}
}

View File

@ -232,13 +232,16 @@ public class FluidTank {
//Called by TE to save fillstate
public void writeToNBT(NBTTagCompound nbt, String s) {
nbt.setInteger(s, fluid);
//nbt.setInteger(s + "_type", Arrays.asList(FluidType.values()).indexOf(type));
nbt.setInteger(s + "_max", maxFluid);
nbt.setString(s + "_type", type.getName());
}
//Called by TE to load fillstate
public void readFromNBT(NBTTagCompound nbt, String s) {
fluid = nbt.getInteger(s);
int max = nbt.getInteger(s + "_max");
if(max > 0)
maxFluid = nbt.getInteger(s + "_max");
type = FluidType.getEnum(nbt.getInteger(s + "_type"));
if(type.name().equals(FluidType.NONE.name()))
type = FluidType.getEnumFromName(nbt.getString(s + "_type"));

View File

@ -811,7 +811,7 @@ public class MachineRecipes {
}
if (item == ModItems.rod_plutonium) {
return new ItemStack(ModItems.rod_lead, 1);
return new ItemStack(ModItems.rod_waste, 1);
}
if (item == ModItems.rod_pu238) {
@ -823,7 +823,7 @@ public class MachineRecipes {
}
if (item == ModItems.rod_pu240) {
return new ItemStack(ModItems.rod_lead, 1);
return new ItemStack(ModItems.rod_waste, 1);
}
if (item == ModItems.rod_schrabidium) {
@ -855,7 +855,7 @@ public class MachineRecipes {
}
if (item == ModItems.rod_dual_plutonium) {
return new ItemStack(ModItems.rod_dual_lead, 1);
return new ItemStack(ModItems.rod_dual_waste, 1);
}
if (item == ModItems.rod_dual_pu238) {
@ -867,7 +867,7 @@ public class MachineRecipes {
}
if (item == ModItems.rod_dual_pu240) {
return new ItemStack(ModItems.rod_dual_lead, 1);
return new ItemStack(ModItems.rod_dual_waste, 1);
}
if (item == ModItems.rod_dual_schrabidium) {
@ -899,7 +899,7 @@ public class MachineRecipes {
}
if (item == ModItems.rod_quad_plutonium) {
return new ItemStack(ModItems.rod_quad_lead, 1);
return new ItemStack(ModItems.rod_quad_waste, 1);
}
if (item == ModItems.rod_quad_pu238) {
@ -911,7 +911,7 @@ public class MachineRecipes {
}
if (item == ModItems.rod_quad_pu240) {
return new ItemStack(ModItems.rod_quad_lead, 1);
return new ItemStack(ModItems.rod_quad_waste, 1);
}
if (item == ModItems.rod_quad_schrabidium) {

View File

@ -7,6 +7,7 @@ import com.hbm.handler.guncfg.Gun20GaugeFactory;
import com.hbm.handler.guncfg.Gun22LRFactory;
import com.hbm.handler.guncfg.Gun357MagnumFactory;
import com.hbm.handler.guncfg.Gun44MagnumFactory;
import com.hbm.handler.guncfg.Gun4GaugeFactory;
import com.hbm.handler.guncfg.Gun50AEFactory;
import com.hbm.handler.guncfg.Gun50BMGFactory;
import com.hbm.handler.guncfg.Gun5mmFactory;
@ -1053,6 +1054,9 @@ public class ModItems {
public static Item ammo_20gauge_caustic;
public static Item ammo_20gauge_shock;
public static Item ammo_20gauge_wither;
public static Item ammo_4gauge;
public static Item ammo_4gauge_slug;
public static Item ammo_4gauge_explosive;
public static Item ammo_357_desh;
public static Item ammo_44;
public static Item ammo_44_ap;
@ -1161,6 +1165,7 @@ public class ModItems {
public static Item gun_uboinik;
public static Item gun_uboinik_ammo;
public static Item gun_supershotgun;
public static Item gun_ks23;
public static Item gun_lever_action;
public static Item gun_lever_action_dark;
public static Item gun_lever_action_sonata;
@ -1543,6 +1548,11 @@ public class ModItems {
public static Item crystal_horn;
public static Item crystal_charred;
public static Item cladding_paint;
public static Item cladding_rubber;
public static Item cladding_lead;
public static Item cladding_desh;
public static Item hazmat_helmet;
public static Item hazmat_plate;
public static Item hazmat_legs;
@ -2341,6 +2351,10 @@ public class ModItems {
jetpack_tank = new ItemSyringe().setUnlocalizedName("jetpack_tank").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":jetpack_tank");
gun_kit_1 = new ItemSyringe().setUnlocalizedName("gun_kit_1").setMaxStackSize(16).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":gun_kit_1");
gun_kit_2 = new ItemSyringe().setUnlocalizedName("gun_kit_2").setMaxStackSize(16).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":gun_kit_2");
cladding_paint = new ItemCladding(0.025F).setUnlocalizedName("cladding_paint").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cladding_paint");
cladding_rubber = new ItemCladding(0.075F).setUnlocalizedName("cladding_rubber").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cladding_rubber");
cladding_lead = new ItemCladding(0.2F).setUnlocalizedName("cladding_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cladding_lead");
cladding_desh = new ItemCladding(0.4F).setUnlocalizedName("cladding_desh").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cladding_desh");
can_empty = new Item().setUnlocalizedName("can_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_empty");
can_smart = new ItemEnergy().setUnlocalizedName("can_smart").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_smart");
@ -2761,6 +2775,9 @@ public class ModItems {
ammo_20gauge_caustic = new ItemAmmo().setUnlocalizedName("ammo_20gauge_caustic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_caustic");
ammo_20gauge_shock = new ItemAmmo().setUnlocalizedName("ammo_20gauge_shock").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_shock");
ammo_20gauge_wither = new ItemAmmo().setUnlocalizedName("ammo_20gauge_wither").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_wither");
ammo_4gauge = new ItemAmmo().setUnlocalizedName("ammo_4gauge").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge");
ammo_4gauge_slug = new ItemAmmo().setUnlocalizedName("ammo_4gauge_slug").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_slug");
ammo_4gauge_explosive = new ItemAmmo().setUnlocalizedName("ammo_4gauge_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_explosive");
ammo_5mm = new ItemAmmo().setUnlocalizedName("ammo_5mm").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm");
ammo_5mm_explosive = new ItemAmmo().setUnlocalizedName("ammo_5mm_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_explosive");
ammo_5mm_du = new ItemAmmo().setUnlocalizedName("ammo_5mm_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_du");
@ -2824,26 +2841,26 @@ public class ModItems {
gun_revolver = new ItemGunBase(Gun357MagnumFactory.getRevolverConfig()).setUnlocalizedName("gun_revolver").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver");
gun_revolver_saturnite = new ItemGunBase(Gun357MagnumFactory.getRevolverSaturniteConfig()).setUnlocalizedName("gun_revolver_saturnite").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_saturnite");
gun_revolver_iron_ammo = new Item().setUnlocalizedName("gun_revolver_iron_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_iron_ammo");
gun_revolver_iron = new ItemGunBase(Gun357MagnumFactory.getRevolverIronConfig()).setMaxDamage(100).setUnlocalizedName("gun_revolver_iron").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_iron");
gun_revolver_iron = new ItemGunBase(Gun357MagnumFactory.getRevolverIronConfig()).setUnlocalizedName("gun_revolver_iron").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_iron");
gun_revolver_gold_ammo = new Item().setUnlocalizedName("gun_revolver_gold_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_gold_ammo");
gun_revolver_gold = new ItemGunBase(Gun357MagnumFactory.getRevolverGoldConfig()).setMaxDamage(1000).setUnlocalizedName("gun_revolver_gold").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_gold");
gun_revolver_gold = new ItemGunBase(Gun357MagnumFactory.getRevolverGoldConfig()).setUnlocalizedName("gun_revolver_gold").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_gold");
gun_revolver_lead_ammo = new Item().setUnlocalizedName("gun_revolver_lead_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_lead_ammo");
gun_revolver_lead = new ItemGunBase(Gun357MagnumFactory.getRevolverLeadConfig()).setMaxDamage(250).setUnlocalizedName("gun_revolver_lead").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_lead");
gun_revolver_lead = new ItemGunBase(Gun357MagnumFactory.getRevolverLeadConfig()).setUnlocalizedName("gun_revolver_lead").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_lead");
gun_revolver_schrabidium_ammo = new ItemRadioactive().setUnlocalizedName("gun_revolver_schrabidium_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium_ammo");
gun_revolver_schrabidium = new ItemGunBase(Gun357MagnumFactory.getRevolverSchrabidiumConfig()).setMaxDamage(100000).setUnlocalizedName("gun_revolver_schrabidium").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium");
gun_revolver_schrabidium = new ItemGunBase(Gun357MagnumFactory.getRevolverSchrabidiumConfig()).setUnlocalizedName("gun_revolver_schrabidium").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium");
gun_revolver_cursed_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_cursed_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_cursed_ammo");
gun_revolver_cursed = new ItemGunBase(Gun357MagnumFactory.getRevolverCursedConfig()).setMaxDamage(5000).setUnlocalizedName("gun_revolver_cursed").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_cursed");
gun_revolver_cursed = new ItemGunBase(Gun357MagnumFactory.getRevolverCursedConfig()).setUnlocalizedName("gun_revolver_cursed").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_cursed");
gun_revolver_nightmare_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_nightmare_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare_ammo");
gun_revolver_nightmare = new ItemGunBase(Gun357MagnumFactory.getRevolverNightmareConfig()).setMaxDamage(6).setUnlocalizedName("gun_revolver_nightmare").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare");
gun_revolver_nightmare = new ItemGunBase(Gun357MagnumFactory.getRevolverNightmareConfig()).setUnlocalizedName("gun_revolver_nightmare").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare");
gun_revolver_nightmare2_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_nightmare2_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2_ammo");
gun_revolver_nightmare2 = new ItemGunBase(Gun357MagnumFactory.getRevolverNightmare2Config()).setMaxDamage(6).setUnlocalizedName("gun_revolver_nightmare2").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2");
gun_revolver_nightmare2 = new ItemGunBase(Gun357MagnumFactory.getRevolverNightmare2Config()).setUnlocalizedName("gun_revolver_nightmare2").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2");
gun_revolver_pip_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_pip_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_revolver_pip_ammo");
gun_revolver_pip = new ItemGunBase(Gun44MagnumFactory.getMacintoshConfig()).setMaxDamage(1000).setUnlocalizedName("gun_revolver_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_pip");
gun_revolver_pip = new ItemGunBase(Gun44MagnumFactory.getMacintoshConfig()).setUnlocalizedName("gun_revolver_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_pip");
gun_revolver_nopip_ammo = new Item().setUnlocalizedName("gun_revolver_nopip_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_revolver_nopip_ammo");
gun_revolver_nopip = new ItemGunBase(Gun44MagnumFactory.getNovacConfig()).setMaxDamage(1000).setUnlocalizedName("gun_revolver_nopip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nopip");
gun_revolver_blackjack = new ItemGunBase(Gun44MagnumFactory.getBlackjackConfig()).setMaxDamage(1000).setUnlocalizedName("gun_revolver_blackjack").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_blackjack");
gun_revolver_silver = new ItemGunBase(Gun44MagnumFactory.getSilverConfig()).setMaxDamage(1000).setUnlocalizedName("gun_revolver_silver").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_silver");
gun_revolver_red = new ItemGunBase(Gun44MagnumFactory.getRedConfig()).setMaxDamage(1000).setUnlocalizedName("gun_revolver_red").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_red");
gun_revolver_nopip = new ItemGunBase(Gun44MagnumFactory.getNovacConfig()).setUnlocalizedName("gun_revolver_nopip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nopip");
gun_revolver_blackjack = new ItemGunBase(Gun44MagnumFactory.getBlackjackConfig()).setUnlocalizedName("gun_revolver_blackjack").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_blackjack");
gun_revolver_silver = new ItemGunBase(Gun44MagnumFactory.getSilverConfig()).setUnlocalizedName("gun_revolver_silver").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_silver");
gun_revolver_red = new ItemGunBase(Gun44MagnumFactory.getRedConfig()).setUnlocalizedName("gun_revolver_red").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_red");
gun_deagle = new ItemGunBase(Gun50AEFactory.getDeagleConfig()).setUnlocalizedName("gun_deagle").setFull3D().setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_deagle");
gun_calamity_ammo = new ItemCustomLore().setUnlocalizedName("gun_calamity_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_calamity_ammo");
gun_calamity = new ItemGunBase(Gun50BMGFactory.getCalamityConfig()).setUnlocalizedName("gun_calamity").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_calamity");
@ -2870,6 +2887,7 @@ public class ModItems {
gun_uboinik_ammo = new Item().setUnlocalizedName("gun_uboinik_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_uboinik_ammo");
gun_uboinik = new ItemGunBase(Gun12GaugeFactory.getUboinikConfig()).setUnlocalizedName("gun_uboinik").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uboinik");
gun_supershotgun = new ItemGunShotty(Gun12GaugeFactory.getShottyConfig()).setUnlocalizedName("gun_supershotgun").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uboinik");
gun_ks23 = new ItemGunBase(Gun4GaugeFactory.getKS23Config()).setUnlocalizedName("gun_ks23").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uboinik");
gun_lever_action_ammo = new Item().setUnlocalizedName("gun_lever_action_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_lever_action_ammo");
gun_lever_action = new ItemGunBase(Gun20GaugeFactory.getMareConfig()).setUnlocalizedName("gun_lever_action").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_lever_action");
gun_lever_action_dark = new ItemGunBase(Gun20GaugeFactory.getMareDarkConfig()).setUnlocalizedName("gun_lever_action_dark").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_lever_action_dark");
@ -4652,6 +4670,7 @@ public class ModItems {
GameRegistry.registerItem(gun_uzi_saturnite_silencer,gun_uzi_saturnite_silencer.getUnlocalizedName());
GameRegistry.registerItem(gun_uboinik, gun_uboinik.getUnlocalizedName());
GameRegistry.registerItem(gun_supershotgun, gun_supershotgun.getUnlocalizedName());
GameRegistry.registerItem(gun_ks23, gun_ks23.getUnlocalizedName());
GameRegistry.registerItem(gun_lever_action, gun_lever_action.getUnlocalizedName());
GameRegistry.registerItem(gun_lever_action_dark, gun_lever_action_dark.getUnlocalizedName());
GameRegistry.registerItem(gun_lever_action_sonata, gun_lever_action_sonata.getUnlocalizedName());
@ -4731,6 +4750,9 @@ public class ModItems {
GameRegistry.registerItem(ammo_20gauge_caustic, ammo_20gauge_caustic.getUnlocalizedName());
GameRegistry.registerItem(ammo_20gauge_shock, ammo_20gauge_shock.getUnlocalizedName());
GameRegistry.registerItem(ammo_20gauge_wither, ammo_20gauge_wither.getUnlocalizedName());
GameRegistry.registerItem(ammo_4gauge, ammo_4gauge.getUnlocalizedName());
GameRegistry.registerItem(ammo_4gauge_slug, ammo_4gauge_slug.getUnlocalizedName());
GameRegistry.registerItem(ammo_4gauge_explosive, ammo_4gauge_explosive.getUnlocalizedName());
GameRegistry.registerItem(ammo_44, ammo_44.getUnlocalizedName());
GameRegistry.registerItem(ammo_44_ap, ammo_44_ap.getUnlocalizedName());
GameRegistry.registerItem(ammo_44_du, ammo_44_du.getUnlocalizedName());
@ -5064,6 +5086,12 @@ public class ModItems {
//Chaos
GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName());
//Cladding
GameRegistry.registerItem(cladding_paint, cladding_paint.getUnlocalizedName());
GameRegistry.registerItem(cladding_rubber, cladding_rubber.getUnlocalizedName());
GameRegistry.registerItem(cladding_lead, cladding_lead.getUnlocalizedName());
GameRegistry.registerItem(cladding_desh, cladding_desh.getUnlocalizedName());
//The Gadget
GameRegistry.registerItem(gadget_explosive, gadget_explosive.getUnlocalizedName());

View File

@ -51,13 +51,19 @@ public class ItemBlockLore extends ItemBlock {
if(this.field_150939_a == ModBlocks.meteor_battery) {
list.add("Provides infinite charge to tesla coils");
}
if(this.field_150939_a == ModBlocks.ore_oil) {
list.add("You weren't supposed to mine that.");
list.add("Come on, get a derrick you doofus.");
}
}
@Override
public EnumRarity getRarity(ItemStack stack) {
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 || this.field_150939_a == ModBlocks.block_schrabidium_cluster ||
this.field_150939_a == ModBlocks.block_schrabidium_fuel || this.field_150939_a == ModBlocks.block_solinium)
return EnumRarity.rare;
if(this.field_150939_a == ModBlocks.block_euphemium || this.field_150939_a == ModBlocks.block_euphemium_cluster ||

View File

@ -184,39 +184,16 @@ public class ArmorModel extends ItemArmor {
return "hbm:textures/models/TestCape.png";
}
if (stack.getItem() == ModItems.cape_radiation) {
return "hbm:textures/models/CapeRadiation.png";
return "hbm:textures/models/capes/CapeRadiation.png";
}
if (stack.getItem() == ModItems.cape_gasmask) {
return "hbm:textures/models/CapeGasMask.png";
return "hbm:textures/models/capes/CapeGasMask.png";
}
if (stack.getItem() == ModItems.cape_schrabidium) {
return "hbm:textures/models/CapeSchrabidium.png";
return "hbm:textures/models/capes/CapeSchrabidium.png";
}
/*if (stack.getItem() == ModItems.cape_hbm && entity instanceof EntityPlayer && ((EntityPlayer)entity).getUniqueID().toString().equals(Library.HbMinecraft)) {
if(MainRegistry.polaroidID == 11)
return "hbm:textures/models/CapeHbm.png";
else
return "hbm:textures/models/CapeHbm2.png";
}
if (stack.getItem() == ModItems.cape_dafnik && entity instanceof EntityPlayer && ((EntityPlayer)entity).getUniqueID().toString().equals(Library.Dafnik)) {
return "hbm:textures/models/CapeDafnik.png";
}
if (stack.getItem() == ModItems.cape_lpkukin && entity instanceof EntityPlayer && ((EntityPlayer)entity).getUniqueID().toString().equals(Library.LPkukin)) {
return "hbm:textures/models/CapeShield.png";
}
if (stack.getItem() == ModItems.cape_vertice && entity instanceof EntityPlayer && ((EntityPlayer)entity).getUniqueID().toString().equals(Library.LordVertice)) {
return "hbm:textures/models/CapeVertice_2.png";
}
if (stack.getItem() == ModItems.cape_codered_ && entity instanceof EntityPlayer && ((EntityPlayer)entity).getUniqueID().toString().equals(Library.CodeRed_)) {
return "hbm:textures/models/CapeRed.png";
}
if (stack.getItem() == ModItems.cape_ayy && entity instanceof EntityPlayer && ((EntityPlayer)entity).getUniqueID().toString().equals(Library.dxmaster769)) {
return "hbm:textures/models/CapeAyy.png";
}
if (stack.getItem() == ModItems.cape_nostalgia && entity instanceof EntityPlayer && ((EntityPlayer)entity).getUniqueID().toString().equals(Library.nostalgia)) {
return "hbm:textures/models/CapeNostalgia.png";
}*/
return "hbm:textures/models/CapeUnknown.png";
return "hbm:textures/models/capes/CapeUnknown.png";
}
@SideOnly(Side.CLIENT)

View File

@ -0,0 +1,56 @@
package com.hbm.items.special;
import java.util.List;
import com.hbm.handler.HazmatRegistry;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
public class ItemCladding extends Item {
float rad;
public ItemCladding(float rad) {
this.rad = rad;
}
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
if(!world.isRemote) {
boolean used = false;
for(ItemStack armor : player.inventory.armorInventory) {
if(armor != null && HazmatRegistry.instance.getCladding(armor) == 0) {
if(!armor.hasTagCompound())
armor.stackTagCompound = new NBTTagCompound();
armor.stackTagCompound.setFloat("hfr_cladding", rad);
used = true;
}
}
if(used) {
world.playSoundAtEntity(player, "hbm:item.repair", 1.0F, 1.0F);
stack.stackSize--;
}
}
return stack;
}
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
list.add(EnumChatFormatting.YELLOW + "Adds " + rad + " rad-resistance to all armor pieces.");
}
}

View File

@ -119,7 +119,8 @@ public class ItemRadioactive extends ItemCustomLore {
this == ModItems.rod_uranium_fuel_depleted ||
this == ModItems.rod_plutonium_fuel_depleted ||
this == ModItems.rod_mox_fuel_depleted ||
this == ModItems.ingot_thorium_fuel) {
this == ModItems.ingot_thorium_fuel ||
this == ModItems.nuclear_waste_tiny) {
//Library.applyRadiation(living, 45, 19, 30, 14);
Library.applyRadData(living, 3.5F/20F * mod);
}

View File

@ -79,6 +79,21 @@ public class ItemAmmo extends Item {
list.add(EnumChatFormatting.BLUE + "+ Withering");
}
//23mm
if(this == ModItems.ammo_4gauge_slug) {
list.add(EnumChatFormatting.BLUE + "+ Near-perfect accuracy");
list.add(EnumChatFormatting.BLUE + "+ Increased damage");
list.add(EnumChatFormatting.BLUE + "+ Decreased wear");
list.add(EnumChatFormatting.RED + "- Single projectile");
}
if(this == ModItems.ammo_4gauge_explosive) {
list.add(EnumChatFormatting.BLUE + "+ Explosive");
list.add(EnumChatFormatting.BLUE + "+ Increased damage");
list.add(EnumChatFormatting.YELLOW + "* It's a 40mm grenade that we squeezed to fit the barrel!");
list.add(EnumChatFormatting.RED + "- Highly increased wear");
list.add(EnumChatFormatting.RED + "- Single projectile");
}
//.357 MAGNUM
if(this == ModItems.ammo_357_desh) {
list.add(EnumChatFormatting.BLUE + "+ Fits every .357 model");

View File

@ -260,6 +260,7 @@ public class Library {
"schrabidium",
"euphemium",
"steel",
"cmb",
"titanium",
"alloy",
"copper",

View File

@ -223,6 +223,7 @@ public class ClientProxy extends ServerProxy
MinecraftForgeClient.registerItemRenderer(ModItems.gun_hk69, new ItemRenderWeaponObj());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_deagle, new ItemRenderWeaponObj());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_supershotgun, new ItemRenderWeaponObj());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_ks23, new ItemRenderWeaponObj());
//MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg_ammo, new ItemRenderRocket());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBombMulti.class, new RenderBombMulti());

View File

@ -112,7 +112,7 @@ public class MainRegistry
//Armor Materials
public static ArmorMaterial enumArmorMaterialEmerald = EnumHelper.addArmorMaterial("TEST", 2500, new int[] {3, 8, 6, 3}, 30);
public static ArmorMaterial enumArmorMaterialSchrabidium = EnumHelper.addArmorMaterial("SCHRABIDIUM", 100, new int[] {3, 8, 6, 3}, 50);
public static ArmorMaterial enumArmorMaterialEuphemium = EnumHelper.addArmorMaterial("EUPHEMIUM", 150000000, new int[] {3, 8, 6, 3}, 100);
public static ArmorMaterial enumArmorMaterialEuphemium = EnumHelper.addArmorMaterial("EUPHEMIUM", 15000000, new int[] {3, 8, 6, 3}, 100);
public static ArmorMaterial enumArmorMaterialHazmat = EnumHelper.addArmorMaterial("HAZMAT", 60, new int[] {2, 5, 4, 1}, 5);
public static ArmorMaterial enumArmorMaterialHazmat2 = EnumHelper.addArmorMaterial("HAZMAT2", 60, new int[] {2, 5, 4, 1}, 5);
public static ArmorMaterial enumArmorMaterialHazmat3 = EnumHelper.addArmorMaterial("HAZMAT3", 60, new int[] {2, 5, 4, 1}, 5);
@ -206,6 +206,9 @@ public class MainRegistry
public static Achievement achFOEQ;
public static Achievement achFiend;
public static Achievement achFiend2;
public static Achievement achSoyuz;
public static Achievement achRadPoison;
public static Achievement achRadDeath;
public static Achievement bobMetalworks;
public static Achievement bobAssembly;
public static Achievement bobChemistry;
@ -1018,29 +1021,33 @@ public class MainRegistry
achievementCraftBreedingReactor,
achievementCraftCentrifuge
}));*/
achSacrifice = new Achievement("achievement.sacrifice", "sacrifice", 0, 0, ModItems.burnt_bark, null).initIndependentStat().setSpecial().registerStat();
achImpossible = new Achievement("achievement.impossible", "impossible", 2, 0, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat();
achTOB = new Achievement("achievement.tasteofblood", "tasteofblood", 0, 2, new ItemStack(ModItems.fluid_icon, 1, FluidType.ASCHRAB.getID()), null).initIndependentStat().setSpecial().registerStat();
achFreytag = new Achievement("achievement.freytag", "freytag", 0, -2, ModItems.gun_mp40, null).initIndependentStat().setSpecial().registerStat();
achSelenium = new Achievement("achievement.selenium", "selenium", -2, -2, ModItems.ingot_starmetal, null).initIndependentStat().setSpecial().registerStat();
achPotato = new Achievement("achievement.potato", "potato", -2, 0, ModItems.battery_potatos, null).initIndependentStat().setSpecial().registerStat();
achC44 = new Achievement("achievement.c44", "c44", 2, -2, ModItems.gun_revolver_pip, null).initIndependentStat().setSpecial().registerStat();
achC20_5 = new Achievement("achievement.c20_5", "c20_5", 4, -2, ModItems.gun_dampfmaschine, null).initIndependentStat().setSpecial().registerStat();
achSpace = new Achievement("achievement.space", "space", 4, 0, ModItems.missile_carrier, null).initIndependentStat().setSpecial().registerStat();
achFOEQ = new Achievement("achievement.FOEQ", "FOEQ", 4, 2, ModItems.sat_foeq, null).initIndependentStat().setSpecial().registerStat();
achFiend = new Achievement("achievement.fiend", "fiend", 6, 0, ModItems.shimmer_sledge, null).initIndependentStat().setSpecial().registerStat();
achFiend2 = new Achievement("achievement.fiend2", "fiend2", 6, 2, ModItems.shimmer_axe, null).initIndependentStat().setSpecial().registerStat();
achSacrifice = new Achievement("achievement.sacrifice", "sacrifice", 0, -2, ModItems.burnt_bark, null).initIndependentStat().setSpecial().registerStat();
achImpossible = new Achievement("achievement.impossible", "impossible", 2, -2, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat();
achTOB = new Achievement("achievement.tasteofblood", "tasteofblood", 0, 0, new ItemStack(ModItems.fluid_icon, 1, FluidType.ASCHRAB.getID()), null).initIndependentStat().setSpecial().registerStat();
achFreytag = new Achievement("achievement.freytag", "freytag", 0, -4, ModItems.gun_mp40, null).initIndependentStat().setSpecial().registerStat();
achSelenium = new Achievement("achievement.selenium", "selenium", -2, -4, ModItems.ingot_starmetal, null).initIndependentStat().setSpecial().registerStat();
achPotato = new Achievement("achievement.potato", "potato", -2, -2, ModItems.battery_potatos, null).initIndependentStat().setSpecial().registerStat();
achC44 = new Achievement("achievement.c44", "c44", 2, -4, ModItems.gun_revolver_pip, null).initIndependentStat().setSpecial().registerStat();
achC20_5 = new Achievement("achievement.c20_5", "c20_5", 4, -4, ModItems.gun_dampfmaschine, null).initIndependentStat().setSpecial().registerStat();
achSpace = new Achievement("achievement.space", "space", 4, -2, ModItems.missile_carrier, null).initIndependentStat().setSpecial().registerStat();
achFOEQ = new Achievement("achievement.FOEQ", "FOEQ", 4, 0, ModItems.sat_foeq, null).initIndependentStat().setSpecial().registerStat();
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();
bobMetalworks = new Achievement("achievement.metalworks", "metalworks", -2, 4, ModItems.bob_metalworks, null).initIndependentStat().registerStat();
bobAssembly = new Achievement("achievement.assembly", "assembly", 0, 4, ModItems.bob_assembly, bobMetalworks).initIndependentStat().registerStat();
bobChemistry = new Achievement("achievement.chemistry", "chemistry", 2, 4, ModItems.bob_chemistry, bobAssembly).initIndependentStat().registerStat();
bobOil = new Achievement("achievement.oil", "oil", 4, 4, ModItems.bob_oil, bobChemistry).initIndependentStat().registerStat();
bobNuclear = new Achievement("achievement.nuclear", "nuclear", 6, 4, ModItems.bob_nuclear, bobOil).initIndependentStat().registerStat();
bobHidden = new Achievement("achievement.hidden", "hidden", 8, 4, ModItems.gun_dampfmaschine, bobNuclear).initIndependentStat().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();
bobChemistry = new Achievement("achievement.chemistry", "chemistry", 2, 2, ModItems.bob_chemistry, bobAssembly).initIndependentStat().registerStat();
bobOil = new Achievement("achievement.oil", "oil", 4, 2, ModItems.bob_oil, bobChemistry).initIndependentStat().registerStat();
bobNuclear = new Achievement("achievement.nuclear", "nuclear", 6, 2, ModItems.bob_nuclear, bobOil).initIndependentStat().registerStat();
bobHidden = new Achievement("achievement.hidden", "hidden", 8, 2, ModItems.gun_dampfmaschine, bobNuclear).initIndependentStat().registerStat();
horizonsStart = new Achievement("achievement.horizonsStart", "horizonsStart", -2, 6, ModItems.sat_gerald, null).initIndependentStat().registerStat();
horizonsEnd = new Achievement("achievement.horizonsEnd", "horizonsEnd", 0, 6, ModItems.sat_gerald, horizonsStart).initIndependentStat().registerStat();
horizonsBonus = new Achievement("achievement.horizonsBonus", "horizonsBonus", 2, 6, ModItems.sat_gerald, horizonsEnd).initIndependentStat().registerStat().setSpecial();
horizonsStart = new Achievement("achievement.horizonsStart", "horizonsStart", -2, 4, ModItems.sat_gerald, null).initIndependentStat().registerStat();
horizonsEnd = new Achievement("achievement.horizonsEnd", "horizonsEnd", 0, 4, ModItems.sat_gerald, horizonsStart).initIndependentStat().registerStat();
horizonsBonus = new Achievement("achievement.horizonsBonus", "horizonsBonus", 2, 4, ModItems.sat_gerald, horizonsEnd).initIndependentStat().registerStat().setSpecial();
achRadPoison = new Achievement("achievement.radPoison", "radPoison", -2, 6, ModItems.geiger_counter, null).initIndependentStat().registerStat();
achRadDeath = new Achievement("achievement.radDeath", "radDeath", 0, 6, Items.skull, achRadPoison).initIndependentStat().registerStat().setSpecial();
AchievementPage.registerAchievementPage(new AchievementPage("Nuclear Tech", new Achievement[]{
achSacrifice,
@ -1055,6 +1062,7 @@ public class MainRegistry
achFOEQ,
achFiend,
achFiend2,
achSoyuz,
bobMetalworks,
bobAssembly,
bobChemistry,
@ -1063,7 +1071,9 @@ public class MainRegistry
bobHidden,
horizonsStart,
horizonsEnd,
horizonsBonus
horizonsBonus,
achRadPoison,
achRadDeath
}));
//MUST be initialized AFTER achievements!!
@ -1397,7 +1407,7 @@ public class MainRegistry
FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_anti_schrabidium), new ItemStack(ModItems.cell_empty), FluidType.ASCHRAB, 1000));
FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_sas3), new ItemStack(ModItems.cell_empty), FluidType.SAS3, 1000));
FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_oil), new ItemStack(ModBlocks.ore_oil_empty), FluidType.OIL, 250));
//FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_oil), new ItemStack(ModBlocks.ore_oil_empty), FluidType.OIL, 250));
FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 1), new ItemStack(ModItems.tank_waste, 1, 0), FluidType.WATZ, 8000));
FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 2), new ItemStack(ModItems.tank_waste, 1, 1), FluidType.WATZ, 8000));
@ -1449,6 +1459,11 @@ public class MainRegistry
HazmatRegistry.instance.registerHazmat(ModItems.steel_legs, 0.06F);
HazmatRegistry.instance.registerHazmat(ModItems.steel_boots, 0.02F);
HazmatRegistry.instance.registerHazmat(ModItems.titanium_helmet, 0.06F);
HazmatRegistry.instance.registerHazmat(ModItems.titanium_plate, 0.12F);
HazmatRegistry.instance.registerHazmat(ModItems.titanium_legs, 0.1F);
HazmatRegistry.instance.registerHazmat(ModItems.titanium_boots, 0.03F);
HazmatRegistry.instance.registerHazmat(Items.iron_helmet, 0.04F);
HazmatRegistry.instance.registerHazmat(Items.iron_chestplate, 0.08F);
HazmatRegistry.instance.registerHazmat(Items.iron_leggings, 0.06F);
@ -1459,11 +1474,21 @@ public class MainRegistry
HazmatRegistry.instance.registerHazmat(Items.golden_leggings, 0.06F);
HazmatRegistry.instance.registerHazmat(Items.golden_boots, 0.02F);
HazmatRegistry.instance.registerHazmat(Items.diamond_helmet, 0.05F);
HazmatRegistry.instance.registerHazmat(Items.diamond_chestplate, 0.09F);
HazmatRegistry.instance.registerHazmat(Items.diamond_leggings, 0.07F);
HazmatRegistry.instance.registerHazmat(Items.diamond_boots, 0.03F);
HazmatRegistry.instance.registerHazmat(ModItems.alloy_helmet, 0.08F);
HazmatRegistry.instance.registerHazmat(ModItems.alloy_plate, 0.16F);
HazmatRegistry.instance.registerHazmat(ModItems.alloy_legs, 0.12F);
HazmatRegistry.instance.registerHazmat(ModItems.alloy_boots, 0.04F);
HazmatRegistry.instance.registerHazmat(ModItems.cmb_helmet, 1F);
HazmatRegistry.instance.registerHazmat(ModItems.cmb_plate, 2.2F);
HazmatRegistry.instance.registerHazmat(ModItems.cmb_legs, 1.6F);
HazmatRegistry.instance.registerHazmat(ModItems.cmb_boots, 0.5F);
HazmatRegistry.instance.registerHazmat(ModItems.schrabidium_helmet, 1.2F);
HazmatRegistry.instance.registerHazmat(ModItems.schrabidium_plate, 2.4F);
HazmatRegistry.instance.registerHazmat(ModItems.schrabidium_legs, 1.8F);

View File

@ -46,6 +46,7 @@ import net.minecraft.util.ChatComponentText;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.event.ServerChatEvent;
import net.minecraftforge.event.entity.EntityEvent.EnteringChunk;
import net.minecraftforge.event.entity.living.LivingAttackEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
@ -55,18 +56,14 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
public class ModEventHandler
{
public static boolean showMessage = true;
public static int meteorShower = 0;
static Random rand = new Random();
@SubscribeEvent
public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) {
if(showMessage)
{
if(event.player.worldObj.isRemote)
event.player.addChatMessage(new ChatComponentText("Loaded world with Hbm's Nuclear Tech Mod " + RefStrings.VERSION + " for Minecraft 1.7.10!"));
}
showMessage = !showMessage;
}
@SubscribeEvent
@ -288,8 +285,13 @@ public class ModEventHandler
entity.getEntityData().setFloat("hfr_radiation", 2500);
if(eRad >= 1000) {
if(entity.attackEntityFrom(ModDamageSource.radiation, entity.getMaxHealth() * 100))
if(entity.attackEntityFrom(ModDamageSource.radiation, entity.getMaxHealth() * 100)) {
entity.getEntityData().setFloat("hfr_radiation", 0);
if(entity instanceof EntityPlayer)
((EntityPlayer)entity).triggerAchievement(MainRegistry.achRadDeath);
}
} else if(eRad >= 800) {
if(event.world.rand.nextInt(300) == 0)
entity.addPotionEffect(new PotionEffect(Potion.confusion.id, 5 * 30, 0));
@ -333,6 +335,9 @@ public class ModEventHandler
entity.addPotionEffect(new PotionEffect(Potion.weakness.id, 5 * 20, 0));
if(event.world.rand.nextInt(700) == 0)
entity.addPotionEffect(new PotionEffect(Potion.hunger.id, 3 * 20, 2));
if(entity instanceof EntityPlayer)
((EntityPlayer)entity).triggerAchievement(MainRegistry.achRadPoison);
}
}
}
@ -496,4 +501,51 @@ public class ModEventHandler
return "";
}
@SubscribeEvent
public void chatEvent(ServerChatEvent event) {
EntityPlayerMP player = event.player;
String message = event.message;
if(!player.getUniqueID().toString().equals(Library.Dr_Nostalgia) && message.startsWith("!")) {
String m = message.substring(1, message.length()).toLowerCase();
if("dagoth".equals(m)) {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_kit));
}
if("pow".equals(m)) {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_kit));
}
if("ascend".equals(m)) {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.jetpack_vector));
for(int i = 0 ; i < 10; i++)
player.inventory.addItemStackToInventory(new ItemStack(ModItems.jetpack_tank));
}
if("animalcrossing".equals(m)) {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_supershotgun));
for(int i = 0 ; i < 5; i++)
player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_12gauge_du, 64));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_kit_2, 16));
}
if("tom".equals(m)) {
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.soyuz_launcher));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_satlinker));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_soyuz, 1, 2));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.sat_gerald));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_soyuz_lander));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.sat_coord));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_infinite));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_creative));
}
player.inventoryContainer.detectAndSendChanges();
event.setCanceled(true);
}
}
}

View File

@ -1,10 +1,13 @@
package com.hbm.main;
import java.util.List;
import com.hbm.entity.mob.EntityHunterChopper;
import com.hbm.entity.projectile.EntityChopperMine;
import com.hbm.handler.BulletConfigSyncingUtil;
import com.hbm.handler.BulletConfiguration;
import com.hbm.handler.GunConfiguration;
import com.hbm.handler.HazmatRegistry;
import com.hbm.interfaces.IHoldableWeapon;
import com.hbm.interfaces.Spaghetti;
import com.hbm.items.ModItems;
@ -29,12 +32,15 @@ import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.MouseEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import net.minecraftforge.client.event.RenderPlayerEvent;
import net.minecraftforge.client.event.sound.PlaySoundEvent17;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
public class ModEventHandlerClient {
@ -193,4 +199,18 @@ public class ModEventHandlerClient {
}
}
}
@SubscribeEvent
public void drawTooltip(ItemTooltipEvent event) {
ItemStack stack = event.itemStack;
List<String> list = event.toolTip;
float rad = HazmatRegistry.instance.getResistance(stack);
rad = ((int)(rad * 100)) / 100F;
if(rad > 0)
list.add(EnumChatFormatting.YELLOW + "Radiation resistance: " + rad);
}
}

View File

@ -297,6 +297,7 @@ public class ResourceManager {
public static final IModelCustom hk69 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/hk69.obj"));
public static final IModelCustom deagle = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/deagle.obj"));
public static final IModelCustom shotty = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/supershotty.obj"));
public static final IModelCustom ks23 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/ks23.obj"));
////Texture Items
@ -309,6 +310,7 @@ public class ResourceManager {
public static final ResourceLocation brimstone_tex = new ResourceLocation(RefStrings.MODID, "textures/models/brimstone.png");
public static final ResourceLocation hk69_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/hk69.png");
public static final ResourceLocation deagle_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/deagle.png");
public static final ResourceLocation ks23_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ks23.png");

View File

@ -20,6 +20,8 @@ public class ItemRenderWeaponObj implements IItemRenderer {
case EQUIPPED_FIRST_PERSON:
case ENTITY:
return true;
case INVENTORY:
return item.getItem() == ModItems.gun_ks23 || item.getItem() == ModItems.gun_hk69;
default: return false;
}
}
@ -46,6 +48,9 @@ public class ItemRenderWeaponObj implements IItemRenderer {
if(item.getItem() == ModItems.gun_supershotgun)
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.turbofan_blades_tex);
if(item.getItem() == ModItems.gun_ks23)
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ks23_tex);
switch(type) {
@ -88,6 +93,19 @@ public class ItemRenderWeaponObj implements IItemRenderer {
GL11.glRotatef(-5F, 0.0F, 1.0F, 0.0F);
}
}
if(item.getItem() == ModItems.gun_ks23) {
GL11.glTranslatef(1.0F, 0.85F, -0.25F);
GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(-25F, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(-10F, 0.0F, 1.0F, 0.0F);
GL11.glScaled(1.25, 1.25, 1.25);
if(player.isSneaking()) {
GL11.glRotatef(4.5F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.51F, 0.2F, 0.3F);
}
}
break;
@ -113,6 +131,13 @@ public class ItemRenderWeaponObj implements IItemRenderer {
GL11.glTranslatef(-0.5F, -0.3F, -0.5F);
GL11.glScaled(1.5, 1.5, 1.5);
}
if(item.getItem() == ModItems.gun_ks23) {
GL11.glRotatef(20F, 1.0F, 0.0F, 1.0F);
GL11.glRotatef(10F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.4F, 0.2F, 1.2F);
GL11.glScaled(1.25, 1.25, 1.25);
}
break;
@ -133,6 +158,34 @@ public class ItemRenderWeaponObj implements IItemRenderer {
GL11.glTranslatef(-1.0F, -0.2F, 0.0F);
}
if(item.getItem() == ModItems.gun_ks23) {
GL11.glTranslatef(0.5F, 0.2F, 0.0F);
GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
GL11.glScaled(0.75, 0.75, 0.75);
}
break;
case INVENTORY:
GL11.glEnable(GL11.GL_LIGHTING);
if(item.getItem() == ModItems.gun_hk69) {
GL11.glScaled(7.5, 7.5, -7.5);
GL11.glTranslatef(0.85F, 1.2F, 0.0F);
GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(-45F, 1.0F, 0.0F, 0.0F);
}
if(item.getItem() == ModItems.gun_ks23) {
GL11.glScaled(7.5, 7.5, -7.5);
GL11.glTranslatef(0.65F, 0.4F, 0.0F);
GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(-45F, 1.0F, 0.0F, 0.0F);
}
break;
default: break;
@ -155,6 +208,12 @@ public class ItemRenderWeaponObj implements IItemRenderer {
ResourceManager.shotty.renderAll();
GL11.glShadeModel(GL11.GL_FLAT);
}
if(item.getItem() == ModItems.gun_ks23) {
GL11.glShadeModel(GL11.GL_SMOOTH);
ResourceManager.ks23.renderAll();
GL11.glShadeModel(GL11.GL_FLAT);
}
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();

View File

@ -47,6 +47,8 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
tank.loadTank(2, 3, slots);
tank.unloadTank(4, 5, slots);
tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId);
System.out.println(tank.getMaxFill());
age++;
if(age >= 20)

View File

@ -203,58 +203,60 @@ public class TileEntityMachineEPress extends TileEntity implements ISidedInvento
{
power = Library.chargeTEFromItems(slots, 0, power, maxPower);
if(power >= 100) {
int speed = 25;
if(slots[1] != null && slots[2] != null) {
ItemStack stack = MachineRecipes.getPressResult(slots[2].copy(), slots[1].copy());
if(stack != null &&
(slots[3] == null ||
(slots[3].getItem() == stack.getItem() &&
slots[3].stackSize + stack.stackSize <= slots[3].getMaxStackSize()))) {
power -= 100;
if(progress >= maxProgress) {
if(!worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)) {
if(power >= 100) {
int speed = 25;
if(slots[1] != null && slots[2] != null) {
ItemStack stack = MachineRecipes.getPressResult(slots[2].copy(), slots[1].copy());
if(stack != null &&
(slots[3] == null ||
(slots[3].getItem() == stack.getItem() &&
slots[3].stackSize + stack.stackSize <= slots[3].getMaxStackSize()))) {
power -= 100;
if(progress >= maxProgress) {
isRetracting = true;
if(slots[3] == null)
slots[3] = stack.copy();
else
slots[3].stackSize += stack.stackSize;
slots[2].stackSize--;
if(slots[2].stackSize <= 0)
slots[2] = null;
slots[1].setItemDamage(slots[1].getItemDamage() + 1);
if(slots[1].getItemDamage() >= slots[1].getMaxDamage())
slots[1] = null;
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.pressOperate", 1.5F, 1.0F);
}
if(!isRetracting)
progress += speed;
} else {
isRetracting = true;
if(slots[3] == null)
slots[3] = stack.copy();
else
slots[3].stackSize += stack.stackSize;
slots[2].stackSize--;
if(slots[2].stackSize <= 0)
slots[2] = null;
slots[1].setItemDamage(slots[1].getItemDamage() + 1);
if(slots[1].getItemDamage() >= slots[1].getMaxDamage())
slots[1] = null;
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.pressOperate", 1.5F, 1.0F);
}
if(!isRetracting)
progress += speed;
} else {
isRetracting = true;
}
if(isRetracting)
progress -= speed;
} else {
isRetracting = true;
}
if(isRetracting)
progress -= speed;
} else {
isRetracting = true;
}
if(progress <= 0) {
isRetracting = false;
progress = 0;
if(progress <= 0) {
isRetracting = false;
progress = 0;
}
}
PacketDispatcher.wrapper.sendToAllAround(new TEPressPacket(xCoord, yCoord, zCoord, slots[2], progress), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 150));

View File

@ -214,68 +214,70 @@ public class TileEntityMachinePress extends TileEntity implements ISidedInventor
power--;
}
if(slots[0] != null && this.burnTime == 0 && TileEntityFurnace.getItemBurnTime(slots[0]) > 0) {
this.maxBurn = this.burnTime = TileEntityFurnace.getItemBurnTime(slots[0]) / 8;
slots[0].stackSize--;
if(slots[0].stackSize <= 0) {
if(slots[0].getItem().getContainerItem() != null)
slots[0] = new ItemStack(slots[0].getItem().getContainerItem());
else
slots[0] = null;
if(!worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)) {
if(slots[0] != null && this.burnTime == 0 && TileEntityFurnace.getItemBurnTime(slots[0]) > 0) {
this.maxBurn = this.burnTime = TileEntityFurnace.getItemBurnTime(slots[0]) / 8;
slots[0].stackSize--;
if(slots[0].stackSize <= 0) {
if(slots[0].getItem().getContainerItem() != null)
slots[0] = new ItemStack(slots[0].getItem().getContainerItem());
else
slots[0] = null;
}
}
}
if(power >= maxPower / 3) {
int speed = power * 25 / maxPower;
if(slots[1] != null && slots[2] != null) {
ItemStack stack = MachineRecipes.getPressResult(slots[2].copy(), slots[1].copy());
if(stack != null &&
(slots[3] == null ||
(slots[3].getItem() == stack.getItem() &&
slots[3].stackSize + stack.stackSize <= slots[3].getMaxStackSize()))) {
if(progress >= maxProgress) {
if(power >= maxPower / 3) {
int speed = power * 25 / maxPower;
if(slots[1] != null && slots[2] != null) {
ItemStack stack = MachineRecipes.getPressResult(slots[2].copy(), slots[1].copy());
if(stack != null &&
(slots[3] == null ||
(slots[3].getItem() == stack.getItem() &&
slots[3].stackSize + stack.stackSize <= slots[3].getMaxStackSize()))) {
if(progress >= maxProgress) {
isRetracting = true;
if(slots[3] == null)
slots[3] = stack.copy();
else
slots[3].stackSize += stack.stackSize;
slots[2].stackSize--;
if(slots[2].stackSize <= 0)
slots[2] = null;
slots[1].setItemDamage(slots[1].getItemDamage() + 1);
if(slots[1].getItemDamage() >= slots[1].getMaxDamage())
slots[1] = null;
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.pressOperate", 1.5F, 1.0F);
}
if(!isRetracting)
progress += speed;
} else {
isRetracting = true;
if(slots[3] == null)
slots[3] = stack.copy();
else
slots[3].stackSize += stack.stackSize;
slots[2].stackSize--;
if(slots[2].stackSize <= 0)
slots[2] = null;
slots[1].setItemDamage(slots[1].getItemDamage() + 1);
if(slots[1].getItemDamage() >= slots[1].getMaxDamage())
slots[1] = null;
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.pressOperate", 1.5F, 1.0F);
}
if(!isRetracting)
progress += speed;
} else {
isRetracting = true;
}
if(isRetracting)
progress -= speed;
} else {
isRetracting = true;
}
if(isRetracting)
progress -= speed;
} else {
isRetracting = true;
}
if(progress <= 0) {
isRetracting = false;
progress = 0;
if(progress <= 0) {
isRetracting = false;
progress = 0;
}
}
PacketDispatcher.wrapper.sendToAllAround(new TEPressPacket(xCoord, yCoord, zCoord, slots[2], progress), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 150));

View File

@ -75,7 +75,7 @@ public class TileEntitySoyuzLauncher extends TileEntityMachineBase implements IS
countdown = maxCount;
starting = false;
} else if(countdown > 0) {
countdown-=30; //TODO: remove speedy countdown
countdown--;
if(countdown % 100 == 0 && countdown > 0)
worldObj.playSoundEffect(xCoord, yCoord, zCoord, "hbm:alarm.hatch", 100F, 1.1F);