xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lil' Pipsqueak, boxcars, compromiss for 100% green cloud probability

Browse Source
This commit is contained in:
HbmMods 2017-12-15 18:22:53 +01:00
parent e5a080b43e
commit 84cf942ed0
64 changed files with 5565 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
assets/hbm/lang/de_DE.lang
View File

@ -119,6 +119,7 @@ death.attack.teleporter=%1$s wurde ins Nichts teleportiert.
death.attack.blackhole=%1$s wurde spaghettifiziert.
death.attack.blender=%1$s wurde in kleine, mundgerechte Stücke geschnitten.
death.attack.meteorite=%1$s wurde von einem fallenden Stein aus dem Weltall erschlagen.
death.attack.boxcar=%1$s wurde von einem fallenden Güterwagon zermatscht. Autsch!
item.redstone_sword.name=Redstoneschwert
item.big_sword.name=Großes Schwert
@ -194,6 +195,7 @@ tile.therm_endo.name=Endothermische Bombe
tile.therm_exo.name=Exothermische Bombe
tile.crashed_bomb.name=Blindgänger
tile.boxcar.name=Güterwagon
tile.crate.name=Vorratskiste
tile.marker_structure.name=Multiblock-Strukturvorlage
@ -398,6 +400,7 @@ item.pipes_steel.name=Stahlrohre
item.drill_titanium.name=Titanbohrer
item.bolt_tungsten.name=Wolframbolzen
item.bolt_compound.name=Verstärkte Turbinenwelle
item.plate_polymer.name=Isolator
item.ingot_australium.name=Australiumbarren
item.ingot_weidanium.name=Weidaniumbarren
@ -417,6 +420,10 @@ item.nugget_desh.name=Deshnugget
item.powder_desh.name=Deshstaub
item.powder_desh_mix.name=Deshmischung
item.powder_nitan_mix.name=Nitaniummischung
item.powder_spark_mix.name=Sparkmischung
item.ingot_dineutronium.name=Dineutroniumbarren
item.powder_dineutronium.name=Dineutroniumstaub
item.nugget_dineutronium.name=Dineutroniumnugget
item.solid_fuel.name=Festbrennstoff
@ -594,8 +601,12 @@ item.battery_generic.name=Batterie
item.battery_advanced.name=Fortgeschrittene Batterie
item.battery_lithium.name=Lithium-Ionen-Batterie
item.battery_schrabidium.name=Schrabidiumbatterie
item.battery_spark.name=Spark-Batterie
item.battery_creative.name=Unendliche Batterie
item.battery_su.name=Einwegbatterie
item.battery_su_l.name=Große Einwegbatterie
item.battery_red_cell.name=Redstone-Energiezelle
item.battery_advanced_cell.name=Fortgeschrittene Energiezelle
item.battery_lithium_cell.name=Lithium-Ionen-Energiezelle
@ -608,6 +619,8 @@ item.battery_red_cell_24.name=24-fache Redstone-Energiezelle
item.battery_advanced_cell_12.name=Zwölffache fortgeschrittene Energiezelle
item.battery_lithium_cell_6.name=Sechsfache Lithium-Ionen-Energiezelle
item.battery_schrabidium_cell_4.name=Vierfache Schrabidium-Energiezelle
item.battery_spark_cell_6.name=Spark-Energiezelle
item.battery_spark_cell_25.name=Spark-Arkane Autobatterie
item.upgrade_template.name=Maschinenupgrade-Vorlage
item.upgrade_speed_1.name=Rotes Maschinenupgrade Mk.I
@ -723,7 +736,7 @@ item.rod_pu240.name=Pu240-Brennstab
item.rod_neptunium.name=Neptuniumbrennstab
item.rod_lead.name=Bleistab
item.rod_schrabidium.name=Schrabidiumbrennstab
item.rod_astatine.name=Euphemiumbrennstab
item.rod_euphemium.name=Euphemiumbrennstab
item.rod_australium.name=Australiumbrennstab
item.rod_weidanium.name=Weidaniumbrennstab
item.rod_reiium.name=Reiiumbrennstab
@ -915,6 +928,7 @@ item.gun_revolver_schrabidium.name=Schrabidiumrevolver
item.gun_revolver_cursed.name=Verfluchte Pistole
item.gun_revolver_nightmare.name=Nightmare-Revolver (Original)
item.gun_revolver_nightmare2.name=Nightmare-Revolver (Dunkel)
item.gun_revolver_pip.name=Lil' Pipsqueak
item.gun_fatman.name=M42 Nukleares Katapult "Fat Man"
item.gun_mirv.name=M42 Nukleares Katapult "Experimentelles MIRV"
item.gun_bf.name=M42_2 Nukleares Katapult "Antimaterienwerfer"
@ -944,6 +958,7 @@ item.gun_revolver_schrabidium_ammo.name=Schrabidiumpatrone
item.gun_revolver_cursed_ammo.name=Stahlpatrone
item.gun_revolver_nightmare_ammo.name=Nightmare-Kugel
item.gun_revolver_nightmare2_ammo.name=Laserschrot
item.gun_revolver_pip_ammo.name=Verdorbene Patrone
item.gun_fatman_ammo.name=Miniatombombe
item.gun_mirv_ammo.name=Achtfaches MIRV
item.gun_bf_ammo.name=Mk.V kompaktes AMAT-Artilleriegeschoss - Typ B.F.
@ -1045,16 +1060,16 @@ item.chopper_blades.name=Jagdschrauber Rotorblätter
item.igniter.name=Zünder
item.watch.name=Zerbrochene Taschenuhr
item.apple_astatine.name=Euphemiumapfel
item.ingot_astatine.name=Euphemiumbarren
item.nugget_astatine.name=Euphemiumnugget
item.rod_quad_astatine.name=Ausgebrannter Schrabidiumvierfachbrennstab
item.apple_euphemium.name=Euphemiumapfel
item.ingot_euphemium.name=Euphemiumbarren
item.nugget_euphemium.name=Euphemiumnugget
item.rod_quad_euphemium.name=Ausgebrannter Schrabidiumvierfachbrennstab
item.plate_euphemium.name=Euphemium-Verbundplatte
item.astatine_helmet.name=Euphemiumstiefel
item.astatine_plate.name=Euphemiumbrustplatte
item.astatine_legs.name=Euphemiumbeinschutz
item.astatine_boots.name=Euphemiumstiefel
item.euphemium_helmet.name=Euphemiumstiefel
item.euphemium_plate.name=Euphemiumbrustplatte
item.euphemium_legs.name=Euphemiumbeinschutz
item.euphemium_boots.name=Euphemiumstiefel
item.schrabidium_helmet.name=Schrabidiumhelm
item.schrabidium_plate.name=Schrabidiumbrustplatte
@ -1281,6 +1296,7 @@ item.bottle_empty.name=Leere bombenförmige Glasflasche
item.bottle_nuka.name=Nuka-Cola Flasche
item.bottle_cherry.name=Nuka-Cherry Flasche
item.bottle_quantum.name=Nuka Cola Quantum
item.bottle_sparkle.name=S~Cola
item.bottle2_empty.name=Leere Glasflasche
item.bottle2_korl.name=Korl
item.bottle2_fritz.name=Fritz-Kola
@ -1289,6 +1305,7 @@ item.bottle2_fritz_special.name=Die erste Fritz-Kola
item.chocolate_milk.name=Schokomilch
item.cap_nuka.name=Nuka-Cola Kronkorken
item.cap_quantum.name=Nuka Cola Quantum Kronkorken
item.cap_sparkle.name=S~Cola Kronkorken
item.cap_korl.name=Korl Kronkorken
item.cap_fritz.name=Fritz-Kola Kronkorken
item.ring_pull.name=Dosenring
@ -1335,6 +1352,32 @@ item.part_carbon.name=Kohlenstoffstaubkiste
item.part_copper.name=Kupferstaubkiste
item.part_plutonium.name=Plutoniumstaubkiste
item.rune_blank.name=Blank Catalyst Matrix
item.rune_isa.name=Cool Catalyst Matrix
item.rune_dagaz.name=Balanced Catalyst Matrix
item.rune_hagalaz.name=Rough Catalyst Matrix
item.rune_jera.name=Multiplicative Catalyst Matrix
item.rune_thurisaz.name=Additive Catalyst Matrix
item.ams_catalyst_blank.name=Blanker Reaktionskatalysator
item.ams_catalyst_aluminium.name=Aluminium-Reaktionskatalysator
item.ams_catalyst_beryllium.name=Beryllium-Reaktionskatalysator
item.ams_catalyst_caesium.name=Caeseium-Reaktionskatalysator
item.ams_catalyst_cerium.name=Cer-Reaktionskatalysator
item.ams_catalyst_cobalt.name=Cobalt-Reaktionskatalysator
item.ams_catalyst_copper.name=Kupfer-Reaktionskatalysator
item.ams_catalyst_euphemium.name=Euphemium-Reaktionskatalysator
item.ams_catalyst_iron.name=Eisen-Reaktionskatalysator
item.ams_catalyst_lithium.name=Lithium-Reaktionskatalysator
item.ams_catalyst_niobium.name=Niob-Reaktionskatalysator
item.ams_catalyst_strontium.name=Strontium-Reaktionskatalysator
item.ams_catalyst_thorium.name=Thorium-Reaktionskatalysator
item.ams_catalyst_tungsten.name=Wolfram-Reaktionskatalysator
item.ams_focus_blank.name=Blanker Stabilisierungsfokus
item.ams_focus_limiter.name=Beschränkender Stabilisierungsfokus
item.ams_focus_booster.name=Verstärkender Stabilisierungsfokus
item.crystal_energy.name=Energiekristall
item.pellet_coolant.name=Kühlcluster

76
assets/hbm/lang/en_US.lang
View File

