More turrets, chemplant fix, debug fluid textures, prep for beta release

This commit is contained in:
HbmMods 2017-08-12 19:11:15 +02:00
parent 59db5b8b02
commit 267fe135f2
34 changed files with 2307 additions and 39 deletions

View File

@ -30,6 +30,8 @@ hbmfluid.heatingoil=Heizöl
hbmfluid.naphtha=Mitteldestillat
hbmfluid.lightoil=Leichtöl
hbmfluid.petroleum=Petroleumgas
hbmfluid.acid=Wasserstoffperoxid
hbmfluid.watz=Giftiger Schlamm
chem.TEST=Test
chem.FP_HEAVYOIL=Schwerölverarbeitung
@ -42,10 +44,17 @@ chem.FC_I_NAPHTHA=Industriöl-Cracking
chem.FC_GAS_PETROLEUM=Erdgas-Cracking
chem.FC_DIESEL_KEROSENE=Diesel-Cracking
chem.FC_KEROSENE_PETROLEUM=Kerosin-Cracking
chem.CC_I=Erweitertes Kohle-Cracking
chem.CC_HEATING=Fortgeschrittenes Kohle-Cracking
chem.CC_HEAVY=Einfaches Kohle-Cracking
chem.CC_NAPHTHA=Naphtha-Kohle-Cracking
chem.CC_OIL=Kohleverflüssigung
chem.CC_I=Erweiterte Kohleverflüssigung
chem.CC_HEATING=Fortgeschrittene Kohleverflüssigung
chem.CC_HEAVY=Einfache Kohleverflüssigung
chem.CC_NAPHTHA=Naphtha-Kohleverflüssigung
chem.ASPHALT=Asphaltherstellung
chem.COOLANT=Kühlflüssigkeit mischen
chem.DESH=Deshherstellung
chem.PEROXIDE=Wasserstoffperoxidherstellung
chem.CIRCUIT_4=Überstaktete Schaltkreisherstellung
chem.CIRCUIT_4=Leistungsstarke Schaltkreisherstellung
item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core
item.record.ss.desc=Valve - Sector Sweep
@ -137,6 +146,13 @@ tile.nuke_fleija.name=F.L.E.I.J.A.
tile.nuke_prototype.name=Der Prototyp
tile.nuke_custom.name=Anpassbare Bombe
tile.turret_light.name=Leichtes MG-Geschütz
tile.turret_heavy.name=Schweres MG-Geschütz
tile.turret_rocket.name=Raketengeschütz
tile.turret_flamer.name=Flammenwerfergeschütz
tile.turret_tau.name=Tauonengeschütz
item.turret_control.name=Geschützsteuerung
tile.bomb_multi.name=Mehrzweckbombe
tile.flame_war.name=Flamewar aus der Box
@ -211,6 +227,7 @@ tile.gas_duct.name=Gasleitung
tile.gas_duct_solid.name=Verstärkte Gasleitung
tile.machine_drill.name=Automatischer Minenbohrer
container.miningDrill=Automatischer Minenbohrer
tile.drill_pipe.name=Bohrgestänge
tile.machine_assembler.name=Fertigungsmaschine
container.assembler=Fertigungsmaschine
tile.machine_chemplant.name=Chemiefabrik
@ -355,6 +372,9 @@ item.nugget_verticium.name=Verticiumnugget
item.ingot_desh.name=Deshbarren
item.nugget_desh.name=Deshnugget
item.powder_desh.name=Deshstaub
item.powder_desh_mix.name=Deshmischung
item.solid_fuel.name=Festbrennstoff
item.nugget_u235.name=U235-Nugget
item.nugget_u238.name=U238-Nugget

View File

