Fixes, laste features, you name it, it's in here.

This commit is contained in:
HbmMods 2016-10-30 20:08:20 +01:00
parent 639ef099e7
commit 0cd49ed944
155 changed files with 3504 additions and 1170 deletions

View File

@ -3,6 +3,10 @@ itemGroup.tabParts=Nuclear Tech Mod Bauteile
itemGroup.tabBlocks=Nuclear Tech Mod Blöcke itemGroup.tabBlocks=Nuclear Tech Mod Blöcke
itemGroup.tabNuke=Nuclear Tech Mod Bomben itemGroup.tabNuke=Nuclear Tech Mod Bomben
item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core
item.record.ss.desc=Valve - Sector Sweep
item.record.vc.desc=Valve - Vortal Combat
death.attack.nuclearBlast=%1$s wurde von einer Atomexplosion weggeblasen. death.attack.nuclearBlast=%1$s wurde von einer Atomexplosion weggeblasen.
death.attack.revolverBullet=%1$s wurde von %2$s in den Kopf geschossen. death.attack.revolverBullet=%1$s wurde von %2$s in den Kopf geschossen.
death.attack.mudPoisoning=%1$s starb an Giftschlamm. death.attack.mudPoisoning=%1$s starb an Giftschlamm.
@ -14,8 +18,13 @@ death.attack.tauBlast=%1$s lud die XVL1456 zu lange auf und wurde in Stücke ger
death.attack.chopperBullet=%1$s wurde von %2$s gerekt. death.attack.chopperBullet=%1$s wurde von %2$s gerekt.
death.attack.cmb=%1$s wurde von %2$s pulverisiert. death.attack.cmb=%1$s wurde von %2$s pulverisiert.
death.attack.subAtomic=%1$s's Atome wurden von %2$s vernichtet. death.attack.subAtomic=%1$s's Atome wurden von %2$s vernichtet.
death.attack.subAtomic2=%1$s verließ das QPU-Gitter weil %2$s seine De-Facto-Geschwindigkeit manipulierte.
death.attack.subAtomic3=%1$s's Divergenzwert fiel wegen %2$s unter den 1%-Wert.
death.attack.subAtomic4=%1$s wurde von %2$s durch null geteilt.
death.attack.subAtomic5=%1$s wurde von %2$s nullifiziert.
death.attack.radiation=%1$s starb an Strahlenvergiftung. death.attack.radiation=%1$s starb an Strahlenvergiftung.
death.attack.acid=%1$s fiel in Säure. death.attack.acid=%1$s fiel in Säure.
death.attack.suicide=%1$s blies sich die Rübe weg.
item.redstone_sword.name=Redstoneschwert item.redstone_sword.name=Redstoneschwert
item.big_sword.name=Großes Schwert item.big_sword.name=Großes Schwert
@ -109,7 +118,7 @@ tile.red_wire_coated.name=Geschirmtes rotes Kupferkabel
tile.machine_deuterium.name=Deuteriumextraktor tile.machine_deuterium.name=Deuteriumextraktor
container.machine_deuterium=Deuteriumextraktor container.machine_deuterium=Deuteriumextraktor
tile.machine_battery.name=Energiespeicherblock tile.machine_battery.name=Energiespeicherblock
container.battery=Energiespeicherblock container.battery=Energiespeicher
tile.machine_coal_off.name=Kohlegenerator tile.machine_coal_off.name=Kohlegenerator
tile.machine_coal_on.name=Kohlegenerator tile.machine_coal_on.name=Kohlegenerator
container.machineCoal=Kohlegenerator container.machineCoal=Kohlegenerator
@ -248,6 +257,7 @@ tile.block_uranium.name=Uranblock
tile.block_trinitite.name=Trinititblock tile.block_trinitite.name=Trinititblock
tile.block_beryllium.name=Berylliumblock tile.block_beryllium.name=Berylliumblock
tile.block_waste.name=Atommüllblock tile.block_waste.name=Atommüllblock
tile.block_scrap.name=Schrottblock
tile.block_advanced_alloy.name=Fortgeschrittener Legierungsblock tile.block_advanced_alloy.name=Fortgeschrittener Legierungsblock
tile.block_magnetized_tungsten.name=Magnetisierter Wolframblock tile.block_magnetized_tungsten.name=Magnetisierter Wolframblock
tile.block_combine_steel.name=CMB-Stahlblock tile.block_combine_steel.name=CMB-Stahlblock
@ -263,6 +273,13 @@ tile.ore_uranium.name=Uranerz
tile.ore_schrabidium.name=Schrabidiumerz tile.ore_schrabidium.name=Schrabidiumerz
tile.ore_beryllium.name=Berylliumerz tile.ore_beryllium.name=Berylliumerz
tile.ore_nether_uranium.name=Nether-Uranerz
tile.ore_nether_plutonium.name=Nether-Plutoniumerz
tile.ore_nether_tungsten.name=Nether-Wolframerz
tile.ore_nether_sulfur.name=Nether-Schwefelerz
tile.ore_nether_fire.name=Feuererz
tile.ore_nether_schrabidium.name=Nether-Schrabidiumerz
tile.reinforced_brick.name=Verstärkter Stein tile.reinforced_brick.name=Verstärkter Stein
tile.reinforced_glass.name=Verstärktes Glas tile.reinforced_glass.name=Verstärktes Glas
tile.reinforced_sand.name=Verstärkter Sandstein tile.reinforced_sand.name=Verstärkter Sandstein
@ -277,6 +294,8 @@ tile.brick_light.name=Helle Ziegel
tile.cmb_brick.name=CMB-Stahlfliese tile.cmb_brick.name=CMB-Stahlfliese
tile.cmb_brick_reinforced.name=Verstärkte CMB-Ziegel tile.cmb_brick_reinforced.name=Verstärkte CMB-Ziegel
tile.gravel_obsidian.name=Gebrochener Obsidian
item.nugget_uranium.name=Urannugget item.nugget_uranium.name=Urannugget
item.nugget_plutonium.name=Plutoniumnugget item.nugget_plutonium.name=Plutoniumnugget
item.nugget_neptunium.name=Neptuniumnugget item.nugget_neptunium.name=Neptuniumnugget
@ -297,6 +316,7 @@ item.powder_copper.name=Kupferstaub
item.powder_titanium.name=Titanstaub item.powder_titanium.name=Titanstaub
item.powder_tungsten.name=Wolframstaub item.powder_tungsten.name=Wolframstaub
item.powder_uranium.name=Uranstaub item.powder_uranium.name=Uranstaub
item.powder_plutonium.name=Plutoniumstaub
item.dust.name=Staub item.dust.name=Staub
item.powder_coal.name=Kohlestaub item.powder_coal.name=Kohlestaub
item.powder_lapis.name=Lapis Lazuli-Staub item.powder_lapis.name=Lapis Lazuli-Staub
@ -305,15 +325,15 @@ item.powder_diamond.name=Diamantstaub
item.powder_red_copper.name=Roter Kupfer Staub item.powder_red_copper.name=Roter Kupfer Staub
item.powder_steel.name=Stahlstaub item.powder_steel.name=Stahlstaub
item.powder_magnetized_tungsten.name=Magnetisierter Wolframstaub item.powder_magnetized_tungsten.name=Magnetisierter Wolframstaub
item.powder_combine_steel.name=CMB-Stahlstaustaub item.powder_combine_steel.name=CMB-Stahlstaub
item.powder_lithium.name=Lithiumstaub item.powder_lithium.name=Lithiumstaub
item.powder_advanced_alloy.name=Fortgeschrittener Legierungsstaub item.powder_advanced_alloy.name=Fortgeschrittener Legierungsstaub
item.powder_quartz.name=Quarzstaub item.powder_quartz.name=Quarzstaub
item.powder_power.name=Energiepulver item.powder_power.name=Energiepulver
item.powder_iodine.name=Iodpulver item.powder_iodine.name=Iodstaub
item.powder_thorium.name=Thoriumpulver item.powder_thorium.name=Thoriumstaub
item.powder_neodymium.name=Neodympulver item.powder_neodymium.name=Neodymstaub
item.powder_astatine.name=Astatpulver item.powder_astatine.name=Astatstaub
item.battery_generic.name=Batterie item.battery_generic.name=Batterie
item.battery_advanced.name=Fortgeschrittene Batterie item.battery_advanced.name=Fortgeschrittene Batterie
@ -337,6 +357,7 @@ item.reactor_core.name=Brutreaktorkern
item.pellet_rtg.name=Plutonium 238 Pellet item.pellet_rtg.name=Plutonium 238 Pellet
item.rtg_unit.name=RTG Einheit item.rtg_unit.name=RTG Einheit
item.hazmat_cloth.name=Strahlenschutzanzugsstoff item.hazmat_cloth.name=Strahlenschutzanzugsstoff
item.filter_coal.name=Aktivkohlefilter
item.tritium_deuterium_cake.name=Tritium-Deuterium-Kuchen item.tritium_deuterium_cake.name=Tritium-Deuterium-Kuchen
item.cell_empty.name=Leere Zelle item.cell_empty.name=Leere Zelle
@ -365,6 +386,7 @@ item.inf_antischrabidium.name=Unendlicher Antischrabidiumtank
item.canister_empty.name=Leerer Kanister item.canister_empty.name=Leerer Kanister
item.canister_fuel.name=Treibstoffkanister item.canister_fuel.name=Treibstoffkanister
item.canister_napalm.name=Napalm B item.canister_napalm.name=Napalm B
item.canister_NITAN.name=NITAN© 100 Oktan Supertreibstoff
item.rod_empty.name=Leerer Brennstab item.rod_empty.name=Leerer Brennstab
item.rod_uranium.name=Uranbrennstab item.rod_uranium.name=Uranbrennstab
@ -483,8 +505,10 @@ item.grenade_tau.name=Taugranate
item.grenade_schrabidium.name=Schrabidiumgranate item.grenade_schrabidium.name=Schrabidiumgranate
item.grenade_lemon.name=Zitronengranate item.grenade_lemon.name=Zitronengranate
item.grenade_mk2.name=Mk 2 Granate "Botschafter Ananas" item.grenade_mk2.name=Mk 2 Granate "Botschafter Ananas"
item.grenade_aschrab.name=Werfbare Antischrabidiumzelle
item.grenade_nuke.name=Mark VI Bohrgranate item.grenade_nuke.name=Mark VI Bohrgranate
item.grenade_nuclear.name=Nuka-Granate item.grenade_nuclear.name=Nuka-Granate
item.grenade_zomg.name=Negativenergie-Paarvernichtungsgranate
item.rod_uranium_fuel.name=Urankernbrennstoffzelle item.rod_uranium_fuel.name=Urankernbrennstoffzelle
item.rod_dual_uranium_fuel.name=Doppelte Urankernbrennstoffzelle item.rod_dual_uranium_fuel.name=Doppelte Urankernbrennstoffzelle
@ -552,10 +576,11 @@ item.gun_revolver_cursed.name=Verfluchte Pistole
item.gun_fatman.name=M42 Nukleares Katapult "Fat Man" item.gun_fatman.name=M42 Nukleares Katapult "Fat Man"
item.gun_xvl1456.name=XVL1456 Tau-Kanone Prototyp item.gun_xvl1456.name=XVL1456 Tau-Kanone Prototyp
item.gun_osipr.name=Standartausrüstung für Sicherheitskräfte item.gun_osipr.name=Standartausrüstung für Sicherheitskräfte
item.gun_mp.name=Des Pazifistens Maschinengewehr item.gun_mp.name=Maschinengewehr des Pazifisten
item.gun_zomg.name=Singularitätsbetriebener Paarvernichtungsstrahl "ZOMG Kanone" item.gun_zomg.name=Singularitätsbetriebener Paarvernichtungsstrahl "ZOMG Kanone"
item.gun_super_shotgun.name=Super Shotgun item.gun_super_shotgun.name=Super Shotgun
item.gun_moist_nugget.name=Moisn-Nagant item.gun_moist_nugget.name=Moisn-Nagant
item.gun_revolver_inverted.name=Umgedrehter Revolver
item.gun_revolver_iron_ammo.name=Patrone item.gun_revolver_iron_ammo.name=Patrone
item.gun_revolver_ammo.name=Bleipatrone item.gun_revolver_ammo.name=Bleipatrone
@ -678,6 +703,14 @@ item.hazmat_helmet.name=Strahlenschutzhelm
item.hazmat_plate.name=Strahlenschutzbrustplatte item.hazmat_plate.name=Strahlenschutzbrustplatte
item.hazmat_legs.name=Strahlenschutzhose item.hazmat_legs.name=Strahlenschutzhose
item.hazmat_boots.name=Strahlenschutzstiefel item.hazmat_boots.name=Strahlenschutzstiefel
item.hazmat_paa_helmet.name=PaA-Kampfschutzanzug Helm
item.hazmat_paa_plate.name=PaA-Kampfschutzanzug Brustplatte
item.hazmat_paa_legs.name=PaA-Kampfschutzanzug Hose
item.hazmat_paa_boots.name=PaA-Kampfschutzanzug Stiefel
item.paa_plate.name=PaA-Brustschutzplatte
item.paa_legs.name=PaA-Beinverstärkungsschienen
item.paa_boots.name=PaA-"olle Latschen"
item.goggles.name=Schutzbrille item.goggles.name=Schutzbrille
item.gas_mask.name=Gasmaske item.gas_mask.name=Gasmaske
@ -733,6 +766,10 @@ item.alloy_helmet.name=Legierungshelm
item.alloy_plate.name=Legierungsbrustpanzer item.alloy_plate.name=Legierungsbrustpanzer
item.alloy_legs.name=Legierungsbeinschutz item.alloy_legs.name=Legierungsbeinschutz
item.alloy_boots.name=Legierungsstiefel item.alloy_boots.name=Legierungsstiefel
item.cmb_helmet.name=CMB-Stahlhelm
item.cmb_plate.name=CMB-Stahlbrustpanzer
item.cmb_legs.name=CMB-Stahlbeinschutz
item.cmb_boots.name=CMB-Stahlstiefel
item.steel_sword.name=Stahlschwert item.steel_sword.name=Stahlschwert
item.steel_pickaxe.name=Stahlspitzhacke item.steel_pickaxe.name=Stahlspitzhacke
@ -749,6 +786,11 @@ item.alloy_pickaxe.name=Legierungsspitzhacke
item.alloy_axe.name=Legierungsaxt item.alloy_axe.name=Legierungsaxt
item.alloy_shovel.name=Legierungsschaufel item.alloy_shovel.name=Legierungsschaufel
item.alloy_hoe.name=Legierungsfeldhacke item.alloy_hoe.name=Legierungsfeldhacke
item.cmb_sword.name=CMB-Stahlschwert
item.cmb_pickaxe.name=CMB-Stahlspitzhacke
item.cmb_axe.name=CMB-Stahlaxt
item.cmb_shovel.name=CMB-Stahlschaufel
item.cmb_hoe.name=CMB-Stahlfeldhacke
tile.red_cable.name=Rotes Kupferkabel tile.red_cable.name=Rotes Kupferkabel
tile.block_meteor.name=Meteoritenblock tile.block_meteor.name=Meteoritenblock
@ -820,4 +862,8 @@ item.blades_steel.name=Stahlsägeblatt
item.blades_titanium.name=Titansägeblatt item.blades_titanium.name=Titansägeblatt
item.blades_advanced_alloy.name=Fortgeschrittenes Sägeblatt item.blades_advanced_alloy.name=Fortgeschrittenes Sägeblatt
item.blades_combine_steel.name=CMB-Sägeblatt item.blades_combine_steel.name=CMB-Sägeblatt
item.blades_schrabidium.name=Schrabidiumsägeblatt item.blades_schrabidium.name=Schrabidiumsägeblatt
item.letter.name=Eilbrief
item.chopper.name=Jagdschrauber