@ -119,6 +119,7 @@ death.attack.teleporter=%1$s was teleported into nothingness.
death.attack.blackhole=%1$s was spaghettified.
death.attack.blender=%1$s was chopped in small, bite-sized pieces.
death.attack.meteorite=%1$s was hit by a falling rock from outer space.
death.attack.boxcar=%1$s was smushed by a falling boxcar. Oh well.
item.redstone_sword.name=Redstone Sword
item.big_sword.name=Great Sword
@ -186,6 +187,7 @@ tile.therm_endo.name=Endothermic Bomb
tile.therm_exo.name=Exothermic Bomb
tile.crashed_bomb.name=Dud
tile.boxcar.name=Boxcar
tile.turret_light.name=Light Machine Gun Turret
tile.turret_heavy.name=Heavy Machine Gun Turret
@ -398,6 +400,7 @@ item.pipes_steel.name=Steel Pipes
item.drill_titanium.name=Titanium Drill
item.bolt_tungsten.name=Tunsten Bolt
item.bolt_compound.name=Reinforced Turbine Shaft
item.plate_polymer.name=Insulator
item.ingot_australium.name=Australium Ingot
item.ingot_weidanium.name=Weidanium Ingot
@ -415,8 +418,12 @@ 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.powder_nitan_mix.name=Nitanium Mixture
item.powder_desh_mix.name=Desh Blend
item.powder_nitan_mix.name=Nitanium Blend
item.powder_spark_mix.name=Spark Blend
item.ingot_dineutronium.name=Dineutronium Ingot
item.powder_dineutronium.name=Dineutronium Powder
item.nugget_dineutronium.name=Dineutronium Nugget
item.solid_fuel.name=Solid Fuel
@ -581,6 +588,9 @@ item.powder_niobium_tiny.name=Tiny Pile of Niobium Powder
item.powder_cerium_tiny.name=Tiny Pile of Cerium Powder
item.powder_lanthanium_tiny.name=Tiny Pile of Lanthanium Powder
item.powder_actinium_tiny.name=Tiny Pile of Actinium Powder
item.powder_euphemium.name=Euphemium Powder
item.powder_meteorite.name=Meteorite Powder
item.powder_meteorite_tiny.name=Tiny Pile of Ḿeteorite Powder
item.fragment_neodymium.name=Neodymium Fragment
item.fragment_cobalt.name=Cobalt Fragment
@ -594,8 +604,12 @@ item.battery_generic.name=Battery
item.battery_advanced.name=Advanced Battery
item.battery_lithium.name=Lithium-Ion Battery
item.battery_schrabidium.name=Schrabidium Battery
item.battery_spark.name=Spark Battery
item.battery_creative.name=Infinite Battery
item.battery_su.name=SU-Battery
item.battery_su_l.name=Large SU-Battery
item.battery_red_cell.name=Redstone Power Cell
item.battery_advanced_cell.name=Advanced Power Cell
item.battery_lithium_cell.name=Lithium-Ion Power Cell
@ -608,6 +622,8 @@ item.battery_red_cell_24.name=24-Fold Redstone Power Cell
item.battery_advanced_cell_12.name=Twelvefold Advanced Power Cell
item.battery_lithium_cell_6.name=Sixfold Lithium-Ion Power Cell
item.battery_schrabidium_cell_4.name=Quadruple Schrabidium Power Cell
item.battery_spark_cell_6.name=Spark Power Cell
item.battery_spark_cell_25.name=Spark Arcane Car Battery
item.upgrade_template.name=Machine Upgrade Piece Template
item.upgrade_speed_1.name=Red Machine Upgrade Mk.I
@ -712,7 +728,7 @@ item.fluid_barrel_empty.name=Empty Fluid Barrel
item.fluid_barrel_full.name=Fluid Barrel:
item.fluid_barrel_infinite.name=Infinite Fluid Barrel
item.rod_empty.name=Emty Rod
item.rod_empty.name=Empty Rod
item.rod_uranium.name=Uranium Rod
item.rod_u235.name=U235 Rod
item.rod_u238.name=U238 Rod
@ -723,7 +739,7 @@ item.rod_pu240.name=Pu240 Rod
item.rod_neptunium.name=Neptunium Rod
item.rod_lead.name=Lead Rod
item.rod_schrabidium.name=Schrabidium Rod
item.rod_astatine.name=Euphemium Rod
item.rod_euphemium.name=Euphemium Rod
item.rod_australium.name=Australium Rod
item.rod_weidanium.name=Weidanium Rod
item.rod_reiium.name=Reiium Rod
@ -731,8 +747,8 @@ item.rod_unobtainium.name=Unobtainium Rod
item.rod_daffergon.name=Daffergon Rod
item.rod_verticium.name=Verticium Rod
item.rod_dual_empty.name=Emty Dual Rod
item.rod_dual_uranium.name=Uranium Dual Fl Rod
item.rod_dual_empty.name=Empty Dual Rod
item.rod_dual_uranium.name=Uranium Dual Fuel Rod
item.rod_dual_u235.name=U235 Dual Rod
item.rod_dual_u238.name=U238 Dual Rod
item.rod_dual_plutonium.name=Plutonium Dual Rod
@ -743,7 +759,7 @@ item.rod_dual_neptunium.name=Neptunium Dual Rod
item.rod_dual_lead.name=Lead Dual Rod
item.rod_dual_schrabidium.name=Schrabidium Dual Rod
item.rod_quad_empty.name=Emty Quad Rod
item.rod_quad_empty.name=Empty Quad Rod
item.rod_quad_uranium.name=Uranium Quad Rod
item.rod_quad_u235.name=U235 Quad Rod
item.rod_quad_u238.name=U238 Quad Rod
@ -915,6 +931,7 @@ item.gun_revolver_schrabidium.name=Schrabidium Revolver
item.gun_revolver_cursed.name=Cursed Revolver
item.gun_revolver_nightmare.name=Nightmare Revolver (Original)
item.gun_revolver_nightmare2.name=Nightmare Revolver (Dark)
item.gun_revolver_pip.name=Lil' Pipsqueak
item.gun_fatman.name=M42 Nuclear Catapult "Fat Man"
item.gun_mirv.name=M42 Nuclear Catapult "Experimental MIRV"
item.gun_bf.name=M42_2 Nuclear Catapult "Antimatter Launcher"
@ -944,6 +961,7 @@ item.gun_revolver_schrabidium_ammo.name=Schrabidium Bullet
item.gun_revolver_cursed_ammo.name=Steel Bullet
item.gun_revolver_nightmare_ammo.name=Nightmare Bullet
item.gun_revolver_nightmare2_ammo.name=Laser Buckshot
item.gun_revolver_pip_ammo.name=Tainted Bullet
item.gun_fatman_ammo.name=Mini Nuke
item.gun_mirv_ammo.name=Eightfold MIRV
item.gun_bf_ammo.name=Mk.V Compact AMAT-Artillery Shell - Type B.F.
@ -1045,16 +1063,16 @@ item.chopper_blades.name=Hunter Chopper Rotor Blades
item.igniter.name=Igniter
item.watch.name=Broken Pocket Watch
item.apple_astatine.name=Euphemium Apple
item.ingot_astatine.name=Euphemium Ingot
item.nugget_astatine.name=Euphemium Nugget
item.rod_quad_astatine.name=Burned Out Quad Schrabidium Fuel Rod
item.apple_euphemium.name=Euphemium Apple
item.ingot_euphemium.name=Euphemium Ingot
item.nugget_euphemium.name=Euphemium Nugget
item.rod_quad_euphemium.name=Burned Out Quad Schrabidium Fuel Rod
item.plate_euphemium.name=Euphemium Compound Plate
item.astatine_helmet.name=Euphemium Helemt
item.astatine_plate.name=Euphemium Chestplate
item.astatine_legs.name=Euphemium Leggings
item.astatine_boots.name=Euphemiums Boots
item.euphemium_helmet.name=Euphemium Helemt
item.euphemium_plate.name=Euphemium Chestplate
item.euphemium_legs.name=Euphemium Leggings
item.euphemium_boots.name=Euphemiums Boots
item.schrabidium_helmet.name=Schrabidium Helmet
item.schrabidium_plate.name=Schrabidium Chestpate
@ -1281,6 +1299,7 @@ item.bottle_empty.name=Empty Bomb-Shaped Bottle
item.bottle_nuka.name=Bottle of Nuka Cola
item.bottle_cherry.name=Bottle of Nuka Cherry
item.bottle_quantum.name=Bottle of Nuka Cola Quantum
item.bottle_sparkle.name=Bottle of S~Cola
item.bottle2_empty.name=Empty Bottle
item.bottle2_korl.name=Korl
item.bottle2_fritz.name=Fritz Cola
@ -1289,6 +1308,7 @@ item.bottle2_fritz_special.name=The First Fritz Cola
item.chocolate_milk.name=Chocolate Milk
item.cap_nuka.name=Nuka Cola Bottle Cap
item.cap_quantum.name=Nuka Cola Quantum Bottle Cap
item.cap_sparkle.name=S~Cola Bottle Cap
item.cap_korl.name=Korl Bottle Cap
item.cap_fritz.name=Fritz Cola Bottle Cap
item.ring_pull.name=Ring Pull
@ -1335,6 +1355,32 @@ item.part_carbon.name=Box of Carbon Dust
item.part_copper.name=Box of Copper Dust
item.part_plutonium.name=Box of Plutonium Dust
item.rune_blank.name=Blank Catalyst Matrix
item.rune_isa.name=Cool Catalyst Matrix
item.rune_dagaz.name=Balanced Catalyst Matrix
item.rune_hagalaz.name=Rough Catalyst Matrix
item.rune_jera.name=Multiplicative Catalyst Matrix
item.rune_thurisaz.name=Additive Catalyst Matrix
item.ams_catalyst_blank.name=Blank Reaction Catalyst
item.ams_catalyst_aluminium.name=Aluminium Reaction Catalyst
item.ams_catalyst_beryllium.name=Beryllium Reaction Catalyst
item.ams_catalyst_caesium.name=Caeseium Reaction Catalyst
item.ams_catalyst_cerium.name=Cerium Reaction Catalyst
item.ams_catalyst_cobalt.name=Cobalt Reaction Catalyst
item.ams_catalyst_copper.name=Copper Reaction Catalyst
item.ams_catalyst_euphemium.name=Euphemium Reaction Catalyst
item.ams_catalyst_iron.name=Iron Reaction Catalyst
item.ams_catalyst_lithium.name=Lithium Reaction Catalyst
item.ams_catalyst_niobium.name=Niobium Reaction Catalyst
item.ams_catalyst_strontium.name=Strontium Reaction Catalyst
item.ams_catalyst_thorium.name=Thorium Reaction Catalyst
item.ams_catalyst_tungsten.name=Tungsten Reaction Catalyst
item.ams_focus_blank.name=Blank Stabilizer Focus
item.ams_focus_limiter.name=Limiting Stabilizer Focus
item.ams_focus_booster.name=Boosting Stabilizer Focus
item.crystal_energy.name=Energy Crystal
item.pellet_coolant.name=Coolant Cluster

4477
assets/hbm/models/boxcar.obj Normal file
View File

File diff suppressed because it is too large Load Diff

8
assets/hbm/sounds.json
View File

@ -29,7 +29,8 @@
"weapon.tauShoot": {"category": "player", "sounds": [{"name": "weapon/tauShoot", "stream": false}]},
"weapon.tauChargeLoop2": {"category": "player", "sounds": [{"name": "weapon/tauChargeLoop2", "stream": true}]},
"weapon.revolverShoot": {"category": "player", "sounds": [{"name": "weapon/revolverShoot", "stream": false}]},
"weapon.revolverShoot": {"category": "player", "sounds": [{"name": "weapon/revolverShoot", "stream": false}]},
"weapon.revolverShootAlt": {"category": "player", "sounds": [{"name": "weapon/revolverShootAlt", "stream": false}]},
"weapon.heavyShoot": {"category": "player", "sounds": [{"name": "weapon/heavyShoot", "stream": false}]},
"weapon.shotgunShoot": {"category": "player", "sounds": [{"name": "weapon/shotgunShoot", "stream": false}]},
"weapon.schrabidiumShoot": {"category": "player", "sounds": [{"name": "weapon/schrabidiumShoot", "stream": false}]},
@ -62,5 +63,8 @@
"entity.chopperDamage": {"category": "hostile", "sounds": [{"name": "entity/chopperDamage", "stream": true}]},
"entity.chopperMineLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperMineLoop", "stream": false}]},
"entity.chopperCrashingLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperCrashingLoop", "stream": true}]},
"entity.oldExplosion": {"category": "ambient", "sounds": [{"name": "entity/oldExplosion", "stream": false}]}
"entity.oldExplosion": {"category": "ambient", "sounds": [{"name": "entity/oldExplosion", "stream": false}]},
"alarm.trainHorn": {"category": "record", "sounds": [{"name": "alarm/trainHorn", "stream": false}]},
"alarm.razortrainHorn": {"category": "record", "sounds": [{"name": "alarm/razortrainHorn", "stream": false}]}
}

BIN
assets/hbm/sounds/alarm/razortrainHorn.ogg Normal file
View File

Binary file not shown.

BIN
assets/hbm/sounds/alarm/trainHorn.ogg Normal file
View File

Binary file not shown.

BIN
assets/hbm/sounds/weapon/revolverShootAlt.ogg Normal file
View File

Binary file not shown.

BIN
assets/hbm/textures/blocks/boxcar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 209 B

BIN
assets/hbm/textures/gui/gui_ams_base.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
assets/hbm/textures/items/battery_spark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 337 B

BIN
assets/hbm/textures/items/battery_spark_cell_25.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 298 B

BIN
assets/hbm/textures/items/battery_spark_cell_6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 287 B

BIN
assets/hbm/textures/items/battery_su.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 240 B

BIN
assets/hbm/textures/items/battery_su_l.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 240 B

BIN
assets/hbm/textures/items/bottle_sparkle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 306 B

BIN
assets/hbm/textures/items/cap_sparkle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 231 B

BIN
assets/hbm/textures/items/gun_revolver_pip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 B

BIN
assets/hbm/textures/items/gun_revolver_pip_alt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 290 B

BIN
assets/hbm/textures/items/gun_revolver_pip_ammo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 231 B

0
assets/hbm/textures/items/ingot_cyrophyr.png → assets/hbm/textures/items/ingot_dineutronium.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 327 B

After

Width:  |  Height:  |  Size: 327 B

BIN
assets/hbm/textures/items/nugget_dineutronium.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 179 B

BIN
assets/hbm/textures/items/ore_cluster_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 259 B

BIN
assets/hbm/textures/items/ore_cluster_fg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 261 B

BIN
assets/hbm/textures/items/ore_cluster_tikite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 433 B

BIN
assets/hbm/textures/items/powder_euphemium.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 293 B

BIN
assets/hbm/textures/items/powder_meteorite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 227 B

BIN
assets/hbm/textures/items/powder_meteorite_tiny.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 180 B

BIN
assets/hbm/textures/items/powder_spark_mix.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 234 B

BIN
assets/hbm/textures/models/ModelPip.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
assets/hbm/textures/models/boxcar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
assets/hbm/textures/models/boxcar_wf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 186 KiB

12
com/hbm/blocks/ModBlocks.java
View File

