Maximum Overcode (fixes for shredder, sounds, nether ores, new grenades, more)

This commit is contained in:
HbmMods 2016-10-18 10:31:05 +02:00
parent 639ef099e7
commit 540fb3d256
133 changed files with 2192 additions and 758 deletions

View File

@ -3,6 +3,10 @@ itemGroup.tabParts=Nuclear Tech Mod Bauteile
itemGroup.tabBlocks=Nuclear Tech Mod Blöcke
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.revolverBullet=%1$s wurde von %2$s in den Kopf geschossen.
death.attack.mudPoisoning=%1$s starb an Giftschlamm.
@ -14,6 +18,10 @@ 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.cmb=%1$s wurde von %2$s pulverisiert.
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.acid=%1$s fiel in Säure.
@ -109,7 +117,7 @@ tile.red_wire_coated.name=Geschirmtes rotes Kupferkabel
tile.machine_deuterium.name=Deuteriumextraktor
container.machine_deuterium=Deuteriumextraktor
tile.machine_battery.name=Energiespeicherblock
container.battery=Energiespeicherblock
container.battery=Energiespeicher
tile.machine_coal_off.name=Kohlegenerator
tile.machine_coal_on.name=Kohlegenerator
container.machineCoal=Kohlegenerator
@ -248,6 +256,7 @@ tile.block_uranium.name=Uranblock
tile.block_trinitite.name=Trinititblock
tile.block_beryllium.name=Berylliumblock
tile.block_waste.name=Atommüllblock
tile.block_scrap.name=Schrottblock
tile.block_advanced_alloy.name=Fortgeschrittener Legierungsblock
tile.block_magnetized_tungsten.name=Magnetisierter Wolframblock
tile.block_combine_steel.name=CMB-Stahlblock
@ -297,6 +306,7 @@ item.powder_copper.name=Kupferstaub
item.powder_titanium.name=Titanstaub
item.powder_tungsten.name=Wolframstaub
item.powder_uranium.name=Uranstaub
item.powder_plutonium.name=Plutoniumstaub
item.dust.name=Staub
item.powder_coal.name=Kohlestaub
item.powder_lapis.name=Lapis Lazuli-Staub
@ -305,15 +315,15 @@ item.powder_diamond.name=Diamantstaub
item.powder_red_copper.name=Roter Kupfer Staub
item.powder_steel.name=Stahlstaub
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_advanced_alloy.name=Fortgeschrittener Legierungsstaub
item.powder_quartz.name=Quarzstaub
item.powder_power.name=Energiepulver
item.powder_iodine.name=Iodpulver
item.powder_thorium.name=Thoriumpulver
item.powder_neodymium.name=Neodympulver
item.powder_astatine.name=Astatpulver
item.powder_iodine.name=Iodstaub
item.powder_thorium.name=Thoriumstaub
item.powder_neodymium.name=Neodymstaub
item.powder_astatine.name=Astatstaub
item.battery_generic.name=Batterie
item.battery_advanced.name=Fortgeschrittene Batterie
@ -337,6 +347,7 @@ item.reactor_core.name=Brutreaktorkern
item.pellet_rtg.name=Plutonium 238 Pellet
item.rtg_unit.name=RTG Einheit
item.hazmat_cloth.name=Strahlenschutzanzugsstoff
item.filter_coal.name=Aktivkohlefilter
item.tritium_deuterium_cake.name=Tritium-Deuterium-Kuchen
item.cell_empty.name=Leere Zelle
@ -365,6 +376,7 @@ item.inf_antischrabidium.name=Unendlicher Antischrabidiumtank
item.canister_empty.name=Leerer Kanister
item.canister_fuel.name=Treibstoffkanister
item.canister_napalm.name=Napalm B
item.canister_NITAN.name=NITAN© 100 Oktan Supertreibstoff
item.rod_empty.name=Leerer Brennstab
item.rod_uranium.name=Uranbrennstab
@ -483,8 +495,10 @@ item.grenade_tau.name=Taugranate
item.grenade_schrabidium.name=Schrabidiumgranate
item.grenade_lemon.name=Zitronengranate
item.grenade_mk2.name=Mk 2 Granate "Botschafter Ananas"
item.grenade_aschrab.name=Werfbare Antischrabidiumzelle
item.grenade_nuke.name=Mark VI Bohrgranate
item.grenade_nuclear.name=Nuka-Granate
item.grenade_zomg.name=Negativenergie-Paarvernichtungsgranate
item.rod_uranium_fuel.name=Urankernbrennstoffzelle
item.rod_dual_uranium_fuel.name=Doppelte Urankernbrennstoffzelle
@ -552,7 +566,7 @@ item.gun_revolver_cursed.name=Verfluchte Pistole
item.gun_fatman.name=M42 Nukleares Katapult "Fat Man"
item.gun_xvl1456.name=XVL1456 Tau-Kanone Prototyp
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_super_shotgun.name=Super Shotgun
item.gun_moist_nugget.name=Moisn-Nagant
@ -678,6 +692,10 @@ item.hazmat_helmet.name=Strahlenschutzhelm
item.hazmat_plate.name=Strahlenschutzbrustplatte
item.hazmat_legs.name=Strahlenschutzhose
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.goggles.name=Schutzbrille
item.gas_mask.name=Gasmaske
@ -733,6 +751,10 @@ item.alloy_helmet.name=Legierungshelm
item.alloy_plate.name=Legierungsbrustpanzer
item.alloy_legs.name=Legierungsbeinschutz
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_pickaxe.name=Stahlspitzhacke
@ -749,6 +771,11 @@ item.alloy_pickaxe.name=Legierungsspitzhacke
item.alloy_axe.name=Legierungsaxt
item.alloy_shovel.name=Legierungsschaufel
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.block_meteor.name=Meteoritenblock
@ -820,4 +847,6 @@ item.blades_steel.name=Stahlsägeblatt
item.blades_titanium.name=Titansägeblatt
item.blades_advanced_alloy.name=Fortgeschrittenes 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