@ -30,6 +30,8 @@ hbmfluid.heatingoil=Heating Oil
hbmfluid.naphtha=Naphtha
hbmfluid.lightoil=Light Oil
hbmfluid.petroleum=Petroleum Gas
hbmfluid.acid=Hydrogen Peroxide
hbmfluid.watz=Poisonous Mud
chem.TEST=Test
chem.FP_HEAVYOIL=Heavy Oil Processing
@ -42,10 +44,17 @@ chem.FC_I_NAPHTHA=Industrial Oil Cracking
chem.FC_GAS_PETROLEUM=Gas Cracking
chem.FC_DIESEL_KEROSENE=Diesel Cracking
chem.FC_KEROSENE_PETROLEUM=Kerosene Cracking
chem.CC_I=Enhanced Coal Cracking
chem.CC_HEATING=Advanced Coal Cracking
chem.CC_HEAVY=Basic Coal Cracking
chem.CC_NAPHTHA=Naphtha Coal Cracking
chem.CC_OIL=Coal Liquefaction
chem.CC_I=Enhanced Coal Liquefaction
chem.CC_HEATING=Advanced Coal Liquefaction
chem.CC_HEAVY=Basic Coal Liquefaction
chem.CC_NAPHTHA=Naphtha Coal Liquefaction
chem.ASPHALT=Asphalt Production
chem.COOLANT=Coolant Mixing
chem.DESH=Desh Production
chem.PEROXIDE=Hydrogen Peroxide Production
chem.CIRCUIT_4=Overclocked Circuit Production
chem.CIRCUIT_5=High Performance Circuit Production
item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core
item.record.ss.desc=Valve - Sector Sweep
@ -146,6 +155,13 @@ tile.therm_exo.name=Exothermic Bomb
tile.crashed_bomb.name=Dud
tile.turret_light.name=Light Machine Gun Turret
tile.turret_heavy.name=Heavy Machine Gun Turret
tile.turret_rocket.name=Rocket Turret
tile.turret_flamer.name=Flamethrower Turret
tile.turret_tau.name=Tauon Turret
item.turret_control.name=Turret Controller
tile.crate.name=Supply Crate
tile.marker_structure.name=Multiblock Structure Marker
@ -211,6 +227,7 @@ tile.gas_duct.name=Gas Pipe
tile.gas_duct_solid.name=Coated Gas Pipe
tile.machine_drill.name=Automatic Mining Drill
container.miningDrill=Automatic Mining Drill
tile.drill_pipe.name=Drill Pipe
tile.machine_assembler.name=Assembly Machine
container.assembler=Assembly Machine
tile.machine_chemplant.name=Chemical Plant
@ -355,6 +372,9 @@ item.nugget_verticium.name=Verticium Nugget
item.ingot_desh.name=Desh Ingot
item.nugget_desh.name=Desh Nugget
item.powder_desh.name=Desh Powder
item.powder_desh_mix.name=Desh Mixture
item.solid_fuel.name=Solid Fuel
item.nugget_u235.name=U235 Nugget
item.nugget_u238.name=U238 Nugget

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,400 @@
# Blender v2.76 (sub 0) OBJ File: 'turret_tau_gun.blend'
# www.blender.org
o Cube.001_Cube
v 0.200000 0.200000 -0.400000
v 0.200000 -0.075000 -0.400000
v 0.200000 0.200000 0.400000
v 0.200000 -0.200000 0.400000
v -0.200000 0.200000 -0.400000
v -0.200000 -0.075000 -0.400000
v -0.200000 0.200000 0.400000
v -0.200000 -0.200000 0.400000
v 0.000000 0.112500 0.400000
v 0.000000 0.150000 0.900000
v 0.097428 0.056250 0.400000
v 0.129904 0.075000 0.900000
v 0.097428 -0.056250 0.400000
v 0.129904 -0.075000 0.900000
v -0.000000 -0.112500 0.400000
v -0.000000 -0.150000 0.900000
v -0.097428 -0.056250 0.400000
v -0.129904 -0.075000 0.900000
v -0.097428 0.056250 0.400000
v -0.129904 0.075000 0.900000
v 0.000000 0.150000 0.650000
v 0.129904 0.075000 0.650000
v 0.129904 0.075000 0.900000
v 0.000000 0.150000 0.900000
v 0.129904 -0.075000 0.650000
v 0.129904 -0.075000 0.900000
v -0.000000 -0.150000 0.650000
v -0.000000 -0.150000 0.900000
v -0.129904 -0.075000 0.650000
v -0.129904 -0.075000 0.900000
v -0.129904 0.075000 0.650000
v -0.129904 0.075000 0.900000
v 0.012990 0.142500 0.675000
v 0.012990 0.142500 0.875000
v 0.116913 0.082500 0.875000
v 0.116913 0.082500 0.675000
v 0.129904 0.060000 0.675000
v 0.129904 0.060000 0.875000
v 0.129904 -0.060000 0.875000
v 0.129904 -0.060000 0.675000
v 0.116913 -0.082500 0.675000
v 0.116913 -0.082500 0.875000
v 0.012990 -0.142500 0.875000
v 0.012990 -0.142500 0.675000
v -0.012990 -0.142500 0.675000
v -0.012990 -0.142500 0.875000
v -0.116913 -0.082500 0.875000
v -0.116913 -0.082500 0.675000
v -0.116913 0.082500 0.675000
v -0.116913 0.082500 0.875000
v -0.012990 0.142500 0.875000
v -0.012990 0.142500 0.675000
v -0.129904 -0.060000 0.675000
v -0.129904 -0.060000 0.875000
v -0.129904 0.060000 0.875000
v -0.129904 0.060000 0.675000
v 0.000490 0.120849 0.675000
v 0.000490 0.120849 0.875000
v 0.104413 0.060849 0.875000
v 0.104413 0.060849 0.675000
v 0.104904 0.060000 0.675000
v 0.104904 0.060000 0.875000
v 0.104904 -0.060000 0.875000
v 0.104904 -0.060000 0.675000
v 0.104413 -0.060849 0.675000
v 0.104413 -0.060849 0.875000
v 0.000490 -0.120849 0.875000
v 0.000490 -0.120849 0.675000
v -0.000490 -0.120849 0.675000
v -0.000490 -0.120849 0.875000
v -0.104413 -0.060849 0.875000
v -0.104413 -0.060849 0.675000
v -0.104413 0.060849 0.675000
v -0.104413 0.060849 0.875000
v -0.000490 0.120849 0.875000
v -0.000490 0.120849 0.675000
v -0.104904 -0.060000 0.675000
v -0.104904 -0.060000 0.875000
v -0.104904 0.060000 0.875000
v -0.104904 0.060000 0.675000
v 0.000000 0.025000 0.900000
v 0.000000 0.025000 1.400000
v 0.021651 0.012500 0.900000
v 0.021651 0.012500 1.400000
v 0.021651 -0.012500 0.900000
v 0.021651 -0.012500 1.400000
v -0.000000 -0.025000 0.900000
v -0.000000 -0.025000 1.400000
v -0.021651 -0.012500 0.900000
v -0.021651 -0.012500 1.400000
v -0.021651 0.012500 0.900000
v -0.021651 0.012500 1.400000
v -0.050000 -0.086603 1.300000
v -0.100000 0.000000 1.050000
v -0.070711 -0.000000 0.979289
v 0.000000 -0.000000 0.950000
v 0.050000 -0.086603 1.300000
v -0.050000 0.086603 1.050000
v -0.035355 0.061237 0.979289
v 0.100000 0.000000 1.300000
v 0.050000 0.086603 1.050000
v 0.035355 0.061237 0.979289
v 0.050000 0.086603 1.300000
v 0.100000 0.000000 1.050000
v 0.070711 -0.000000 0.979289
v -0.050000 0.086603 1.300000
v 0.050000 -0.086603 1.050000
v 0.035355 -0.061237 0.979289
v -0.100000 0.000000 1.300000
v -0.050000 -0.086603 1.050000
v -0.035355 -0.061237 0.979289
v -0.125000 0.250000 0.050000
v -0.125000 -0.050000 0.050000
v -0.375000 -0.000000 -0.100000
v 0.375000 0.000000 -0.100000
v -0.375000 -0.070711 -0.070711
v 0.375000 -0.070711 -0.070711
v -0.375000 -0.100000 0.000000
v 0.375000 -0.100000 0.000000
v -0.375000 -0.070711 0.070711
v 0.375000 -0.070711 0.070711
v -0.375000 -0.000000 0.100000
v 0.375000 0.000000 0.100000
v -0.375000 0.070711 0.070711
v 0.375000 0.070711 0.070711
v -0.375000 0.100000 -0.000000
v 0.375000 0.100000 -0.000000
v -0.375000 0.070711 -0.070711
v 0.375000 0.070711 -0.070711
v -0.125000 -0.050000 -0.450000
v -0.125000 0.250000 -0.450000
v 0.125000 -0.050000 0.050000
v 0.125000 0.250000 0.050000
v 0.125000 -0.050000 -0.450000
v 0.125000 0.250000 -0.450000
vn 0.000000 1.000000 0.000000
vn 0.000000 -0.988000 -0.154400
vn 0.000000 0.000000 1.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 0.000000 -1.000000
vn -1.000000 0.000000 0.000000
vn 0.495800 -0.858800 -0.128800
vn 0.495800 0.858800 -0.128800
vn -0.495800 -0.858800 -0.128800
vn -0.991700 0.000000 -0.128800
vn -0.495800 0.858800 -0.128800
vn 0.991700 -0.000000 -0.128800
vn 0.500000 0.866000 0.000000
vn 0.500000 -0.866000 0.000000
vn -0.500000 -0.866000 0.000000
vn -0.500000 0.866000 0.000000
vn 0.866000 -0.500000 0.000000
vn -0.866000 0.500000 0.000000
vn -0.000000 -1.000000 0.000000
vn -0.866000 -0.500000 0.000000
vn 0.866000 0.500000 0.000000
vn -0.815200 0.470600 -0.337700
vn 0.000000 0.941300 -0.337700
vn 0.815200 0.470600 -0.337700
vn 0.815200 -0.470600 -0.337700
vn 0.000000 -0.941300 -0.337700
vn -0.373700 0.215700 -0.902100
vn 0.000000 0.431500 -0.902100
vn 0.373700 0.215700 -0.902100
vn 0.373700 -0.215700 -0.902100
vn 0.000000 -0.431500 -0.902100
vn -0.815200 -0.470600 -0.337700
vn -0.373700 -0.215700 -0.902100
vn 0.000000 -0.382700 -0.923900
vn 0.000000 -0.923900 -0.382700
vn 0.000000 -0.923900 0.382700
vn 0.000000 -0.382700 0.923900
vn -0.000000 0.382700 0.923900
vn -0.000000 0.923900 0.382700
vn -0.000000 0.382700 -0.923900
vn -0.000000 0.923900 -0.382700
s off
f 1//1 5//1 7//1
f 6//2 2//2 4//2
f 7//3 8//3 4//3
f 3//4 4//4 2//4
f 1//5 2//5 6//5
f 7//6 5//6 6//6
f 13//7 25//7 27//7
f 9//8 21//8 22//8
f 20//3 10//3 24//3
f 15//9 27//9 29//9
f 10//3 16//3 14//3
f 17//10 29//10 31//10
f 19//11 31//11 21//11
f 18//3 20//3 32//3
f 13//12 11//12 22//12
f 16//3 18//3 30//3
f 10//3 12//3 23//3
f 14//3 16//3 28//3
f 12//3 14//3 26//3
f 34//13 33//13 21//13
f 35//13 34//13 24//13
f 22//13 36//13 35//13
f 33//13 36//13 22//13
f 38//4 37//4 22//4
f 26//4 39//4 38//4
f 25//4 40//4 39//4
f 37//4 40//4 25//4
f 42//14 41//14 25//14
f 43//14 42//14 26//14
f 27//14 44//14 43//14
f 41//14 44//14 27//14
f 46//15 45//15 27//15
f 47//15 46//15 28//15
f 29//15 48//15 47//15
f 45//15 48//15 29//15
f 50//16 49//16 31//16
f 24//16 51//16 50//16
f 21//16 52//16 51//16
f 49//16 52//16 21//16
f 54//6 53//6 29//6
f 55//6 54//6 30//6
f 31//6 56//6 55//6
f 53//6 56//6 31//6
f 58//13 59//13 60//13
f 58//17 57//17 33//17
f 35//5 59//5 58//5
f 60//18 59//18 35//18
f 57//3 60//3 36//3
f 62//4 63//4 64//4
f 62//19 61//19 37//19
f 63//5 62//5 38//5
f 64//1 63//1 39//1
f 37//3 61//3 64//3
f 66//14 67//14 68//14
f 66//20 65//20 41//20
f 67//5 66//5 42//5
f 68//21 67//21 43//21
f 65//3 68//3 44//3
f 70//15 71//15 72//15
f 70//18 69//18 45//18
f 71//5 70//5 46//5
f 72//17 71//17 47//17
f 45//3 69//3 72//3
f 74//16 75//16 76//16
f 74//21 73//21 49//21
f 75//5 74//5 50//5
f 76//20 75//20 51//20
f 49//3 73//3 76//3
f 78//6 79//6 80//6
f 78//1 77//1 53//1
f 79//5 78//5 54//5
f 80//19 79//19 55//19
f 77//3 80//3 56//3
f 82//13 84//13 83//13
f 84//4 86//4 85//4
f 86//14 88//14 87//14
f 88//15 90//15 89//15
f 82//3 88//3 86//3
f 92//16 82//16 81//16
f 90//6 92//6 91//6
f 94//22 98//22 99//22
f 98//23 101//23 102//23
f 101//24 104//24 105//24
f 104//25 107//25 108//25
f 107//26 110//26 111//26
f 96//27 95//27 99//27
f 96//28 99//28 102//28
f 94//18 109//18 106//18
f 106//1 103//1 101//1
f 96//29 102//29 105//29
f 94//20 110//20 93//20
f 96//30 105//30 108//30
f 104//17 100//17 97//17
f 96//31 108//31 111//31
f 111//32 110//32 94//32
f 110//19 107//19 97//19
f 96//33 111//33 95//33
f 115//34 117//34 116//34
f 117//35 119//35 118//35
f 135//1 131//1 112//1
f 119//36 121//36 120//36
f 130//19 134//19 132//19
f 121//37 123//37 122//37
f 112//3 113//3 132//3
f 123//38 125//38 124//38
f 133//4 132//4 134//4
f 125//39 127//39 126//39
f 135//5 134//5 130//5
f 129//40 115//40 114//40
f 127//41 129//41 128//41
f 131//6 130//6 113//6
f 3//1 1//1 7//1
f 8//2 6//2 4//2
f 3//3 7//3 4//3
f 1//4 3//4 2//4
f 5//5 1//5 6//5
f 8//6 7//6 6//6
f 15//7 13//7 27//7
f 11//8 9//8 22//8
f 32//3 20//3 24//3
f 17//9 15//9 29//9
f 14//3 12//3 10//3
f 10//3 20//3 18//3
f 18//3 16//3 10//3
f 19//10 17//10 31//10
f 9//11 19//11 21//11
f 30//3 18//3 32//3
f 25//12 13//12 22//12
f 28//3 16//3 30//3
f 24//3 10//3 23//3
f 26//3 14//3 28//3
f 23//3 12//3 26//3
f 24//13 34//13 21//13
f 23//13 35//13 24//13
f 23//13 22//13 35//13
f 21//13 33//13 22//13
f 23//4 38//4 22//4
f 23//4 26//4 38//4
f 26//4 25//4 39//4
f 22//4 37//4 25//4
f 26//14 42//14 25//14
f 28//14 43//14 26//14
f 28//14 27//14 43//14
f 25//14 41//14 27//14
f 28//15 46//15 27//15
f 30//15 47//15 28//15
f 30//15 29//15 47//15
f 27//15 45//15 29//15
f 32//16 50//16 31//16
f 32//16 24//16 50//16
f 24//16 21//16 51//16
f 31//16 49//16 21//16
f 30//6 54//6 29//6
f 32//6 55//6 30//6
f 32//6 31//6 55//6
f 29//6 53//6 31//6
f 57//13 58//13 60//13
f 34//17 58//17 33//17
f 34//5 35//5 58//5
f 36//18 60//18 35//18
f 33//3 57//3 36//3
f 61//4 62//4 64//4
f 38//19 62//19 37//19
f 39//5 63//5 38//5
f 40//1 64//1 39//1
f 40//3 37//3 64//3
f 65//14 66//14 68//14
f 42//20 66//20 41//20
f 43//5 67//5 42//5
f 44//21 68//21 43//21
f 41//3 65//3 44//3
f 69//15 70//15 72//15
f 46//18 70//18 45//18
f 47//5 71//5 46//5
f 48//17 72//17 47//17
f 48//3 45//3 72//3
f 73//16 74//16 76//16
f 50//21 74//21 49//21
f 51//5 75//5 50//5
f 52//20 76//20 51//20
f 52//3 49//3 76//3
f 77//6 78//6 80//6
f 54//1 78//1 53//1
f 55//5 79//5 54//5
f 56//19 80//19 55//19
f 53//3 77//3 56//3
f 81//13 82//13 83//13
f 83//4 84//4 85//4
f 85//14 86//14 87//14
f 87//15 88//15 89//15
f 86//3 84//3 82//3
f 82//3 92//3 90//3
f 90//3 88//3 82//3
f 91//16 92//16 81//16
f 89//6 90//6 91//6
f 95//22 94//22 99//22
f 99//23 98//23 102//23
f 102//24 101//24 105//24
f 105//25 104//25 108//25
f 108//26 107//26 111//26
f 98//18 94//18 106//18
f 98//1 106//1 101//1
f 109//20 94//20 93//20
f 107//17 104//17 97//17
f 95//32 111//32 94//32
f 93//19 110//19 97//19
f 114//34 115//34 116//34
f 116//35 117//35 118//35
f 133//1 135//1 112//1
f 118//36 119//36 120//36
f 113//19 130//19 132//19
f 120//37 121//37 122//37
f 133//3 112//3 132//3
f 122//38 123//38 124//38
f 135//4 133//4 134//4
f 124//39 125//39 126//39
f 131//5 135//5 130//5
f 128//40 129//40 114//40
f 126//41 127//41 128//41
f 112//6 131//6 113//6

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 300 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 249 B