View File

@ -3,6 +3,10 @@ itemGroup.tabParts=Nuclear Tech Mod Parts
itemGroup.tabBlocks=Nuclear Tech Mod Blocks itemGroup.tabBlocks=Nuclear Tech Mod Blocks
itemGroup.tabNuke=Nuclear Tech Mod Nukes itemGroup.tabNuke=Nuclear Tech Mod Nukes
item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core
item.record.ss.desc=Valve - Sector Sweep
item.record.vc.desc=Valve - Vortal Combat
death.attack.nuclearBlast=%1$s was blown away by a nuclear explosion. death.attack.nuclearBlast=%1$s was blown away by a nuclear explosion.
death.attack.revolverBullet=%1$s was shot in the head by %2$s. death.attack.revolverBullet=%1$s was shot in the head by %2$s.
death.attack.mudPoisoning=%1$s died in poisonous mud. death.attack.mudPoisoning=%1$s died in poisonous mud.
@ -13,9 +17,14 @@ death.attack.tau=%1$s was riddeled by %2$s using negatively charged tauons.
death.attack.tauBlast=%1$s charged the XVL1456 for too long and was blown into pieces. death.attack.tauBlast=%1$s charged the XVL1456 for too long and was blown into pieces.
death.attack.chopperBullet=%1$s was rekt by %2$s. death.attack.chopperBullet=%1$s was rekt by %2$s.
death.attack.cmb=%1$s was fizzeled by %2$s. death.attack.cmb=%1$s was fizzeled by %2$s.
death.attack.subAtomic=%1$s's atoms were annihilated by %2$s. death.attack.subAtomic=%1$s's atoms have been destroyed by %2$s.
death.attack.subAtomic2=%1$s was QPU-misaligned because %2$s tampered with his de facto speed.
death.attack.subAtomic3=%1$s's divergence dropped below 1% because of %2$s.
death.attack.subAtomic4=%1$s was divided by zero by %2$s.
death.attack.subAtomic5=%1$s was nullified by %2$s.
death.attack.radiation=%1$s died from radiation poisoning. death.attack.radiation=%1$s died from radiation poisoning.
death.attack.acid=%1$s fell into acid. death.attack.acid=%1$s fell into acid.
death.attack.suicide=%1$s blew their head off.
item.redstone_sword.name=Redstone Sword item.redstone_sword.name=Redstone Sword
item.big_sword.name=Great Sword item.big_sword.name=Great Sword
@ -30,7 +39,7 @@ item.test_nuke_tier2_target.name=Subcritical MOX Target (Tier 2)
item.gadget_explosive.name=Propellant item.gadget_explosive.name=Propellant
item.gadget_explosive8.name=Bundle of Propellant item.gadget_explosive8.name=Bundle of Propellant
item.gadget_wireing.name=Wireing item.gadget_wireing.name=Wiring
item.gadget_core.name=Plutonium Core item.gadget_core.name=Plutonium Core
item.boy_igniter.name=Bomb Igniter item.boy_igniter.name=Bomb Igniter
@ -88,9 +97,9 @@ tile.machine_difurnace_on.name=Alloy Furnace
container.diFurnace=Alloy Furnace container.diFurnace=Alloy Furnace
tile.machine_centrifuge.name=Centrifuge tile.machine_centrifuge.name=Centrifuge
container.centrifuge=Centrifuge container.centrifuge=Centrifuge
tile.machine_uf6_tank.name=Uranium Hexafluorite Tank tile.machine_uf6_tank.name=Uranium Hexafluoride Tank
container.uf6_tank=UF6 Tank container.uf6_tank=UF6 Tank
tile.machine_puf6_tank.name=Plutonium Hexafluorite Tank tile.machine_puf6_tank.name=Plutonium Hexafluoride Tank
container.puf6_tank=PuF6 Tank container.puf6_tank=PuF6 Tank
tile.machine_reactor.name=Breeding Reactor tile.machine_reactor.name=Breeding Reactor
container.reactor=Breeding Reactor container.reactor=Breeding Reactor
@ -109,7 +118,7 @@ tile.red_wire_coated.name=Coated Red Copper Cable
tile.machine_deuterium.name=Deuterium Extractor tile.machine_deuterium.name=Deuterium Extractor
container.machine_deuterium=Deuterium Extractor container.machine_deuterium=Deuterium Extractor
tile.machine_battery.name=Energy Storage Block tile.machine_battery.name=Energy Storage Block
container.battery=Energy Storage Block container.battery=Energy Storage
tile.machine_coal_off.name=Coal Generator tile.machine_coal_off.name=Coal Generator
tile.machine_coal_on.name=Coal Generator tile.machine_coal_on.name=Coal Generator
container.machineCoal=Coal Generator container.machineCoal=Coal Generator
@ -248,6 +257,7 @@ tile.block_uranium.name=Block of Uranium
tile.block_trinitite.name=Block of Trinitite tile.block_trinitite.name=Block of Trinitite
tile.block_beryllium.name=Block of Beryllium tile.block_beryllium.name=Block of Beryllium
tile.block_waste.name=Block of Nuclear Waste tile.block_waste.name=Block of Nuclear Waste
tile.block_scrap.name=Block of Scrap
tile.block_advanced_alloy.name=Block of Advanced Alloy tile.block_advanced_alloy.name=Block of Advanced Alloy
tile.block_magnetized_tungsten.name=Block of Magnetized Tungsten tile.block_magnetized_tungsten.name=Block of Magnetized Tungsten
tile.block_combine_steel.name=Block of CMB Steel tile.block_combine_steel.name=Block of CMB Steel
@ -263,6 +273,13 @@ tile.ore_uranium.name=Uranium Ore
tile.ore_schrabidium.name=Schrabidium Ore tile.ore_schrabidium.name=Schrabidium Ore
tile.ore_beryllium.name=Beryllium Ore tile.ore_beryllium.name=Beryllium Ore
tile.ore_nether_uranium.name=Nether Uranium Ore
tile.ore_nether_plutonium.name=Nether Plutonium Ore
tile.ore_nether_tungsten.name=Nether Tungsten Ore
tile.ore_nether_sulfur.name=Nether Sulfur Ore
tile.ore_nether_fire.name=Fire Ore
tile.ore_nether_schrabidium.name=Nether Schrabidium Ore
tile.reinforced_brick.name=Reinforced Stone tile.reinforced_brick.name=Reinforced Stone
tile.reinforced_glass.name=Reinforced Glass tile.reinforced_glass.name=Reinforced Glass
tile.reinforced_sand.name=Reinforced Sandstone tile.reinforced_sand.name=Reinforced Sandstone
@ -277,6 +294,8 @@ tile.brick_light.name=Light Bricks
tile.cmb_brick.name=CMB Steel Tile tile.cmb_brick.name=CMB Steel Tile
tile.cmb_brick_reinforced.name=Reinforced CMB Bricks tile.cmb_brick_reinforced.name=Reinforced CMB Bricks
tile.gravel_obsidian.name=Crushed Obsidian
item.nugget_uranium.name=Uranium Nugget item.nugget_uranium.name=Uranium Nugget
item.nugget_plutonium.name=Plutonium Nugget item.nugget_plutonium.name=Plutonium Nugget
item.nugget_neptunium.name=Neptunium Nugget item.nugget_neptunium.name=Neptunium Nugget
@ -297,6 +316,7 @@ item.powder_copper.name=Copper Powder
item.powder_titanium.name=Titanium Powder item.powder_titanium.name=Titanium Powder
item.powder_tungsten.name=Tungsten Powder item.powder_tungsten.name=Tungsten Powder
item.powder_uranium.name=Uranium Powder item.powder_uranium.name=Uranium Powder
item.powder_plutonium.name=Plutonium Powder
item.dust.name=Dust item.dust.name=Dust
item.powder_coal.name=Coal Powder item.powder_coal.name=Coal Powder
item.powder_lapis.name=Lapis Lazuli Powder item.powder_lapis.name=Lapis Lazuli Powder
@ -337,6 +357,7 @@ item.reactor_core.name=Breeding Reactor Core
item.pellet_rtg.name=Plutonium 238 Fuel Pellet item.pellet_rtg.name=Plutonium 238 Fuel Pellet
item.rtg_unit.name=RTG Unit item.rtg_unit.name=RTG Unit
item.hazmat_cloth.name=Hazmat Cloth item.hazmat_cloth.name=Hazmat Cloth
item.filter_coal.name=Activated Carbon Filter
item.tritium_deuterium_cake.name=Tritium-Deuterium-Cake item.tritium_deuterium_cake.name=Tritium-Deuterium-Cake
item.cell_empty.name=Empty Cell item.cell_empty.name=Empty Cell
@ -365,6 +386,7 @@ item.inf_antischrabidium.name=Infinite Antischrabidium Tank
item.canister_empty.name=Empty Canister item.canister_empty.name=Empty Canister
item.canister_fuel.name=Fuel Canister item.canister_fuel.name=Fuel Canister
item.canister_napalm.name=Napalm B item.canister_napalm.name=Napalm B
item.canister_NITAN.name=NITAN© 100 Octane Super Fuel
item.rod_empty.name=Emty Rod item.rod_empty.name=Emty Rod
item.rod_uranium.name=Uranium Rod item.rod_uranium.name=Uranium Rod
@ -433,7 +455,7 @@ item.powder_poison.name=Poison Powder
item.pellet_gas.name=Poison Gas Cartridge item.pellet_gas.name=Poison Gas Cartridge
item.nuke_starter_kit.name=Atomic Science Starter Kit item.nuke_starter_kit.name=Atomic Science Starter Kit
item.nuke_commercially_kit.name=Atomic Science Kit for Commercialy Uses item.nuke_commercially_kit.name=Atomic Science Kit for Commercial Uses
item.nuke_advanced_kit.name=Atomic Science Advanced Kit item.nuke_advanced_kit.name=Atomic Science Advanced Kit
item.gadget_kit.name=The Gadget Kit item.gadget_kit.name=The Gadget Kit
item.boy_kit.name=Little Boy Kit item.boy_kit.name=Little Boy Kit
@ -483,8 +505,10 @@ item.grenade_tau.name=Tau Grenade
item.grenade_schrabidium.name=Schrabidium Grenade item.grenade_schrabidium.name=Schrabidium Grenade
item.grenade_lemon.name=Combustible Lemon item.grenade_lemon.name=Combustible Lemon
item.grenade_mk2.name=Mk 2 Grenade "Ambassador Pineapple" item.grenade_mk2.name=Mk 2 Grenade "Ambassador Pineapple"
item.grenade_aschrab.name=Tossable Antischrabidium Cell
item.grenade_nuke.name=Mark VI Drill Grenade item.grenade_nuke.name=Mark VI Drill Grenade
item.grenade_nuclear.name=Nuka Grenade item.grenade_nuclear.name=Nuka Grenade
item.grenade_zomg.name=Negative Energy Pair Annihilation Grenade
item.rod_uranium_fuel.name=Uranium Fuel Rod item.rod_uranium_fuel.name=Uranium Fuel Rod
item.rod_dual_uranium_fuel.name=Uranium Dual Fuel Rod item.rod_dual_uranium_fuel.name=Uranium Dual Fuel Rod
@ -556,6 +580,7 @@ item.gun_mp.name=Pacifist's Machine Gun
item.gun_zomg.name=Singularity Powered Annihilation Ray "ZOMG Cannon" item.gun_zomg.name=Singularity Powered Annihilation Ray "ZOMG Cannon"
item.gun_super_shotgun.name=Super Shotgun item.gun_super_shotgun.name=Super Shotgun
item.gun_moist_nugget.name=Moisn-Nagant item.gun_moist_nugget.name=Moisn-Nagant
item.gun_revolver_inverted.name=Flipped Revolver
item.gun_revolver_iron_ammo.name=Bullet item.gun_revolver_iron_ammo.name=Bullet
item.gun_revolver_ammo.name=Lead Bullet item.gun_revolver_ammo.name=Lead Bullet
@ -678,6 +703,14 @@ item.hazmat_helmet.name=Hazmat Helmet
item.hazmat_plate.name=Hazmmat Chestplate item.hazmat_plate.name=Hazmmat Chestplate
item.hazmat_legs.name=Hazmat Leggings item.hazmat_legs.name=Hazmat Leggings
item.hazmat_boots.name=Hazmat Boots item.hazmat_boots.name=Hazmat Boots
item.hazmat_paa_helmet.name=PaA Battle Hazmat Suit Helmet
item.hazmat_paa_plate.name=PaA Battle Hazmat Suit Chestplate
item.hazmat_paa_legs.name=PaA Battle Hazmat Suit Leggings
item.hazmat_paa_boots.name=PaA Battle Hazmat Suit Boots
item.paa_plate.name=PaA Chest Protection Plate
item.paa_legs.name=PaA Leg Reinforcements
item.paa_boots.name=PaA "good ol' shoes"
item.goggles.name=Protection Goggles item.goggles.name=Protection Goggles
item.gas_mask.name=Gas Mask item.gas_mask.name=Gas Mask
@ -733,6 +766,10 @@ item.alloy_helmet.name=Advanced Alloy Helmet
item.alloy_plate.name=Advanced Alloy Chestplate item.alloy_plate.name=Advanced Alloy Chestplate
item.alloy_legs.name=Advanced Alloy Leggings item.alloy_legs.name=Advanced Alloy Leggings
item.alloy_boots.name=Advanced Alloy Boots item.alloy_boots.name=Advanced Alloy Boots
item.cmb_helmet.name=CMB Steel Helmet
item.cmb_plate.name=CMB Steel Chestplate
item.cmb_legs.name=CMB Steel Leggings
item.cmb_boots.name=CMB Steel Boots
item.steel_sword.name=Steel Sword item.steel_sword.name=Steel Sword
item.steel_pickaxe.name=Steel Pickaxe item.steel_pickaxe.name=Steel Pickaxe
@ -749,6 +786,11 @@ item.alloy_pickaxe.name=Advanced Alloy Pickaxe
item.alloy_axe.name=Advanced Alloy Axe item.alloy_axe.name=Advanced Alloy Axe
item.alloy_shovel.name=Advanced Alloy Shovel item.alloy_shovel.name=Advanced Alloy Shovel
item.alloy_hoe.name=Advanced Alloy Hoe item.alloy_hoe.name=Advanced Alloy Hoe
item.cmb_sword.name=CMB Steel Sword
item.cmb_pickaxe.name=CMB Steel Pickaxe
item.cmb_axe.name=CMB Steel Axe
item.cmb_shovel.name=CMB Steel Shovel
item.cmb_hoe.name=CMB Steel Hoe
tile.red_cable.name=Red Copper Cable tile.red_cable.name=Red Copper Cable
tile.block_meteor.name=Meteor Block tile.block_meteor.name=Meteor Block
@ -820,4 +862,8 @@ item.blades_steel.name=Steel Shredder Blades
item.blades_titanium.name=Titanium Shredder Blades item.blades_titanium.name=Titanium Shredder Blades
item.blades_advanced_alloy.name=Advanced Shredder Blades item.blades_advanced_alloy.name=Advanced Shredder Blades
item.blades_combine_steel.name=CMB Shredder Blades item.blades_combine_steel.name=CMB Shredder Blades
item.blades_schrabidium.name=Schrabidium Shredder Blades item.blades_schrabidium.name=Schrabidium Shredder Blades
item.letter.name=Express Mail
item.chopper.name=Hunter Chopper