View File

@ -3,6 +3,10 @@ itemGroup.tabParts=Nuclear Tech Mod Parts
itemGroup.tabBlocks=Nuclear Tech Mod Blocks
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.revolverBullet=%1$s was shot in the head by %2$s.
death.attack.mudPoisoning=%1$s died in poisonous mud.
@ -13,7 +17,10 @@ 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.chopperBullet=%1$s was rekt 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.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.acid=%1$s fell into acid.
@ -109,7 +116,7 @@ tile.red_wire_coated.name=Coated Red Copper Cable
tile.machine_deuterium.name=Deuterium Extractor
container.machine_deuterium=Deuterium Extractor
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_on.name=Coal Generator
container.machineCoal=Coal Generator
@ -248,6 +255,7 @@ tile.block_uranium.name=Block of Uranium
tile.block_trinitite.name=Block of Trinitite
tile.block_beryllium.name=Block of Beryllium
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_magnetized_tungsten.name=Block of Magnetized Tungsten
tile.block_combine_steel.name=Block of CMB Steel
@ -297,6 +305,7 @@ item.powder_copper.name=Copper Powder
item.powder_titanium.name=Titanium Powder
item.powder_tungsten.name=Tungsten Powder
item.powder_uranium.name=Uranium Powder
item.powder_plutonium.name=Plutonium Powder
item.dust.name=Dust
item.powder_coal.name=Coal Powder
item.powder_lapis.name=Lapis Lazuli Powder
@ -337,6 +346,7 @@ item.reactor_core.name=Breeding Reactor Core
item.pellet_rtg.name=Plutonium 238 Fuel Pellet
item.rtg_unit.name=RTG Unit
item.hazmat_cloth.name=Hazmat Cloth
item.filter_coal.name=Activated Carbon Filter
item.tritium_deuterium_cake.name=Tritium-Deuterium-Cake
item.cell_empty.name=Empty Cell
@ -365,6 +375,7 @@ item.inf_antischrabidium.name=Infinite Antischrabidium Tank
item.canister_empty.name=Empty Canister
item.canister_fuel.name=Fuel Canister
item.canister_napalm.name=Napalm B
item.canister_NITAN.name=NITAN© 100 Octane Super Fuel
item.rod_empty.name=Emty Rod
item.rod_uranium.name=Uranium Rod
@ -483,8 +494,10 @@ item.grenade_tau.name=Tau Grenade
item.grenade_schrabidium.name=Schrabidium Grenade
item.grenade_lemon.name=Combustible Lemon
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_nuclear.name=Nuka Grenade
item.grenade_zomg.name=Negative Energy Pair Annihilation Grenade
item.rod_uranium_fuel.name=Uranium Fuel Rod
item.rod_dual_uranium_fuel.name=Uranium Dual Fuel Rod
@ -678,6 +691,10 @@ item.hazmat_helmet.name=Hazmat Helmet
item.hazmat_plate.name=Hazmmat Chestplate
item.hazmat_legs.name=Hazmat Leggings
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.goggles.name=Protection Goggles
item.gas_mask.name=Gas Mask
@ -733,6 +750,10 @@ item.alloy_helmet.name=Advanced Alloy Helmet
item.alloy_plate.name=Advanced Alloy Chestplate
item.alloy_legs.name=Advanced Alloy Leggings
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_pickaxe.name=Steel Pickaxe
@ -749,6 +770,11 @@ item.alloy_pickaxe.name=Advanced Alloy Pickaxe
item.alloy_axe.name=Advanced Alloy Axe
item.alloy_shovel.name=Advanced Alloy Shovel
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.block_meteor.name=Meteor Block
@ -820,4 +846,6 @@ item.blades_steel.name=Steel Shredder Blades
item.blades_titanium.name=Titanium Shredder Blades
item.blades_advanced_alloy.name=Advanced 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

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.2 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: 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.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

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: 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: 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

View File