View File

@ -366,6 +366,8 @@ public class ModBlocks {
public static Block turret_light;
public static Block turret_heavy;
public static Block turret_rocket;
public static Block turret_flamer;
public static Block turret_tau;
public static Block book_guide;
@ -669,6 +671,8 @@ public class ModBlocks {
turret_light = new TurretLight(Material.iron).setBlockName("turret_light").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":turret_light");
turret_heavy = new TurretHeavy(Material.iron).setBlockName("turret_heavy").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":turret_heavy");
turret_rocket = new TurretRocket(Material.iron).setBlockName("turret_rocket").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":turret_rocket");
turret_flamer = new TurretFlamer(Material.iron).setBlockName("turret_flamer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":turret_flamer");
turret_tau = new TurretTau(Material.iron).setBlockName("turret_tau").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":turret_tau");
book_guide = new Guide(Material.iron).setBlockName("book_guide").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke);
@ -879,6 +883,8 @@ public class ModBlocks {
GameRegistry.registerBlock(turret_light, turret_light.getUnlocalizedName());
GameRegistry.registerBlock(turret_heavy, turret_heavy.getUnlocalizedName());
GameRegistry.registerBlock(turret_rocket, turret_rocket.getUnlocalizedName());
GameRegistry.registerBlock(turret_flamer, turret_flamer.getUnlocalizedName());
GameRegistry.registerBlock(turret_tau, turret_tau.getUnlocalizedName());
//Block Bombs
GameRegistry.registerBlock(flame_war, flame_war.getUnlocalizedName());

View File

@ -0,0 +1,66 @@
package com.hbm.blocks.bomb;
import com.hbm.entity.particle.EntityGasFlameFX;
import com.hbm.entity.projectile.EntityBullet;
import com.hbm.entity.projectile.EntityFire;
import com.hbm.tileentity.TileEntityTurretFlamer;
import com.hbm.tileentity.TileEntityTurretHeavy;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public class TurretFlamer extends TurretBase {
public TurretFlamer(Material mat) {
super(mat);
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileEntityTurretFlamer();
}
@Override
public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
if(pitch < -60)
pitch = -60;
if(pitch > 30)
pitch = 30;
if(true) {
Vec3 vector = Vec3.createVectorHelper(
-Math.sin(yaw / 180.0F * (float) Math.PI) * Math.cos(pitch / 180.0F * (float) Math.PI),
-Math.sin(pitch / 180.0F * (float) Math.PI),
Math.cos(yaw / 180.0F * (float) Math.PI) * Math.cos(pitch / 180.0F * (float) Math.PI));
vector.normalize();
if(!world.isRemote) {
EntityFire bullet = new EntityFire(world);
bullet.posX = x + vector.xCoord * 2 + 0.5;
bullet.posY = y + vector.yCoord * 2 + 1;
bullet.posZ = z + vector.zCoord * 2 + 0.5;
bullet.motionX = vector.xCoord * 3;
bullet.motionY = vector.yCoord * 3;
bullet.motionZ = vector.zCoord * 3;
bullet.setDamage(6 + rand.nextInt(5));
world.spawnEntityInWorld(bullet);
}
if(i == 0)
world.playSoundEffect(x, y, z, "hbm:weapon.flamethrowerIgnite", 1.0F, 1.0F);
else
world.playSoundEffect(x, y, z, "hbm:weapon.flamethrowerShoot", 1.0F, 1.0F);
}
}
@Override
public void executeReleaseAction(World world, int i, double yaw, double pitch, int x, int y, int z) { }
}