@ -166,6 +166,7 @@ public class ModBlocks {
public static Block rejuvinator;
public static Block crate;
public static Block boxcar;
public static Block seal_frame;
public static Block seal_controller;
@ -449,6 +450,8 @@ public class ModBlocks {
public static Block dummy_port_ams_limiter;
public static Block dummy_block_ams_emitter;
public static Block dummy_port_ams_emitter;
public static Block dummy_block_ams_base;
public static Block dummy_port_ams_base;
private static void initializeBlock() {
@ -726,6 +729,8 @@ public class ModBlocks {
crate = new BlockCrate(Material.iron).setBlockName("crate").setStepSound(Block.soundTypeWood).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":crate");
crate_iron = new BlockStorageCrate(Material.iron).setBlockName("crate_iron").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
crate_steel = new BlockStorageCrate(Material.iron).setBlockName("crate_steel").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
boxcar = new DecoBlock(Material.iron).setBlockName("boxcar").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":boxcar");
machine_well = new MachineOilWell(Material.iron).setBlockName("machine_well").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_well");
machine_pumpjack = new MachinePumpjack(Material.iron).setBlockName("machine_pumpjack").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_pumpjack");
@ -794,6 +799,8 @@ public class ModBlocks {
dummy_port_ams_limiter = new DummyBlockAMSLimiter(Material.iron).setBlockName("dummy_port_ams_limiter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel");
dummy_block_ams_emitter = new DummyBlockAMSEmitter(Material.iron).setBlockName("dummy_block_ams_emitter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel");
dummy_port_ams_emitter = new DummyBlockAMSEmitter(Material.iron).setBlockName("dummy_port_ams_emitter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel");
dummy_block_ams_base = new DummyBlockAMSBase(Material.iron).setBlockName("dummy_block_ams_base").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel");
dummy_port_ams_base = new DummyBlockAMSBase(Material.iron).setBlockName("dummy_port_ams_base").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel");
}
private static void registerBlock() {
@ -969,6 +976,9 @@ public class ModBlocks {
GameRegistry.registerBlock(crate_iron, crate_iron.getUnlocalizedName());
GameRegistry.registerBlock(crate_steel, crate_steel.getUnlocalizedName());
//Junk
GameRegistry.registerBlock(boxcar, boxcar.getUnlocalizedName());
//Machines
GameRegistry.registerBlock(machine_press, machine_press.getUnlocalizedName());
GameRegistry.registerBlock(machine_difurnace_off, machine_difurnace_off.getUnlocalizedName());
@ -1131,6 +1141,8 @@ public class ModBlocks {
GameRegistry.registerBlock(dummy_port_ams_limiter, dummy_port_ams_limiter.getUnlocalizedName());
GameRegistry.registerBlock(dummy_block_ams_emitter, dummy_block_ams_emitter.getUnlocalizedName());
GameRegistry.registerBlock(dummy_port_ams_emitter, dummy_port_ams_emitter.getUnlocalizedName());
GameRegistry.registerBlock(dummy_block_ams_base, dummy_block_ams_base.getUnlocalizedName());
GameRegistry.registerBlock(dummy_port_ams_base, dummy_port_ams_base.getUnlocalizedName());
//Other Technical Blocks
GameRegistry.registerBlock(oil_pipe, oil_pipe.getUnlocalizedName());

73
com/hbm/blocks/generic/DecoBlock.java
View File

@ -1,12 +1,23 @@
package com.hbm.blocks.generic;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import com.hbm.blocks.ModBlocks;
import com.hbm.items.ModItems;
import com.hbm.tileentity.bomb.TileEntityNukeGadget;
import com.hbm.tileentity.deco.TileEntityDecoBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
@ -14,6 +25,8 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public class DecoBlock extends BlockContainer {
Random rand = new Random();
public DecoBlock(Material p_i45386_1_) {
super(p_i45386_1_);
@ -39,6 +52,14 @@ public class DecoBlock extends BlockContainer {
return false;
}
@Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
{
if(this == ModBlocks.boxcar)
return null;
return Item.getItemFromBlock(this);
}
@Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
@ -187,4 +208,56 @@ public class DecoBlock extends BlockContainer {
return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ);
}
@Override
public void breakBlock(World world, int x, int y, int z, Block b, int i) {
if (b == ModBlocks.boxcar) {
List<ItemStack> list = new ArrayList<ItemStack>();
list.add(new ItemStack(ModItems.ingot_steel, 5 + rand.nextInt(16)));
list.add(new ItemStack(ModItems.plate_steel, 15 + rand.nextInt(31)));
list.add(new ItemStack(Items.iron_ingot, 5 + rand.nextInt(11)));
list.add(new ItemStack(ModBlocks.block_steel, 1 + rand.nextInt(3)));
list.add(new ItemStack(ModBlocks.crate, 1 + rand.nextInt(6)));
for (int i1 = 0; i1 < list.size(); ++i1) {
ItemStack itemstack = list.get(i1).copy();
if (itemstack != null) {
float f = this.rand.nextFloat() * 0.8F + 0.1F;
float f1 = this.rand.nextFloat() * 0.8F + 0.1F;
float f2 = this.rand.nextFloat() * 0.8F + 0.1F;
while (itemstack.stackSize > 0) {
int j1 = this.rand.nextInt(21) + 10;
if (j1 > itemstack.stackSize) {
j1 = itemstack.stackSize;
}
itemstack.stackSize -= j1;
EntityItem entityitem = new EntityItem(world, x + f, y + f1,
z + f2,
new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
if (itemstack.hasTagCompound()) {
entityitem.getEntityItem()
.setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy());
}
float f3 = 0.05F;
entityitem.motionX = (float) this.rand.nextGaussian() * f3;
entityitem.motionY = (float) this.rand.nextGaussian() * f3 + 0.2F;
entityitem.motionZ = (float) this.rand.nextGaussian() * f3;
world.spawnEntityInWorld(entityitem);
}
}
}
world.func_147453_f(x, y, z, b);
}
super.breakBlock(world, x, y, z, b, i);
}
}

52
com/hbm/blocks/machine/BlockAMSBase.java
View File

@ -1,18 +1,23 @@
package com.hbm.blocks.machine;
import com.hbm.blocks.ModBlocks;
import com.hbm.handler.MultiblockHandler;
import com.hbm.interfaces.IMultiblock;
import com.hbm.main.MainRegistry;
import com.hbm.tileentity.machine.TileEntityAMSBase;
import com.hbm.tileentity.machine.TileEntityAMSEmitter;
import com.hbm.tileentity.machine.TileEntityDummy;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class BlockAMSBase extends BlockContainer {
public class BlockAMSBase extends BlockContainer implements IMultiblock {
public BlockAMSBase(Material p_i45386_1_) {
super(p_i45386_1_);
@ -56,4 +61,49 @@ public class BlockAMSBase extends BlockContainer {
return false;
}
@Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.AMSBaseDimension)) {
MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.AMSBaseDimension, ModBlocks.dummy_block_ams_base);
DummyBlockAMSBase.safeBreak = true;
world.setBlock(x + 1, y, z, ModBlocks.dummy_port_ams_base);
TileEntity te = world.getTileEntity(x + 1, y, z);
if(te instanceof TileEntityDummy) {
TileEntityDummy dummy = (TileEntityDummy)te;
dummy.targetX = x;
dummy.targetY = y;
dummy.targetZ = z;
}
world.setBlock(x, y, z - 1, ModBlocks.dummy_port_ams_base);
TileEntity te2 = world.getTileEntity(x, y, z - 1);
if(te instanceof TileEntityDummy) {
TileEntityDummy dummy = (TileEntityDummy)te2;
dummy.targetX = x;
dummy.targetY = y;
dummy.targetZ = z;
}
world.setBlock(x - 1, y, z, ModBlocks.dummy_port_ams_base);
TileEntity te3 = world.getTileEntity(x - 1, y, z);
if(te3 instanceof TileEntityDummy) {
TileEntityDummy dummy = (TileEntityDummy)te3;
dummy.targetX = x;
dummy.targetY = y;
dummy.targetZ = z;
}
world.setBlock(x, y, z + 1, ModBlocks.dummy_port_ams_base);
TileEntity te4 = world.getTileEntity(x, y , z + 1);
if(te4 instanceof TileEntityDummy) {
TileEntityDummy dummy = (TileEntityDummy)te4;
dummy.targetX = x;
dummy.targetY = y;
dummy.targetZ = z;
}
DummyBlockAMSBase.safeBreak = false;
} else
world.func_147480_a(x, y, z, true);
}
}

106
com/hbm/blocks/machine/DummyBlockAMSBase.java Normal file
View File

@ -0,0 +1,106 @@
package com.hbm.blocks.machine;
import java.util.Random;
import com.hbm.blocks.ModBlocks;
import com.hbm.interfaces.IDummy;
import com.hbm.main.MainRegistry;
import com.hbm.tileentity.machine.TileEntityAMSBase;
import com.hbm.tileentity.machine.TileEntityAMSEmitter;
import com.hbm.tileentity.machine.TileEntityDummy;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class DummyBlockAMSBase extends BlockContainer implements IDummy {
public static boolean safeBreak = false;
public DummyBlockAMSBase(Material p_i45386_1_) {
super(p_i45386_1_);
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileEntityDummy();
}
@Override
public void breakBlock(World world, int x, int y, int z, Block block, int i)
{
if(!safeBreak) {
TileEntity te = world.getTileEntity(x, y, z);
if(te != null && te instanceof TileEntityDummy) {
int a = ((TileEntityDummy)te).targetX;
int b = ((TileEntityDummy)te).targetY;
int c = ((TileEntityDummy)te).targetZ;
//world.getBlock(a, b, c).breakBlock(world, a, b, c, block, i);
if(!world.isRemote)
world.func_147480_a(a, b, c, true);
}
}
world.removeTileEntity(x, y, z);
}
@Override
public int getRenderType() {
return -1;
}
@Override
public boolean isOpaqueCube() {
return false;
}
@Override
public boolean renderAsNormalBlock() {
return false;
}
@Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
{
return null;
}
@Override
@SideOnly(Side.CLIENT)
public Item getItem(World world, int x, int y, int z)
{
return Item.getItemFromBlock(ModBlocks.ams_base);
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(world.isRemote)
{
return true;
} else if(!player.isSneaking())
{
TileEntity te = world.getTileEntity(x, y, z);
if(te != null && te instanceof TileEntityDummy) {
int a = ((TileEntityDummy)te).targetX;
int b = ((TileEntityDummy)te).targetY;
int c = ((TileEntityDummy)te).targetZ;
TileEntityAMSBase entity = (TileEntityAMSBase) world.getTileEntity(a, b, c);
if(entity != null)
{
FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_ams_base, world, a, b, c);
}
}
return true;
} else {
return false;
}
}
}

77
com/hbm/entity/projectile/EntityBoxcar.java Normal file
View File

@ -0,0 +1,77 @@
package com.hbm.entity.projectile;
import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.entity.particle.EntityGasFlameFX;
import com.hbm.entity.particle.EntitySmokeFX;
import com.hbm.explosion.ExplosionLarge;
import com.hbm.lib.ModDamageSource;
import com.hbm.main.MainRegistry;
import com.hbm.world.Meteorite;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.Entity;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.init.Blocks;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityBoxcar extends EntityThrowable {
public EntityBoxcar(World p_i1582_1_) {
super(p_i1582_1_);
this.ignoreFrustumCheck = true;
this.isImmuneToFire = true;
}
@Override
public void onUpdate() {
this.prevPosX = this.posX;
this.prevPosY = this.posY;
this.prevPosZ = this.posZ;
this.posX += this.motionX;
this.posY += this.motionY;
this.posZ += this.motionZ;
this.motionY -= 0.03;
if(motionY < -1.5)
motionY = -1.5;
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
{
this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "hbm:entity.oldExplosion", 10000.0F, 0.5F + this.rand.nextFloat() * 0.1F);
this.setDead();
ExplosionLarge.spawnShock(worldObj, posX, posY + 1, posZ, 24, 3);
ExplosionLarge.spawnShock(worldObj, posX, posY + 1, posZ, 24, 2.5);
ExplosionLarge.spawnShock(worldObj, posX, posY + 1, posZ, 24, 2);
ExplosionLarge.spawnShock(worldObj, posX, posY + 1, posZ, 24, 1.5);
ExplosionLarge.spawnShock(worldObj, posX, posY + 1, posZ, 24, 1);
List<Entity> list = (List<Entity>)worldObj.getEntitiesWithinAABBExcludingEntity(null,
AxisAlignedBB.getBoundingBox(posX - 2, posY - 2, posZ - 2, posX + 2, posY + 2, posZ + 2));
for(Entity e : list) {
e.attackEntityFrom(ModDamageSource.boxcar, 1000);
}
if(!worldObj.isRemote)
worldObj.setBlock((int)(this.posX - 0.5), (int)(this.posY + 0.5), (int)(this.posZ - 0.5), ModBlocks.boxcar);
}
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_) {
}
@Override
@SideOnly(Side.CLIENT)
public boolean isInRangeToRenderDist(double distance)
{
return distance < 25000;
}
}

28
com/hbm/entity/projectile/EntityBullet.java
View File

@ -33,6 +33,7 @@ import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.generic.RedBarrel;
import com.hbm.entity.grenade.EntityGrenadeTau;
import com.hbm.entity.mob.EntityNuclearCreeper;
import com.hbm.entity.particle.EntityBSmokeFX;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.lib.ModDamageSource;
@ -66,6 +67,7 @@ public class EntityBullet extends Entity implements IProjectile {
private boolean instakill = false;
private boolean rad = false;
public boolean antidote = false;
public boolean pip = false;
public EntityBullet(World p_i1753_1_) {
super(p_i1753_1_);
@ -431,7 +433,7 @@ public class EntityBullet extends Entity implements IProjectile {
if (movingobjectposition != null) {
if (movingobjectposition.entityHit != null) {
//TODO: Remove test feature in retail version
//TODO: Remove test feature in release version
if (!(movingobjectposition.entityHit instanceof EntityItemFrame)
|| movingobjectposition.entityHit instanceof EntityItemFrame
&& (((EntityItemFrame) movingobjectposition.entityHit).getDisplayedItem() == null
@ -455,9 +457,9 @@ public class EntityBullet extends Entity implements IProjectile {
//O: Direct
// X X Bullet
// \ |
// \|
// O-X Tau
// | /
// |/
// X-O Displacer
if (!this.getIsCritical() && !this.getIsChopper()) {
@ -542,6 +544,26 @@ public class EntityBullet extends Entity implements IProjectile {
((EntityPlayerMP) this.shootingEntity).playerNetServerHandler
.sendPacket(new S2BPacketChangeGameState(6, 0.0F));
}
if(this.pip) {
if(!worldObj.isRemote) {
EntityBoxcar pippo = new EntityBoxcar(worldObj);
pippo.posX = movingobjectposition.entityHit.posX;
pippo.posY = movingobjectposition.entityHit.posY + 50;
pippo.posZ = movingobjectposition.entityHit.posZ;
for(int j = 0; j < 50; j++) {
EntityBSmokeFX fx = new EntityBSmokeFX(worldObj, pippo.posX + (rand.nextDouble() - 0.5) * 4, pippo.posY + (rand.nextDouble() - 0.5) * 12, pippo.posZ + (rand.nextDouble() - 0.5) * 4, 0, 0, 0);
worldObj.spawnEntityInWorld(fx);
}
worldObj.spawnEntityInWorld(pippo);
}
worldObj.playSoundEffect(movingobjectposition.entityHit.posX,
movingobjectposition.entityHit.posY + 50,
movingobjectposition.entityHit.posZ, "hbm:alarm.trainHorn", 100F, 1F);
}
}
if (!(movingobjectposition.entityHit instanceof EntityEnderman)) {

21
com/hbm/entity/projectile/EntityMiniNuke.java
View File

@ -246,12 +246,21 @@ public class EntityMiniNuke extends Entity implements IProjectile
entity0.coefficient = 10.0F;
this.worldObj.spawnEntityInWorld(entity0);
if(rand.nextInt(100) >= 0) //edited
{
ExplosionParticleB.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ);
} else {
ExplosionParticle.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ);
}
//Perma-baleflare mode if the polaroid's glitched
if(MainRegistry.polaroidID == 11)
if(rand.nextInt(100) >= 0) //edited
{
ExplosionParticleB.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ);
} else {
ExplosionParticle.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ);
}
else
if(rand.nextInt(100) == 0) //original
{
ExplosionParticleB.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ);
} else {
ExplosionParticle.spawnMush(this.worldObj, (int)this.posX, (int)this.posY - 3, (int)this.posZ);
}
}
this.setDead();
}

1
com/hbm/handler/MultiblockHandler.java
View File

@ -72,6 +72,7 @@ public class MultiblockHandler {
public static final int[] AMSLimiterDimensionSouth = new int[] { 0, 0, 5, 0, 2, 2 };
public static final int[] AMSLimiterDimensionWest = new int[] { 2, 2, 5, 0, 0, 0 };
public static final int[] AMSEmitterDimension = new int[] { 2, 2, 5, 0, 2, 2, };
public static final int[] AMSBaseDimension = new int[] { 1, 1, 1, 0, 1, 1, };
//Approved!
public static boolean checkSpace(World world, int x, int y, int z, int[] i) {

4
com/hbm/inventory/MachineRecipes.java
View File

@ -157,7 +157,7 @@ public class MachineRecipes {
new ItemStack(ModItems.rod_dual_waste, 1) };
ItemStack[] schrabidium3 = new ItemStack[] { new ItemStack(ModItems.nugget_schrabidium_fuel, 4),
new ItemStack(ModItems.nugget_lead, 19), new ItemStack(ModItems.nugget_neptunium, 1),
new ItemStack(ModItems.rod_quad_euphemium, 1, 34) };
new ItemStack(ModItems.rod_quad_euphemium, 1) };
if (item == ModItems.cell_uf6) {
return uranium;
@ -2554,7 +2554,7 @@ public class MachineRecipes {
case PROTOTYPE:
list.add(new ItemStack(ModItems.dysfunctional_reactor, 1));
list.add(new ItemStack(ModItems.hull_small_steel, 2));
list.add(new ItemStack(ModItems.ingot_euphemium, 3, 34));
list.add(new ItemStack(ModItems.ingot_euphemium, 3));
list.add(new ItemStack(ModItems.circuit_gold, 2));
list.add(new ItemStack(ModItems.wire_gold, 16));
break;

8
com/hbm/inventory/gui/GUIAMSBase.java
View File

@ -55,16 +55,16 @@ public class GUIAMSBase extends GuiInfoContainer {
Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
int i = (int)base.getPowerScaled(104);
int i = (int)base.getPowerScaled(106);
drawTexturedModalRect(guiLeft + 116, guiTop + 124 - i, 206, 106 - i, 7, i);
int j = base.getFieldScaled(104);
int j = base.getFieldScaled(106);
drawTexturedModalRect(guiLeft + 44, guiTop + 124 - j, 192, 106 - j, 7, j);
int k = base.getEfficiencyScaled(104);
int k = base.getEfficiencyScaled(106);
drawTexturedModalRect(guiLeft + 53, guiTop + 124 - k, 199, 106 - k, 7, k);
int l = base.getHeatScaled(104);
int l = base.getHeatScaled(106);
drawTexturedModalRect(guiLeft + 125, guiTop + 124 - l, 213, 106 - l, 7, l);
int m = base.mode;

4
com/hbm/inventory/gui/GUIFusionMultiblock.java
View File

@ -33,7 +33,7 @@ public class GUIFusionMultiblock extends GuiInfoContainer {
diFurnace.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 88 - 70, 16, 70);
diFurnace.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 88 - 70, 16, 70);
diFurnace.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 88 - 70, 16, 70);
this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 88 - 88, 16, 88, diFurnace.power, diFurnace.maxPower);
this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 88 - 70, 16, 70, diFurnace.power, diFurnace.maxPower);
}
@Override
@ -50,7 +50,7 @@ public class GUIFusionMultiblock extends GuiInfoContainer {
Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
int k = (int)diFurnace.getPowerScaled(88);
int k = (int)diFurnace.getPowerScaled(70);
drawTexturedModalRect(guiLeft + 26, guiTop + 88 - k, 192, 88 - k, 16, k);
if(diFurnace.isRunning())

4
com/hbm/inventory/gui/GuiInfoContainer.java
View File

@ -2,6 +2,8 @@ package com.hbm.inventory.gui;
import java.util.Arrays;
import com.hbm.lib.Library;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.inventory.Container;
@ -18,7 +20,7 @@ public abstract class GuiInfoContainer extends GuiContainer {
public void drawElectricityInfo(GuiInfoContainer gui, int mouseX, int mouseY, int x, int y, int width, int height, long power, long maxPower) {
if(x <= mouseX && x + width > mouseX && y < mouseY && y + height >= mouseY)
gui.drawFluidInfo(new String[] { power + "/" + maxPower + "HE" }, mouseX, mouseY);
gui.drawFluidInfo(new String[] { Library.getShortNumber(power) + "/" + Library.getShortNumber(maxPower) + "HE" }, mouseX, mouseY);
}
public void drawCustomInfo(GuiInfoContainer gui, int mouseX, int mouseY, int x, int y, int width, int height, String[] text) {

58
com/hbm/items/ModItems.java
View File

@ -90,6 +90,8 @@ public class ModItems {
public static Item ingot_desh;
public static Item nugget_desh;
public static Item ingot_dineutronium;
public static Item nugget_dineutronium;
public static Item nugget_uranium;
public static Item nugget_u235;
@ -130,6 +132,7 @@ public class ModItems {
public static Item plate_euphemium;
public static Item bolt_tungsten;
public static Item bolt_compound;
public static Item plate_polymer;
public static Item ingot_dura_steel;
public static Item ingot_polymer;
@ -189,6 +192,8 @@ public class ModItems {
public static Item powder_dura_steel;
public static Item powder_polymer;
public static Item powder_euphemium;
public static Item powder_meteorite;
public static Item powder_lithium_tiny;
public static Item powder_neodymium_tiny;
@ -197,12 +202,14 @@ public class ModItems {
public static Item powder_cerium_tiny;
public static Item powder_lanthanium_tiny;
public static Item powder_actinium_tiny;
public static Item powder_meteorite_tiny;
public static Item powder_lanthanium;
public static Item powder_actinium;
public static Item powder_desh;
public static Item powder_desh_mix;
public static Item powder_nitan_mix;
public static Item powder_spark_mix;
public static Item fragment_neodymium;
public static Item fragment_cobalt;
@ -465,6 +472,7 @@ public class ModItems {
public static Item bottle_nuka;
public static Item bottle_cherry;
public static Item bottle_quantum;
public static Item bottle_sparkle;
public static Item bottle2_empty;
public static Item bottle2_korl;
public static Item bottle2_fritz;
@ -473,6 +481,7 @@ public class ModItems {
public static Item chocolate_milk;
public static Item cap_nuka;
public static Item cap_quantum;
public static Item cap_sparkle;
public static Item cap_korl;
public static Item cap_fritz;
public static Item ring_pull;
@ -636,6 +645,8 @@ public class ModItems {
public static Item gun_revolver_nightmare_ammo;
public static Item gun_revolver_nightmare2;
public static Item gun_revolver_nightmare2_ammo;
public static Item gun_revolver_pip;
public static Item gun_revolver_pip_ammo;
public static Item gun_fatman;
public static Item gun_fatman_ammo;
public static Item gun_mirv;
@ -746,6 +757,7 @@ public class ModItems {
public static Item battery_advanced;
public static Item battery_lithium;
public static Item battery_schrabidium;
public static Item battery_spark;
public static Item battery_creative;
public static Item battery_red_cell;
@ -760,7 +772,11 @@ public class ModItems {
public static Item battery_schrabidium_cell;
public static Item battery_schrabidium_cell_2;
public static Item battery_schrabidium_cell_4;
public static Item battery_spark_cell_6;
public static Item battery_spark_cell_25;
public static Item battery_su;
public static Item battery_su_l;
public static Item fusion_core;
public static Item fusion_core_infinite;
public static Item energy_core;
@ -1153,14 +1169,17 @@ public class ModItems {
pipes_steel = new Item().setUnlocalizedName("pipes_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":pipes_steel");
drill_titanium = new Item().setUnlocalizedName("drill_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":drill_titanium");
plate_dalekanium = new Item().setUnlocalizedName("plate_dalekanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_dalekanium");
plate_euphemium = new ItemCustomLore().setUnlocalizedName("plate_euphemium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":plate_euphemium");
plate_euphemium = new ItemCustomLore().setUnlocalizedName("plate_euphemium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_euphemium");
bolt_tungsten = new Item().setUnlocalizedName("bolt_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":bolt_tungsten");
bolt_compound = new Item().setUnlocalizedName("bolt_compound").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":bolt_compound");
plate_polymer = new Item().setUnlocalizedName("plate_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_polymer");
ingot_dura_steel = new ItemCustomLore().setUnlocalizedName("ingot_dura_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_dura_steel");
ingot_polymer = new ItemCustomLore().setUnlocalizedName("ingot_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_polymer");
ingot_desh = new ItemCustomLore().setUnlocalizedName("ingot_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_desh");
nugget_desh = new ItemCustomLore().setUnlocalizedName("nugget_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_desh");
ingot_dineutronium = new ItemCustomLore().setUnlocalizedName("ingot_dineutronium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_dineutronium");
nugget_dineutronium = new ItemCustomLore().setUnlocalizedName("nugget_dineutronium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_dineutronium");
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");
@ -1249,10 +1268,13 @@ public class ModItems {
powder_cerium = new ItemCustomLore().setUnlocalizedName("powder_cerium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_cerium");
powder_dura_steel = new ItemCustomLore().setUnlocalizedName("powder_dura_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_dura_steel");
powder_polymer = new ItemCustomLore().setUnlocalizedName("powder_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_polymer");
powder_euphemium = new ItemCustomLore().setUnlocalizedName("powder_euphemium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_euphemium");
powder_meteorite = new Item().setUnlocalizedName("powder_meteorite").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_meteorite");
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_nitan_mix = new Item().setUnlocalizedName("powder_nitan_mix").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_nitan_mix");
powder_spark_mix = new Item().setUnlocalizedName("powder_spark_mix").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_spark_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");
@ -1261,6 +1283,7 @@ public class ModItems {
powder_cerium_tiny = new Item().setUnlocalizedName("powder_cerium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_cerium_tiny");
powder_lanthanium_tiny = new Item().setUnlocalizedName("powder_lanthanium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lanthanium_tiny");
powder_actinium_tiny = new Item().setUnlocalizedName("powder_actinium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_actinium_tiny");
powder_meteorite_tiny = new Item().setUnlocalizedName("powder_meteorite_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_meteorite_tiny");
fragment_neodymium = new Item().setUnlocalizedName("fragment_neodymium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fragment_neodymium");
fragment_cobalt = new Item().setUnlocalizedName("fragment_cobalt").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fragment_cobalt");
@ -1505,6 +1528,7 @@ public class ModItems {
bottle_nuka = new ItemEnergy().setUnlocalizedName("bottle_nuka").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_nuka");
bottle_cherry = new ItemEnergy().setUnlocalizedName("bottle_cherry").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_cherry");
bottle_quantum = new ItemEnergy().setUnlocalizedName("bottle_quantum").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_quantum");
bottle_sparkle = new ItemEnergy().setUnlocalizedName("bottle_sparkle").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_sparkle");
bottle2_empty = new Item().setUnlocalizedName("bottle2_empty").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle2_empty");
bottle2_korl = new ItemEnergy().setUnlocalizedName("bottle2_korl").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle2_korl");
bottle2_fritz = new ItemEnergy().setUnlocalizedName("bottle2_fritz").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle2_fritz");
@ -1513,6 +1537,7 @@ public class ModItems {
chocolate_milk = new ItemEnergy().setUnlocalizedName("chocolate_milk").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":chocolate_milk");
cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_nuka");
cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_quantum");
cap_sparkle = new Item().setUnlocalizedName("cap_sparkle").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_sparkle");
cap_korl = new Item().setUnlocalizedName("cap_korl").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_korl");
cap_fritz = new Item().setUnlocalizedName("cap_fritz").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_fritz");
ring_pull = new Item().setUnlocalizedName("ring_pull").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":ring_pull");
@ -1528,7 +1553,7 @@ public class ModItems {
rod_neptunium = new ItemCustomLore().setUnlocalizedName("rod_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_neptunium");
rod_lead = new Item().setUnlocalizedName("rod_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_lead");
rod_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium");
rod_euphemium = new ItemCustomLore().setUnlocalizedName("rod_astatine").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_euphemium");
rod_euphemium = new ItemCustomLore().setUnlocalizedName("rod_astatine").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_euphemium");
rod_australium = new ItemCustomLore().setUnlocalizedName("rod_australium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_australium");
rod_weidanium = new ItemCustomLore().setUnlocalizedName("rod_weidanium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_weidanium");
rod_reiium = new ItemCustomLore().setUnlocalizedName("rod_reiium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_reiium");
@ -1665,6 +1690,8 @@ public class ModItems {
gun_revolver_nightmare = new GunNightmare().setMaxDamage(6).setUnlocalizedName("gun_revolver_nightmare").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare");
gun_revolver_nightmare2_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_nightmare2_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2_ammo");
gun_revolver_nightmare2 = new GunNightmare().setMaxDamage(6).setUnlocalizedName("gun_revolver_nightmare2").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2");
gun_revolver_pip_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_pip_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_pip_ammo");
gun_revolver_pip = new GunRevolver(gun_revolver_pip_ammo, 25, 35, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_pip").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_pip");
gun_fatman_ammo = new Item().setUnlocalizedName("gun_fatman_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_fatman_ammo");
gun_fatman = new GunFatman().setMaxDamage(2500).setUnlocalizedName("gun_fatman").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_fatman");
gun_mirv_ammo = new Item().setUnlocalizedName("gun_mirv_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_mirv_ammo");
@ -1774,6 +1801,7 @@ public class ModItems {
battery_advanced = new ItemBattery(200).setUnlocalizedName("battery_advanced").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_advanced");
battery_lithium = new ItemBattery(2500).setUnlocalizedName("battery_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_lithium");
battery_schrabidium = new ItemBattery(10000).setUnlocalizedName("battery_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_schrabidium");
battery_spark = new ItemBattery(1000000).setUnlocalizedName("battery_spark").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_spark");
battery_creative = new Item().setUnlocalizedName("battery_creative").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_creative");
battery_red_cell = new ItemBattery(150).setUnlocalizedName("battery_red_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_red_cell");
@ -1788,7 +1816,11 @@ public class ModItems {
battery_schrabidium_cell = new ItemBattery(30000).setUnlocalizedName("battery_schrabidium_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell");
battery_schrabidium_cell_2 = new ItemBattery(30000 * 2).setUnlocalizedName("battery_schrabidium_cell_2").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell_2");
battery_schrabidium_cell_4 = new ItemBattery(30000 * 4).setUnlocalizedName("battery_schrabidium_cell_4").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell_4");
battery_spark_cell_6 = new ItemBattery(1000000 * 6).setUnlocalizedName("battery_spark_cell_6").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_spark_cell_6");
battery_spark_cell_25 = new ItemBattery(1000000 * 25).setUnlocalizedName("battery_spark_cell_25").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_spark_cell_25");
battery_su = new ItemBattery(15).setUnlocalizedName("battery_su").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_su");
battery_su_l = new ItemBattery(35).setUnlocalizedName("battery_su_l").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":battery_su_l");
fusion_core = new ItemBattery(5000).setUnlocalizedName("fusion_core").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fusion_core");
fusion_core_infinite = new Item().setUnlocalizedName("fusion_core_infinite").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fusion_core_infinite");
energy_core = new ItemBattery(5000).setUnlocalizedName("energy_core").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":energy_core");
@ -1864,9 +1896,9 @@ public class ModItems {
clip_xvl1456 = new ItemClip().setUnlocalizedName("clip_xvl1456").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_xvl1456");
clip_emp = new ItemClip().setUnlocalizedName("clip_emp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_emp");
ingot_euphemium = new ItemAntiCheat().setUnlocalizedName("ingot_astatine").setTextureName(RefStrings.MODID + ":ingot_euphemium");
nugget_euphemium = new ItemAntiCheat().setUnlocalizedName("nugget_astatine").setTextureName(RefStrings.MODID + ":nugget_euphemium");
rod_quad_euphemium = new ItemCustomLore().setUnlocalizedName("rod_quad_astatine").setMaxStackSize(1).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_euphemium");
ingot_euphemium = new ItemAntiCheat().setUnlocalizedName("ingot_euphemium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_euphemium");
nugget_euphemium = new ItemAntiCheat().setUnlocalizedName("nugget_euphemium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_euphemium");
rod_quad_euphemium = new ItemCustomLore().setUnlocalizedName("rod_quad_astatine").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_euphemium");
watch = new ItemCustomLore().setUnlocalizedName("watch").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":watch");
apple_euphemium = new ItemAppleEuphemium(20, 100, false).setUnlocalizedName("apple_astatine").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":apple_euphemium");
@ -2190,6 +2222,7 @@ public class ModItems {
GameRegistry.registerItem(ingot_lanthanium, ingot_lanthanium.getUnlocalizedName());
GameRegistry.registerItem(ingot_actinium, ingot_actinium.getUnlocalizedName());
GameRegistry.registerItem(ingot_desh, ingot_desh.getUnlocalizedName());
GameRegistry.registerItem(ingot_dineutronium, ingot_dineutronium.getUnlocalizedName());
//Dusts & Other
GameRegistry.registerItem(lithium, lithium.getUnlocalizedName());
@ -2244,6 +2277,8 @@ public class ModItems {
GameRegistry.registerItem(powder_desh_mix, powder_desh_mix.getUnlocalizedName());
GameRegistry.registerItem(powder_desh, powder_desh.getUnlocalizedName());
GameRegistry.registerItem(powder_nitan_mix, powder_nitan_mix.getUnlocalizedName());
GameRegistry.registerItem(powder_spark_mix, powder_spark_mix.getUnlocalizedName());
GameRegistry.registerItem(powder_meteorite, powder_meteorite.getUnlocalizedName());
GameRegistry.registerItem(dust, dust.getUnlocalizedName());
GameRegistry.registerItem(powder_lithium_tiny, powder_lithium_tiny.getUnlocalizedName());
GameRegistry.registerItem(powder_neodymium_tiny, powder_neodymium_tiny.getUnlocalizedName());
@ -2252,6 +2287,8 @@ public class ModItems {
GameRegistry.registerItem(powder_cerium_tiny, powder_cerium_tiny.getUnlocalizedName());
GameRegistry.registerItem(powder_lanthanium_tiny, powder_lanthanium_tiny.getUnlocalizedName());
GameRegistry.registerItem(powder_actinium_tiny, powder_actinium_tiny.getUnlocalizedName());
GameRegistry.registerItem(powder_meteorite_tiny, powder_meteorite_tiny.getUnlocalizedName());
GameRegistry.registerItem(powder_euphemium, powder_euphemium.getUnlocalizedName());
//Powders
GameRegistry.registerItem(powder_fire, powder_fire.getUnlocalizedName());
@ -2297,6 +2334,7 @@ public class ModItems {
GameRegistry.registerItem(nugget_daffergon, nugget_daffergon.getUnlocalizedName());
GameRegistry.registerItem(nugget_verticium, nugget_verticium.getUnlocalizedName());
GameRegistry.registerItem(nugget_desh, nugget_desh.getUnlocalizedName());
GameRegistry.registerItem(nugget_dineutronium, nugget_dineutronium.getUnlocalizedName());
//Plates
GameRegistry.registerItem(plate_iron, plate_iron.getUnlocalizedName());
@ -2312,6 +2350,7 @@ public class ModItems {
GameRegistry.registerItem(plate_combine_steel, plate_combine_steel.getUnlocalizedName());
GameRegistry.registerItem(plate_mixed, plate_mixed.getUnlocalizedName());
GameRegistry.registerItem(plate_paa, plate_paa.getUnlocalizedName());
GameRegistry.registerItem(plate_polymer, plate_polymer.getUnlocalizedName());
GameRegistry.registerItem(plate_dalekanium, plate_dalekanium.getUnlocalizedName());
GameRegistry.registerItem(plate_euphemium, plate_euphemium.getUnlocalizedName());
@ -2539,7 +2578,12 @@ public class ModItems {
GameRegistry.registerItem(battery_schrabidium_cell, battery_schrabidium_cell.getUnlocalizedName());
GameRegistry.registerItem(battery_schrabidium_cell_2, battery_schrabidium_cell_2.getUnlocalizedName());
GameRegistry.registerItem(battery_schrabidium_cell_4, battery_schrabidium_cell_4.getUnlocalizedName());
GameRegistry.registerItem(battery_spark, battery_spark.getUnlocalizedName());
GameRegistry.registerItem(battery_spark_cell_6, battery_spark_cell_6.getUnlocalizedName());
GameRegistry.registerItem(battery_spark_cell_25, battery_spark_cell_25.getUnlocalizedName());
GameRegistry.registerItem(battery_creative, battery_creative.getUnlocalizedName());
GameRegistry.registerItem(battery_su, battery_su.getUnlocalizedName());
GameRegistry.registerItem(battery_su_l, battery_su_l.getUnlocalizedName());
GameRegistry.registerItem(fusion_core, fusion_core.getUnlocalizedName());
GameRegistry.registerItem(energy_core, energy_core.getUnlocalizedName());
GameRegistry.registerItem(fusion_core_infinite, fusion_core_infinite.getUnlocalizedName());
@ -2813,6 +2857,7 @@ public class ModItems {
GameRegistry.registerItem(gun_revolver_cursed, gun_revolver_cursed.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_nightmare, gun_revolver_nightmare.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_nightmare2, gun_revolver_nightmare2.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_pip, gun_revolver_pip.getUnlocalizedName());
GameRegistry.registerItem(gun_rpg, gun_rpg.getUnlocalizedName());
GameRegistry.registerItem(gun_fatman, gun_fatman.getUnlocalizedName());
GameRegistry.registerItem(gun_mirv, gun_mirv.getUnlocalizedName());
@ -2846,6 +2891,7 @@ public class ModItems {
GameRegistry.registerItem(gun_revolver_cursed_ammo, gun_revolver_cursed_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_nightmare_ammo, gun_revolver_nightmare_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_nightmare2_ammo, gun_revolver_nightmare2_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_pip_ammo, gun_revolver_pip_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_fatman_ammo, gun_fatman_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_mirv_ammo, gun_mirv_ammo.getUnlocalizedName());
@ -3022,6 +3068,7 @@ public class ModItems {
GameRegistry.registerItem(bottle_nuka, bottle_nuka.getUnlocalizedName());
GameRegistry.registerItem(bottle_cherry, bottle_cherry.getUnlocalizedName());
GameRegistry.registerItem(bottle_quantum, bottle_quantum.getUnlocalizedName());
GameRegistry.registerItem(bottle_sparkle, bottle_sparkle.getUnlocalizedName());
GameRegistry.registerItem(bottle2_empty, bottle2_empty.getUnlocalizedName());
GameRegistry.registerItem(bottle2_korl, bottle2_korl.getUnlocalizedName());
GameRegistry.registerItem(bottle2_fritz, bottle2_fritz.getUnlocalizedName());
@ -3032,6 +3079,7 @@ public class ModItems {
//Money
GameRegistry.registerItem(cap_nuka, cap_nuka.getUnlocalizedName());
GameRegistry.registerItem(cap_quantum, cap_quantum.getUnlocalizedName());
GameRegistry.registerItem(cap_sparkle, cap_sparkle.getUnlocalizedName());
GameRegistry.registerItem(cap_korl, cap_korl.getUnlocalizedName());
GameRegistry.registerItem(cap_fritz, cap_fritz.getUnlocalizedName());
GameRegistry.registerItem(ring_pull, ring_pull.getUnlocalizedName());

25
com/hbm/items/food/ItemEnergy.java
View File

@ -109,6 +109,14 @@ public class ItemEnergy extends Item {
p_77654_3_.addPotionEffect(new PotionEffect(Potion.resistance.id, 120 * 20, 2));
p_77654_3_.addPotionEffect(new PotionEffect(Potion.jump.id, 120 * 20, 2));
}
if(this == ModItems.bottle_sparkle)
{
p_77654_3_.heal(10F);
p_77654_3_.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 120 * 20, 1));
p_77654_3_.addPotionEffect(new PotionEffect(Potion.resistance.id, 120 * 20, 2));
p_77654_3_.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 120 * 20, 2));
p_77654_3_.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 120 * 20, 1));
}
}
if (!p_77654_3_.capabilities.isCreativeMode && this != ModItems.chocolate_milk)
@ -162,6 +170,16 @@ public class ItemEnergy extends Item {
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle2_empty));
}
if(this == ModItems.bottle_sparkle || this == ModItems.bottle_sparkle) {
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_sparkle));
if (p_77654_1_.stackSize <= 0)
{
return new ItemStack(ModItems.bottle_empty);
}
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_empty));
}
}
return p_77654_1_;
@ -254,5 +272,12 @@ public class ItemEnergy extends Item {
else
list.add("moremore caffeine");
}
if(this == ModItems.bottle_sparkle)
{
if(MainRegistry.polaroidID == 11)
list.add("Contains trace amounts of taint.");
else
list.add("The most delicious beverage in the wasteland!");
}
}
}

4
com/hbm/items/special/ItemAntiCheat.java
View File

@ -12,7 +12,7 @@ public class ItemAntiCheat extends ItemCustomLore {
@Override
public void onUpdate(ItemStack stack, World world, Entity entity, int j, boolean b) {
if(stack.getItemDamage() != 34) {
/*if(stack.getItemDamage() != 34) {
if(entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer)entity;
@ -28,7 +28,7 @@ public class ItemAntiCheat extends ItemCustomLore {
//if(!world.isRemote)
// ExplosionChaos.antiCheat(world, (int)entity.posX, (int)entity.posY, (int)entity.posZ, 20);
}
}*/
}
}

3
com/hbm/items/special/ItemBattery.java
View File

@ -3,6 +3,7 @@ package com.hbm.items.special;
import java.util.List;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
@ -27,7 +28,7 @@ public class ItemBattery extends Item {
if(itemstack.getItem() != ModItems.fusion_core && itemstack.getItem() != ModItems.factory_core_titanium && itemstack.getItem() != ModItems.factory_core_advanced && itemstack.getItem() != ModItems.energy_core)
{
list.add("Energy stored: " + (charge * 100) + "/" + (maxCharge * 100) + " HE");
list.add("Energy stored: " + Library.getShortNumber(charge * 100) + "/" + Library.getShortNumber(maxCharge * 100) + "HE");
} else {
long charge1 = (charge * 100) / this.maxCharge;
list.add("Charge: " + charge1 + "%");

35
com/hbm/items/special/ItemCustomLore.java
View File

@ -296,6 +296,12 @@ public class ItemCustomLore extends ItemRadioactive {
list.add("DEAL WITH IT carefully.");
}
if(this == ModItems.powder_euphemium)
{
list.add("Pulverized pink.");
list.add("Tastes like strawberries.");
}
if(this == ModItems.watch)
{
list.add("A small blue pocket watch.");
@ -560,17 +566,40 @@ public class ItemCustomLore extends ItemRadioactive {
@Override
public EnumRarity getRarity(ItemStack p_77613_1_) {
if(this == ModItems.nugget_euphemium || this == ModItems.ingot_euphemium || this == ModItems.rod_quad_euphemium || this == ModItems.plate_euphemium || this == ModItems.watch || this == ModItems.powder_iodine || this == ModItems.powder_thorium || this == ModItems.powder_neodymium || this == ModItems.powder_neptunium || this == ModItems.powder_astatine || this == ModItems.powder_caesium || this == ModItems.powder_strontium || this == ModItems.powder_cobalt || this == ModItems.powder_bromine || this == ModItems.powder_niobium || this == ModItems.powder_tennessine || this == ModItems.powder_cerium)
if(this == ModItems.nugget_euphemium || this == ModItems.ingot_euphemium ||
this == ModItems.rod_quad_euphemium || this == ModItems.plate_euphemium ||
this == ModItems.watch || this == ModItems.powder_iodine ||
this == ModItems.powder_thorium || this == ModItems.powder_neodymium ||
this == ModItems.powder_neptunium || this == ModItems.powder_astatine ||
this == ModItems.powder_caesium || this == ModItems.powder_strontium ||
this == ModItems.powder_cobalt || this == ModItems.powder_bromine ||
this == ModItems.powder_niobium || this == ModItems.powder_tennessine ||
this == ModItems.powder_cerium || this == ModItems.powder_euphemium)
{
return EnumRarity.epic;
}
if(this == ModItems.rod_schrabidium || this == ModItems.rod_dual_schrabidium || this == ModItems.rod_quad_schrabidium || this == ModItems.ingot_schrabidium || this == ModItems.nugget_schrabidium || this == ModItems.plate_schrabidium || this == ModItems.cell_sas3 || this == ModItems.powder_schrabidium || this == ModItems.wire_schrabidium || this == ModItems.circuit_schrabidium || this == ModItems.gun_revolver_schrabidium_ammo)
if(this == ModItems.rod_schrabidium || this == ModItems.rod_dual_schrabidium ||
this == ModItems.rod_quad_schrabidium || this == ModItems.ingot_schrabidium ||
this == ModItems.nugget_schrabidium || this == ModItems.plate_schrabidium ||
this == ModItems.cell_sas3 || this == ModItems.powder_schrabidium ||
this == ModItems.wire_schrabidium || this == ModItems.circuit_schrabidium ||
this == ModItems.gun_revolver_schrabidium_ammo)
{
return EnumRarity.rare;
}
if(this == ModItems.gun_revolver_cursed_ammo || this == ModItems.plate_paa || this == ModItems.gun_mp_ammo || this == ModItems.powder_power || this == ModItems.ingot_australium || this == ModItems.ingot_weidanium || this == ModItems.ingot_reiium || this == ModItems.ingot_unobtainium || this == ModItems.ingot_daffergon || this == ModItems.ingot_verticium || this == ModItems.nugget_australium || this == ModItems.nugget_weidanium || this == ModItems.nugget_reiium || this == ModItems.nugget_unobtainium || this == ModItems.nugget_daffergon || this == ModItems.nugget_verticium || this == ModItems.powder_australium || this == ModItems.powder_weidanium || this == ModItems.powder_reiium || this == ModItems.powder_unobtainium || this == ModItems.powder_daffergon || this == ModItems.powder_verticium)
if(this == ModItems.gun_revolver_cursed_ammo || this == ModItems.plate_paa ||
this == ModItems.gun_mp_ammo || this == ModItems.powder_power ||
this == ModItems.ingot_australium || this == ModItems.ingot_weidanium ||
this == ModItems.ingot_reiium || this == ModItems.ingot_unobtainium ||
this == ModItems.ingot_daffergon || this == ModItems.ingot_verticium ||
this == ModItems.nugget_australium || this == ModItems.nugget_weidanium ||
this == ModItems.nugget_reiium || this == ModItems.nugget_unobtainium ||
this == ModItems.nugget_daffergon || this == ModItems.nugget_verticium ||
this == ModItems.powder_australium || this == ModItems.powder_weidanium ||
this == ModItems.powder_reiium || this == ModItems.powder_unobtainium ||
this == ModItems.powder_daffergon || this == ModItems.powder_verticium)
{
return EnumRarity.uncommon;
}

35
com/hbm/items/weapon/GunRevolver.java
View File

@ -27,10 +27,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class GunRevolver extends Item {
public static final String[] bowPullIconNameArray = new String[] { "pulling_0", "pulling_1", "pulling_2" };
@SideOnly(Side.CLIENT)
private IIcon[] iconArray;
private static final String __OBFID = "CL_00001777";
private Item ammo;
private int dmgMin;
private int dmgMax;
@ -58,6 +55,9 @@ public class GunRevolver extends Item {
if (this == ModItems.gun_revolver_cursed) {
this.setMaxDamage(5000);
}
if (this == ModItems.gun_revolver_pip) {
this.setMaxDamage(1000);
}
this.ammo = ammo;
this.dmgMin = dmgMin;
@ -77,6 +77,10 @@ public class GunRevolver extends Item {
return EnumRarity.uncommon;
}
if (this == ModItems.gun_revolver_pip) {
return EnumRarity.uncommon;
}
return EnumRarity.common;
}
@ -109,24 +113,25 @@ public class GunRevolver extends Item {
EntityBullet entityarrow = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, instakill, rad);
entityarrow.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin));
if(this == ModItems.gun_revolver_pip && p_77615_3_.isSneaking()) {
entityarrow.pip = true;
entityarrow.setDamage(1);
}
p_77615_1_.damageItem(1, p_77615_3_);
if (this == ModItems.gun_revolver || this == ModItems.gun_revolver_iron
|| this == ModItems.gun_revolver_gold || this == ModItems.gun_revolver_lead) {
// p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode",
// 1.0F, 3.0F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShoot", 1.0F, 1.0F);
}
if (this == ModItems.gun_revolver_cursed) {
// p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode",
// 3.0F, 1.5F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.heavyShoot", 3.0F, 1.0F);
}
if (this == ModItems.gun_revolver_schrabidium) {
// p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode",
// 1.0F, 3.0F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.schrabidiumShoot", 1.0F, 1.0F);
}
if (this == ModItems.gun_revolver_pip) {
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShootAlt", 1.0F, 1.0F);
}
if (flag) {
entityarrow.canBePickedUp = 2;
@ -233,6 +238,16 @@ public class GunRevolver extends Item {
list.add("Damage: 25 - 40");
list.add("33% chance of user being withered.");
}
if (this == ModItems.gun_revolver_pip) {
list.add("In loving memory of the eldritch");
list.add("creature which got smushed by a");
list.add("falling freight wagon.");
list.add("");
list.add("Ammo: Tainted Bullets");
list.add("Damage: 25 - 35");
list.add("Secondary Damage: 1");
list.add("Enemy is hit by boxcar.");
}
}
@Override

96
com/hbm/lib/Library.java
View File

@ -291,7 +291,8 @@ public class Library {
world.getBlock(x, y, z) == ModBlocks.dummy_port_pumpjack ||
world.getBlock(x, y, z) == ModBlocks.dummy_port_turbofan ||
world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_limiter ||
world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_emitter)
world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_emitter ||
world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_base)
{
return true;
}
@ -325,7 +326,8 @@ public class Library {
world.getBlock(x, y, z) == ModBlocks.watz_hatch ||
world.getBlock(x, y, z) == ModBlocks.fwatz_hatch ||
world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_limiter ||
world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_emitter)
world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_emitter ||
world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_base)
{
return true;
}
@ -500,6 +502,42 @@ public class Library {
return list;
}
public static String getShortNumber(long l) {
if(l >= Math.pow(10, 18)) {
double res = l / Math.pow(10, 18);
res = Math.round(res * 100.0) / 100.0;
return res + "E";
}
if(l >= Math.pow(10, 15)) {
double res = l / Math.pow(10, 15);
res = Math.round(res * 100.0) / 100.0;
return res + "P";
}
if(l >= Math.pow(10, 12)) {
double res = l / Math.pow(10, 12);
res = Math.round(res * 100.0) / 100.0;
return res + "T";
}
if(l >= Math.pow(10, 9)) {
double res = l / Math.pow(10, 9);
res = Math.round(res * 100.0) / 100.0;
return res + "G";
}
if(l >= Math.pow(10, 6)) {
double res = l / Math.pow(10, 6);
res = Math.round(res * 100.0) / 100.0;
return res + "M";
}
if(l >= Math.pow(10, 3)) {
double res = l / Math.pow(10, 3);
res = Math.round(res * 100.0) / 100.0;
return res + "k";
}
return Long.toString(l);
}
public static long chargeItemsFromTE(ItemStack[] slots, int index, long power, long maxPower) {
if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_generic && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge())
@ -597,6 +635,25 @@ public class Library {
power -= 100;
((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1);
} else break;
for(int i = 0; i < 200; i++)
if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_spark && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge())
{
power -= 100;
((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1);
} else break;
for(int i = 0; i < 200; i++)
if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_spark_cell_6 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge())
{
power -= 100;
((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1);
} else break;
for(int i = 0; i < 200; i++)
if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_spark_cell_25 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge())
{
power -= 100;
((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1);
} else break;
for(int i = 0; i < 10; i++)
if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.factory_core_titanium && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge())
@ -655,6 +712,17 @@ public class Library {
return maxPower;
}
if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_su && ItemBattery.getCharge(slots[index]) > 0)
{
power += 100;
((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1);
}
if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_su_l && ItemBattery.getCharge(slots[index]) > 0)
{
power += 100;
((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1);
}
if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_generic && ItemBattery.getCharge(slots[index]) > 0)
{
power += 100;
@ -750,6 +818,25 @@ public class Library {
power += 100;
((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1);
} else break;
for(int i = 0; i < 200; i++)
if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_spark && ItemBattery.getCharge(slots[index]) > 0)
{
power += 100;
((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1);
} else break;
for(int i = 0; i < 200; i++)
if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_spark_cell_6 && ItemBattery.getCharge(slots[index]) > 0)
{
power += 100;
((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1);
} else break;
for(int i = 0; i < 200; i++)
if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_spark_cell_25 && ItemBattery.getCharge(slots[index]) > 0)
{
power += 100;
((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1);
} else break;
for(int i = 0; i < 25; i++)
if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.fusion_core && ItemBattery.getCharge(slots[index]) > 0)
@ -1059,6 +1146,11 @@ public class Library {
{
tileentity = worldObj.getTileEntity(((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetX, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetY, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetZ);
}
//AMS Base
if(block == ModBlocks.dummy_port_ams_base)
{
tileentity = worldObj.getTileEntity(((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetX, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetY, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetZ);
}
if(tileentity == that)
tileentity = null;

1
com/hbm/lib/ModDamageSource.java
View File

@ -31,6 +31,7 @@ public class ModDamageSource extends DamageSource {
public static DamageSource blackhole = (new DamageSource("blackhole")).setDamageIsAbsolute().setDamageBypassesArmor();
public static DamageSource turbofan = (new DamageSource("blender")).setDamageIsAbsolute().setDamageBypassesArmor();
public static DamageSource meteorite = (new DamageSource("meteorite")).setDamageIsAbsolute().setDamageBypassesArmor();
public static DamageSource boxcar = (new DamageSource("boxcar")).setDamageIsAbsolute().setDamageBypassesArmor();
public ModDamageSource(String p_i1566_1_) {
super(p_i1566_1_);

2
com/hbm/lib/RefStrings.java
View File

@ -3,7 +3,7 @@ package com.hbm.lib;
public class RefStrings {
public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod";
public static final String VERSION = "1.0.26";
public static final String VERSION = "1.0.27 BETA (Bromine-Mercury-X01)";
//HBM's Beta Naming Convention:
//V T (X-Y-Z)
//V -> next release version

2
com/hbm/main/ClientProxy.java
View File

@ -161,6 +161,7 @@ public class ClientProxy extends ServerProxy
MinecraftForgeClient.registerItemRenderer(ModItems.gun_defabricator, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_dash, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_twigun, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_pip, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.multitool_dig, new ItemRenderMultitool());
MinecraftForgeClient.registerItemRenderer(ModItems.multitool_silk, new ItemRenderMultitool());
@ -238,6 +239,7 @@ public class ClientProxy extends ServerProxy
RenderingRegistry.registerEntityRenderingHandler(EntityBombletTheta.class, new RenderBombletTheta());
RenderingRegistry.registerEntityRenderingHandler(EntityBombletSelena.class, new RenderBombletSelena());
RenderingRegistry.registerEntityRenderingHandler(EntityMeteor.class, new RenderMeteor());
RenderingRegistry.registerEntityRenderingHandler(EntityBoxcar.class, new RenderBoxcar());
RenderingRegistry.registerEntityRenderingHandler(EntityMissileEndo.class, new RenderMissileThermo());
RenderingRegistry.registerEntityRenderingHandler(EntityMissileExo.class, new RenderMissileThermo());

24
com/hbm/main/CraftingManager.java
View File

@ -374,9 +374,9 @@ public class CraftingManager {
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_copper), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustCopper" }));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_plutonium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustPlutonium" }));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_euphemium, 1, 34), new Object[] { ModItems.rod_quad_euphemium });
GameRegistry.addRecipe(new ItemStack(ModItems.ingot_euphemium, 1, 34), new Object[] { "###", "###", "###", '#', new ItemStack(ModItems.nugget_euphemium, 1, 34) });
GameRegistry.addRecipe(new ItemStack(ModItems.nugget_euphemium, 9, 34), new Object[] { "#", '#', new ItemStack(ModItems.ingot_euphemium, 1, 34) });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_euphemium, 1), new Object[] { ModItems.rod_quad_euphemium });
GameRegistry.addRecipe(new ItemStack(ModItems.ingot_euphemium, 1), new Object[] { "###", "###", "###", '#', ModItems.nugget_euphemium });
GameRegistry.addRecipe(new ItemStack(ModItems.nugget_euphemium, 9), new Object[] { "#", '#', ModItems.ingot_euphemium });
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_rtg, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "tinyPu238" }));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_rtg_weak, 1), new Object[] { "IUI", "UPU", "IUI", 'I', "plateIron", 'P', "tinyPu238", 'U', "tinyU238" }));
@ -543,11 +543,11 @@ public class CraftingManager {
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.titanium_filter, 1), new Object[] { "PFP", "CBC", "CBC", 'P', "plateLead", 'B', "U238", 'C', "plateTitanium", 'F', ModItems.fuse }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.detonator, 1), new Object[] { " W", "SC", "CE", 'S', "plateSteel", 'W', ModItems.wire_red_copper, 'C', ModItems.circuit_red_copper, 'E', "ingotSteel" }));
GameRegistry.addRecipe(new ItemStack(ModItems.singularity, 1), new Object[] { "ESE", "SBS", "ESE", 'E', new ItemStack(ModItems.nugget_euphemium, 1, 34), 'S', ModItems.cell_anti_schrabidium, 'B', Item.getItemFromBlock(ModBlocks.block_schrabidium) });
GameRegistry.addRecipe(new ItemStack(ModItems.singularity, 1), new Object[] { "ESE", "SBS", "ESE", 'E', ModItems.nugget_euphemium, 'S', ModItems.cell_anti_schrabidium, 'B', Item.getItemFromBlock(ModBlocks.block_schrabidium) });
GameRegistry.addRecipe(new ItemStack(ModItems.singularity_counter_resonant, 1), new Object[] { "CTC", "TST", "CTC", 'C', ModItems.plate_combine_steel, 'T', ModItems.ingot_magnetized_tungsten, 'S', ModItems.singularity });
GameRegistry.addRecipe(new ItemStack(ModItems.singularity_super_heated, 1), new Object[] { "CTC", "TST", "CTC", 'C', ModItems.plate_advanced_alloy, 'T', ModItems.powder_power, 'S', ModItems.singularity });
GameRegistry.addRecipe(new ItemStack(ModItems.black_hole, 1), new Object[] { "SSS", "SCS", "SSS", 'C', ModItems.singularity, 'S', ModItems.crystal_xen });
GameRegistry.addRecipe(new ItemStack(ModItems.crystal_xen, 1), new Object[] { "EEE", "EIE", "EEE", 'E', ModItems.powder_power, 'I', new ItemStack(ModItems.ingot_euphemium, 1, 34) });
GameRegistry.addRecipe(new ItemStack(ModItems.crystal_xen, 1), new Object[] { "EEE", "EIE", "EEE", 'E', ModItems.powder_power, 'I', ModItems.ingot_euphemium });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.screwdriver, 1), new Object[] { " I", " I ", "S ", 'S', "ingotSteel", 'I', "ingotIron" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.overfuse, 1), new Object[] { ModItems.screwdriver, "dustNeptunium", ModItems.powder_iodine, ModItems.powder_thorium, ModItems.powder_astatine, ModItems.powder_neodymium, ModItems.board_copper, ModItems.black_hole, ModItems.powder_caesium }));
@ -679,7 +679,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_cryolator_ammo, 16), new Object[] { "SPS", "PCP", "SPS", 'S', "plateSteel", 'C', "dustSalpeter", 'P', Items.snowball }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_cryolator_ammo, 16), new Object[] { " F ", "SFS", " F ", 'S', "plateSteel", 'F', ModItems.powder_ice }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_zomg, 1), new Object[] { "PRR", "CCS", "PXX", 'P', ModItems.plate_paa, 'R', "plateDenseLead", 'S', ModItems.singularity_counter_resonant, 'X', ModItems.crystal_xen, 'C', ModItems.coil_magnetized_tungsten}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp, 1), new Object[] { "EEE", "SSM", "III", 'E', new ItemStack(ModItems.ingot_euphemium, 1, 34), 'S', "plateSteel", 'I', "ingotSteel", 'M', ModItems.motor}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp, 1), new Object[] { "EEE", "SSM", "III", 'E', ModItems.ingot_euphemium, 'S', "plateSteel", 'I', "ingotSteel", 'M', ModItems.motor}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp_ammo, 32), new Object[] { "G", "C", 'G', "plateGold", 'C', "plateCopper", 'S', Items.gunpowder }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_emp, 1), new Object[] { "CPG", "CMF", "CPI", 'C', ModItems.coil_copper, 'P', "plateLead", 'G', ModItems.circuit_gold, 'M', ModItems.magnetron, 'I', "ingotTungsten", 'F', ModItems.fuse }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_emp_ammo, 8), new Object[] { "IGI", "IPI", "IPI", 'G', "plateGold", 'I', "plateIron", 'P', ModItems.powder_power }));
@ -949,18 +949,18 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(ModItems.cape_radiation, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 11), 'D', new ItemStack(Items.dye, 1, 11), 'I', ModItems.nuclear_waste });
GameRegistry.addRecipe(new ItemStack(ModItems.cape_gasmask, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 4), 'D', new ItemStack(Items.dye, 1, 0), 'I', ModItems.gas_mask });
GameRegistry.addRecipe(new ItemStack(ModItems.cape_schrabidium, 1), new Object[] { "W W", "WIW", "WDW", 'W', ModItems.ingot_schrabidium, 'D', new ItemStack(Items.dye, 1, 0), 'I', ModItems.circuit_red_copper });
GameRegistry.addRecipe(new ItemStack(ModItems.cape_hbm, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), 'D', ModItems.ingot_neptunium, 'I', new ItemStack(ModItems.ingot_euphemium, 1, 34) });
GameRegistry.addRecipe(new ItemStack(ModItems.cape_hbm, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), 'D', ModItems.ingot_neptunium, 'I', ModItems.ingot_euphemium });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_dafnik, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 1), 'D', new ItemStack(Items.dye, 1, 0), 'I', "ingotSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_lpkukin, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 13), 'D', new ItemStack(Items.dye, 1, 8), 'I', "plateSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.igniter, 1), new Object[] { " W", "SC", "CE", 'S', "plateSteel", 'W', ModItems.wire_schrabidium, 'C', ModItems.circuit_schrabidium, 'E', new ItemStack(ModItems.ingot_euphemium, 1, 34) }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.igniter, 1), new Object[] { " W", "SC", "CE", 'S', "plateSteel", 'W', ModItems.wire_schrabidium, 'C', ModItems.circuit_schrabidium, 'E', ModItems.ingot_euphemium }));
GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.plate_euphemium });
GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_plate, 1), new Object[] { "EWE", "EEE", "EEE", 'E', ModItems.plate_euphemium, 'W', ModItems.watch });
GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.plate_euphemium });
GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.plate_euphemium });
GameRegistry.addRecipe(new ItemStack(ModItems.watch, 1), new Object[] { "LEL", "EWE", "LEL", 'E', new ItemStack(ModItems.ingot_euphemium, 1, 34), 'L', new ItemStack(Items.dye, 1, 4), 'W', Items.clock });
GameRegistry.addRecipe(new ItemStack(ModItems.apple_euphemium, 1), new Object[] { "EEE", "EAE", "EEE", 'E', new ItemStack(ModItems.nugget_euphemium, 1, 34), 'A', Items.apple });
GameRegistry.addRecipe(new ItemStack(ModItems.plate_euphemium, 1), new Object[] { "AEA", "ENE", "AEA", 'E', new ItemStack(ModItems.ingot_euphemium, 1, 34), 'N', Items.nether_star, 'A', ModItems.powder_astatine });
GameRegistry.addRecipe(new ItemStack(ModItems.watch, 1), new Object[] { "LEL", "EWE", "LEL", 'E', ModItems.ingot_euphemium, 'L', new ItemStack(Items.dye, 1, 4), 'W', Items.clock });
GameRegistry.addRecipe(new ItemStack(ModItems.apple_euphemium, 1), new Object[] { "EEE", "EAE", "EEE", 'E', ModItems.nugget_euphemium, 'A', Items.apple });
GameRegistry.addRecipe(new ItemStack(ModItems.plate_euphemium, 1), new Object[] { "AEA", "ENE", "AEA", 'E', ModItems.ingot_euphemium, 'N', Items.nether_star, 'A', ModItems.powder_astatine });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mask_of_infamy, 1), new Object[] { "III", "III", " I ", 'I', "plateIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.designator, 1), new Object[] { " A", "#B#", "#B#", '#', "plateIron", 'A', "plateSteel", 'B', ModItems.circuit_red_copper }));
@ -972,7 +972,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.geiger_counter, 1), new Object[] { "GPP", "WCS", "WBB", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_copper, 'G', "ingotGold", 'S', "plateSteel", 'B', ModItems.ingot_beryllium }));
//GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hammer, 1), new Object[] { "BBB", "BBB", " S ", 'B', Item.getItemFromBlock(ModBlocks.block_schrabidium), 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_stopper, 1), new Object[] { "I", "S", "S", 'I', new ItemStack(ModItems.ingot_euphemium, 1, 34), 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_stopper, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_euphemium, 'S', Items.stick });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "sulfur", 'S', Items.stick }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "dustSulfur", 'S', Items.stick }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.crowbar, 1), new Object[] { "II", " I", " I", 'I', "ingotSteel" }));