@ -34,6 +34,7 @@ public class BlockCrate extends BlockFalling {
{
dropItems(world, x, y, z);
world.setBlockToAir(x, y, z);
world.playSoundEffect(x, y, z, "hbm:block.crateBreak", 1.0F, 1.0F);
return true;
} else {
if(world.isRemote)
@ -49,7 +50,7 @@ public class BlockCrate extends BlockFalling {
Random rand = new Random();
List<Item> list = new ArrayList<Item>();
switch(rand.nextInt(23)) {
switch(rand.nextInt(29)) {
case 0:
list.add(ModItems.clip_revolver_iron);
list.add(ModItems.clip_revolver_iron);
@ -149,6 +150,29 @@ public class BlockCrate extends BlockFalling {
list.add(ModItems.syringe_metal_stimpak);
list.add(ModItems.syringe_metal_stimpak);
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;
}
for(Item stack : list) {

View File

@ -42,7 +42,7 @@ public class BlockOre extends Block {
{
return ModItems.niter;
}
if(this == ModBlocks.ore_sulfur)
if(this == ModBlocks.ore_sulfur || this == ModBlocks.ore_nether_sulfur)
{
return ModItems.sulfur;
}
@ -62,6 +62,10 @@ public class BlockOre extends Block {
{
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);
}
@ -77,7 +81,11 @@ public class BlockOre extends Block {
{
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);
}

View File

@ -9,6 +9,7 @@ import com.hbm.main.MainRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFalling;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.material.MaterialLiquid;
@ -48,6 +49,13 @@ public class ModBlocks {
public static Block ore_schrabidium;
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_titanium;
public static Block block_sulfur;
@ -61,6 +69,7 @@ public class ModBlocks {
public static Block block_lead;
public static Block block_trinitite;
public static Block block_waste;
public static Block block_scrap;
public static Block block_beryllium;
public static Block block_schrabidium;
public static Block block_advanced_alloy;
@ -322,6 +331,13 @@ 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_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_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_titanium = new BlockGeneric(Material.iron).setBlockName("block_titanium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_titanium");
@ -336,6 +352,7 @@ public class ModBlocks {
block_lead = new BlockGeneric(Material.iron).setBlockName("block_lead").setCreativeTab(MainRegistry.tabBlock).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_waste = new BlockOre(Material.iron).setBlockName("block_waste").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_waste");
block_scrap = new BlockFalling(Material.sand).setBlockName("block_scrap").setCreativeTab(MainRegistry.tabBlock).setHardness(2.5F).setResistance(5.0F).setBlockTextureName(RefStrings.MODID + ":block_scrap");
block_beryllium = new BlockGeneric(Material.iron).setBlockName("block_beryllium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_beryllium");
block_schrabidium = new BlockGeneric(Material.iron).setBlockName("block_schrabidium").setCreativeTab(MainRegistry.tabBlock).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");
@ -529,7 +546,7 @@ public class ModBlocks {
private static void registerBlock() {
//Test
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_advanced, test_bomb_advanced.getUnlocalizedName());
@ -554,6 +571,14 @@ public class ModBlocks {
GameRegistry.registerBlock(ore_lead, ore_lead.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
GameRegistry.registerBlock(block_uranium, block_uranium.getUnlocalizedName());
GameRegistry.registerBlock(block_titanium, block_titanium.getUnlocalizedName());
@ -568,6 +593,7 @@ public class ModBlocks {
GameRegistry.registerBlock(block_beryllium, block_beryllium.getUnlocalizedName());
GameRegistry.registerBlock(block_steel, block_steel.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_waste, block_waste.getUnlocalizedName());
GameRegistry.registerBlock(block_schrabidium, ItemSchrabidiumBlock.class, block_schrabidium.getUnlocalizedName());

View File

@ -2,6 +2,7 @@ package com.hbm.blocks;
import java.util.Random;
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityNukeExplosionAdvanced;
import com.hbm.interfaces.IBomb;
@ -27,8 +28,8 @@ public class NukeBoy extends BlockContainer implements IBomb {
public TileEntityNukeBoy tetn = new TileEntityNukeBoy();
private static boolean keepInventory = false;
private final static Random field_149933_a = new Random();
private boolean isExploding = false;
private final static Random field_149933_a = new Random();
private boolean isExploding = false;
protected NukeBoy(Material 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_) {
return new TileEntityNukeBoy();
}
@Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
{
return Item.getItemFromBlock(ModBlocks.nuke_boy);
}
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
return Item.getItemFromBlock(ModBlocks.nuke_boy);
}
@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_)
{
if (!keepInventory)
{
TileEntityNukeBoy tileentityfurnace = (TileEntityNukeBoy)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_);
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) {
TileEntityNukeBoy tileentityfurnace = (TileEntityNukeBoy) p_149749_1_.getTileEntity(p_149749_2_,
p_149749_3_, p_149749_4_);
if (tileentityfurnace != null)
{
for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1)
{
ItemStack itemstack = tileentityfurnace.getStackInSlot(i1);
if (tileentityfurnace != null) {
for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1) {
ItemStack itemstack = tileentityfurnace.getStackInSlot(i1);
if (itemstack != null)
{
float f = 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;
if (itemstack != null) {
float f = 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;
while (itemstack.stackSize > 0)
{
int j1 = NukeBoy.field_149933_a.nextInt(21) + 10;
while (itemstack.stackSize > 0) {
int j1 = NukeBoy.field_149933_a.nextInt(21) + 10;
if (j1 > itemstack.stackSize)
{
j1 = itemstack.stackSize;
}
if (j1 > itemstack.stackSize) {
j1 = itemstack.stackSize;
}
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()));
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()));
if (itemstack.hasTagCompound())
{
entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy());
}
if (itemstack.hasTagCompound()) {
entityitem.getEntityItem()
.setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy());
}
float f3 = 0.05F;
entityitem.motionX = (float)NukeBoy.field_149933_a.nextGaussian() * f3;
entityitem.motionY = (float)NukeBoy.field_149933_a.nextGaussian() * f3 + 0.2F;
entityitem.motionZ = (float)NukeBoy.field_149933_a.nextGaussian() * f3;
p_149749_1_.spawnEntityInWorld(entityitem);
}
}
}
float f3 = 0.05F;
entityitem.motionX = (float) NukeBoy.field_149933_a.nextGaussian() * f3;
entityitem.motionY = (float) NukeBoy.field_149933_a.nextGaussian() * f3 + 0.2F;
entityitem.motionZ = (float) NukeBoy.field_149933_a.nextGaussian() * f3;
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
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(world.isRemote)
{
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())
{
} else if (!player.isSneaking()) {
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);
}
return true;
@ -114,115 +109,113 @@ public class NukeBoy extends BlockContainer implements IBomb {
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);
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);
@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);
}
}
}
EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000);
entity2.posX = x;
entity2.posY = y - 11;
entity2.posZ = z;
world.spawnEntityInWorld(entity2);
}
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);
* 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;
}
@Override
public int getRenderType(){
public int getRenderType() {
return -1;
}
@Override
public boolean isOpaqueCube() {
return false;
}
@Override
public boolean renderAsNormalBlock() {
return false;
}
@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;
if(i == 0)
{
if (i == 0) {
world.setBlockMetadataWithNotify(x, y, z, 5, 2);
}
if(i == 1)
{
if (i == 1) {
world.setBlockMetadataWithNotify(x, y, z, 3, 2);
}
if(i == 2)
{
if (i == 2) {
world.setBlockMetadataWithNotify(x, y, z, 4, 2);
}
if(i == 3)
{
if (i == 3) {
world.setBlockMetadataWithNotify(x, y, z, 2, 2);
}
}
public void explode(World world, int x, int y, int z) {
TileEntityNukeBoy entity = (TileEntityNukeBoy) world.getTileEntity(x, y, z);
//if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z))
{
if(entity.isReady())
{
this.onBlockDestroyedByPlayer(world, x, y, z, 1);
entity.clearSlots();
world.setBlockToAir(x, y, z);
igniteTestBomb(world, x, y, z);
}
}
TileEntityNukeBoy entity = (TileEntityNukeBoy) world.getTileEntity(x, y, z);
// if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z))
{
if (entity.isReady()) {
this.onBlockDestroyedByPlayer(world, x, y, z, 1);
entity.clearSlots();
world.setBlockToAir(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.Random;
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityNukeExplosionAdvanced;
import com.hbm.interfaces.IBomb;
@ -183,11 +184,19 @@ public class NukeGadget extends BlockContainer implements IBomb {
//ExplosionNukeAdvanced.mush(world, x, y, z);
EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000);
entity2.posX = x;
entity2.posY = y - 15;
entity2.posZ = z;
world.spawnEntityInWorld(entity2);
if (MainRegistry.enableNukeClouds) {
EntityNukeCloudSmall entity2 = new EntityNukeCloudSmall(world, 1000);
entity2.posX = x;
entity2.posY = y - 15;
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;

View File

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

View File

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

View File

@ -119,10 +119,12 @@ public class EntityChopperMine extends Entity implements IProjectile {
this.setDead();
}
if(timer % 10 == 0 && timer % 20 != 0)
worldObj.playSoundAtEntity(this, "random.click", 10.0F, 1F);
if(timer % 20 == 0)
worldObj.playSoundAtEntity(this, "random.click", 10.0F, 1.5F);
//if(timer % 10 == 0 && timer % 20 != 0)
// worldObj.playSoundAtEntity(this, "random.click", 10.0F, 1F);
//if(timer % 20 == 0)
// worldObj.playSoundAtEntity(this, "random.click", 10.0F, 1.5F);
worldObj.playSoundAtEntity(this, "hbm:misc.nullMine", 10.0F, 1F);
if(timer >= 100 || worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ).getMaterial() != Material.air)
{

View File

@ -0,0 +1,75 @@
package com.hbm.entity;
import com.hbm.explosion.ExplosionChaos;
import com.hbm.main.MainRegistry;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntityBlaze;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeASchrab extends EntityThrowable
{
private static final String __OBFID = "CL_00001722";
public EntityGrenadeASchrab(World p_i1773_1_)
{
super(p_i1773_1_);
}
public EntityGrenadeASchrab(World p_i1774_1_, EntityLivingBase p_i1774_2_)
{
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeASchrab(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
if (!this.worldObj.isRemote)
{
this.setDead();
if (!this.worldObj.isRemote) {
this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ,
"random.explode", 100.0f, this.worldObj.rand.nextFloat() * 0.1F + 0.9F);
EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(this.worldObj);
entity.posX = this.posX;
entity.posY = this.posY;
entity.posZ = this.posZ;
entity.destructionRange = MainRegistry.aSchrabRadius;
entity.speed = 25;
entity.coefficient = 1.0F;
entity.waste = false;
this.worldObj.spawnEntityInWorld(entity);
EntityCloudFleija cloud = new EntityCloudFleija(this.worldObj, MainRegistry.aSchrabRadius);
cloud.posX = this.posX;
cloud.posY = this.posY;
cloud.posZ = this.posZ;
this.worldObj.spawnEntityInWorld(cloud);
}
}
}
}

View File

@ -0,0 +1,55 @@
package com.hbm.entity;
import com.hbm.explosion.ExplosionChaos;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntityBlaze;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeZOMG extends EntityThrowable
{
private static final String __OBFID = "CL_00001722";
public EntityGrenadeZOMG(World p_i1773_1_)
{
super(p_i1773_1_);
}
public EntityGrenadeZOMG(World p_i1774_1_, EntityLivingBase p_i1774_2_)
{
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeZOMG(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
if (!this.worldObj.isRemote)
{
this.setDead();
ExplosionChaos.zomgMeSinPi(this.worldObj, this.posX, this.posY, this.posZ, 100, this.getThrower(), this);
}
}
}

View File

@ -35,14 +35,10 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
public double waypointY;
public double waypointZ;
private Entity targetedEntity;
/** Cooldown time between target loss and new target aquirement. */
private int aggroCooldown;
public int prevAttackCounter;
public int attackCounter;
public int mineDropCounter;
/** The explosion radius of spawned fireballs. */
private int explosionStrength = 1;
private static final String __OBFID = "CL_00001689";
public boolean isDying = false;
public EntityHunterChopper(World p_i1735_1_) {
@ -50,6 +46,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
this.setSize(8.25F, 3.0F);
this.isImmuneToFire = true;
this.experienceValue = 500;
this.ignoreFrustumCheck = true;
}
@SideOnly(Side.CLIENT)
@ -61,10 +58,12 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
* Called when the entity is attacked.
*/
public boolean attackEntityFrom(DamageSource source, float amount) {
if (this.isEntityInvulnerable() || !(source.isExplosion() || ModDamageSource.getIsTau(source) || (ModDamageSource.getIsEmplacer(source) && source.getSourceOfDamage() != this))) {
if (this.isEntityInvulnerable() || !(source == ModDamageSource.nuclearBlast || source.isExplosion() || ModDamageSource.getIsTau(source) || ModDamageSource.getIsSubatomic(source))) {
return false;
} else if(amount >= this.getHealth()) {
this.initDeath();
this.setIsDying(true);
this.setHealth(0.1F);
return false;
}
@ -95,11 +94,12 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
this.dataWatcher.addObject(16, Byte.valueOf((byte) 0));
this.dataWatcher.addObject(21, Float.valueOf((float) 0));
this.dataWatcher.addObject(22, Float.valueOf((float) 0));
this.dataWatcher.addObject(23, Byte.valueOf((byte) 0));
}
protected void applyEntityAttributes() {
super.applyEntityAttributes();
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(1500.0D);
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(750.0D);
}
protected void updateEntityActionState() {
@ -108,10 +108,8 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
}
if (!isDying) {
if (this.ticksExisted % 2 == 0)
this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "fireworks.blast", 10.0F, 0.5F);
this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "hbm:misc.nullChopper", 10.0F, 0.5F);
this.despawnEntity();
this.prevAttackCounter = this.attackCounter;
double d0 = this.waypointX - this.posX;
double d1 = this.waypointY - this.posY;
@ -156,8 +154,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
// this.targetedEntity =
// this.worldObj.getClosestVulnerablePlayerToEntity(this,
// 100.0D);
this.targetedEntity = Library.getClosestEntityForChopper(worldObj, this.posX, this.posY, this.posZ,
250);
this.targetedEntity = Library.getClosestEntityForChopper(worldObj, this.posX, this.posY, this.posZ, 250);
if (this.targetedEntity != null) {
this.aggroCooldown = 20;
@ -183,7 +180,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
}
if (this.attackCounter % 2 == 0 && attackCounter >= 120) {
worldObj.playSoundAtEntity(this, "random.explode", 10.0F, 3.0F);
worldObj.playSoundAtEntity(this, "hbm:weapon.osiprShoot", 10.0F, 1.0F);
// EntityLargeFireball entitylargefireball = new
// EntityLargeFireball(this.worldObj, this, d5, d6, d7);
EntityBullet entityarrow = new EntityBullet(this.worldObj, this, 3.0F, 35, 45, false, "chopper");
@ -207,12 +204,13 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
// this.worldObj.spawnEntityInWorld(entitylargefireball);
this.worldObj.spawnEntityInWorld(entityarrow);
}
if (this.attackCounter >= 80 && this.attackCounter < 120) {
worldObj.playSoundAtEntity(this, "random.click", 10.0F, 0.5F + ((attackCounter / 100) - 0.8F));
if (this.attackCounter == 80) {
worldObj.playSoundAtEntity(this, "hbm:entity.chopperCharge", 5.0F, 1.0F);
}
this.mineDropCounter++;
if (mineDropCounter > 100 && rand.nextInt(15) == 0) {
worldObj.playSoundAtEntity(this, "hbm:entity.chopperDrop", 15.0F, 1.0F);
EntityChopperMine mine = new EntityChopperMine(worldObj, this.posX, this.posY - 0.5, this.posZ, 0, -0.3, 0, this);
this.mineDropCounter = 0;
this.worldObj.spawnEntityInWorld(mine);
@ -260,12 +258,16 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(worldObj, this.posX, this.posY, this.posZ, 0, 0, 0));
rotationYaw += 20;
if(this.onGround)
{
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 15F, true);
this.dropItems();
this.setDead();
}
if (this.ticksExisted % 2 == 0)
this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "hbm:misc.nullCrashing", 10.0F, 0.5F);
}
if (this.targetedEntity == null) {
@ -296,10 +298,6 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
double d5 = this.targetedEntity.posX - xStart;
double d6 = this.targetedEntity.boundingBox.minY + (double) (this.targetedEntity.height / 2.0F) - yStart;
double d7 = this.targetedEntity.posZ - zStart;
this.setYaw(-((float) (Math.atan2(d5, d7) * 180.0D / Math.PI) + 90));
f3 = MathHelper.sqrt_double(d5 * d5 + d7 * d7);
this.setPitch((float) (Math.atan2(d6, f3) * 180.0D / Math.PI));
}
if(rotationPitch <= 330 && rotationPitch >= 30)
@ -392,7 +390,6 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
*/
public void writeEntityToNBT(NBTTagCompound p_70014_1_) {
super.writeEntityToNBT(p_70014_1_);
p_70014_1_.setInteger("ExplosionPower", this.explosionStrength);
}
/**
@ -400,10 +397,6 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
*/
public void readEntityFromNBT(NBTTagCompound p_70037_1_) {
super.readEntityFromNBT(p_70037_1_);
if (p_70037_1_.hasKey("ExplosionPower", 99)) {
this.explosionStrength = p_70037_1_.getInteger("ExplosionPower");
}
}
@Override
@ -415,6 +408,8 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
public void initDeath() {
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 10F, true);
if(!this.isDying)
worldObj.playSoundAtEntity(this, "hbm:entity.chopperDamage", 10.0F, 1.0F);
isDying = true;
}
@ -429,19 +424,11 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
this.dropItem(ModItems.wire_magnetized_tungsten, 1);
}
public void setYaw(float f) {
this.dataWatcher.updateObject(21, Float.valueOf((float) f));
public void setIsDying(boolean b) {
this.dataWatcher.updateObject(23, Byte.valueOf((byte) (b ? 1 : 0)));
}
public void setPitch(float f) {
this.dataWatcher.updateObject(22, Float.valueOf((float) f));
}
public float getYaw() {
return this.dataWatcher.getWatchableObjectFloat(21);
}
public float getPitch() {
return this.dataWatcher.getWatchableObjectFloat(22);
public boolean getIsDying() {
return this.dataWatcher.getWatchableObjectByte(23) == 1;
}
}

View File

@ -0,0 +1,15 @@
package com.hbm.entity;
import net.minecraft.world.World;
public class EntityNukeCloudNoShroom extends EntityNukeCloudSmall {
public EntityNukeCloudNoShroom(World p_i1582_1_) {
super(p_i1582_1_);
}
public EntityNukeCloudNoShroom(World p_i1582_1_, int maxAge) {
super(p_i1582_1_, maxAge);
}
}

View File

@ -95,6 +95,27 @@ public class EntityRainbow extends Entity implements IProjectile
this.setThrowableHeading(d0, d1 + f4, d2, p_i1755_4_, p_i1755_5_);
}
}
public EntityRainbow(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_, int dmgMin, int dmgMax, EntityGrenadeZOMG grenade) {
super(p_i1756_1_);
this.renderDistanceWeight = 10.0D;
this.shootingEntity = p_i1756_2_;
this.setSize(0.5F, 0.5F);
this.setLocationAndAngles(grenade.posX, grenade.posY + grenade.getEyeHeight(), grenade.posZ,
grenade.rotationYaw, grenade.rotationPitch);
this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F;
this.posY -= 0.10000000149011612D;
this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F;
this.setPosition(this.posX, this.posY, this.posZ);
this.yOffset = 0.0F;
this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI)
* MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI);
this.motionZ = MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI)
* MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI);
this.motionY = (-MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI));
this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, p_i1756_3_ * 1.5F, 1.0F);
}
public EntityRainbow(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_)
{
@ -312,7 +333,18 @@ public class EntityRainbow extends Entity implements IProjectile
}
else
{
damagesource = ModDamageSource.causeSubatomicDamage(this, this.shootingEntity);
int j = rand.nextInt(5);
if(j == 0)
damagesource = ModDamageSource.causeSubatomicDamage(this, this.shootingEntity);
else if(j == 1)
damagesource = ModDamageSource.causeSubatomicDamage2(this, this.shootingEntity);
else if(j == 2)
damagesource = ModDamageSource.causeSubatomicDamage3(this, this.shootingEntity);
else if(j == 3)
damagesource = ModDamageSource.causeSubatomicDamage4(this, this.shootingEntity);
else
damagesource = ModDamageSource.causeSubatomicDamage5(this, this.shootingEntity);
}
if (this.isBurning() && !(movingobjectposition.entityHit instanceof EntityEnderman))