View File

@ -0,0 +1,63 @@
package com.hbm.blocks.bomb;
import com.hbm.entity.particle.EntityGasFlameFX;
import com.hbm.entity.projectile.EntityBullet;
import com.hbm.tileentity.TileEntityTurretHeavy;
import com.hbm.tileentity.TileEntityTurretTau;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public class TurretTau extends TurretBase {
public TurretTau(Material mat) {
super(mat);
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileEntityTurretTau();
}
@Override
public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
if(pitch < -60)
pitch = -60;
if(pitch > 30)
pitch = 30;
if(i != 0 && i % 4 == 0) {
Vec3 vector = Vec3.createVectorHelper(
-Math.sin(yaw / 180.0F * (float) Math.PI) * Math.cos(pitch / 180.0F * (float) Math.PI),
-Math.sin(pitch / 180.0F * (float) Math.PI),
Math.cos(yaw / 180.0F * (float) Math.PI) * Math.cos(pitch / 180.0F * (float) Math.PI));
vector.normalize();
if(!world.isRemote) {
EntityBullet bullet = new EntityBullet(world);
bullet.setIsCritical(true);
bullet.posX = x + vector.xCoord * 2 + 0.5;
bullet.posY = y + vector.yCoord * 2 + 1;
bullet.posZ = z + vector.zCoord * 2 + 0.5;
bullet.motionX = vector.xCoord * 3;
bullet.motionY = vector.yCoord * 3;
bullet.motionZ = vector.zCoord * 3;
bullet.setDamage(25 + rand.nextInt(65 - 25));
world.spawnEntityInWorld(bullet);
}
world.playSoundEffect(x, y, z, "hbm:weapon.tauShoot", 1.0F, 0.5F);
}
}
@Override
public void executeReleaseAction(World world, int i, double yaw, double pitch, int x, int y, int z) { }
}

View File