33
assets/hbm/sounds.json Normal file
View File

@ -0,0 +1,33 @@
{
"misc.nullTau": {"category": "player", "sounds": [{"name": "misc/null", "stream": false}]},
"misc.nullChopper": {"category": "player", "sounds": [{"name": "misc/null", "stream": false}]},
"misc.nullCrashing": {"category": "player", "sounds": [{"name": "misc/null", "stream": false}]},
"misc.nullMine": {"category": "player", "sounds": [{"name": "misc/null", "stream": false}]},
"block.crateBreak": {"category": "block", "sounds": ["block/crateBreak1", "block/crateBreak2", "block/crateBreak3", "block/crateBreak4", "block/crateBreak5"]},
"music.recordLambdaCore": {"category": "record", "sounds": [{"name": "music/recordLambdaCore", "stream": true}]},
"music.recordSectorSweep": {"category": "record", "sounds": [{"name": "music/recordSectorSweep", "stream": true}]},
"music.recordVortalCombat": {"category": "record", "sounds": [{"name": "music/recordVortalCombat", "stream": true}]},
"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.heavyShoot": {"category": "player", "sounds": [{"name": "weapon/heavyShoot", "stream": false}]},
"weapon.schrabidiumShoot": {"category": "player", "sounds": [{"name": "weapon/schrabidiumShoot", "stream": false}]},
"weapon.osiprShoot": {"category": "player", "sounds": [{"name": "weapon/osiprShoot", "stream": false}]},
"weapon.osiprAltFire": {"category": "player", "sounds": [{"name": "weapon/osiprAltFire", "stream": false}]},
"weapon.osiprCharging": {"category": "player", "sounds": [{"name": "weapon/osiprCharging", "stream": false}]},
"weapon.singFlyby": {"category": "player", "sounds": [{"name": "weapon/singFlyby", "stream": false}]},
"weapon.rifleShoot": {"category": "player", "sounds": [{"name": "weapon/rifleShoot", "stream": false}]},
"weapon.rpgShoot": {"category": "player", "sounds": [{"name": "weapon/rpgShoot", "stream": false}]},
"weapon.fatmanShoot": {"category": "player", "sounds": [{"name": "weapon/fatmanShoot", "stream": false}]},
"weapon.zomgShoot": {"category": "player", "sounds": [{"name": "weapon/zomgShoot", "stream": false}]},
"entity.chopperFlyingLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperFlyingLoop", "stream": true}]},
"entity.chopperDrop": {"category": "hostile", "sounds": [{"name": "entity/chopperDrop", "stream": false}]},
"entity.chopperCharge": {"category": "hostile", "sounds": [{"name": "entity/chopperCharge", "stream": false}]},
"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}]}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1010 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 727 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 731 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 669 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 603 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 859 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 820 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 870 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 864 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 814 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 847 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 273 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 293 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 344 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 241 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 264 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -86,7 +86,7 @@ public class BlockCrashedBomb extends BlockContainer implements IBomb {
entity0.posX = x; entity0.posX = x;
entity0.posY = y; entity0.posY = y;
entity0.posZ = z; entity0.posZ = z;
entity0.destructionRange = 35; entity0.destructionRange = MainRegistry.fatmanRadius;
entity0.speed = 25; entity0.speed = 25;
entity0.coefficient = 10.0F; entity0.coefficient = 10.0F;