2
com/hbm/main/MainRegistry.java
View File

@ -105,6 +105,7 @@ import com.hbm.entity.particle.EntitySSmokeFX;
import com.hbm.entity.particle.EntitySmokeFX;
import com.hbm.entity.particle.EntityTSmokeFX;
import com.hbm.entity.projectile.EntityBaleflare;
import com.hbm.entity.projectile.EntityBoxcar;
import com.hbm.entity.projectile.EntityBullet;
import com.hbm.entity.projectile.EntityChopperMine;
import com.hbm.entity.projectile.EntityCombineBall;
@ -615,6 +616,7 @@ public class MainRegistry
EntityRegistry.registerModEntity(EntityVortex.class, "entity_vortex", 83, this, 250, 1, true);
EntityRegistry.registerModEntity(EntityMeteor.class, "entity_meteor", 84, this, 1000, 1, true);
EntityRegistry.registerModEntity(EntityLaser.class, "entity_laser", 85, this, 1000, 1, true);
EntityRegistry.registerModEntity(EntityBoxcar.class, "entity_boxcar", 86, this, 1000, 1, true);
EntityRegistry.registerGlobalEntityID(EntityNuclearCreeper.class, "entity_mob_nuclear_creeper", EntityRegistry.findGlobalUniqueEntityId(), 0x204131, 0x75CE00);
EntityRegistry.registerGlobalEntityID(EntityHunterChopper.class, "entity_mob_hunter_chopper", EntityRegistry.findGlobalUniqueEntityId(), 0x000020, 0x2D2D72);