View File

@ -7,8 +7,10 @@ import java.util.Random;
import com.hbm.blocks.ModBlocks;
import com.hbm.entity.EntityBullet;
import com.hbm.entity.EntityGrenadeTau;
import com.hbm.entity.EntityGrenadeZOMG;
import com.hbm.entity.EntityMirv;
import com.hbm.entity.EntityMissileBase;
import com.hbm.entity.EntityRainbow;
import com.hbm.entity.EntityRocket;
import com.hbm.entity.EntitySchrab;
import com.hbm.lib.Library;
@ -787,11 +789,12 @@ public class ExplosionChaos {
}
}
public static void tauMeSinPi(World world, double x, double y, double z, int count, Entity shooter, EntityGrenadeTau tau) {
double d1 = 0;
double d2 = 0;
double d3 = 0;
public static void tauMeSinPi(World world, double x, double y, double z, int count, Entity shooter,
EntityGrenadeTau tau) {
double d1 = 0;
double d2 = 0;
double d3 = 0;
EntityBullet fragment;
if (shooter != null && shooter instanceof EntityPlayer)
@ -813,10 +816,10 @@ public class ExplosionChaos {
}
if (rand.nextInt(5) == 0) {
fragment = new EntityBullet(world, (EntityPlayer)shooter, 3.0F, 35, 45, false, "tauDay", tau);
fragment = new EntityBullet(world, (EntityPlayer) shooter, 3.0F, 35, 45, false, "tauDay", tau);
fragment.setDamage(rand.nextInt(301) + 100);
} else {
fragment = new EntityBullet(world, (EntityPlayer)shooter, 3.0F, 35, 45, false, "eyyOk", tau);
fragment = new EntityBullet(world, (EntityPlayer) shooter, 3.0F, 35, 45, false, "eyyOk", tau);
fragment.setDamage(rand.nextInt(11) + 35);
}
@ -831,4 +834,42 @@ public class ExplosionChaos {
}
}
public static void zomgMeSinPi(World world, double x, double y, double z, int count, Entity shooter,
EntityGrenadeZOMG zomg) {
double d1 = 0;
double d2 = 0;
double d3 = 0;
EntityBullet fragment;
if (shooter != null && shooter instanceof EntityPlayer)
for (int i = 0; i < count; i++) {
d1 = rand.nextDouble();
d2 = rand.nextDouble();
d3 = rand.nextDouble();
if (rand.nextInt(2) == 0) {
d1 *= -1;
}
if (rand.nextInt(2) == 0) {
d2 *= -1;
}
if (rand.nextInt(2) == 0) {
d3 *= -1;
}
EntityRainbow entityZomg = new EntityRainbow(world, (EntityPlayer) shooter, 1F, 10000, 100000, zomg);
entityZomg.motionX = d1;// * 5;
entityZomg.motionY = d2;// * 5;
entityZomg.motionZ = d3;// * 5;
entityZomg.shootingEntity = shooter;
world.spawnEntityInWorld(entityZomg);
world.playSoundAtEntity(zomg, "hbm:weapon.zomgShoot", 10.0F, 0.8F + (rand.nextFloat() * 0.4F));
}
}
}