@ -6,7 +6,7 @@ public class FluidTypeHandler {
NONE (0x888888, 8947848, 0, 1, "hbmfluid.none"),
WATER (0x3333FF, 3355647, 1, 1, "hbmfluid.water"),
STEAM (0x3333FF, 3355647, 1, 1, "hbmfluid.steam"),
STEAM (0x020202, 3355647, 9, 1, "hbmfluid.steam"),
COOLANT (0xd8fcff, 14220543, 2, 1, "hbmfluid.coolant"),
LAVA (0xFF3300, 16724736, 3, 1, "hbmfluid.lava"),
@ -15,7 +15,7 @@ public class FluidTypeHandler {
TRITIUM (0x000099, 153, 5, 1, "hbmfluid.tritium"),
OIL (0x020202, 131586, 6, 1, "hbmfluid.oil"),
HOTOIL (0x020202, 131586, 6, 1, "hbmfluid.hotoil"),
HOTOIL (0x020202, 131586, 8, 1, "hbmfluid.hotoil"),
HEAVYOIL (0x141312, 1315602, 2, 2, "hbmfluid.heavyoil"),
BITUMEN (0x1f2426, 2040870, 3, 2, "hbmfluid.bitumen"),
@ -40,7 +40,10 @@ public class FluidTypeHandler {
PUF6 (0x4C4C4C, 5000268, 15, 1, "hbmfluid.puf6"),
AMAT (0x010101, 65793, 0, 2, "hbmfluid.amat"),
ASCHRAB (0xb50000, 11862016, 1, 2, "hbmfluid.aschrab");
ASCHRAB (0xb50000, 11862016, 1, 2, "hbmfluid.aschrab"),
ACID (0x020202, 11862016, 10, 2, "hbmfluid.acid"),
WATZ (0x020202, 11862016, 11, 2, "hbmfluid.watz");
private int color;

View File

@ -12,20 +12,8 @@ public class FuelHandler implements IFuelHandler {
@Override
public int getBurnTime(ItemStack fuel) {
if(fuel.getItem().equals(ModItems.canister_oil))
if(fuel.getItem().equals(ModItems.solid_fuel))
return 3200;
if(fuel.getItem().equals(ModItems.canister_smear))
return 6400;
if(fuel.getItem().equals(ModItems.canister_reoil))
return 9600;
if(fuel.getItem().equals(ModItems.canister_petroil))
return 9200;
if(fuel.getItem().equals(ModItems.canister_canola))
return 4800;
if(fuel.getItem().equals(ModItems.canister_fuel))
return 3200;
if(fuel.getItem().equals(ModItems.canister_kerosene))
return 2400;
if(fuel.getItem().equals(ModItems.powder_coal))
return 1600;
if(fuel.getItem().equals(ModItems.scrap))
@ -34,8 +22,6 @@ public class FuelHandler implements IFuelHandler {
return 400;
if(fuel.getItem().equals(ModItems.powder_fire))
return 6400;
if(fuel.getItem().equals(Item.getItemFromBlock(ModBlocks.red_barrel)))
return 32000;
if(fuel.getItem().equals(Item.getItemFromBlock(ModBlocks.block_scrap)))
return 8000;

View File

@ -1756,11 +1756,13 @@ public class MachineRecipes {
list.add(new ItemStack(ModItems.circuit_aluminium, 1));
list.add(new ItemStack(ModItems.wire_copper, 6));
list.add(new ItemStack(ModItems.powder_quartz, 4));
list.add(new ItemStack(ModItems.plate_copper, 1));
break;
case CIRCUIT_3:
list.add(new ItemStack(ModItems.circuit_copper, 1));
list.add(new ItemStack(ModItems.wire_red_copper, 6));
list.add(new ItemStack(ModItems.powder_gold, 4));
list.add(new ItemStack(ModItems.ingot_polymer, 1));
break;
case RTG_PELLET:
list.add(new ItemStack(ModItems.nugget_pu238, 5));
@ -2489,10 +2491,10 @@ public class MachineRecipes {
Map<Object, Object[]> recipes = new HashMap<Object, Object[]>();
recipes.put(new ItemStack(ModItems.canister_oil, 1) , new ItemStack[] {
new ItemStack(ModItems.canister_smear, 1),
new ItemStack(ModItems.canister_canola, 1),
new ItemStack(ModItems.canister_fuel, 1),
new ItemStack(ModItems.canister_kerosene, 1),
new ItemStack(ModItems.canister_heavyoil, 1),
new ItemStack(ModItems.canister_naphtha, 1),
new ItemStack(ModItems.canister_lightoil, 1),
new ItemStack(ModItems.gas_petroleum, 1),
new ItemStack(ModItems.sulfur, 1) });
return recipes;
@ -2511,6 +2513,9 @@ public class MachineRecipes {
list.add(new ItemStack(Items.gold_ingot, 2));
list.add(new ItemStack(Items.coal, 8));
break;
case CC_OIL:
list.add(new ItemStack(Items.coal, 10));
break;
case CC_I:
list.add(new ItemStack(Items.coal, 8));
break;
@ -2523,6 +2528,28 @@ public class MachineRecipes {
case CC_NAPHTHA:
list.add(new ItemStack(Items.coal, 10));
break;
case ASPHALT:
list.add(new ItemStack(Blocks.gravel, 2));
list.add(new ItemStack(Blocks.sand, 6));
break;
case COOLANT:
list.add(new ItemStack(ModItems.niter, 1));
break;
case DESH:
list.add(new ItemStack(ModItems.powder_desh_mix, 2));
break;
case CIRCUIT_4:
list.add(new ItemStack(ModItems.circuit_red_copper, 1));
list.add(new ItemStack(ModItems.wire_gold, 6));
list.add(new ItemStack(ModItems.powder_lapis, 4));
list.add(new ItemStack(ModItems.ingot_desh, 1));
break;
case CIRCUIT_5:
list.add(new ItemStack(ModItems.circuit_gold, 1));
list.add(new ItemStack(ModItems.wire_schrabidium, 6));
list.add(new ItemStack(ModItems.powder_diamond, 4));
list.add(new ItemStack(ModItems.powder_power, 1));
break;
default:
break;
}
@ -2584,6 +2611,10 @@ public class MachineRecipes {
input[0] = new FluidStack(800, FluidType.SMEAR);
input[1] = new FluidStack(1800, FluidType.WATER);
break;
case CC_OIL:
input[0] = new FluidStack(600, FluidType.OIL);
input[1] = new FluidStack(1400, FluidType.STEAM);
break;
case CC_HEATING:
input[0] = new FluidStack(800, FluidType.HEATINGOIL);
input[1] = new FluidStack(2000, FluidType.STEAM);
@ -2596,6 +2627,26 @@ public class MachineRecipes {
input[0] = new FluidStack(1200, FluidType.NAPHTHA);
input[1] = new FluidStack(2400, FluidType.STEAM);
break;
case ASPHALT:
input[0] = new FluidStack(8000, FluidType.BITUMEN);
break;
case COOLANT:
input[0] = new FluidStack(1800, FluidType.WATER);
break;
case DESH:
input[0] = new FluidStack(800, FluidType.ACID);
input[1] = new FluidStack(200, FluidType.LIGHTOIL);
break;
case PEROXIDE:
input[0] = new FluidStack(1000, FluidType.WATER);
break;
case CIRCUIT_4:
input[0] = new FluidStack(400, FluidType.ACID);
break;
case CIRCUIT_5:
input[0] = new FluidStack(800, FluidType.ACID);
input[1] = new FluidStack(400, FluidType.PETROLEUM);
break;
default:
break;
}
@ -2615,6 +2666,21 @@ public class MachineRecipes {
output[0] = new ItemStack(ModItems.ingot_steel);
output[1] = new ItemStack(ModItems.ingot_desh, 2);
break;
case ASPHALT:
output[0] = new ItemStack(ModBlocks.asphalt, 4);
output[1] = new ItemStack(ModBlocks.asphalt, 4);
output[2] = new ItemStack(ModBlocks.asphalt, 4);
output[3] = new ItemStack(ModBlocks.asphalt, 4);
break;
case DESH:
output[0] = new ItemStack(ModItems.ingot_desh, 1);
break;
case CIRCUIT_4:
output[0] = new ItemStack(ModItems.circuit_gold, 1);
break;
case CIRCUIT_5:
output[0] = new ItemStack(ModItems.circuit_schrabidium, 1);
break;
default:
break;
}
@ -2667,6 +2733,9 @@ public class MachineRecipes {
case FC_KEROSENE_PETROLEUM:
input[0] = new FluidStack(800, FluidType.PETROLEUM);
break;
case CC_OIL:
input[0] = new FluidStack(1000, FluidType.OIL);
break;
case CC_I:
input[0] = new FluidStack(800, FluidType.SMEAR);
break;
@ -2679,6 +2748,12 @@ public class MachineRecipes {
case CC_NAPHTHA:
input[0] = new FluidStack(2000, FluidType.NAPHTHA);
break;
case COOLANT:
input[0] = new FluidStack(2000, FluidType.COOLANT);
break;
case PEROXIDE:
input[0] = new FluidStack(800, FluidType.ACID);
break;
default:
break;
}

View File

@ -134,6 +134,8 @@ public class ModItems {
public static Item ingot_lanthanium;
public static Item ingot_actinium;
public static Item solid_fuel;
public static Item powder_lead;
public static Item powder_neptunium;
public static Item powder_schrabidium;
@ -196,6 +198,7 @@ public class ModItems {
public static Item powder_lanthanium;
public static Item powder_actinium;
public static Item powder_desh;
public static Item powder_desh_mix;
public static Item fragment_neodymium;
public static Item fragment_cobalt;
@ -535,6 +538,7 @@ public class ModItems {
public static Item assembly_template;
public static Item chemistry_template;
public static Item fluid_identifier;
public static Item fluid_icon;
public static Item missile_generic;
public static Item missile_anti_ballistic;
@ -1067,6 +1071,8 @@ public class ModItems {
ingot_lanthanium = new ItemCustomLore().setUnlocalizedName("ingot_lanthanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_lanthanium");
ingot_actinium = new ItemCustomLore().setUnlocalizedName("ingot_actinium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_actinium");
solid_fuel = new Item().setUnlocalizedName("solid_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":solid_fuel");
ingot_australium = new ItemCustomLore().setUnlocalizedName("ingot_australium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_australium");
ingot_weidanium = new ItemCustomLore().setUnlocalizedName("ingot_weidanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_weidanium");
@ -1130,7 +1136,7 @@ public class ModItems {
powder_red_copper = new Item().setUnlocalizedName("powder_red_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_red_copper");
powder_steel = new Item().setUnlocalizedName("powder_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_steel");
powder_lithium = new Item().setUnlocalizedName("powder_lithium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lithium");
powder_power = new ItemCustomLore().setUnlocalizedName("powder_power").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_energy");
powder_power = new ItemCustomLore().setUnlocalizedName("powder_power").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_energy_alt");
powder_iodine = new ItemCustomLore().setUnlocalizedName("powder_iodine").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_iodine");
powder_thorium = new ItemCustomLore().setUnlocalizedName("powder_thorium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_thorium");
powder_neodymium = new ItemCustomLore().setUnlocalizedName("powder_neodymium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neodymium");
@ -1152,6 +1158,7 @@ public class ModItems {
powder_polymer = new ItemCustomLore().setUnlocalizedName("powder_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_polymer");
powder_lanthanium = new ItemCustomLore().setUnlocalizedName("powder_lanthanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lanthanium");
powder_actinium = new ItemCustomLore().setUnlocalizedName("powder_actinium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_actinium");
powder_desh_mix = new Item().setUnlocalizedName("powder_desh_mix").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_desh_mix");
powder_desh = new Item().setUnlocalizedName("powder_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_desh");
powder_lithium_tiny = new Item().setUnlocalizedName("powder_lithium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lithium_tiny");
powder_neodymium_tiny = new Item().setUnlocalizedName("powder_neodymium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neodymium_tiny");
@ -1712,11 +1719,12 @@ public class ModItems {
chopper = new ItemChopper().setUnlocalizedName("chopper").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":chopper");
linker = new ItemTeleLink().setUnlocalizedName("linker").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":linker");
oil_detector = new ItemOilDetector().setUnlocalizedName("oil_detector").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":oil_detector");
turret_control = new ItemTurretControl().setUnlocalizedName("turret_control").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_control");
turret_control = new ItemTurretControl().setUnlocalizedName("turret_control").setFull3D().setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_control");
assembly_template = new ItemAssemblyTemplate().setUnlocalizedName("assembly_template").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":assembly_template");
chemistry_template = new ItemChemistryTemplate().setUnlocalizedName("chemistry_template").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":chemistry_template");
fluid_identifier = new ItemFluidIdentifier().setUnlocalizedName("fluid_identifier").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":fluid_identifier");
fluid_icon = new ItemFluidIcon().setUnlocalizedName("fluid_icon").setCreativeTab(null).setTextureName(RefStrings.MODID + ":fluid_icon");
fluid_tank_full = new ItemFluidTank().setUnlocalizedName("fluid_tank_full").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fluid_tank");
fluid_tank_empty = new Item().setUnlocalizedName("fluid_tank_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fluid_tank");
fluid_barrel_full = new ItemFluidTank().setUnlocalizedName("fluid_barrel_full").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fluid_barrel");
@ -2007,6 +2015,7 @@ public class ModItems {
//Dusts & Other
GameRegistry.registerItem(lithium, lithium.getUnlocalizedName());
GameRegistry.registerItem(solid_fuel, solid_fuel.getUnlocalizedName());
GameRegistry.registerItem(sulfur, sulfur.getUnlocalizedName());
GameRegistry.registerItem(niter, niter.getUnlocalizedName());
GameRegistry.registerItem(fluorite, fluorite.getUnlocalizedName());
@ -2054,6 +2063,7 @@ public class ModItems {
GameRegistry.registerItem(powder_cerium, powder_cerium.getUnlocalizedName());
GameRegistry.registerItem(powder_lanthanium, powder_lanthanium.getUnlocalizedName());
GameRegistry.registerItem(powder_actinium, powder_actinium.getUnlocalizedName());
GameRegistry.registerItem(powder_desh_mix, powder_desh_mix.getUnlocalizedName());
GameRegistry.registerItem(powder_desh, powder_desh.getUnlocalizedName());
GameRegistry.registerItem(dust, dust.getUnlocalizedName());
GameRegistry.registerItem(powder_lithium_tiny, powder_lithium_tiny.getUnlocalizedName());
@ -2365,6 +2375,7 @@ public class ModItems {
//Machine Templates
GameRegistry.registerItem(fluid_identifier, fluid_identifier.getUnlocalizedName());
GameRegistry.registerItem(fluid_icon, fluid_icon.getUnlocalizedName());
GameRegistry.registerItem(assembly_template, assembly_template.getUnlocalizedName());
GameRegistry.registerItem(chemistry_template, chemistry_template.getUnlocalizedName());

View File

@ -24,8 +24,9 @@ public class ItemChemistryTemplate extends Item {
//CC - Coal Cracking
TEST, FP_HEAVYOIL, FP_SMEAR, FP_NAPHTHA, FP_LIGHTOIL, FR_REOIL, FR_PETROIL,
FC_I_NAPHTHA, FC_GAS_PETROLEUM, FC_DIESEL_KEROSENE, FC_KEROSENE_PETROLEUM, CC_I,
CC_HEATING, CC_HEAVY, CC_NAPHTHA;
FC_I_NAPHTHA, FC_GAS_PETROLEUM, FC_DIESEL_KEROSENE, FC_KEROSENE_PETROLEUM, CC_OIL,
CC_I, CC_HEATING, CC_HEAVY, CC_NAPHTHA, ASPHALT, COOLANT, DESH, PEROXIDE, CIRCUIT_4,
CIRCUIT_5;
public static EnumChemistryTemplate getEnum(int i) {
if(i < EnumChemistryTemplate.values().length)
@ -99,6 +100,8 @@ public class ItemChemistryTemplate extends Item {
return 150;
case FC_KEROSENE_PETROLEUM:
return 150;
case CC_OIL:
return 150;
case CC_I:
return 200;
case CC_HEATING:
@ -107,6 +110,18 @@ public class ItemChemistryTemplate extends Item {
return 200;
case CC_NAPHTHA:
return 300;
case ASPHALT:
return 100;
case COOLANT:
return 50;
case DESH:
return 300;
case PEROXIDE:
return 50;
case CIRCUIT_4:
return 200;
case CIRCUIT_5:
return 250;
default:
return 100;
}

View File

@ -0,0 +1,92 @@
package com.hbm.items.tool;
import java.util.List;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.items.tool.ItemChemistryTemplate.EnumChemistryTemplate;
import com.hbm.tileentity.TileEntityFluidDuct;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.resources.I18n;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
public class ItemFluidIcon extends Item {
IIcon overlayIcon;
public ItemFluidIcon()
{
this.setHasSubtypes(true);
this.setMaxDamage(0);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list)
{
for (int i = 0; i < FluidType.values().length; ++i)
{
list.add(new ItemStack(item, 1, i));
}
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool)
{
super.addInformation(stack, player, list, bool);
}
public String getItemStackDisplayName(ItemStack stack)
{
String s = (I18n.format(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim();
if (s != null)
{
return s;
}
return "Unknown";
}
/*
* @Override
*
* @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() {
* return true; }
*
* @Override
*
* @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister
* p_94581_1_) { super.registerIcons(p_94581_1_);
*
* this.overlayIcon =
* p_94581_1_.registerIcon("hbm:fluid_identifier_overlay"); }
*
* @Override
*
* @SideOnly(Side.CLIENT) public IIcon getIconFromDamageForRenderPass(int
* p_77618_1_, int p_77618_2_) { return p_77618_2_ == 1 ? this.overlayIcon :
* super.getIconFromDamageForRenderPass(p_77618_1_, p_77618_2_); }
*/
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int p_82790_2_) {
int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor();
if (j < 0) {
j = 16777215;
}
return j;
}
}

View File

@ -179,6 +179,7 @@ import com.hbm.render.tileentity.RenderCyclotron;
import com.hbm.render.tileentity.RenderDecoBlock;
import com.hbm.render.tileentity.RenderDecoBlockAlt;
import com.hbm.render.tileentity.RenderDerrick;
import com.hbm.render.tileentity.RenderFlamerTurret;
import com.hbm.render.tileentity.RenderFluidDuct;
import com.hbm.render.tileentity.RenderFluidTank;
import com.hbm.render.tileentity.RenderGasDuct;
@ -208,6 +209,7 @@ import com.hbm.render.tileentity.RenderRotationTester;
import com.hbm.render.tileentity.RenderSteelPoles;
import com.hbm.render.tileentity.RenderStructureMaker;
import com.hbm.render.tileentity.RenderTapeRecorder;
import com.hbm.render.tileentity.RenderTauTurret;
import com.hbm.render.tileentity.RenderTestBombAdvanced;
import com.hbm.render.tileentity.RenderTestContainer;
import com.hbm.render.tileentity.RenderTestMissile;
@ -259,9 +261,11 @@ import com.hbm.tileentity.TileEntityStructureMarker;
import com.hbm.tileentity.TileEntityTestBombAdvanced;
import com.hbm.tileentity.TileEntityTestContainer;
import com.hbm.tileentity.TileEntityTestRender;
import com.hbm.tileentity.TileEntityTurretFlamer;
import com.hbm.tileentity.TileEntityTurretHeavy;
import com.hbm.tileentity.TileEntityTurretLight;
import com.hbm.tileentity.TileEntityTurretRocket;
import com.hbm.tileentity.TileEntityTurretTau;
import com.hbm.tileentity.TileEntityYellowBarrel;
import cpw.mods.fml.client.registry.ClientRegistry;
@ -308,6 +312,8 @@ public class ClientProxy extends ServerProxy
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretHeavy.class, new RenderHeavyTurret());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretRocket.class, new RenderRocketTurret());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretLight.class, new RenderLightTurret());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretFlamer.class, new RenderFlamerTurret());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretTau.class, new RenderTauTurret());
//RenderingRegistry.registerEntityRenderingHandler(EntityRocket.class, new RenderRocket());
RenderingRegistry.registerEntityRenderingHandler(EntityRocket.class, new RenderSnowball(ModItems.man_core));

View File

@ -195,9 +195,11 @@ import com.hbm.tileentity.TileEntityTestBombAdvanced;
import com.hbm.tileentity.TileEntityTestContainer;
import com.hbm.tileentity.TileEntityTestNuke;
import com.hbm.tileentity.TileEntityTestRender;
import com.hbm.tileentity.TileEntityTurretFlamer;
import com.hbm.tileentity.TileEntityTurretHeavy;
import com.hbm.tileentity.TileEntityTurretLight;
import com.hbm.tileentity.TileEntityTurretRocket;
import com.hbm.tileentity.TileEntityTurretTau;
import com.hbm.tileentity.TileEntityWatzCore;
import com.hbm.tileentity.TileEntityWireCoated;
import com.hbm.tileentity.TileEntityYellowBarrel;
@ -479,6 +481,8 @@ public class MainRegistry
GameRegistry.registerTileEntity(TileEntityTurretHeavy.class, "tileentity_turret_heavy");
GameRegistry.registerTileEntity(TileEntityTurretRocket.class, "tileentity_turret_rocket");
GameRegistry.registerTileEntity(TileEntityTurretLight.class, "tileentity_turret_light");
GameRegistry.registerTileEntity(TileEntityTurretFlamer.class, "tileentity_turret_flamer");
GameRegistry.registerTileEntity(TileEntityTurretTau.class, "tileentity_turret_tau");
EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true);
EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true);
@ -812,6 +816,7 @@ public class MainRegistry
FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(Items.water_bucket), new ItemStack(Items.bucket), FluidType.WATER, 1000));
FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket), FluidType.LAVA, 1000));
FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_mud), new ItemStack(Items.bucket), FluidType.WATZ, 1000));
FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.rod_water), new ItemStack(ModItems.rod_empty), FluidType.WATER, 1000));
FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.rod_dual_water), new ItemStack(ModItems.rod_dual_empty), FluidType.WATER, 2000));