9
com/hbm/main/ResourceManager.java
View File

@ -89,4 +89,13 @@ public class ResourceManager {
//Shimmer Sledge
public static final ResourceLocation shimmer_sledge_tex = new ResourceLocation(RefStrings.MODID, "textures/models/shimmer_sledge.png");
////Obj Entities
//Boxcar
public static final IModelCustom boxcar = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/boxcar.obj"));
////Texture Entities
//Boxcar
public static final ResourceLocation boxcar_tex = new ResourceLocation(RefStrings.MODID, "textures/models/boxcar.png");
}

36
com/hbm/render/entity/RenderBoxcar.java Normal file
View File

@ -0,0 +1,36 @@
package com.hbm.render.entity;
import org.lwjgl.opengl.GL11;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
public class RenderBoxcar extends Render {
@Override
public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
float p_76986_9_) {
GL11.glPushMatrix();
GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_);
GL11.glTranslatef(0, 0, -1.5F);
GL11.glRotated(180, 0, 0, 1);
GL11.glRotated(90, 1, 0, 0);
GL11.glDisable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.boxcar_tex);
ResourceManager.boxcar.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
}
@Override
protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
return ResourceManager.boxcar_tex;
}
}

23
com/hbm/render/item/ItemRenderOverkill.java
View File