View File

@ -131,7 +131,7 @@ public class ExplosionNukeGeneric {
if(!(entity instanceof EntityPlayerMP) || (entity instanceof EntityPlayerMP && ((EntityPlayerMP)entity).theItemInWorldManager.getGameType() != GameType.CREATIVE))
{
//entity.attackEntityFrom(DamageSource.generic, ((int)((d11 * d11 + d11) / 2.0D * 8.0D * bombStartStrength + 1.0D)));
entity.attackEntityFrom(ModDamageSource.nuclearBlast, 5F);
entity.attackEntityFrom(ModDamageSource.nuclearBlast, 10F);
entity.setFire(5);
double d8 = EnchantmentProtection.func_92092_a(entity, d11);
entity.motionX += d5 * d8;
@ -173,7 +173,7 @@ public class ExplosionNukeGeneric {
int rand;
if(!world.isRemote)
{
if(world.getBlock(x, y, z) != Blocks.bedrock && world.getBlock(x, y, z) != ModBlocks.reinforced_brick && world.getBlock(x, y, z) != ModBlocks.reinforced_glass && world.getBlock(x, y, z) != ModBlocks.reinforced_light && world.getBlock(x, y, z) != ModBlocks.reinforced_sand && world.getBlock(x, y, z) != ModBlocks.reinforced_lamp_off && world.getBlock(x, y, z) != ModBlocks.reinforced_lamp_on && !(world.getBlock(x, y, z) instanceof DecoBlockAlt))
if(world.getBlock(x, y, z) != Blocks.bedrock && world.getBlock(x, y, z) != ModBlocks.reinforced_brick && world.getBlock(x, y, z) != ModBlocks.reinforced_glass && world.getBlock(x, y, z) != ModBlocks.reinforced_light && world.getBlock(x, y, z) != ModBlocks.reinforced_sand && world.getBlock(x, y, z) != ModBlocks.reinforced_lamp_off && world.getBlock(x, y, z) != ModBlocks.reinforced_lamp_on && world.getBlock(x, y, z) != ModBlocks.cmb_brick && world.getBlock(x, y, z) != ModBlocks.cmb_brick_reinforced && !(world.getBlock(x, y, z) instanceof DecoBlockAlt))
{
if(world.getBlock(x, y, z) == ModBlocks.brick_concrete)
{
@ -351,6 +351,15 @@ public class ExplosionNukeGeneric {
}
}
else if(world.getBlock(x, y, z) == ModBlocks.ore_nether_uranium)
{
rand = field_149933_a.nextInt(30);
if(rand == 1)
{
world.setBlock(x, y, z, ModBlocks.ore_nether_schrabidium);
}
}
else if(world.getBlock(x, y, z) == Blocks.brown_mushroom_block)
{
if(world.getBlockMetadata(x, y, z) == 10)

View File

@ -27,6 +27,7 @@ public class GUIMachineBattery extends GuiContainer {
@Override
protected void drawGuiContainerForegroundLayer(int i, int j) {
String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.getInventoryName());
name += (" (" + this.diFurnace.power + " HE)");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);

View File

@ -70,6 +70,11 @@ public class MachineRecipes {
return new ItemStack(ModItems.canister_fuel, 1);
}
if (item == ModItems.canister_fuel && item2 == Items.slime_ball
|| item == Items.slime_ball && item2 == ModItems.canister_fuel) {
return new ItemStack(ModItems.canister_napalm, 1);
}
if (item == ModItems.ingot_red_copper && item2 == ModItems.ingot_steel
|| item == ModItems.ingot_steel && item2 == ModItems.ingot_red_copper) {
return new ItemStack(ModItems.ingot_advanced_alloy, 2);
@ -80,6 +85,11 @@ public class MachineRecipes {
return new ItemStack(ModItems.ingot_magnetized_tungsten, 1);
}
if (item == ModItems.plate_mixed && item2 == ModItems.plate_gold
|| item == ModItems.plate_gold && item2 == ModItems.plate_mixed) {
return new ItemStack(ModItems.plate_paa, 2);
}
return null;
}
@ -375,9 +385,14 @@ public class MachineRecipes {
new ItemStack(ModItems.ingot_advanced_alloy, 2));
recipes.put(new ItemStack[] { new ItemStack(ModItems.canister_empty), new ItemStack(Items.coal) },
new ItemStack(ModItems.canister_fuel, 1));
recipes.put(new ItemStack[] { new ItemStack(ModItems.canister_fuel), new ItemStack(Items.slime_ball) },
new ItemStack(ModItems.canister_napalm, 1));
recipes.put(
new ItemStack[] { new ItemStack(ModItems.ingot_tungsten), new ItemStack(ModItems.nugget_schrabidium) },
new ItemStack(ModItems.ingot_magnetized_tungsten, 1));
recipes.put(
new ItemStack[] { new ItemStack(ModItems.plate_mixed), new ItemStack(ModItems.plate_gold) },
new ItemStack(ModItems.plate_paa, 2));
return recipes;
}
@ -524,8 +539,10 @@ public class MachineRecipes {
public void registerEverythingImSrs() {
//Makes the OreDict easily accessible. Neat.
//You see that guy up there? He's a liar. "easily accessible" may be true, but the detection is bullshit.
System.out.println("Loading all items and blocks, please wait...");
/*System.out.println("Loading all items and blocks, please wait...");
System.out.println("This process normally takes very long due to the incompetence of other modders I have to compensate for. Sorry for the inconvenience.");
for (Object item : GameData.getItemRegistry()) {
@ -589,6 +606,28 @@ public class MachineRecipes {
}
}
System.out.println("Added " + theWholeThing.size() + " elements from the Ore Dict!");*/
String[] names = OreDictionary.getOreNames();
List<ItemStack> stacks = new ArrayList<ItemStack>();
for(int i = 0; i < names.length; i++) {
stacks.addAll(OreDictionary.getOres(names[i]));
}
for(int i = 0; i < stacks.size(); i++) {
int[] ids = OreDictionary.getOreIDs(stacks.get(i));
List<String> oreNames = new ArrayList<String>();
for(int j = 0; j < ids.length; j++) {
oreNames.add(OreDictionary.getOreName(ids[j]));
}
theWholeThing.add(new DictCouple(stacks.get(i), oreNames));
}
System.out.println("Added " + theWholeThing.size() + " elements from the Ore Dict!");
}
@ -647,9 +686,11 @@ public class MachineRecipes {
setRecipe(theWholeThing.get(i).item, new ItemStack(ModItems.scrap));
}
}
if(theWholeThing.get(i).list.isEmpty())
setRecipe(theWholeThing.get(i).item, new ItemStack(ModItems.scrap));
if(!theWholeThing.get(i).list.isEmpty() && theWholeThing.get(i).list.get(0).equals("Unknown"))
setRecipe(theWholeThing.get(i).item, new ItemStack(ModItems.scrap));
}
System.out.println("Added " + recipes.size() + " in total.");
@ -683,6 +724,9 @@ public class MachineRecipes {
}
public void overridePreSetRecipe(ItemStack inp, ItemStack outp) {
boolean flag = false;
for(int i = 0; i < recipes.size(); i++)
{
if(recipes.get(i) != null &&
@ -691,8 +735,17 @@ public class MachineRecipes {
inp != null &&
outp != null &&
recipes.get(i).input.getItem() == inp.getItem() &&
recipes.get(i).input.getItemDamage() == inp.getItemDamage())
recipes.get(i).input.getItemDamage() == inp.getItemDamage()) {
recipes.get(i).output = outp;
flag = true;
}
}
if(!flag) {
ShredderRecipe rec = new ShredderRecipe();
rec.input = inp;
rec.output = outp;
recipes.add(rec);
}
}
@ -783,14 +836,14 @@ public class MachineRecipes {
return rec.output.copy();
}
return null;
return new ItemStack(ModItems.scrap);
}
public Map<Object, Object> getShredderRecipes() {
Map<Object, Object> recipes = new HashMap<Object, Object>();
for(int i = 0; i < this.recipes.size(); i++) {
if(this.recipes.get(i) != null && this.recipes.get(i).output.getItem() != ModItems.dust && this.recipes.get(i).output.getItem() != ModItems.scrap)
if(this.recipes.get(i) != null && this.recipes.get(i).output.getItem() != ModItems.scrap)
recipes.put(((ShredderRecipe)this.recipes.get(i)).input, getShredderResult(((ShredderRecipe)this.recipes.get(i)).input));
}

View File

@ -11,11 +11,15 @@ public class FuelHandler implements IFuelHandler {
public int getBurnTime(ItemStack fuel) {
if(fuel.getItem().equals(ModItems.canister_fuel))
return 32000;
return 3200;
if(fuel.getItem().equals(ModItems.powder_coal))
return 1600;
if(fuel.getItem().equals(ModItems.scrap))
return 4000;
return 800;
if(fuel.getItem().equals(ModItems.dust))
return 400;
if(fuel.getItem().equals(ModItems.powder_fire))
return 20000;
return 6400;
return 0;
}

View File

@ -20,6 +20,12 @@ public class ArmorHazmat extends ItemArmor {
if(stack.getItem().equals(ModItems.hazmat_legs)) {
return (RefStrings.MODID + ":textures/armor/hazmat_2.png");
}
if(stack.getItem().equals(ModItems.hazmat_paa_helmet) || stack.getItem().equals(ModItems.hazmat_paa_plate) || stack.getItem().equals(ModItems.hazmat_paa_boots)) {
return (RefStrings.MODID + ":textures/armor/hazmat_paa_1.png");
}
if(stack.getItem().equals(ModItems.hazmat_paa_legs)) {
return (RefStrings.MODID + ":textures/armor/hazmat_paa_2.png");
}
else return null;
}

View File

@ -74,7 +74,8 @@ public class GunFatman extends Item {
entityarrow.setDamage(1000);
p_77615_1_.damageItem(1, p_77615_3_);
p_77615_2_.playSoundAtEntity(p_77615_3_, "tile.piston.out", 1.0F, 0.5F);
//p_77615_2_.playSoundAtEntity(p_77615_3_, "tile.piston.out", 1.0F, 0.5F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.fatmanShoot", 1.0F, 1F);
if(!flag)
{

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