View File

@ -34,6 +34,7 @@ public class BlockCrate extends BlockFalling {
{ {
dropItems(world, x, y, z); dropItems(world, x, y, z);
world.setBlockToAir(x, y, z); world.setBlockToAir(x, y, z);
world.playSoundEffect(x, y, z, "hbm:block.crateBreak", 1.0F, 1.0F);
return true; return true;
} else { } else {
if(world.isRemote) if(world.isRemote)
@ -49,7 +50,7 @@ public class BlockCrate extends BlockFalling {
Random rand = new Random(); Random rand = new Random();
List<Item> list = new ArrayList<Item>(); List<Item> list = new ArrayList<Item>();
switch(rand.nextInt(23)) { switch(rand.nextInt(32)) {
case 0: case 0:
list.add(ModItems.clip_revolver_iron); list.add(ModItems.clip_revolver_iron);
list.add(ModItems.clip_revolver_iron); list.add(ModItems.clip_revolver_iron);
@ -149,6 +150,43 @@ public class BlockCrate extends BlockFalling {
list.add(ModItems.syringe_metal_stimpak); list.add(ModItems.syringe_metal_stimpak);
list.add(ModItems.syringe_metal_stimpak); list.add(ModItems.syringe_metal_stimpak);
break; break;
case 23:
list.add(ModItems.clip_revolver_cursed);
list.add(ModItems.clip_revolver_cursed);
list.add(ModItems.clip_revolver_cursed);
break;
case 24:
list.add(ModItems.clip_revolver_lead);
list.add(ModItems.syringe_metal_stimpak);
break;
case 25:
list.add(ModItems.clip_revolver_lead);
list.add(ModItems.clip_revolver_lead);
break;
case 26:
list.add(ModItems.clip_mp);
break;
case 27:
list.add(ModItems.clip_fatman);
break;
case 28:
list.add(ModItems.clip_fatman);
list.add(ModItems.clip_rpg);
break;
case 29:
list.add(ModItems.grenade_generic);
list.add(ModItems.grenade_generic);
list.add(ModItems.grenade_generic);
break;
case 30:
list.add(ModItems.grenade_strong);
list.add(ModItems.grenade_strong);
list.add(ModItems.grenade_strong);
break;
case 31:
list.add(ModItems.grenade_mk2);
list.add(ModItems.grenade_mk2);
break;
} }
for(Item stack : list) { for(Item stack : list) {

View File

@ -42,7 +42,7 @@ public class BlockOre extends Block {
{ {
return ModItems.niter; return ModItems.niter;
} }
if(this == ModBlocks.ore_sulfur) if(this == ModBlocks.ore_sulfur || this == ModBlocks.ore_nether_sulfur)
{ {
return ModItems.sulfur; return ModItems.sulfur;
} }
@ -62,6 +62,10 @@ public class BlockOre extends Block {
{ {
return Items.snowball; return Items.snowball;
} }
if(this == ModBlocks.ore_nether_fire)
{
return p_149650_2_.nextInt(2) == 0 ? ModItems.powder_fire : Items.blaze_powder;
}
return Item.getItemFromBlock(this); return Item.getItemFromBlock(this);
} }
@ -77,7 +81,11 @@ public class BlockOre extends Block {
{ {
return 2 + p_149745_1_.nextInt(3); return 2 + p_149745_1_.nextInt(3);
} }
if(this == ModBlocks.ore_sulfur) if(this == ModBlocks.ore_sulfur || this == ModBlocks.ore_nether_sulfur)
{
return 2 + p_149745_1_.nextInt(3);
}
if(this == ModBlocks.ore_nether_fire)
{ {
return 2 + p_149745_1_.nextInt(3); return 2 + p_149745_1_.nextInt(3);
} }

View File

@ -149,27 +149,17 @@ public class Guide extends Block {
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(!player.isSneaking()) if(!player.isSneaking())
{ {
ItemStack book1 = new ItemStack(Items.written_book); ItemStack book1 = new ItemStack(Items.written_book);
book1.stackTagCompound = new NBTTagCompound(); book1.stackTagCompound = new NBTTagCompound();
book1.stackTagCompound.setString("author", "HbMinecraft"); book1.stackTagCompound.setString("author", "HbMinecraft");
book1.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 1: Resources"); book1.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 1: Resources");
NBTTagList pages1 = new NBTTagList(); NBTTagList pages1 = new NBTTagList();
pages1.appendTag(new NBTTagString(Library.book11));
pages1.appendTag(new NBTTagString(Library.book12)); for(String s : Library.book1) {
pages1.appendTag(new NBTTagString(Library.book13)); pages1.appendTag(new NBTTagString(s));
pages1.appendTag(new NBTTagString(Library.book14)); }
pages1.appendTag(new NBTTagString(Library.book15));
pages1.appendTag(new NBTTagString(Library.book16));
pages1.appendTag(new NBTTagString(Library.book17));
pages1.appendTag(new NBTTagString(Library.book18));
pages1.appendTag(new NBTTagString(Library.book19));
pages1.appendTag(new NBTTagString(Library.book110));
pages1.appendTag(new NBTTagString(Library.book111));
pages1.appendTag(new NBTTagString(Library.book112));
pages1.appendTag(new NBTTagString(Library.book113));
pages1.appendTag(new NBTTagString(Library.book114));
pages1.appendTag(new NBTTagString(Library.book115));
pages1.appendTag(new NBTTagString(Library.book116));
book1.stackTagCompound.setTag("pages", pages1); book1.stackTagCompound.setTag("pages", pages1);
player.inventory.addItemStackToInventory(book1); player.inventory.addItemStackToInventory(book1);
@ -178,23 +168,11 @@ public class Guide extends Block {
book2.stackTagCompound.setString("author", "HbMinecraft"); book2.stackTagCompound.setString("author", "HbMinecraft");
book2.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 2: Machines"); book2.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 2: Machines");
NBTTagList pages2 = new NBTTagList(); NBTTagList pages2 = new NBTTagList();
pages2.appendTag(new NBTTagString(Library.book21));
pages2.appendTag(new NBTTagString(Library.book22)); for(String s : Library.book2) {
pages2.appendTag(new NBTTagString(Library.book23)); pages2.appendTag(new NBTTagString(s));
pages2.appendTag(new NBTTagString(Library.book24)); }
pages2.appendTag(new NBTTagString(Library.book25));
pages2.appendTag(new NBTTagString(Library.book26));
pages2.appendTag(new NBTTagString(Library.book27));
pages2.appendTag(new NBTTagString(Library.book28));
pages2.appendTag(new NBTTagString(Library.book29));
pages2.appendTag(new NBTTagString(Library.book210));
pages2.appendTag(new NBTTagString(Library.book211));
pages2.appendTag(new NBTTagString(Library.book212));
pages2.appendTag(new NBTTagString(Library.book213));
pages2.appendTag(new NBTTagString(Library.book214));
pages2.appendTag(new NBTTagString(Library.book215));
pages2.appendTag(new NBTTagString(Library.book216));
pages2.appendTag(new NBTTagString(Library.book217));
book2.stackTagCompound.setTag("pages", pages2); book2.stackTagCompound.setTag("pages", pages2);
player.inventory.addItemStackToInventory(book2); player.inventory.addItemStackToInventory(book2);
@ -203,26 +181,11 @@ public class Guide extends Block {
book3.stackTagCompound.setString("author", "HbMinecraft"); book3.stackTagCompound.setString("author", "HbMinecraft");
book3.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 3: Bombs"); book3.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 3: Bombs");
NBTTagList pages3 = new NBTTagList(); NBTTagList pages3 = new NBTTagList();
pages3.appendTag(new NBTTagString(Library.book31));
pages3.appendTag(new NBTTagString(Library.book32)); for(String s : Library.book3) {
pages3.appendTag(new NBTTagString(Library.book33)); pages3.appendTag(new NBTTagString(s));
pages3.appendTag(new NBTTagString(Library.book34)); }
pages3.appendTag(new NBTTagString(Library.book35));
pages3.appendTag(new NBTTagString(Library.book36));
pages3.appendTag(new NBTTagString(Library.book37));
pages3.appendTag(new NBTTagString(Library.book38));
pages3.appendTag(new NBTTagString(Library.book39));
pages3.appendTag(new NBTTagString(Library.book310));
pages3.appendTag(new NBTTagString(Library.book311));
pages3.appendTag(new NBTTagString(Library.book312));
pages3.appendTag(new NBTTagString(Library.book313));
pages3.appendTag(new NBTTagString(Library.book314));
pages3.appendTag(new NBTTagString(Library.book315));
pages3.appendTag(new NBTTagString(Library.book316));
pages3.appendTag(new NBTTagString(Library.book317));
pages3.appendTag(new NBTTagString(Library.book318));
pages3.appendTag(new NBTTagString(Library.book319));
pages3.appendTag(new NBTTagString(Library.book320));
book3.stackTagCompound.setTag("pages", pages3); book3.stackTagCompound.setTag("pages", pages3);
player.inventory.addItemStackToInventory(book3); player.inventory.addItemStackToInventory(book3);
@ -231,15 +194,11 @@ public class Guide extends Block {
book4.stackTagCompound.setString("author", "HbMinecraft"); book4.stackTagCompound.setString("author", "HbMinecraft");
book4.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 4: Missiles"); book4.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 4: Missiles");
NBTTagList pages4 = new NBTTagList(); NBTTagList pages4 = new NBTTagList();
pages4.appendTag(new NBTTagString(Library.book41));
pages4.appendTag(new NBTTagString(Library.book42)); for(String s : Library.book4) {
pages4.appendTag(new NBTTagString(Library.book43)); pages4.appendTag(new NBTTagString(s));
pages4.appendTag(new NBTTagString(Library.book44)); }
pages4.appendTag(new NBTTagString(Library.book45));
pages4.appendTag(new NBTTagString(Library.book46));
pages4.appendTag(new NBTTagString(Library.book47));
pages4.appendTag(new NBTTagString(Library.book48));
pages4.appendTag(new NBTTagString(Library.book49));
book4.stackTagCompound.setTag("pages", pages4); book4.stackTagCompound.setTag("pages", pages4);
player.inventory.addItemStackToInventory(book4); player.inventory.addItemStackToInventory(book4);
@ -248,14 +207,11 @@ public class Guide extends Block {
book5.stackTagCompound.setString("author", "HbMinecraft"); book5.stackTagCompound.setString("author", "HbMinecraft");
book5.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 5: Misc"); book5.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 5: Misc");
NBTTagList pages5 = new NBTTagList(); NBTTagList pages5 = new NBTTagList();
pages5.appendTag(new NBTTagString(Library.book51));
pages5.appendTag(new NBTTagString(Library.book52)); for(String s : Library.book5) {
pages5.appendTag(new NBTTagString(Library.book53)); pages5.appendTag(new NBTTagString(s));
pages5.appendTag(new NBTTagString(Library.book54)); }
pages5.appendTag(new NBTTagString(Library.book55));
pages5.appendTag(new NBTTagString(Library.book56));
pages5.appendTag(new NBTTagString(Library.book57));
pages5.appendTag(new NBTTagString(Library.book58));
book5.stackTagCompound.setTag("pages", pages5); book5.stackTagCompound.setTag("pages", pages5);
player.inventory.addItemStackToInventory(book5); player.inventory.addItemStackToInventory(book5);

View File

@ -9,6 +9,8 @@ import com.hbm.main.MainRegistry;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.Block.SoundType;
import net.minecraft.block.BlockFalling;
import net.minecraft.block.material.MapColor; import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.material.MaterialLiquid; import net.minecraft.block.material.MaterialLiquid;
@ -48,6 +50,13 @@ public class ModBlocks {
public static Block ore_schrabidium; public static Block ore_schrabidium;
public static Block ore_beryllium; public static Block ore_beryllium;
public static Block ore_nether_uranium;
public static Block ore_nether_plutonium;
public static Block ore_nether_tungsten;
public static Block ore_nether_sulfur;
public static Block ore_nether_fire;
public static Block ore_nether_schrabidium;
public static Block block_uranium; public static Block block_uranium;
public static Block block_titanium; public static Block block_titanium;
public static Block block_sulfur; public static Block block_sulfur;
@ -61,12 +70,15 @@ public class ModBlocks {
public static Block block_lead; public static Block block_lead;
public static Block block_trinitite; public static Block block_trinitite;
public static Block block_waste; public static Block block_waste;
public static Block block_scrap;
public static Block block_beryllium; public static Block block_beryllium;
public static Block block_schrabidium; public static Block block_schrabidium;
public static Block block_advanced_alloy; public static Block block_advanced_alloy;
public static Block block_magnetized_tungsten; public static Block block_magnetized_tungsten;
public static Block block_combine_steel; public static Block block_combine_steel;
public static Block gravel_obsidian;
public static Block reinforced_brick; public static Block reinforced_brick;
public static Block reinforced_glass; public static Block reinforced_glass;
public static Block reinforced_light; public static Block reinforced_light;
@ -322,25 +334,35 @@ public class ModBlocks {
ore_lead = new BlockGeneric(Material.rock).setBlockName("ore_lead").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_lead"); ore_lead = new BlockGeneric(Material.rock).setBlockName("ore_lead").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_lead");
ore_schrabidium = new BlockGeneric(Material.rock).setBlockName("ore_schrabidium").setCreativeTab(MainRegistry.tabBlock).setHardness(15.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":ore_schrabidium"); ore_schrabidium = new BlockGeneric(Material.rock).setBlockName("ore_schrabidium").setCreativeTab(MainRegistry.tabBlock).setHardness(15.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":ore_schrabidium");
ore_beryllium = new BlockGeneric(Material.rock).setBlockName("ore_beryllium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_beryllium"); ore_beryllium = new BlockGeneric(Material.rock).setBlockName("ore_beryllium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_beryllium");
ore_nether_uranium = new BlockGeneric(Material.rock).setBlockName("ore_nether_uranium").setCreativeTab(MainRegistry.tabBlock).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_uranium");
ore_nether_plutonium = new BlockGeneric(Material.rock).setBlockName("ore_nether_plutonium").setCreativeTab(MainRegistry.tabBlock).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_plutonium");
ore_nether_tungsten = new BlockGeneric(Material.rock).setBlockName("ore_nether_tungsten").setCreativeTab(MainRegistry.tabBlock).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_tungsten");
ore_nether_sulfur = new BlockOre(Material.rock).setBlockName("ore_nether_sulfur").setCreativeTab(MainRegistry.tabBlock).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_sulfur");
ore_nether_fire = new BlockOre(Material.rock).setBlockName("ore_nether_fire").setCreativeTab(MainRegistry.tabBlock).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_fire");
ore_nether_schrabidium = new BlockGeneric(Material.rock).setBlockName("ore_nether_schrabidium").setCreativeTab(MainRegistry.tabBlock).setHardness(15.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_schrabidium");
block_uranium = new BlockGeneric(Material.iron).setBlockName("block_uranium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium"); block_uranium = new BlockGeneric(Material.iron).setBlockName("block_uranium").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium");
block_titanium = new BlockGeneric(Material.iron).setBlockName("block_titanium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_titanium"); block_titanium = new BlockGeneric(Material.iron).setBlockName("block_titanium").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_titanium");
block_sulfur = new BlockGeneric(Material.iron).setBlockName("block_sulfur").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_sulfur"); block_sulfur = new BlockGeneric(Material.iron).setBlockName("block_sulfur").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_sulfur");
block_niter = new BlockGeneric(Material.iron).setBlockName("block_niter").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_niter"); block_niter = new BlockGeneric(Material.iron).setBlockName("block_niter").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_niter");
block_copper = new BlockGeneric(Material.iron).setBlockName("block_copper").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_copper"); block_copper = new BlockGeneric(Material.iron).setBlockName("block_copper").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_copper");
block_red_copper = new BlockGeneric(Material.iron).setBlockName("block_red_copper").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_red_copper"); block_red_copper = new BlockGeneric(Material.iron).setBlockName("block_red_copper").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_red_copper");
block_tungsten = new BlockGeneric(Material.iron).setBlockName("block_tungsten").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_tungsten"); block_tungsten = new BlockGeneric(Material.iron).setBlockName("block_tungsten").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_tungsten");
block_aluminium = new BlockGeneric(Material.iron).setBlockName("block_aluminium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_aluminium"); block_aluminium = new BlockGeneric(Material.iron).setBlockName("block_aluminium").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_aluminium");
block_fluorite = new BlockGeneric(Material.iron).setBlockName("block_fluorite").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_fluorite"); block_fluorite = new BlockGeneric(Material.iron).setBlockName("block_fluorite").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_fluorite");
block_steel = new BlockGeneric(Material.iron).setBlockName("block_steel").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_steel"); block_steel = new BlockGeneric(Material.iron).setBlockName("block_steel").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_steel");
block_lead = new BlockGeneric(Material.iron).setBlockName("block_lead").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_lead"); block_lead = new BlockGeneric(Material.iron).setBlockName("block_lead").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_lead");
block_trinitite = new BlockOre(Material.iron).setBlockName("block_trinitite").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_trinitite"); block_trinitite = new BlockOre(Material.iron).setBlockName("block_trinitite").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_trinitite");
block_waste = new BlockOre(Material.iron).setBlockName("block_waste").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_waste"); block_waste = new BlockOre(Material.iron).setBlockName("block_waste").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_waste");
block_beryllium = new BlockGeneric(Material.iron).setBlockName("block_beryllium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_beryllium"); block_scrap = new BlockFalling(Material.sand).setBlockName("block_scrap").setCreativeTab(MainRegistry.tabBlock).setHardness(2.5F).setResistance(5.0F).setStepSound(Block.soundTypeGravel).setBlockTextureName(RefStrings.MODID + ":block_scrap");
block_schrabidium = new BlockGeneric(Material.iron).setBlockName("block_schrabidium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_schrabidium"); block_beryllium = new BlockGeneric(Material.iron).setBlockName("block_beryllium").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_beryllium");
block_schrabidium = new BlockGeneric(Material.iron).setBlockName("block_schrabidium").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_schrabidium");
block_advanced_alloy = new BlockGeneric(Material.iron).setBlockName("block_advanced_alloy").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_advanced_alloy"); block_advanced_alloy = new BlockGeneric(Material.iron).setBlockName("block_advanced_alloy").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_advanced_alloy");
block_magnetized_tungsten = new BlockGeneric(Material.iron).setBlockName("block_magnetized_tungsten").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(35.0F).setBlockTextureName(RefStrings.MODID + ":block_magnetized_tungsten"); block_magnetized_tungsten = new BlockGeneric(Material.iron).setBlockName("block_magnetized_tungsten").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(35.0F).setBlockTextureName(RefStrings.MODID + ":block_magnetized_tungsten");
block_combine_steel = new BlockGeneric(Material.iron).setBlockName("block_combine_steel").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_combine_steel"); block_combine_steel = new BlockGeneric(Material.iron).setBlockName("block_combine_steel").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_combine_steel");
gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian");
reinforced_brick = new BlockGeneric(Material.rock).setBlockName("reinforced_brick").setCreativeTab(MainRegistry.tabBlock).setLightOpacity(15).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_brick"); reinforced_brick = new BlockGeneric(Material.rock).setBlockName("reinforced_brick").setCreativeTab(MainRegistry.tabBlock).setLightOpacity(15).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_brick");
reinforced_glass = new ReinforcedBlock(Material.glass).setBlockName("reinforced_glass").setCreativeTab(MainRegistry.tabBlock).setLightOpacity(0).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_glass"); reinforced_glass = new ReinforcedBlock(Material.glass).setBlockName("reinforced_glass").setCreativeTab(MainRegistry.tabBlock).setLightOpacity(0).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_glass");
@ -504,7 +526,7 @@ public class ModBlocks {
book_guide = new Guide(Material.iron).setBlockName("book_guide").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke); book_guide = new Guide(Material.iron).setBlockName("book_guide").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke);
crate = new BlockCrate(Material.iron).setBlockName("crate").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":crate"); crate = new BlockCrate(Material.iron).setBlockName("crate").setStepSound(Block.soundTypeWood).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":crate");
machine_schrabidium_transmutator = new MachineSchrabidiumTransmutator(Material.iron).setBlockName("machine_schrabidium_transmutator").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock); machine_schrabidium_transmutator = new MachineSchrabidiumTransmutator(Material.iron).setBlockName("machine_schrabidium_transmutator").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock);
@ -529,7 +551,7 @@ public class ModBlocks {
private static void registerBlock() { private static void registerBlock() {
//Test //Test
GameRegistry.registerBlock(test_render, test_render.getUnlocalizedName()); GameRegistry.registerBlock(test_render, test_render.getUnlocalizedName());
GameRegistry.registerBlock(test_container, test_container.getUnlocalizedName()); //GameRegistry.registerBlock(test_container, test_container.getUnlocalizedName());
GameRegistry.registerBlock(test_bomb, test_bomb.getUnlocalizedName()); GameRegistry.registerBlock(test_bomb, test_bomb.getUnlocalizedName());
GameRegistry.registerBlock(test_bomb_advanced, test_bomb_advanced.getUnlocalizedName()); GameRegistry.registerBlock(test_bomb_advanced, test_bomb_advanced.getUnlocalizedName());
@ -554,6 +576,14 @@ public class ModBlocks {
GameRegistry.registerBlock(ore_lead, ore_lead.getUnlocalizedName()); GameRegistry.registerBlock(ore_lead, ore_lead.getUnlocalizedName());
GameRegistry.registerBlock(ore_schrabidium, ItemSchrabidiumBlock.class, ore_schrabidium.getUnlocalizedName()); GameRegistry.registerBlock(ore_schrabidium, ItemSchrabidiumBlock.class, ore_schrabidium.getUnlocalizedName());
//Nether Ores
GameRegistry.registerBlock(ore_nether_uranium, ore_nether_uranium.getUnlocalizedName());
GameRegistry.registerBlock(ore_nether_plutonium, ore_nether_plutonium.getUnlocalizedName());
GameRegistry.registerBlock(ore_nether_tungsten, ore_nether_tungsten.getUnlocalizedName());
GameRegistry.registerBlock(ore_nether_sulfur, ore_nether_sulfur.getUnlocalizedName());
GameRegistry.registerBlock(ore_nether_fire, ore_nether_fire.getUnlocalizedName());
GameRegistry.registerBlock(ore_nether_schrabidium, ItemSchrabidiumBlock.class, ore_nether_schrabidium.getUnlocalizedName());
//Blocks //Blocks
GameRegistry.registerBlock(block_uranium, block_uranium.getUnlocalizedName()); GameRegistry.registerBlock(block_uranium, block_uranium.getUnlocalizedName());
GameRegistry.registerBlock(block_titanium, block_titanium.getUnlocalizedName()); GameRegistry.registerBlock(block_titanium, block_titanium.getUnlocalizedName());
@ -568,11 +598,15 @@ public class ModBlocks {
GameRegistry.registerBlock(block_beryllium, block_beryllium.getUnlocalizedName()); GameRegistry.registerBlock(block_beryllium, block_beryllium.getUnlocalizedName());
GameRegistry.registerBlock(block_steel, block_steel.getUnlocalizedName()); GameRegistry.registerBlock(block_steel, block_steel.getUnlocalizedName());
GameRegistry.registerBlock(block_lead, block_lead.getUnlocalizedName()); GameRegistry.registerBlock(block_lead, block_lead.getUnlocalizedName());
GameRegistry.registerBlock(block_scrap, block_scrap.getUnlocalizedName());
GameRegistry.registerBlock(block_trinitite, block_trinitite.getUnlocalizedName()); GameRegistry.registerBlock(block_trinitite, block_trinitite.getUnlocalizedName());
GameRegistry.registerBlock(block_waste, block_waste.getUnlocalizedName()); GameRegistry.registerBlock(block_waste, block_waste.getUnlocalizedName());
GameRegistry.registerBlock(block_schrabidium, ItemSchrabidiumBlock.class, block_schrabidium.getUnlocalizedName()); GameRegistry.registerBlock(block_schrabidium, ItemSchrabidiumBlock.class, block_schrabidium.getUnlocalizedName());
GameRegistry.registerBlock(block_magnetized_tungsten, block_magnetized_tungsten.getUnlocalizedName()); GameRegistry.registerBlock(block_magnetized_tungsten, block_magnetized_tungsten.getUnlocalizedName());
GameRegistry.registerBlock(block_combine_steel, block_combine_steel.getUnlocalizedName()); GameRegistry.registerBlock(block_combine_steel, block_combine_steel.getUnlocalizedName());
//Gravel
GameRegistry.registerBlock(gravel_obsidian, gravel_obsidian.getUnlocalizedName());
//Reinforced Blocks //Reinforced Blocks
GameRegistry.registerBlock(reinforced_brick, reinforced_brick.getUnlocalizedName()); GameRegistry.registerBlock(reinforced_brick, reinforced_brick.getUnlocalizedName());

View File

@ -2,6 +2,7 @@ package com.hbm.blocks;
import java.util.Random; import java.util.Random;
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall; import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.entity.EntityNukeExplosionAdvanced;
import com.hbm.interfaces.IBomb; import com.hbm.interfaces.IBomb;
@ -27,8 +28,8 @@ public class NukeBoy extends BlockContainer implements IBomb {
public TileEntityNukeBoy tetn = new TileEntityNukeBoy(); public TileEntityNukeBoy tetn = new TileEntityNukeBoy();
private static boolean keepInventory = false; private static boolean keepInventory = false;
private final static Random field_149933_a = new Random(); private final static Random field_149933_a = new Random();
private boolean isExploding = false; private boolean isExploding = false;
protected NukeBoy(Material p_i45386_1_) { protected NukeBoy(Material p_i45386_1_) {
super(p_i45386_1_); super(p_i45386_1_);
@ -38,75 +39,69 @@ public class NukeBoy extends BlockContainer implements IBomb {
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileEntityNukeBoy(); return new TileEntityNukeBoy();
} }
@Override @Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
{ return Item.getItemFromBlock(ModBlocks.nuke_boy);
return Item.getItemFromBlock(ModBlocks.nuke_boy); }
}
@Override @Override
public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_,
{ int p_149749_6_) {
if (!keepInventory) if (!keepInventory) {
{ TileEntityNukeBoy tileentityfurnace = (TileEntityNukeBoy) p_149749_1_.getTileEntity(p_149749_2_,
TileEntityNukeBoy tileentityfurnace = (TileEntityNukeBoy)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_); p_149749_3_, p_149749_4_);
if (tileentityfurnace != null) if (tileentityfurnace != null) {
{ for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1) {
for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1) ItemStack itemstack = tileentityfurnace.getStackInSlot(i1);
{
ItemStack itemstack = tileentityfurnace.getStackInSlot(i1);
if (itemstack != null) if (itemstack != null) {
{ float f = NukeBoy.field_149933_a.nextFloat() * 0.8F + 0.1F;
float f = NukeBoy.field_149933_a.nextFloat() * 0.8F + 0.1F; float f1 = NukeBoy.field_149933_a.nextFloat() * 0.8F + 0.1F;
float f1 = NukeBoy.field_149933_a.nextFloat() * 0.8F + 0.1F; float f2 = NukeBoy.field_149933_a.nextFloat() * 0.8F + 0.1F;
float f2 = NukeBoy.field_149933_a.nextFloat() * 0.8F + 0.1F;
while (itemstack.stackSize > 0) while (itemstack.stackSize > 0) {
{ int j1 = NukeBoy.field_149933_a.nextInt(21) + 10;
int j1 = NukeBoy.field_149933_a.nextInt(21) + 10;
if (j1 > itemstack.stackSize) if (j1 > itemstack.stackSize) {
{ j1 = itemstack.stackSize;
j1 = itemstack.stackSize; }
}
itemstack.stackSize -= j1; itemstack.stackSize -= j1;
EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1,
p_149749_4_ + f2,
new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
if (itemstack.hasTagCompound()) if (itemstack.hasTagCompound()) {
{ entityitem.getEntityItem()
entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); .setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy());
} }
float f3 = 0.05F; float f3 = 0.05F;
entityitem.motionX = (float)NukeBoy.field_149933_a.nextGaussian() * f3; entityitem.motionX = (float) NukeBoy.field_149933_a.nextGaussian() * f3;
entityitem.motionY = (float)NukeBoy.field_149933_a.nextGaussian() * f3 + 0.2F; entityitem.motionY = (float) NukeBoy.field_149933_a.nextGaussian() * f3 + 0.2F;
entityitem.motionZ = (float)NukeBoy.field_149933_a.nextGaussian() * f3; entityitem.motionZ = (float) NukeBoy.field_149933_a.nextGaussian() * f3;
p_149749_1_.spawnEntityInWorld(entityitem); p_149749_1_.spawnEntityInWorld(entityitem);
} }
} }
} }
p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_); p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_);
} }
} }
super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
}
super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
}
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
if(world.isRemote) float hitY, float hitZ) {
{ if (world.isRemote) {
return true; return true;
} else if(!player.isSneaking()) } else if (!player.isSneaking()) {
{
TileEntityNukeBoy entity = (TileEntityNukeBoy) world.getTileEntity(x, y, z); TileEntityNukeBoy entity = (TileEntityNukeBoy) world.getTileEntity(x, y, z);
if(entity != null) if (entity != null) {
{
FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_boy, world, x, y, z); FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_boy, world, x, y, z);
} }
return true; return true;
@ -114,115 +109,113 @@ public class NukeBoy extends BlockContainer implements IBomb {
return false; return false;
} }
} }
@Override
public void onNeighborBlockChange(World p_149695_1_, int x, int y, int z, Block p_149695_5_)
{
TileEntityNukeBoy entity = (TileEntityNukeBoy) p_149695_1_.getTileEntity(x, y, z);
if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z))
{
if(entity.isReady())
{
this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1);
entity.clearSlots();
p_149695_1_.setBlockToAir(x, y, z);
igniteTestBomb(p_149695_1_, x, y, z);
}
}
}
public boolean igniteTestBomb(World world, int x, int y, int z)
{
if (!world.isRemote)
{
tetn.clearSlots();
//world.spawnParticle("hugeexplosion", x, y, z, 0, 0, 0); //spawns a huge explosion particle
world.playSoundEffect(x, y, z, "random.explode", 1.0f, world.rand.nextFloat() * 0.1F + 0.9F); //x,y,z,sound,volume,pitch
/*ExplosionNukeGeneric.detonateTestBomb(world, x, y, z, 120);
ExplosionNukeGeneric.vapor(world, x, y, z, 200);
ExplosionNukeGeneric.waste(world, x, y, z, 150);
ExplosionNukeGeneric.dealDamage(world, x, y, z, 150);*/
/*EntityNukeExplosion entity = new EntityNukeExplosion(world); @Override
entity.posX = x; public void onNeighborBlockChange(World p_149695_1_, int x, int y, int z, Block p_149695_5_) {
entity.posY = y; TileEntityNukeBoy entity = (TileEntityNukeBoy) p_149695_1_.getTileEntity(x, y, z);
entity.posZ = z; if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) {
entity.destructionRange = 120; if (entity.isReady()) {
entity.vaporRange = 200; this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1);
entity.wasteRange = 150; entity.clearSlots();
entity.damageRange = 150; p_149695_1_.setBlockToAir(x, y, z);
igniteTestBomb(p_149695_1_, x, y, z);
world.spawnEntityInWorld(entity);*/ }
}
EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(world); }
entity.posX = x;
entity.posY = y;
entity.posZ = z;
entity.destructionRange = MainRegistry.boyRadius;
entity.speed = 25;
entity.coefficient = 10.0F;
world.spawnEntityInWorld(entity);
//ExplosionNukeAdvanced.mush(world, x, y, z);
EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000); public boolean igniteTestBomb(World world, int x, int y, int z) {
entity2.posX = x; if (!world.isRemote) {
entity2.posY = y - 11; tetn.clearSlots();
entity2.posZ = z; // world.spawnParticle("hugeexplosion", x, y, z, 0, 0, 0); //spawns
world.spawnEntityInWorld(entity2); // a huge explosion particle
} world.playSoundEffect(x, y, z, "random.explode", 1.0f, world.rand.nextFloat() * 0.1F + 0.9F); // x,y,z,sound,volume,pitch
/*
* ExplosionNukeGeneric.detonateTestBomb(world, x, y, z, 120);
* ExplosionNukeGeneric.vapor(world, x, y, z, 200);
* ExplosionNukeGeneric.waste(world, x, y, z, 150);
* ExplosionNukeGeneric.dealDamage(world, x, y, z, 150);
*/
/*
* EntityNukeExplosion entity = new EntityNukeExplosion(world);
* entity.posX = x; entity.posY = y; entity.posZ = z;
* entity.destructionRange = 120; entity.vaporRange = 200;
* entity.wasteRange = 150; entity.damageRange = 150;
*
* world.spawnEntityInWorld(entity);
*/
EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(world);
entity.posX = x;
entity.posY = y;
entity.posZ = z;
entity.destructionRange = MainRegistry.boyRadius;
entity.speed = 25;
entity.coefficient = 10.0F;
world.spawnEntityInWorld(entity);
// ExplosionNukeAdvanced.mush(world, x, y, z);
if (MainRegistry.enableNukeClouds) {
EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000);
entity2.posX = x;
entity2.posY = y - 11;
entity2.posZ = z;
world.spawnEntityInWorld(entity2);
} else {
EntityNukeCloudSmall entity2 = new EntityNukeCloudNoShroom(world, 1000);
entity2.posX = x;
entity2.posY = y - 11;
entity2.posZ = z;
world.spawnEntityInWorld(entity2);
}
}
return false; return false;
} }
@Override @Override
public int getRenderType(){ public int getRenderType() {
return -1; return -1;
} }
@Override @Override
public boolean isOpaqueCube() { public boolean isOpaqueCube() {
return false; return false;
} }
@Override @Override
public boolean renderAsNormalBlock() { public boolean renderAsNormalBlock() {
return false; return false;
} }
@Override @Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { 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; int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
if(i == 0) if (i == 0) {
{
world.setBlockMetadataWithNotify(x, y, z, 5, 2); world.setBlockMetadataWithNotify(x, y, z, 5, 2);
} }
if(i == 1) if (i == 1) {
{
world.setBlockMetadataWithNotify(x, y, z, 3, 2); world.setBlockMetadataWithNotify(x, y, z, 3, 2);
} }
if(i == 2) if (i == 2) {
{
world.setBlockMetadataWithNotify(x, y, z, 4, 2); world.setBlockMetadataWithNotify(x, y, z, 4, 2);
} }
if(i == 3) if (i == 3) {
{
world.setBlockMetadataWithNotify(x, y, z, 2, 2); world.setBlockMetadataWithNotify(x, y, z, 2, 2);
} }
} }
public void explode(World world, int x, int y, int z) { public void explode(World world, int x, int y, int z) {
TileEntityNukeBoy entity = (TileEntityNukeBoy) world.getTileEntity(x, y, z); TileEntityNukeBoy entity = (TileEntityNukeBoy) world.getTileEntity(x, y, z);
//if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) // if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z))
{ {
if(entity.isReady()) if (entity.isReady()) {
{ this.onBlockDestroyedByPlayer(world, x, y, z, 1);
this.onBlockDestroyedByPlayer(world, x, y, z, 1); entity.clearSlots();
entity.clearSlots(); world.setBlockToAir(x, y, z);
world.setBlockToAir(x, y, z); igniteTestBomb(world, x, y, z);
igniteTestBomb(world, x, y, z); }
} }
}
} }
} }