@ -4,12 +4,14 @@ import org.lwjgl.opengl.GL11;
import com.hbm.items.ModItems;
import com.hbm.lib.RefStrings;
import com.hbm.main.MainRegistry;
import com.hbm.render.model.ModelDash;
import com.hbm.render.model.ModelDefabricator;
import com.hbm.render.model.ModelEuthanasia;
import com.hbm.render.model.ModelGun;
import com.hbm.render.model.ModelHP;
import com.hbm.render.model.ModelJack;
import com.hbm.render.model.ModelPip;
import com.hbm.render.model.ModelSpark;
import com.hbm.render.model.ModelTwiGun;
@ -28,6 +30,7 @@ public class ItemRenderOverkill implements IItemRenderer {
protected ModelDefabricator defab;
protected ModelDash dasher;
protected ModelTwiGun rgottp;
protected ModelPip pip;
public ItemRenderOverkill() {
powerJack = new ModelJack();
@ -37,6 +40,7 @@ public class ItemRenderOverkill implements IItemRenderer {
defab = new ModelDefabricator();
dasher = new ModelDash();
rgottp = new ModelTwiGun();
pip = new ModelPip();
}
@Override
@ -76,6 +80,8 @@ public class ItemRenderOverkill implements IItemRenderer {
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDash.png"));
if(item.getItem() == ModItems.gun_twigun)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelTwiGun.png"));
if(item.getItem() == ModItems.gun_revolver_pip)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPip.png"));
GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(-0.5F, 0.0F, -0.2F);
@ -83,9 +89,15 @@ public class ItemRenderOverkill implements IItemRenderer {
GL11.glScalef(0.5F, 0.5F, 0.5F);
//GL11.glTranslatef(-0.4F, -0.1F, 0.1F);
GL11.glTranslatef(-0.2F, -0.1F, -0.1F);
if(item.getItem() == ModItems.gun_defabricator)
GL11.glTranslatef(0, 0.5F, 0.4F);
if(item.getItem() == ModItems.gun_revolver_pip) {
GL11.glScalef(0.60F, 0.60F, 0.60F);
GL11.glTranslatef(0.0F, 0.3F, 0.2F);
}
if(item.getItem() == ModItems.gun_jack)
powerJack.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_spark)
@ -100,6 +112,8 @@ public class ItemRenderOverkill implements IItemRenderer {
dasher.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_twigun)
rgottp.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_revolver_pip)
pip.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
GL11.glPopMatrix();
break;
case EQUIPPED:
@ -120,6 +134,8 @@ public class ItemRenderOverkill implements IItemRenderer {
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDash.png"));
if(item.getItem() == ModItems.gun_twigun)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelTwiGun.png"));
if(item.getItem() == ModItems.gun_revolver_pip)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPip.png"));
GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F);
@ -138,6 +154,11 @@ public class ItemRenderOverkill implements IItemRenderer {
if(item.getItem() == ModItems.gun_defabricator)
GL11.glTranslatef(0.5F, 0.6F, -0.2F);
if(item.getItem() == ModItems.gun_revolver_pip) {
GL11.glScalef(0.60F, 0.60F, 0.60F);
GL11.glTranslatef(0.7F, 0.3F, 0.0F);
}
if(item.getItem() == ModItems.gun_jack)
powerJack.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_spark)
@ -152,6 +173,8 @@ public class ItemRenderOverkill implements IItemRenderer {
dasher.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_twigun)
rgottp.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_revolver_pip)
pip.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
GL11.glPopMatrix();
default: break;
}