View File

@ -13,9 +13,11 @@ public class ResourceManager {
//Turrets
public static final IModelCustom turret_heavy_base = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_heavy_base.obj"));
public static final IModelCustom turret_heavy_rotor = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_heavy_rotor.obj"));
public static final IModelCustom turret_heavy_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_heavy_gun.obj"));
public static final IModelCustom turret_rocket_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_rocket_gun.obj"));
public static final IModelCustom turret_light_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_light_gun.obj"));
public static final IModelCustom turret_flamer_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_flamer_gun.obj"));
public static final IModelCustom turret_tau_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_tau_gun.obj"));
}

View File

@ -0,0 +1,77 @@
package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import com.hbm.tileentity.TileEntityTurretBase;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
public class RenderFlamerTurret extends TileEntitySpecialRenderer {
public RenderFlamerTurret() { }
private ResourceLocation gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png");
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
{
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glRotatef(180, 0F, 1F, 0F);
double yaw = 0;
double pitch = 0;
if(tileEntity instanceof TileEntityTurretBase) {
yaw = ((TileEntityTurretBase)tileEntity).rotationYaw;
pitch = ((TileEntityTurretBase)tileEntity).rotationPitch;
}
this.bindTexture(gadgetTexture);
ResourceManager.turret_heavy_base.renderAll();
GL11.glPopMatrix();
renderTileEntityAt2(tileEntity, x, y, z, f, yaw, pitch);
}
public void renderTileEntityAt2(TileEntity tileEntity, double x, double y, double z, float f, double yaw, double pitch)
{
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glRotatef(180, 0F, 1F, 0F);
GL11.glRotated(yaw + 180, 0F, -1F, 0F);
this.bindTexture(gadgetTexture);
ResourceManager.turret_heavy_rotor.renderAll();
GL11.glPopMatrix();
renderTileEntityAt3(tileEntity, x, y, z, f, yaw, pitch);
}
public void renderTileEntityAt3(TileEntity tileEntity, double x, double y, double z, float f, double yaw, double pitch)
{
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y + 1, z + 0.5D);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glRotatef(180, 0F, 1F, 0F);
GL11.glRotated(yaw + 180, 0F, -1F, 0F);
GL11.glRotated(pitch, 1F, 0F, 0F);
this.bindTexture(gadgetTexture);
ResourceManager.turret_flamer_gun.renderAll();
GL11.glPopMatrix();
}
}