View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall; import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.entity.EntityNukeExplosionAdvanced;
import com.hbm.interfaces.IBomb; import com.hbm.interfaces.IBomb;
@ -183,11 +184,19 @@ public class NukeGadget extends BlockContainer implements IBomb {
//ExplosionNukeAdvanced.mush(world, x, y, z); //ExplosionNukeAdvanced.mush(world, x, y, z);
EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000); if (MainRegistry.enableNukeClouds) {
entity2.posX = x; EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000);
entity2.posY = y - 15; entity2.posX = x;
entity2.posZ = z; entity2.posY = y - 15;
world.spawnEntityInWorld(entity2); entity2.posZ = z;
world.spawnEntityInWorld(entity2);
} else {
EntityNukeCloudSmall entity2 = new EntityNukeCloudNoShroom(world, 1000);
entity2.posX = x;
entity2.posY = y - 15;
entity2.posZ = z;
world.spawnEntityInWorld(entity2);
}
} }
return false; return false;

View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall; import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.entity.EntityNukeExplosionAdvanced;
import com.hbm.interfaces.IBomb; import com.hbm.interfaces.IBomb;
@ -182,11 +183,19 @@ public class NukeMan extends BlockContainer implements IBomb {
//ExplosionNukeAdvanced.mush(world, x, y, z); //ExplosionNukeAdvanced.mush(world, x, y, z);
EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000); if (MainRegistry.enableNukeClouds) {
entity2.posX = x; EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000);
entity2.posY = y - 17; entity2.posX = x;
entity2.posZ = z; entity2.posY = y - 17;
world.spawnEntityInWorld(entity2); entity2.posZ = z;
world.spawnEntityInWorld(entity2);
} else {
EntityNukeCloudSmall entity2 = new EntityNukeCloudNoShroom(world, 1000);
entity2.posX = x;
entity2.posY = y - 17;
entity2.posZ = z;
world.spawnEntityInWorld(entity2);
}
} }
return false; return false;