223
com/hbm/render/model/ModelPip.java Executable file
View File

@ -0,0 +1,223 @@
//This File was created with the Minecraft-SMP Modelling Toolbox 2.3.0.0
// Copyright (C) 2017 Minecraft-SMP.de
// This file is for Flan's Flying Mod Version 4.0.x+
// Model: Pip
// Model Creator:
// Created on:09.12.2017 - 12:48:52
// Last changed on: 09.12.2017 - 12:48:52
package com.hbm.render.model;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelPip extends ModelBase
{
public ModelRenderer pipModel[];
int textureX = 128;
int textureY = 128;
public ModelPip()
{
textureWidth = 128;
textureHeight = 128;
pipModel = new ModelRenderer[39];
pipModel[0] = new ModelRenderer(this, 1, 1); // Box 0
pipModel[1] = new ModelRenderer(this, 49, 1); // Box 1
pipModel[2] = new ModelRenderer(this, 97, 1); // Box 2
pipModel[3] = new ModelRenderer(this, 1, 9); // Box 3
pipModel[4] = new ModelRenderer(this, 25, 9); // Box 4
pipModel[5] = new ModelRenderer(this, 49, 9); // Box 5
pipModel[6] = new ModelRenderer(this, 73, 9); // Box 6
pipModel[7] = new ModelRenderer(this, 81, 17); // Box 7
pipModel[8] = new ModelRenderer(this, 97, 17); // Box 10
pipModel[9] = new ModelRenderer(this, 1, 25); // Box 12
pipModel[10] = new ModelRenderer(this, 1, 9); // Box 14
pipModel[11] = new ModelRenderer(this, 17, 25); // Box 15
pipModel[12] = new ModelRenderer(this, 41, 25); // Box 16
pipModel[13] = new ModelRenderer(this, 49, 9); // Box 17
pipModel[14] = new ModelRenderer(this, 113, 17); // Box 18
pipModel[15] = new ModelRenderer(this, 73, 17); // Box 19
pipModel[16] = new ModelRenderer(this, 65, 25); // Box 20
pipModel[17] = new ModelRenderer(this, 113, 25); // Box 22
pipModel[18] = new ModelRenderer(this, 65, 25); // Box 23
pipModel[19] = new ModelRenderer(this, 1, 33); // Box 24
pipModel[20] = new ModelRenderer(this, 81, 33); // Box 25
pipModel[21] = new ModelRenderer(this, 1, 41); // Box 26
pipModel[22] = new ModelRenderer(this, 89, 33); // Box 27
pipModel[23] = new ModelRenderer(this, 105, 33); // Box 28
pipModel[24] = new ModelRenderer(this, 33, 41); // Box 29
pipModel[25] = new ModelRenderer(this, 49, 41); // Box 30
pipModel[26] = new ModelRenderer(this, 65, 41); // Box 31
pipModel[27] = new ModelRenderer(this, 105, 41); // Box 32
pipModel[28] = new ModelRenderer(this, 1, 49); // Box 33
pipModel[29] = new ModelRenderer(this, 17, 49); // Box 34
pipModel[30] = new ModelRenderer(this, 33, 49); // Box 35
pipModel[31] = new ModelRenderer(this, 57, 49); // Box 36
pipModel[32] = new ModelRenderer(this, 81, 49); // Box 37
pipModel[33] = new ModelRenderer(this, 105, 49); // Box 38
pipModel[34] = new ModelRenderer(this, 1, 57); // Box 39
pipModel[35] = new ModelRenderer(this, 89, 25); // Box 40
pipModel[36] = new ModelRenderer(this, 97, 41); // Box 41
pipModel[37] = new ModelRenderer(this, 49, 49); // Box 42
pipModel[38] = new ModelRenderer(this, 73, 57); // Box 43
pipModel[0].addBox(0F, 0F, 0F, 20, 3, 2, 0F); // Box 0
pipModel[0].setRotationPoint(-20F, -5.5F, -1F);
pipModel[1].addBox(0F, 0F, 0F, 20, 2, 3, 0F); // Box 1
pipModel[1].setRotationPoint(-20F, -5F, -1.5F);
pipModel[2].addBox(0F, 0F, 0F, 10, 8, 3, 0F); // Box 2
pipModel[2].setRotationPoint(0F, -6F, -1.5F);
pipModel[3].addBox(0F, 0F, 0F, 6, 5, 5, 0F); // Box 3
pipModel[3].setRotationPoint(2F, -5F, -2.5F);
pipModel[4].addBox(0F, 0F, 0F, 6, 6, 4, 0F); // Box 4
pipModel[4].setRotationPoint(2F, -5.5F, -2F);
pipModel[5].addBox(0F, 0F, 0F, 6, 4, 6, 0F); // Box 5
pipModel[5].setRotationPoint(2F, -4.5F, -3F);
pipModel[6].addBox(0F, 0F, 0F, 7, 2, 1, 0F); // Box 6
pipModel[6].setRotationPoint(-7F, -2.5F, -0.5F);
pipModel[7].addBox(-6F, 0F, 0F, 6, 3, 1, 0F); // Box 7
pipModel[7].setRotationPoint(15F, -2.5F, -1.5F);
pipModel[7].rotateAngleZ = 0.61086524F;
pipModel[8].addBox(0F, 0F, 0F, 5, 5, 3, 0F); // Box 10
pipModel[8].setRotationPoint(10F, -2.5F, -1.5F);
pipModel[9].addBox(-6F, 0F, 0F, 6, 3, 1, 0F); // Box 12
pipModel[9].setRotationPoint(15F, -2.5F, 0.5F);
pipModel[9].rotateAngleZ = 0.61086524F;
pipModel[10].addBox(-6F, 0F, 0F, 1, 3, 1, 0F); // Box 14
pipModel[10].setRotationPoint(15F, -2.5F, -0.5F);
pipModel[10].rotateAngleZ = 0.61086524F;
pipModel[11].addBox(0F, 0F, 0F, 6, 6, 4, 0F); // Box 15
pipModel[11].setRotationPoint(12F, 4F, -2F);
pipModel[12].addBox(-5F, -7F, 0F, 5, 7, 4, 0F); // Box 16
pipModel[12].setRotationPoint(18F, 4F, -2F);
pipModel[12].rotateAngleZ = -0.52359878F;
pipModel[13].addBox(0F, -2F, 0F, 1, 2, 1, 0F); // Box 17
pipModel[13].setRotationPoint(12F, -2.5F, -0.5F);
pipModel[13].rotateAngleZ = 0.34906585F;
pipModel[14].addBox(-0.5F, -3F, 0F, 3, 1, 1, 0F); // Box 18
pipModel[14].setRotationPoint(12F, -2.5F, -0.5F);
pipModel[14].rotateAngleZ = 0.34906585F;
pipModel[15].addBox(0F, 0F, 0F, 1, 3, 5, 0F); // Box 19
pipModel[15].setRotationPoint(8F, -4F, -2.5F);
pipModel[16].addBox(0F, 0F, 0F, 1, 3, 5, 0F); // Box 20
pipModel[16].setRotationPoint(1F, -4F, -2.5F);
pipModel[17].addBox(0F, 0F, 0F, 5, 3, 2, 0F); // Box 22
pipModel[17].setRotationPoint(5F, 2F, -1F);
pipModel[18].addBox(-1F, -0.5F, 0F, 1, 3, 1, 0F); // Box 23
pipModel[18].setRotationPoint(9F, 2F, -0.5F);
pipModel[18].rotateAngleZ = 0.43633231F;
pipModel[19].addBox(0F, 0F, 0F, 5, 1, 2, 0F); // Box 24
pipModel[19].setRotationPoint(-19.5F, -6.5F, -1F);
pipModel[20].addBox(0F, 0F, 0F, 4, 1, 1, 0F); // Box 25
pipModel[20].setRotationPoint(-19F, -7.5F, -0.5F);
pipModel[20].rotateAngleZ = 0.26179939F;
pipModel[21].addBox(0F, 0F, 0F, 15, 1, 2, 0F); // Box 26
pipModel[21].setRotationPoint(-4F, -7F, -1F);
pipModel[22].addBox(1F, 0F, 0F, 3, 4, 3, 0F); // Box 27
pipModel[22].setRotationPoint(-3F, -12F, -1.5F);
pipModel[23].addBox(1F, 0F, 0F, 3, 3, 4, 0F); // Box 28
pipModel[23].setRotationPoint(-3F, -11.5F, -2F);
pipModel[24].addBox(0F, 0F, 0F, 3, 3, 4, 0F); // Box 29
pipModel[24].setRotationPoint(6F, -11.5F, -2F);
pipModel[25].addBox(0F, 0F, 0F, 3, 4, 3, 0F); // Box 30
pipModel[25].setRotationPoint(6F, -12F, -1.5F);
pipModel[26].addBox(0F, 0F, 0F, 13, 3, 3, 0F); // Box 31
pipModel[26].setRotationPoint(-3F, -11.5F, -1.5F);
pipModel[27].addBox(0F, 0F, 0F, 3, 4, 3, 0F); // Box 32
pipModel[27].setRotationPoint(-6F, -12F, -1.5F);
pipModel[28].addBox(0F, 0F, 0F, 3, 3, 4, 0F); // Box 33
pipModel[28].setRotationPoint(-6F, -11.5F, -2F);
pipModel[29].addBox(0F, 0F, 0F, 4, 5, 3, 0F); // Box 34
pipModel[29].setRotationPoint(-10F, -12.5F, -1.5F);
pipModel[30].addBox(0F, 0F, 0F, 4, 3, 5, 0F); // Box 35
pipModel[30].setRotationPoint(-10F, -11.5F, -2.5F);
pipModel[31].addBox(0F, 0F, 0F, 4, 4, 4, 0F); // Box 36
pipModel[31].setRotationPoint(-10F, -12F, -2F);
pipModel[32].addBox(0F, 0F, 0F, 5, 3, 4, 0F); // Box 37
pipModel[32].setRotationPoint(10F, -11.5F, -2F);
pipModel[33].addBox(0F, 0F, 0F, 5, 4, 3, 0F); // Box 38
pipModel[33].setRotationPoint(10F, -12F, -1.5F);
pipModel[34].addBox(0F, 0F, 0F, 3, 4, 4, 0F); // Box 39
pipModel[34].setRotationPoint(2F, -12F, -2F);
pipModel[35].addBox(0F, 0F, 0F, 3, 1, 1, 0F); // Box 40
pipModel[35].setRotationPoint(-2F, -8F, -0.5F);
pipModel[36].addBox(0F, 0F, 0F, 3, 1, 1, 0F); // Box 41
pipModel[36].setRotationPoint(6F, -8F, -0.5F);
pipModel[37].addBox(0F, 0F, 0F, 2, 1, 2, 0F); // Box 42
pipModel[37].setRotationPoint(2.5F, -12.5F, -1F);
pipModel[38].addBox(0F, 0F, 0F, 3, 1, 3, 0F); // Box 43
pipModel[38].setRotationPoint(2F, -13.5F, -1.5F);
for(int i = 0; i < 39; i++)
{
pipModel[i].setTextureSize(textureX, textureY);
pipModel[i].mirror = true;
}
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
GL11.glDisable(GL11.GL_CULL_FACE);
for(int i = 0; i < 39; i++)
{
pipModel[i].render(f5);
}
GL11.glEnable(GL11.GL_CULL_FACE);
}
@Override
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity)
{
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
}
}