View File

@ -0,0 +1,77 @@
package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import com.hbm.tileentity.TileEntityTurretBase;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
public class RenderTauTurret extends TileEntitySpecialRenderer {
public RenderTauTurret() { }
private ResourceLocation gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png");
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
{
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glRotatef(180, 0F, 1F, 0F);
double yaw = 0;
double pitch = 0;
if(tileEntity instanceof TileEntityTurretBase) {
yaw = ((TileEntityTurretBase)tileEntity).rotationYaw;
pitch = ((TileEntityTurretBase)tileEntity).rotationPitch;
}
this.bindTexture(gadgetTexture);
ResourceManager.turret_heavy_base.renderAll();
GL11.glPopMatrix();
renderTileEntityAt2(tileEntity, x, y, z, f, yaw, pitch);
}
public void renderTileEntityAt2(TileEntity tileEntity, double x, double y, double z, float f, double yaw, double pitch)
{
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glRotatef(180, 0F, 1F, 0F);
GL11.glRotated(yaw + 180, 0F, -1F, 0F);
this.bindTexture(gadgetTexture);
ResourceManager.turret_heavy_rotor.renderAll();
GL11.glPopMatrix();
renderTileEntityAt3(tileEntity, x, y, z, f, yaw, pitch);
}
public void renderTileEntityAt3(TileEntity tileEntity, double x, double y, double z, float f, double yaw, double pitch)
{
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y + 1, z + 0.5D);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glRotatef(180, 0F, 1F, 0F);
GL11.glRotated(yaw + 180, 0F, -1F, 0F);
GL11.glRotated(pitch, 1F, 0F, 0F);
this.bindTexture(gadgetTexture);
ResourceManager.turret_tau_gun.renderAll();
GL11.glPopMatrix();
}
}