View File

@ -5,6 +5,7 @@ import java.util.Map;
import java.util.Random; import java.util.Random;
import com.hbm.entity.EntityNukeCloudBig; import com.hbm.entity.EntityNukeCloudBig;
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall; import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.entity.EntityNukeExplosionAdvanced;
import com.hbm.interfaces.IBomb; import com.hbm.interfaces.IBomb;
@ -160,20 +161,28 @@ public class NukeMike extends BlockContainer implements IBomb {
world.spawnEntityInWorld(entity); world.spawnEntityInWorld(entity);
if(r < 200)
{ if (MainRegistry.enableNukeClouds) {
EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000); if (r < 200) {
entity2.posX = x; EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000);
entity2.posY = y - (r / 10); entity2.posX = x;
entity2.posZ = z; entity2.posY = y - (r / 10);
world.spawnEntityInWorld(entity2); entity2.posZ = z;
} else { world.spawnEntityInWorld(entity2);
EntityNukeCloudBig entity2 = new EntityNukeCloudBig(world, 1000); } else {
entity2.posX = x; EntityNukeCloudBig entity2 = new EntityNukeCloudBig(world, 1000);
entity2.posY = y - (r / 10); entity2.posX = x;
entity2.posZ = z; entity2.posY = y - (r / 10);
world.spawnEntityInWorld(entity2); entity2.posZ = z;
} world.spawnEntityInWorld(entity2);
}
} else {
EntityNukeCloudSmall entity2 = new EntityNukeCloudNoShroom(world, 1000);
entity2.posX = x;
entity2.posY = y - (r / 10);
entity2.posZ = z;
world.spawnEntityInWorld(entity2);
}
//ExplosionNukeAdvanced.mush(world, x, y, z); //ExplosionNukeAdvanced.mush(world, x, y, z);
} }