12
com/hbm/render/tileentity/RenderDecoBlock.java
View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.ModBlocks;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import com.hbm.render.model.ModelSteelBeam;
import com.hbm.render.model.ModelSteelCorner;
import com.hbm.render.model.ModelSteelRoof;
@ -108,6 +109,17 @@ public class RenderDecoBlock extends TileEntitySpecialRenderer {
if(tileentity.getWorldObj().getBlock(tileentity.xCoord, tileentity.yCoord, tileentity.zCoord) == ModBlocks.steel_scaffold)
this.model5.renderModel(0.0625F);
GL11.glPopMatrix();
if(tileentity.getWorldObj().getBlock(tileentity.xCoord, tileentity.yCoord, tileentity.zCoord) == ModBlocks.boxcar) {
GL11.glTranslatef(0, 0, -1.5F);
GL11.glRotated(90, 1, 0, 0);
GL11.glDisable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.boxcar_tex);
ResourceManager.boxcar.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
}
GL11.glPopMatrix();
}

37
com/hbm/tileentity/machine/TileEntityAMSBase.java
View File

@ -35,7 +35,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS
private ItemStack slots[];
public long power = 0;
public static final long maxPower = 1000000;
public static final long maxPower = 1000000000000000L;
public int field = 0;
public static final int maxField = 100;
public int efficiency = 0;
@ -61,10 +61,10 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS
public TileEntityAMSBase() {
slots = new ItemStack[13];
tanks = new FluidTank[4];
tanks[0] = new FluidTank(FluidType.WATER, 64000, 0);
tanks[1] = new FluidTank(FluidType.COOLANT, 64000, 1);
tanks[2] = new FluidTank(FluidType.DEUTERIUM, 64000, 2);
tanks[3] = new FluidTank(FluidType.TRITIUM, 64000, 3);
tanks[0] = new FluidTank(FluidType.WATER, 8000, 0);
tanks[1] = new FluidTank(FluidType.COOLANT, 8000, 1);
tanks[2] = new FluidTank(FluidType.DEUTERIUM, 8000, 2);
tanks[3] = new FluidTank(FluidType.TRITIUM, 8000, 3);
}
@Override
@ -246,30 +246,49 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS
tanks[i].updateTank(xCoord, yCoord, zCoord);
int f1 = 0, f2 = 0, f3 = 0, f4 = 0;
int booster = 0;
if(worldObj.getTileEntity(xCoord + 6, yCoord, zCoord) instanceof TileEntityAMSLimiter) {
TileEntityAMSLimiter te = (TileEntityAMSLimiter)worldObj.getTileEntity(xCoord + 6, yCoord, zCoord);
if(!te.locked && worldObj.getBlockMetadata(xCoord + 6, yCoord, zCoord) == 4)
if(!te.locked && worldObj.getBlockMetadata(xCoord + 6, yCoord, zCoord) == 4) {
f1 = te.efficiency;
if(te.mode == 2)
booster++;
}
}
if(worldObj.getTileEntity(xCoord - 6, yCoord, zCoord) instanceof TileEntityAMSLimiter) {
TileEntityAMSLimiter te = (TileEntityAMSLimiter)worldObj.getTileEntity(xCoord - 6, yCoord, zCoord);
if(!te.locked && worldObj.getBlockMetadata(xCoord - 6, yCoord, zCoord) == 5)
if(!te.locked && worldObj.getBlockMetadata(xCoord - 6, yCoord, zCoord) == 5) {
f2 = te.efficiency;
if(te.mode == 2)
booster++;
}
}
if(worldObj.getTileEntity(xCoord, yCoord, zCoord + 6) instanceof TileEntityAMSLimiter) {
TileEntityAMSLimiter te = (TileEntityAMSLimiter)worldObj.getTileEntity(xCoord, yCoord, zCoord + 6);
if(!te.locked && worldObj.getBlockMetadata(xCoord, yCoord, zCoord + 6) == 2)
if(!te.locked && worldObj.getBlockMetadata(xCoord, yCoord, zCoord + 6) == 2) {
f3 = te.efficiency;
if(te.mode == 2)
booster++;
}
}
if(worldObj.getTileEntity(xCoord, yCoord, zCoord - 6) instanceof TileEntityAMSLimiter) {
TileEntityAMSLimiter te = (TileEntityAMSLimiter)worldObj.getTileEntity(xCoord, yCoord, zCoord - 6);
if(!te.locked && worldObj.getBlockMetadata(xCoord, yCoord, zCoord - 6) == 3)
if(!te.locked && worldObj.getBlockMetadata(xCoord, yCoord, zCoord - 6) == 3) {
f4 = te.efficiency;
if(te.mode == 2)
booster++;
}
}
this.field = Math.round(calcField(f1, f2, f3, f4));
mode = 0;
if(field > 0)
mode = 1;
if(booster > 0)
mode = 2;
if(worldObj.getTileEntity(xCoord, yCoord + 9, zCoord) instanceof TileEntityAMSEmitter) {
TileEntityAMSEmitter te = (TileEntityAMSEmitter)worldObj.getTileEntity(xCoord, yCoord + 9, zCoord);
this.efficiency = te.efficiency;

7
com/hbm/tileentity/machine/TileEntityAMSLimiter.java
View File

@ -302,9 +302,12 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
if(slots[2] != null) {
if(slots[2].getItem() == ModItems.ams_focus_limiter)
mode = 1;
if(slots[2].getItem() == ModItems.ams_focus_booster)
else if(slots[2].getItem() == ModItems.ams_focus_booster)
mode = 2;
}
else
this.efficiency = 0;
} else
this.efficiency = 0;
if(tank.getFill() <= 5 || heat > maxHeat * 0.9)
warning = 2;

12
com/hbm/tileentity/machine/TileEntityFWatzCore.java
View File

@ -29,7 +29,7 @@ import net.minecraft.world.World;
public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, IReactor, ISource, IFluidContainer, IFluidAcceptor {
public long power;
public final static long maxPower = 100000000;
public final static long maxPower = 10000000000L;
public boolean cooldown = false;
public FluidTank tanks[];
@ -303,35 +303,35 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory,
tanks[0].setFill(tanks[0].getFill() - 150);
tanks[1].setFill(tanks[1].getFill() - 75);
tanks[2].setFill(tanks[2].getFill() - 75);
power += 500000;
power += 5000000;
isWorking = true;
}
if(i == 2 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 35 >= 0) {
tanks[0].setFill(tanks[0].getFill() - 75);
tanks[1].setFill(tanks[1].getFill() - 35);
tanks[2].setFill(tanks[2].getFill() - 30);
power += 250000;
power += 2500000;
isWorking = true;
}
if(i == 3 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 140 >= 0) {
tanks[0].setFill(tanks[0].getFill() - 300);
tanks[1].setFill(tanks[1].getFill() - 75);
tanks[2].setFill(tanks[2].getFill() - 140);
power += 1000000;
power += 10000000;
isWorking = true;
}
if(i == 4 && tanks[1].getFill() - 100 >= 0 && tanks[2].getFill() - 100 >= 0) {
tanks[0].setFill(tanks[0].getFill() - 100);
tanks[1].setFill(tanks[1].getFill() - 100);
tanks[2].setFill(tanks[2].getFill() - 100);
power += 1000000;
power += 10000000;
isWorking = true;
}
if(i == 5 && tanks[1].getFill() - 15 >= 0 && tanks[2].getFill() - 15 >= 0) {
tanks[0].setFill(tanks[0].getFill() - 150);
tanks[1].setFill(tanks[1].getFill() - 15);
tanks[2].setFill(tanks[2].getFill() - 15);
power += 10000000;
power += 100000000;
isWorking = true;
}

10
com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java
View File

@ -26,7 +26,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
public long power = 0;
public int process = 0;
public int soundCycle = 0;
public static final long maxPower = 100000;
public static final long maxPower = 100000000;
public static final int processSpeed = 200;
public FluidTank tank;
@ -38,7 +38,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
public TileEntityMachineCMBFactory() {
slots = new ItemStack[6];
tank = new FluidTank(FluidType.WATZ, 16000, 0);
tank = new FluidTank(FluidType.WATZ, 8000, 0);
}
@Override
@ -232,7 +232,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
boolean b = false;
if(tank.getFill() > 0 && power > 0 && slots[1] != null && slots[3] != null && (slots[4] == null || slots[4].stackSize <= 60))
if(tank.getFill() >= 10 && power >= 100000 && slots[1] != null && slots[3] != null && (slots[4] == null || slots[4].stackSize <= 60))
{
boolean flag0 = slots[1].getItem() == ModItems.ingot_magnetized_tungsten || slots[1].getItem() == ModItems.powder_magnetized_tungsten;
boolean flag1 = slots[3].getItem() == ModItems.ingot_advanced_alloy || slots[3].getItem() == ModItems.powder_advanced_alloy;
@ -248,8 +248,8 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
}
public void process() {
tank.setFill(tank.getFill() - 1);
power -= 15;
tank.setFill(tank.getFill() - 10);
power -= 100000;
process++;