View File

@ -485,10 +485,10 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
if(sta7 != null)
sta7.stackSize = 1;
if(slots[5] == null || stacks[0] == null || (stacks[0] != null && ItemStack.areItemStacksEqual(sta0, sta1) && ItemStack.areItemStackTagsEqual(sta0, sta1) && slots[5].stackSize + stacks[0].stackSize <= slots[5].getMaxStackSize()) &&
slots[6] == null || stacks[1] == null || (stacks[1] != null && ItemStack.areItemStacksEqual(sta2, sta3) && ItemStack.areItemStackTagsEqual(sta2, sta3) && slots[6].stackSize + stacks[1].stackSize <= slots[6].getMaxStackSize()) &&
slots[7] == null || stacks[2] == null || (stacks[2] != null && ItemStack.areItemStacksEqual(sta4, sta5) && ItemStack.areItemStackTagsEqual(sta4, sta5) && slots[7].stackSize + stacks[2].stackSize <= slots[7].getMaxStackSize()) &&
slots[8] == null || stacks[3] == null || (stacks[3] != null && ItemStack.areItemStacksEqual(sta6, sta7) && ItemStack.areItemStackTagsEqual(sta6, sta7) && slots[8].stackSize + stacks[3].stackSize <= slots[8].getMaxStackSize()))
if((slots[5] == null || stacks[0] == null || (stacks[0] != null && ItemStack.areItemStacksEqual(sta0, sta1) && ItemStack.areItemStackTagsEqual(sta0, sta1) && slots[5].stackSize + stacks[0].stackSize <= slots[5].getMaxStackSize())) &&
(slots[6] == null || stacks[1] == null || (stacks[1] != null && ItemStack.areItemStacksEqual(sta2, sta3) && ItemStack.areItemStackTagsEqual(sta2, sta3) && slots[6].stackSize + stacks[1].stackSize <= slots[6].getMaxStackSize())) &&
(slots[7] == null || stacks[2] == null || (stacks[2] != null && ItemStack.areItemStacksEqual(sta4, sta5) && ItemStack.areItemStackTagsEqual(sta4, sta5) && slots[7].stackSize + stacks[2].stackSize <= slots[7].getMaxStackSize())) &&
(slots[8] == null || stacks[3] == null || (stacks[3] != null && ItemStack.areItemStacksEqual(sta6, sta7) && ItemStack.areItemStackTagsEqual(sta6, sta7) && slots[8].stackSize + stacks[3].stackSize <= slots[8].getMaxStackSize())))
return true;
return false;

View File

@ -0,0 +1,10 @@
package com.hbm.tileentity;
import com.hbm.entity.particle.EntityGasFlameFX;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Vec3;
public class TileEntityTurretFlamer extends TileEntityTurretBase {
}

View File

@ -0,0 +1,7 @@
package com.hbm.tileentity;
import net.minecraft.tileentity.TileEntity;
public class TileEntityTurretTau extends TileEntityTurretBase {
}