View File

@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import com.hbm.entity.EntityFalloutRain;
import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionChaos;
import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticle;
import com.hbm.particles.EntitySmokeFX; import com.hbm.particles.EntitySmokeFX;
@ -43,7 +44,7 @@ public class TestEventTester extends Block {
//ExplosionChaos.frag(p_149695_1_, x, y + 2, z, 10, false, null); //ExplosionChaos.frag(p_149695_1_, x, y + 2, z, 10, false, null);
//EntitySmokeFX smoke = new EntitySmokeFX(p_149695_1_, x + 0.5, y + 1, z + 0.5, 0.0, 0.0, 0.0); //EntitySmokeFX smoke = new EntitySmokeFX(p_149695_1_, x + 0.5, y + 1, z + 0.5, 0.0, 0.0, 0.0);
//p_149695_1_.spawnEntityInWorld(smoke); //p_149695_1_.spawnEntityInWorld(smoke);
ExplosionParticle.spawnMush(p_149695_1_, x, y, z); //ExplosionParticle.spawnMush(p_149695_1_, x, y, z);
//mirv(this.worldObj, x, y + 20, z); //mirv(this.worldObj, x, y + 20, z);
//killEvent(p_149695_1_, x, y, z); //killEvent(p_149695_1_, x, y, z);
/*EntityNuclearCreeper e = new EntityNuclearCreeper(p_149695_1_); /*EntityNuclearCreeper e = new EntityNuclearCreeper(p_149695_1_);
@ -58,6 +59,13 @@ public class TestEventTester extends Block {
{ {
ExplosionNukeAdvanced.mush(p_149695_1_, x, y, z); ExplosionNukeAdvanced.mush(p_149695_1_, x, y, z);
}*/ }*/
EntityFalloutRain fallout = new EntityFalloutRain(p_149695_1_, 1000);
fallout.posX = x;
fallout.posY = y + 3;
fallout.posZ = z;
fallout.setScale(50);
p_149695_1_.spawnEntityInWorld(fallout);
} }
} }

Some files were not shown because too many files have changed in this diff Show More