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

Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT

Browse Source 
# Conflicts:
#	assets/hbm/lang/de_DE.lang
#	assets/hbm/lang/en_US.lang
#	assets/hbm/sounds.json
#	assets/hbm/sounds/music/recordLambdaCore.ogg
#	assets/hbm/sounds/music/recordSectorSweep.ogg
#	assets/hbm/sounds/music/recordVortalCombat.ogg
#	com/hbm/blocks/BlockCrate.java
#	com/hbm/blocks/ModBlocks.java
#	com/hbm/blocks/NukeBoy.java
#	com/hbm/blocks/NukeGadget.java
#	com/hbm/blocks/NukeMan.java
#	com/hbm/blocks/NukeMike.java
#	com/hbm/blocks/TestEventTester.java
#	com/hbm/entity/mob/EntityHunterChopper.java
#	com/hbm/explosion/ExplosionChaos.java
#	com/hbm/explosion/ExplosionNukeGeneric.java
#	com/hbm/handler/FuelHandler.java
#	com/hbm/items/GunFatman.java
#	com/hbm/items/ModItems.java
#	com/hbm/items/gear/ModArmor.java
#	com/hbm/items/special/ItemStarterKit.java
#	com/hbm/items/weapon/GunMP.java
#	com/hbm/items/weapon/GunSuicide.java
#	com/hbm/items/weapon/ItemGrenade.java
#	com/hbm/lib/HbmChestContents.java
#	com/hbm/lib/HbmWorldGen.java
#	com/hbm/lib/Library.java
#	com/hbm/lib/ModDamageSource.java
#	com/hbm/lib/RefStrings.java
#	com/hbm/main/ClientProxy.java
#	com/hbm/main/CraftingManager.java
#	com/hbm/main/MainRegistry.java
#	com/hbm/main/ModEventHandlerClient.java
#	com/hbm/sound/MovingSoundChopper.java
#	com/hbm/sound/MovingSoundChopperMine.java
#	com/hbm/sound/MovingSoundCrashing.java
#	com/hbm/sound/MovingSoundPlayerLoop.java
#	com/hbm/sound/MovingSoundXVL1456.java
This commit is contained in:
HbmMods 2016-11-30 10:21:39 +01:00
commit 208a32410f
45 changed files with 2682 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,16 +19,23 @@ 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.
<<<<<<< HEAD
death.attack.subAtomic3=%1$s's Divergenzwert fiel wegen %2$s unter 1 Prozent.
=======
death.attack.subAtomic3=%1$s's Divergenzwert fiel wegen %2$s unter den 1%-Wert.
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
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.
death.attack.suicide=%1$s blies sich die Rübe weg.
<<<<<<< HEAD
death.attack.electrified=%1$s wurde von %2$s elektrisiert.
death.attack.flamethrower=%1$s wurde von %2$s gegrillt.
death.attack.plasma=%1$s wurde von %2$s eingeäschert.
death.attack.ice=%1$s wurde von %2$s in ein Eis am Stiel verwandelt.
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
item.redstone_sword.name=Redstoneschwert
item.big_sword.name=Großes Schwert
@ -263,7 +270,10 @@ tile.block_trinitite.name=Trinititblock
tile.block_beryllium.name=Berylliumblock
tile.block_waste.name=Atommüllblock
tile.block_scrap.name=Schrottblock
<<<<<<< HEAD
tile.block_electrical_scrap.name=Elektroschrottblock
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
tile.block_advanced_alloy.name=Fortgeschrittener Legierungsblock
tile.block_magnetized_tungsten.name=Magnetisierter Wolframblock
tile.block_combine_steel.name=CMB-Stahlblock
@ -340,7 +350,10 @@ item.powder_iodine.name=Iodstaub
item.powder_thorium.name=Thoriumstaub
item.powder_neodymium.name=Neodymstaub
item.powder_astatine.name=Astatstaub
<<<<<<< HEAD
item.powder_caesium.name=Caesiumstaub
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
item.battery_generic.name=Batterie
item.battery_advanced.name=Fortgeschrittene Batterie
@ -590,8 +603,11 @@ item.gun_bf.name=M42_2 Nukleares Katapult "Antimaterienwerfer"
item.gun_mp40.name=Maschinenpistole
item.gun_xvl1456.name=XVL1456 Tau-Kanone Prototyp
item.gun_osipr.name=Standartausrüstung für Sicherheitskräfte
<<<<<<< HEAD
item.gun_immolator.name=Der Immolator
item.gun_cryolator.name=Der Cryolator
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
item.gun_mp.name=Maschinengewehr des Pazifisten
item.gun_zomg.name=Singularitätsbetriebener Paarvernichtungsstrahl "ZOMG Kanone"
item.gun_emp.name=EMP-Strahler
@ -736,10 +752,19 @@ 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
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
item.paa_plate.name=PaA-Brustschutzplatte
item.paa_legs.name=PaA-Beinverstärkungsschienen
item.paa_boots.name=PaA-"olle Latschen"
<<<<<<< HEAD
=======
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
item.goggles.name=Schutzbrille
item.gas_mask.name=Gasmaske
@ -893,8 +918,18 @@ item.blades_advanced_alloy.name=Fortgeschrittenes Sägeblatt
item.blades_combine_steel.name=CMB-Sägeblatt
item.blades_schrabidium.name=Schrabidiumsägeblatt
<<<<<<< HEAD
item.linker.name=Telelinker
item.letter.name=Eilbrief
item.chopper.name=Jagdschrauber
item.chopper.name=Jagdschrauber
=======
<<<<<<< HEAD
item.letter.name=Eilbrief
item.chopper.name=Jagdschrauber
=======
item.letter.name=Eilbrief
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af

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

@ -17,18 +17,30 @@ 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.
<<<<<<< HEAD
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 percent because of %2$s.
=======
<<<<<<< HEAD
death.attack.subAtomic=%1$s's atoms have been destroyed by %2$s.
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
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.
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
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.
death.attack.suicide=%1$s blew their head off.
<<<<<<< HEAD
death.attack.electrified=%1$s was electrified by %2$s.
death.attack.flamethrower=%1$s was cremated by %2$s.
death.attack.plasma=%1$s was immolated by %2$s.
death.attack.ice=%1$s was turned into a popsicle by %2$s.
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
item.redstone_sword.name=Redstone Sword
item.big_sword.name=Great Sword
@ -263,7 +275,10 @@ 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
<<<<<<< HEAD
tile.block_electrical_scrap.name=Block of Electrical Scrap
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
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
@ -736,10 +751,19 @@ 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
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
item.paa_plate.name=PaA Chest Protection Plate
item.paa_legs.name=PaA Leg Reinforcements
item.paa_boots.name=PaA "good ol' shoes"
<<<<<<< HEAD
=======
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
item.goggles.name=Protection Goggles
item.gas_mask.name=Gas Mask
@ -893,8 +917,18 @@ item.blades_advanced_alloy.name=Advanced Shredder Blades
item.blades_combine_steel.name=CMB Shredder Blades
item.blades_schrabidium.name=Schrabidium Shredder Blades
<<<<<<< HEAD
item.linker.name=Telelinker
item.letter.name=Express Mail
item.chopper.name=Hunter Chopper
item.chopper.name=Hunter Chopper
=======
<<<<<<< HEAD
item.letter.name=Express Mail
item.chopper.name=Hunter Chopper
=======
item.letter.name=Express Mail
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af

3
assets/hbm/sounds.json
View File

@ -23,11 +23,14 @@
"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}]},
<<<<<<< HEAD
"weapon.flamethrowerIgnite": {"category": "player", "sounds": [{"name": "weapon/flamethrowerIgnite", "stream": false}]},
"weapon.flamethrowerShoot": {"category": "player", "sounds": [{"name": "weapon/flamethrowerShoot", "stream": false}]},
"weapon.immolatorIgnite": {"category": "player", "sounds": [{"name": "weapon/immolatorIgnite", "stream": false}]},
"weapon.immolatorShoot": {"category": "player", "sounds": [{"name": "weapon/immolatorShoot", "stream": false}]},
"weapon.cryolatorShoot": {"category": "player", "sounds": [{"name": "weapon/cryolatorShoot", "stream": false}]},
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
"entity.chopperFlyingLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperFlyingLoop", "stream": true}]},
"entity.chopperDrop": {"category": "hostile", "sounds": [{"name": "entity/chopperDrop", "stream": false}]},

148
com/hbm/blocks/BlockCrate.java
View File

@ -76,10 +76,158 @@ public class BlockCrate extends BlockFalling {
List<Item> list = new ArrayList<Item>();
<<<<<<< HEAD
int i = rand.nextInt(5);
for(int j = 0; j < i; j++)
list.add(list1.get(rand.nextInt(list1.size())));
=======
<<<<<<< HEAD
switch(rand.nextInt(32)) {
=======
switch(rand.nextInt(29)) {
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
case 0:
list.add(ModItems.clip_revolver_iron);
list.add(ModItems.clip_revolver_iron);
break;
case 1:
list.add(ModItems.clip_revolver_iron);
list.add(ModItems.syringe_metal_stimpak);
list.add(ModItems.syringe_metal_stimpak);
break;
case 2:
list.add(ModItems.clip_revolver);
list.add(ModItems.syringe_metal_stimpak);
break;
case 3:
list.add(ModItems.clip_osipr);
list.add(ModItems.syringe_metal_stimpak);
break;
case 4:
list.add(ModItems.clip_osipr);
list.add(ModItems.clip_osipr);
list.add(ModItems.syringe_metal_stimpak);
break;
case 5:
list.add(ModItems.clip_revolver_iron);
list.add(ModItems.clip_revolver);
break;
case 6:
list.add(ModItems.clip_revolver_iron);
list.add(ModItems.clip_revolver_iron);
list.add(ModItems.clip_revolver);
break;
case 7:
list.add(ModItems.clip_revolver_iron);
list.add(ModItems.clip_osipr);
break;
case 8:
list.add(ModItems.clip_revolver_gold);
list.add(ModItems.syringe_metal_stimpak);
break;
case 9:
list.add(ModItems.clip_revolver_gold);
list.add(ModItems.clip_revolver_gold);
list.add(ModItems.syringe_metal_stimpak);
break;
case 10:
list.add(ModItems.clip_revolver_schrabidium);
break;
case 11:
list.add(ModItems.clip_xvl1456);
break;
case 12:
list.add(ModItems.clip_xvl1456);
list.add(ModItems.clip_xvl1456);
break;
case 13:
list.add(ModItems.clip_xvl1456);
list.add(ModItems.syringe_metal_stimpak);
break;
case 14:
list.add(ModItems.clip_osipr);
list.add(ModItems.clip_osipr);
list.add(ModItems.syringe_metal_stimpak);
break;
case 15:
list.add(ModItems.clip_osipr);
list.add(ModItems.syringe_metal_stimpak);
list.add(ModItems.syringe_metal_stimpak);
break;
case 16:
list.add(ModItems.clip_revolver_gold);
list.add(ModItems.clip_revolver_gold);
break;
case 17:
list.add(ModItems.clip_rpg);
list.add(ModItems.clip_rpg);
break;
case 18:
list.add(ModItems.clip_rpg);
list.add(ModItems.syringe_metal_stimpak);
break;
case 19:
list.add(ModItems.clip_rpg);
list.add(ModItems.clip_revolver_iron);
list.add(ModItems.syringe_metal_stimpak);
break;
case 20:
list.add(ModItems.clip_rpg);
list.add(ModItems.clip_revolver);
list.add(ModItems.syringe_metal_stimpak);
break;
case 21:
list.add(ModItems.syringe_metal_stimpak);
list.add(ModItems.syringe_metal_stimpak);
break;
case 22:
list.add(ModItems.syringe_metal_stimpak);
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;
<<<<<<< HEAD
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;
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
}
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
for(Item stack : list) {
float f = rand.nextFloat() * 0.8F + 0.1F;

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

@ -9,7 +9,14 @@ import com.hbm.main.MainRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
<<<<<<< HEAD
import net.minecraft.block.Block.SoundType;
=======
<<<<<<< HEAD
import net.minecraft.block.Block.SoundType;
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import net.minecraft.block.BlockFalling;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
@ -71,7 +78,10 @@ public class ModBlocks {
public static Block block_trinitite;
public static Block block_waste;
public static Block block_scrap;
<<<<<<< HEAD
public static Block block_electrical_scrap;
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
public static Block block_beryllium;
public static Block block_schrabidium;
public static Block block_advanced_alloy;
@ -359,10 +369,22 @@ public class ModBlocks {
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_waste = new BlockOre(Material.iron).setBlockName("block_waste").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_waste");
<<<<<<< HEAD
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_electrical_scrap = new BlockFalling(Material.iron).setBlockName("block_electrical_scrap").setCreativeTab(MainRegistry.tabBlock).setHardness(2.5F).setResistance(5.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName(RefStrings.MODID + ":electrical_scrap_alt2");
block_beryllium = new BlockGeneric(Material.iron).setBlockName("block_beryllium").setCreativeTab(MainRegistry.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");
=======
<<<<<<< HEAD
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_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_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");
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
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).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).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_combine_steel");
@ -606,7 +628,10 @@ public class ModBlocks {
GameRegistry.registerBlock(block_steel, block_steel.getUnlocalizedName());
GameRegistry.registerBlock(block_lead, block_lead.getUnlocalizedName());
GameRegistry.registerBlock(block_scrap, block_scrap.getUnlocalizedName());
<<<<<<< HEAD
GameRegistry.registerBlock(block_electrical_scrap, block_electrical_scrap.getUnlocalizedName());
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
GameRegistry.registerBlock(block_trinitite, block_trinitite.getUnlocalizedName());
GameRegistry.registerBlock(block_waste, block_waste.getUnlocalizedName());
GameRegistry.registerBlock(block_schrabidium, ItemSchrabidiumBlock.class, block_schrabidium.getUnlocalizedName());

6
com/hbm/blocks/NukeBoy.java
View File

@ -2,9 +2,15 @@ package com.hbm.blocks;
import java.util.Random;
<<<<<<< HEAD
import com.hbm.entity.effect.EntityNukeCloudNoShroom;
import com.hbm.entity.effect.EntityNukeCloudSmall;
import com.hbm.entity.logic.EntityNukeExplosionAdvanced;
=======
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityNukeExplosionAdvanced;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.interfaces.IBomb;
import com.hbm.main.MainRegistry;
import com.hbm.tileentity.TileEntityNukeBoy;

6
com/hbm/blocks/NukeGadget.java
View File

@ -4,9 +4,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
<<<<<<< HEAD
import com.hbm.entity.effect.EntityNukeCloudNoShroom;
import com.hbm.entity.effect.EntityNukeCloudSmall;
import com.hbm.entity.logic.EntityNukeExplosionAdvanced;
=======
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityNukeExplosionAdvanced;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.interfaces.IBomb;
import com.hbm.main.MainRegistry;
import com.hbm.tileentity.TileEntityNukeGadget;

6
com/hbm/blocks/NukeMan.java
View File

@ -4,9 +4,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
<<<<<<< HEAD
import com.hbm.entity.effect.EntityNukeCloudNoShroom;
import com.hbm.entity.effect.EntityNukeCloudSmall;
import com.hbm.entity.logic.EntityNukeExplosionAdvanced;
=======
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityNukeExplosionAdvanced;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.interfaces.IBomb;
import com.hbm.main.MainRegistry;
import com.hbm.tileentity.TileEntityNukeMan;

7
com/hbm/blocks/NukeMike.java
View File

@ -4,10 +4,17 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
<<<<<<< HEAD
import com.hbm.entity.effect.EntityNukeCloudBig;
import com.hbm.entity.effect.EntityNukeCloudNoShroom;
import com.hbm.entity.effect.EntityNukeCloudSmall;
import com.hbm.entity.logic.EntityNukeExplosionAdvanced;
=======
import com.hbm.entity.EntityNukeCloudBig;
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityNukeExplosionAdvanced;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.interfaces.IBomb;
import com.hbm.main.MainRegistry;
import com.hbm.tileentity.TileEntityNukeMike;

4
com/hbm/blocks/TestEventTester.java
View File

@ -6,8 +6,12 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
<<<<<<< HEAD
import com.hbm.entity.effect.EntityFalloutRain;
import com.hbm.entity.particle.EntitySmokeFX;
=======
import com.hbm.entity.EntityFalloutRain;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.explosion.ExplosionChaos;
import com.hbm.explosion.ExplosionParticle;

69
com/hbm/entity/EntityFalloutRain.java Normal file
View File

@ -0,0 +1,69 @@
package com.hbm.entity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.Entity;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
public class EntityFalloutRain extends Entity {
public int maxAge = 1000;
public int age;
public float scale = 0;
public EntityFalloutRain(World p_i1582_1_) {
super(p_i1582_1_);
this.setSize(4, 20);
this.ignoreFrustumCheck = true;
this.isImmuneToFire = true;
this.age = 0;
scale = 0;
}
public EntityFalloutRain(World p_i1582_1_, int maxAge) {
super(p_i1582_1_);
this.setSize(4, 20);
this.isImmuneToFire = true;
this.maxAge = maxAge;
}
@Override
public void onUpdate() {
//super.onUpdate();
this.age++;
if(this.age >= this.maxAge)
{
this.age = 0;
this.setDead();
}
}
@Override
protected void entityInit() {
this.dataWatcher.addObject(16, Integer.valueOf((int) 0));
}
@Override
protected void readEntityFromNBT(NBTTagCompound p_70037_1_) {
age = p_70037_1_.getShort("age");
}
@Override
protected void writeEntityToNBT(NBTTagCompound p_70014_1_) {
p_70014_1_.setShort("age", (short)age);
}
public void setScale(int i) {
this.dataWatcher.updateObject(16, Integer.valueOf((int) i));
}
public int getScale() {
return this.dataWatcher.getWatchableObjectInt(16);
}
}

75
com/hbm/entity/EntityGrenadeASchrab.java Normal file
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);
}
}
}
}

55
com/hbm/entity/EntityGrenadeZOMG.java Normal file
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);
}
}
}

15
com/hbm/entity/EntityNukeCloudNoShroom.java Normal file
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);
}
}

4
com/hbm/entity/mob/EntityHunterChopper.java
View File

@ -60,7 +60,11 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp
* Called when the entity is attacked.
*/
public boolean attackEntityFrom(DamageSource source, float amount) {
<<<<<<< HEAD:com/hbm/entity/mob/EntityHunterChopper.java
if (this.isEntityInvulnerable() || !(source == ModDamageSource.nuclearBlast || source.isExplosion() || ModDamageSource.getIsTau(source) || ModDamageSource.getIsSubatomic(source) || ModDamageSource.getIsDischarge(source))) {
=======
if (this.isEntityInvulnerable() || !(source == ModDamageSource.nuclearBlast || source.isExplosion() || ModDamageSource.getIsTau(source) || ModDamageSource.getIsSubatomic(source))) {
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af:com/hbm/entity/EntityHunterChopper.java
return false;
} else if(amount >= this.getHealth()) {
this.initDeath();

11
com/hbm/explosion/ExplosionChaos.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import java.util.Random;
import com.hbm.blocks.ModBlocks;
<<<<<<< HEAD
import com.hbm.entity.grenade.EntityGrenadeTau;
import com.hbm.entity.grenade.EntityGrenadeZOMG;
import com.hbm.entity.missile.EntityMIRV;
@ -14,6 +15,16 @@ import com.hbm.entity.projectile.EntityMiniNuke;
import com.hbm.entity.projectile.EntityRainbow;
import com.hbm.entity.projectile.EntityRocket;
import com.hbm.entity.projectile.EntitySchrab;
=======
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;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.lib.Library;
import net.minecraft.block.Block;

117
com/hbm/explosion/ExplosionNukeGeneric.java
View File

@ -104,6 +104,7 @@ public class ExplosionNukeGeneric {
}
public static void dealDamage(World world, int x, int y, int z, int bombStartStrength) {
<<<<<<< HEAD
float f = bombStartStrength;
HashSet hashset = new HashSet();
int i;
@ -166,6 +167,64 @@ public class ExplosionNukeGeneric {
}
bombStartStrength = (int) f;
=======
float f = bombStartStrength;
HashSet hashset = new HashSet();
int i;
int j;
int k;
double d5;
double d6;
double d7;
double wat = bombStartStrength/**2*/;
boolean isOccupied = false;
//bombStartStrength *= 2.0F;
i = MathHelper.floor_double(x - wat - 1.0D);
j = MathHelper.floor_double(x + wat + 1.0D);
k = MathHelper.floor_double(y - wat - 1.0D);
int i2 = MathHelper.floor_double(y + wat + 1.0D);
int l = MathHelper.floor_double(z - wat - 1.0D);
int j2 = MathHelper.floor_double(z + wat + 1.0D);
List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2));
Vec3 vec3 = Vec3.createVectorHelper(x, y, z);
for (int i1 = 0; i1 < list.size(); ++i1)
{
Entity entity = (Entity)list.get(i1);
double d4 = entity.getDistance(x, y, z) / bombStartStrength;
if (d4 <= 1.0D)
{
d5 = entity.posX - x;
d6 = entity.posY + entity.getEyeHeight() - y;
d7 = entity.posZ - z;
double d9 = MathHelper.sqrt_double(d5 * d5 + d6 * d6 + d7 * d7);
if (d9 < wat && !(entity instanceof EntityOcelot) && !(entity instanceof EntityNukeCloudSmall) && !(entity instanceof EntityMirv) && !(entity instanceof EntityMiniNuke) && !(entity instanceof EntityGrenadeNuclear) && !(entity instanceof EntityPlayer && Library.checkArmor((EntityPlayer)entity, ModItems.euphemium_helmet, ModItems.euphemium_plate, ModItems.euphemium_legs, ModItems.euphemium_boots)))
{
d5 /= d9;
d6 /= d9;
d7 /= d9;
//double d10 = (double)world.getBlockDensity(vec3, entity.boundingBox);
//if(d10 > 0) isOccupied = true;
double d11 = (1.0D - d4);// * d10;
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, 10F);
entity.setFire(5);
double d8 = EnchantmentProtection.func_92092_a(entity, d11);
entity.motionX += d5 * d8;
entity.motionY += d6 * d8;
entity.motionZ += d7 * d8;
}
}
}
}
bombStartStrength = (int)f;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
}
public static void vapor(World world, int x, int y, int z, int bombStartStrength) {
@ -190,6 +249,10 @@ public class ExplosionNukeGeneric {
public static void destruction(World world, int x, int y, int z) {
int rand;
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
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
@ -215,10 +278,43 @@ public class ExplosionNukeGeneric {
if (rand == 0) {
world.setBlock(x, y, z, Blocks.obsidian, 0, 3);
}
<<<<<<< HEAD
} else if (world.getBlock(x, y, z) == Blocks.obsidian) {
world.setBlock(x, y, z, ModBlocks.gravel_obsidian, 0, 3);
} else {
world.setBlock(x, y, z, Blocks.air, 0, 3);
=======
} else if (world.getBlock(x, y, z) == ModBlocks.brick_obsidian) {
world.setBlock(x, y, z, ModBlocks.gravel_obsidian, 0, 3);
} else {
world.setBlock(x, y, z, Blocks.air, 0, 3);
=======
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) != 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)
{
rand = field_149933_a.nextInt(8);
if(rand == 0)
{
world.setBlock(x, y, z, Blocks.gravel, 0, 3);
}
}else if(world.getBlock(x, y, z) == ModBlocks.brick_light)
{
rand = field_149933_a.nextInt(2);
if(rand == 0)
{
world.setBlock(x, y, z, ModBlocks.waste_planks, 0, 3);
}
}else if(world.getBlock(x, y, z) == ModBlocks.brick_obsidian)
{
rand = field_149933_a.nextInt(20);
if(rand == 0)
{
world.setBlock(x, y, z, Blocks.obsidian, 0, 3);
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
}
}
}
@ -292,6 +388,7 @@ public class ExplosionNukeGeneric {
else if (world.getBlock(x, y, z) == Blocks.mycelium) {
world.setBlock(x, y, z, ModBlocks.waste_mycelium);
}
<<<<<<< HEAD
else if (world.getBlock(x, y, z) == Blocks.sand) {
rand = field_149933_a.nextInt(20);
@ -301,6 +398,26 @@ public class ExplosionNukeGeneric {
if (rand == 1 && world.getBlockMetadata(x, y, z) == 1) {
world.setBlock(x, y, z, ModBlocks.waste_trinitite_red);
}
=======
}
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)
{
world.setBlock(x, y, z, ModBlocks.waste_log);
} else {
world.setBlock(x, y, z, Blocks.air);
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
}
else if (world.getBlock(x, y, z) == Blocks.clay) {

26
com/hbm/handler/FuelHandler.java
View File

@ -15,6 +15,7 @@ public class FuelHandler implements IFuelHandler {
int i = 200;
if(fuel.getItem().equals(ModItems.canister_fuel))
<<<<<<< HEAD
return i * 16;
if(fuel.getItem().equals(ModItems.powder_coal))
return i * 8;
@ -26,6 +27,31 @@ public class FuelHandler implements IFuelHandler {
return i * 32;
if(fuel.getItem().equals(Item.getItemFromBlock(ModBlocks.block_scrap)))
return i * 20;
=======
<<<<<<< HEAD
return i * 16;
if(fuel.getItem().equals(ModItems.powder_coal))
return i * 8;
if(fuel.getItem().equals(ModItems.scrap))
return i * 4;
if(fuel.getItem().equals(ModItems.dust))
return i * 2;
if(fuel.getItem().equals(ModItems.powder_fire))
return i * 32;
if(fuel.getItem().equals(Item.getItemFromBlock(ModBlocks.block_scrap)))
return i * 20;
=======
return 3200;
if(fuel.getItem().equals(ModItems.powder_coal))
return 1600;
if(fuel.getItem().equals(ModItems.scrap))
return 800;
if(fuel.getItem().equals(ModItems.dust))
return 400;
if(fuel.getItem().equals(ModItems.powder_fire))
return 6400;
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
return 0;
}

162
com/hbm/items/GunFatman.java Normal file
View File

@ -0,0 +1,162 @@
package com.hbm.items;
import java.util.List;
import com.google.common.collect.Multimap;
import com.hbm.entity.EntityMiniNuke;
import com.hbm.entity.EntityRocket;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
import net.minecraftforge.event.entity.player.ArrowNockEvent;
public class GunFatman extends Item {
public static final String[] bowPullIconNameArray = new String[] {"pulling_0", "pulling_1", "pulling_2"};
@SideOnly(Side.CLIENT)
private IIcon[] iconArray;
private static final String __OBFID = "CL_00001777";
public GunFatman()
{
this.maxStackSize = 1;
this.setMaxDamage(2500);
}
/**
* called when the player releases the use item button. Args: itemstack, world, entityplayer, itemInUseCount
*/
@Override
public void onPlayerStoppedUsing(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_)
{
int j = this.getMaxItemUseDuration(p_77615_1_) - p_77615_4_;
ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j);
MinecraftForge.EVENT_BUS.post(event);
if (event.isCanceled())
{
return;
}
j = event.charge;
boolean flag = p_77615_3_.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
if (flag || p_77615_3_.inventory.hasItem(ModItems.gun_fatman_ammo))
{
float f = j / 20.0F;
f = (f * f + f * 2.0F) / 3.0F;
if (j < 25.0D)
{
return;
}
if (j > 25.0F)
{
f = 25.0F;
}
EntityMiniNuke entityarrow = new EntityMiniNuke(p_77615_2_, p_77615_3_, 3.0F);
entityarrow.setIsCritical(true);
entityarrow.gravity = 0.3;
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_, "hbm:weapon.fatmanShoot", 1.0F, 1F);
if(!flag)
{
p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_fatman_ammo);
}
if (!p_77615_2_.isRemote)
{
p_77615_2_.spawnEntityInWorld(entityarrow);
}
}
}
@Override
public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_)
{
return p_77654_1_;
}
/**
* How long it takes to use or consume an item
*/
@Override
public int getMaxItemUseDuration(ItemStack p_77626_1_)
{
return 72000;
}
/**
* returns the action that specifies what animation to play when the items is being used
*/
@Override
public EnumAction getItemUseAction(ItemStack p_77661_1_)
{
return EnumAction.bow;
}
/**
* Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
*/
@Override
public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_)
{
ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
MinecraftForge.EVENT_BUS.post(event);
if (event.isCanceled())
{
return event.result;
}
if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_fatman_ammo))
{
p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
}
return p_77659_1_;
}
/**
* Return the enchantability factor of the item, most of the time is based on material.
*/
@Override
public int getItemEnchantability()
{
return 0;
}
public Multimap getItemAttributeModifiers()
{
Multimap multimap = super.getItemAttributeModifiers();
multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)-0.3, 1));
return multimap;
}
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
list.add("When normal nukes aren't enough...");
list.add("");
list.add("Ammo: Mini Nukes");
list.add("Damage: 1000");
list.add("Creates small nuclear explosion.");
}
}

165
com/hbm/items/GunSuicide.java Normal file
View File

@ -0,0 +1,165 @@
package com.hbm.items;
import java.util.List;
import java.util.Random;
import com.hbm.entity.EntityBullet;
import com.hbm.lib.ModDamageSource;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
import net.minecraftforge.event.entity.player.ArrowNockEvent;
public class GunSuicide extends Item {
public static final String[] bowPullIconNameArray = new String[] {"pulling_0", "pulling_1", "pulling_2"};
@SideOnly(Side.CLIENT)
private IIcon[] iconArray;
private static final String __OBFID = "CL_00001777";
private Item ammo;
Random rand = new Random();
public GunSuicide()
{
this.maxStackSize = 1;
//if(this == ModItems.gun_revolver)
{
this.setMaxDamage(500);
}
this.ammo = ModItems.gun_revolver_ammo;
}
@Override
public EnumRarity getRarity(ItemStack p_77613_1_) {
return EnumRarity.uncommon;
}
/**
* called when the player releases the use item button. Args: itemstack, world, entityplayer, itemInUseCount
*/
@Override
public void onPlayerStoppedUsing(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_)
{
int j = this.getMaxItemUseDuration(p_77615_1_) - p_77615_4_;
ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j);
MinecraftForge.EVENT_BUS.post(event);
j = event.charge;
boolean flag = p_77615_3_.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
if (flag || p_77615_3_.inventory.hasItem(ammo))
{
float f = j / 20.0F;
f = (f * f + f * 2.0F) / 3.0F;
if (j < 10.0D)
{
return;
}
if (j > 10.0F)
{
f = 10.0F;
}
p_77615_1_.damageItem(1, p_77615_3_);
//if(this == ModItems.gun_revolver || this == ModItems.gun_revolver_iron || this == ModItems.gun_revolver_gold || this == ModItems.gun_revolver_lead)
{
//p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", 1.0F, 3.0F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShoot", 1.0F, 1.0F);
}
if (flag)
{ }
else
{
p_77615_3_.inventory.consumeInventoryItem(ammo);
}
if (!p_77615_2_.isRemote)
{
p_77615_3_.attackEntityFrom(ModDamageSource.suicide, Float.POSITIVE_INFINITY);
}
}
}
@Override
public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_)
{
return p_77654_1_;
}
/**
* How long it takes to use or consume an item
*/
@Override
public int getMaxItemUseDuration(ItemStack p_77626_1_)
{
return 72000;
}
/**
* returns the action that specifies what animation to play when the items is being used
*/
@Override
public EnumAction getItemUseAction(ItemStack p_77661_1_)
{
return EnumAction.bow;
}
/**
* Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
*/
@Override
public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_)
{
ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
MinecraftForge.EVENT_BUS.post(event);
if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ammo))
{
p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
}
return p_77659_1_;
}
/**
* Return the enchantability factor of the item, most of the time is based on material.
*/
@Override
public int getItemEnchantability()
{
return 1;
}
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
//if(this == ModItems.gun_revolver)
{
list.add("I've seen things...");
list.add("...I shouldn't have seen.");
list.add("");
list.add("Ammo: Lead Bullets");
list.add("Damage: ∞");
}
}
}

147
com/hbm/items/ItemChopper.java Normal file
View File

@ -0,0 +1,147 @@
package com.hbm.items;
import com.hbm.entity.EntityHunterChopper;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLiquid;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IEntityLivingData;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Facing;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class ItemChopper extends Item {
public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_)
{
if (p_77648_3_.isRemote)
{
return true;
}
else
{
Block block = p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_);
p_77648_4_ += Facing.offsetsXForSide[p_77648_7_];
p_77648_5_ += Facing.offsetsYForSide[p_77648_7_];
p_77648_6_ += Facing.offsetsZForSide[p_77648_7_];
double d0 = 0.0D;
if (p_77648_7_ == 1 && block.getRenderType() == 11)
{
d0 = 0.5D;
}
Entity entity = spawnCreature(p_77648_3_, p_77648_1_.getItemDamage(), (double)p_77648_4_ + 0.5D, (double)p_77648_5_ + d0, (double)p_77648_6_ + 0.5D);
if (entity != null)
{
if (entity instanceof EntityLivingBase && p_77648_1_.hasDisplayName())
{
((EntityLiving)entity).setCustomNameTag(p_77648_1_.getDisplayName());
}
if (!p_77648_2_.capabilities.isCreativeMode)
{
--p_77648_1_.stackSize;
}
}
return true;
}
}
/**
* Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
*/
public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_)
{
if (p_77659_2_.isRemote)
{
return p_77659_1_;
}
else
{
MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(p_77659_2_, p_77659_3_, true);
if (movingobjectposition == null)
{
return p_77659_1_;
}
else
{
if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
{
int i = movingobjectposition.blockX;
int j = movingobjectposition.blockY;
int k = movingobjectposition.blockZ;
if (!p_77659_2_.canMineBlock(p_77659_3_, i, j, k))
{
return p_77659_1_;
}
if (!p_77659_3_.canPlayerEdit(i, j, k, movingobjectposition.sideHit, p_77659_1_))
{
return p_77659_1_;
}
if (p_77659_2_.getBlock(i, j, k) instanceof BlockLiquid)
{
Entity entity = spawnCreature(p_77659_2_, p_77659_1_.getItemDamage(), (double)i, (double)j, (double)k);
if (entity != null)
{
if (entity instanceof EntityLivingBase && p_77659_1_.hasDisplayName())
{
((EntityLiving)entity).setCustomNameTag(p_77659_1_.getDisplayName());
}
if (!p_77659_3_.capabilities.isCreativeMode)
{
--p_77659_1_.stackSize;
}
}
}
}
return p_77659_1_;
}
}
}
/**
* Spawns the creature specified by the egg's type in the location specified by the last three parameters.
* Parameters: world, entityID, x, y, z.
*/
public static Entity spawnCreature(World p_77840_0_, int p_77840_1_, double p_77840_2_, double p_77840_4_, double p_77840_6_)
{
{
Entity entity = null;
for (int j = 0; j < 1; ++j)
{
entity = new EntityHunterChopper(p_77840_0_);
if (entity != null && entity instanceof EntityLivingBase)
{
EntityLiving entityliving = (EntityLiving)entity;
entity.setLocationAndAngles(p_77840_2_, p_77840_4_, p_77840_6_, MathHelper.wrapAngleTo180_float(p_77840_0_.rand.nextFloat() * 360.0F), 0.0F);
entityliving.rotationYawHead = entityliving.rotationYaw;
entityliving.renderYawOffset = entityliving.rotationYaw;
entityliving.onSpawnWithEgg((IEntityLivingData)null);
p_77840_0_.spawnEntityInWorld(entity);
}
}
return entity;
}
}
}

112
com/hbm/items/ItemModRecord.java Normal file
View File

@ -0,0 +1,112 @@
package com.hbm.items;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.hbm.lib.RefStrings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockJukebox;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemRecord;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
public class ItemModRecord extends ItemRecord {
private static final Map modRecords = new HashMap();
public final String recordName;
public ItemModRecord(String string) {
super(string);
recordName = string;
modRecords.put(string, this);
}
public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_,
int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) {
if (p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_) == Blocks.jukebox
&& p_77648_3_.getBlockMetadata(p_77648_4_, p_77648_5_, p_77648_6_) == 0) {
if (p_77648_3_.isRemote) {
return true;
} else {
((BlockJukebox) Blocks.jukebox).func_149926_b(p_77648_3_, p_77648_4_, p_77648_5_, p_77648_6_,
p_77648_1_);
p_77648_3_.playAuxSFXAtEntity((EntityPlayer) null, 1005, p_77648_4_, p_77648_5_, p_77648_6_,
Item.getIdFromItem(this));
--p_77648_1_.stackSize;
return true;
}
} else {
return false;
}
}
/**
* allows items to add custom lines of information to the mouseover
* description
*/
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) {
p_77624_3_.add(this.getRecordNameLocal());
}
@SideOnly(Side.CLIENT)
public String getRecordNameLocal() {
return StatCollector.translateToLocal("item.record." + this.recordName + ".desc");
}
/**
* Return an item rarity from EnumRarity
*/
public EnumRarity getRarity(ItemStack p_77613_1_) {
return EnumRarity.rare;
}
/**
* Return the record item corresponding to the given name.
*/
@SideOnly(Side.CLIENT)
public static ItemRecord getRecord(String p_150926_0_) {
return (ItemRecord) modRecords.get(p_150926_0_);
}
/**
* Retrieves the resource location of the sound to play for this record.
*
* @param name
* The name of the record to play
* @return The resource location for the audio, null to use default.
*/
public ResourceLocation getRecordResource(String name) {
String s = "";
if(name.equals("records.lc"))
s = RefStrings.MODID + ":music.recordLambdaCore";
if(name.equals("records.ss"))
s = RefStrings.MODID + ":music.recordSectorSweep";
if(name.equals("records.vc"))
s = RefStrings.MODID + ":music.recordVortalCombat";
return new ResourceLocation(s);
}
public String getItemStackDisplayName(ItemStack p_77653_1_)
{
String s = (StatCollector.translateToLocal(Items.record_11.getUnlocalizedName() + ".name")).trim();
return s;
}
}

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

@ -514,8 +514,11 @@ public class ModItems {
public static Item gun_super_shotgun;
public static Item gun_moist_nugget;
public static Item gun_revolver_inverted;
<<<<<<< HEAD
public static Item gun_emp;
public static Item gun_emp_ammo;
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
public static Item gun_waluigi;
public static Item grenade_generic;
@ -635,9 +638,18 @@ public class ModItems {
public static Item cmb_plate;
public static Item cmb_legs;
public static Item cmb_boots;
<<<<<<< HEAD
public static Item paa_plate;
public static Item paa_legs;
public static Item paa_boots;
=======
<<<<<<< HEAD
public static Item paa_plate;
public static Item paa_legs;
public static Item paa_boots;
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
public static Item schrabidium_sword;
public static Item schrabidium_pickaxe;
@ -1196,8 +1208,11 @@ public class ModItems {
gun_mp = new GunMP().setUnlocalizedName("gun_mp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_pm");
gun_zomg = new GunZOMG().setUnlocalizedName("gun_zomg").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_zomg");
gun_revolver_inverted = new GunSuicide().setUnlocalizedName("gun_revolver_inverted").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_inverted");
<<<<<<< HEAD
gun_emp_ammo = new Item().setUnlocalizedName("gun_emp_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_emp_ammo");
gun_emp = new GunEMPRay().setUnlocalizedName("gun_emp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_emp");
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
gun_super_shotgun = new ItemCustomLore().setUnlocalizedName("gun_super_shotgun").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_super_shotgun");
gun_moist_nugget = new ItemNugget(3, false).setUnlocalizedName("gun_moist_nugget").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_moist_nugget");
@ -1325,7 +1340,10 @@ public class ModItems {
crate_caller = new ItemCrateCaller().setUnlocalizedName("crate_caller").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":crate_caller");
remote = new ItemRamManipulator().setUnlocalizedName("remote").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":remote");
chopper = new ItemChopper().setUnlocalizedName("chopper").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":chopper");
<<<<<<< HEAD
linker = new ItemTeleLink().setUnlocalizedName("linker").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":linker");
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
euphemium_helmet = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 0).setUnlocalizedName("euphemium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_helmet");
euphemium_plate = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 1).setUnlocalizedName("euphemium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_plate");
@ -1362,9 +1380,18 @@ public class ModItems {
cmb_plate = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 1).setUnlocalizedName("cmb_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cmb_plate");
cmb_legs = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 2).setUnlocalizedName("cmb_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cmb_legs");
cmb_boots = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 3).setUnlocalizedName("cmb_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cmb_boots");
<<<<<<< HEAD
paa_plate = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 1).setUnlocalizedName("paa_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_plate");
paa_legs = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 2).setUnlocalizedName("paa_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_legs");
paa_boots = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 3).setUnlocalizedName("paa_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_boots");
=======
<<<<<<< HEAD
paa_plate = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 1).setUnlocalizedName("paa_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_plate");
paa_legs = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 2).setUnlocalizedName("paa_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_legs");
paa_boots = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 3).setUnlocalizedName("paa_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_boots");
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
schrabidium_sword = new SwordSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_sword").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_sword");
schrabidium_pickaxe = new PickaxeSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_pickaxe").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_pickaxe");
@ -1879,7 +1906,11 @@ public class ModItems {
//Da Chopper
GameRegistry.registerItem(chopper, chopper.getUnlocalizedName());
<<<<<<< HEAD
//Computer Tools
=======
//Missiles
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
GameRegistry.registerItem(designator, designator.getUnlocalizedName());
GameRegistry.registerItem(linker, linker.getUnlocalizedName());
@ -1920,7 +1951,10 @@ public class ModItems {
GameRegistry.registerItem(gun_cryolator, gun_cryolator.getUnlocalizedName());
GameRegistry.registerItem(gun_mp, gun_mp.getUnlocalizedName());
GameRegistry.registerItem(gun_zomg, gun_zomg.getUnlocalizedName());
<<<<<<< HEAD
GameRegistry.registerItem(gun_emp, gun_emp.getUnlocalizedName());
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
GameRegistry.registerItem(gun_revolver_inverted, gun_revolver_inverted.getUnlocalizedName());
GameRegistry.registerItem(gun_super_shotgun, gun_super_shotgun.getUnlocalizedName());
GameRegistry.registerItem(gun_moist_nugget, gun_moist_nugget.getUnlocalizedName());
@ -2121,9 +2155,18 @@ public class ModItems {
GameRegistry.registerItem(cmb_plate, cmb_plate.getUnlocalizedName());
GameRegistry.registerItem(cmb_legs, cmb_legs.getUnlocalizedName());
GameRegistry.registerItem(cmb_boots, cmb_boots.getUnlocalizedName());
<<<<<<< HEAD
GameRegistry.registerItem(paa_plate, paa_plate.getUnlocalizedName());
GameRegistry.registerItem(paa_legs, paa_legs.getUnlocalizedName());
GameRegistry.registerItem(paa_boots, paa_boots.getUnlocalizedName());
=======
<<<<<<< HEAD
GameRegistry.registerItem(paa_plate, paa_plate.getUnlocalizedName());
GameRegistry.registerItem(paa_legs, paa_legs.getUnlocalizedName());
GameRegistry.registerItem(paa_boots, paa_boots.getUnlocalizedName());
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
GameRegistry.registerItem(schrabidium_helmet, schrabidium_helmet.getUnlocalizedName());
GameRegistry.registerItem(schrabidium_plate, schrabidium_plate.getUnlocalizedName());
GameRegistry.registerItem(schrabidium_legs, schrabidium_legs.getUnlocalizedName());

9
com/hbm/items/gear/ModArmor.java
View File

@ -39,12 +39,21 @@ public class ModArmor extends ItemArmor {
if(stack.getItem().equals(ModItems.cmb_legs)) {
return (RefStrings.MODID + ":textures/armor/cmb_2.png");
}
<<<<<<< HEAD:com/hbm/items/gear/ModArmor.java
=======
<<<<<<< HEAD
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af:com/hbm/items/ModArmor.java
if(stack.getItem().equals(ModItems.paa_plate) || stack.getItem().equals(ModItems.paa_boots)) {
return (RefStrings.MODID + ":textures/armor/paa_1.png");
}
if(stack.getItem().equals(ModItems.paa_legs)) {
return (RefStrings.MODID + ":textures/armor/paa_2.png");
}
<<<<<<< HEAD:com/hbm/items/gear/ModArmor.java
=======
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af:com/hbm/items/ModArmor.java
else return null;
}

11
com/hbm/items/special/ItemStarterKit.java
View File

@ -1,7 +1,10 @@
package com.hbm.items.special;
import com.hbm.blocks.ModBlocks;
<<<<<<< HEAD:com/hbm/items/special/ItemStarterKit.java
import com.hbm.items.ModItems;
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af:com/hbm/items/ItemStarterKit.java
import com.hbm.lib.Library;
import net.minecraft.entity.player.EntityPlayer;
@ -349,7 +352,15 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.watch, 1));
}
<<<<<<< HEAD:com/hbm/items/special/ItemStarterKit.java
if(this == ModItems.letter && world.isRemote)
=======
<<<<<<< HEAD
if(this == ModItems.letter && world.isRemote)
=======
if(this == ModItems.letter && !world.isRemote)
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af:com/hbm/items/ItemStarterKit.java
{
if(player.getUniqueID().toString().equals(Library.a20)) {
player.addChatMessage(new ChatComponentText("Error: null reference @ com.hbm.items.ItemStarterKit.class, please report this to the modder!"));

8
com/hbm/items/weapon/GunMP.java
View File

@ -85,6 +85,14 @@ public class GunMP extends Item {
list.add("user's? The victim's? Both?");
list.add("");
list.add("Ammo: Small Propellantless Machine Gun Round");
<<<<<<< HEAD:com/hbm/items/weapon/GunMP.java
list.add("Damage: 100 - 150");
=======
<<<<<<< HEAD
list.add("Damage: 100 - 150");
=======
list.add("Damage: 35 - 45");
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af:com/hbm/items/GunMP.java
}
}

232
com/hbm/items/weapon/GunSuicide.java
View File

@ -24,6 +24,7 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
import net.minecraftforge.event.entity.player.ArrowNockEvent;
<<<<<<< HEAD:com/hbm/items/weapon/GunSuicide.java
public class GunSuicide extends Item {
public static final String[] bowPullIconNameArray = new String[] {"pulling_0", "pulling_1", "pulling_2"};
@ -43,9 +44,179 @@ public class GunSuicide extends Item {
this.ammo = ModItems.gun_revolver_ammo;
}
=======
import com.hbm.entity.EntityBullet;
@Override
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class GunRevolver extends Item {
public static final String[] bowPullIconNameArray = new String[] { "pulling_0", "pulling_1", "pulling_2" };
@SideOnly(Side.CLIENT)
private IIcon[] iconArray;
private static final String __OBFID = "CL_00001777";
private Item ammo;
private int dmgMin;
private int dmgMax;
private boolean instakill = false;
private boolean rad = false;
Random rand = new Random();
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af:com/hbm/items/GunRevolver.java
public GunRevolver(Item ammo, int dmgMin, int dmgMax, boolean instakill, boolean rad) {
this.maxStackSize = 1;
if (this == ModItems.gun_revolver_iron) {
this.setMaxDamage(100);
}
if (this == ModItems.gun_revolver) {
this.setMaxDamage(500);
}
if (this == ModItems.gun_revolver_gold) {
this.setMaxDamage(1000);
}
if (this == ModItems.gun_revolver_lead) {
this.setMaxDamage(250);
}
if (this == ModItems.gun_revolver_schrabidium) {
this.setMaxDamage(100000);
}
if (this == ModItems.gun_revolver_cursed) {
this.setMaxDamage(5000);
}
this.ammo = ammo;
this.dmgMin = dmgMin;
this.dmgMax = dmgMax;
this.instakill = instakill;
this.rad = rad;
}
@Override
public EnumRarity getRarity(ItemStack p_77613_1_) {
<<<<<<< HEAD
if (this == ModItems.gun_revolver_schrabidium) {
return EnumRarity.rare;
}
if (this == ModItems.gun_revolver_cursed) {
return EnumRarity.uncommon;
}
return EnumRarity.common;
}
/**
* called when the player releases the use item button. Args: itemstack,
* world, entityplayer, itemInUseCount
*/
@Override
public void onPlayerStoppedUsing(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) {
int j = this.getMaxItemUseDuration(p_77615_1_) - p_77615_4_;
ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j);
MinecraftForge.EVENT_BUS.post(event);
j = event.charge;
boolean flag = p_77615_3_.capabilities.isCreativeMode
|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
if (flag || p_77615_3_.inventory.hasItem(ammo)) {
float f = j / 20.0F;
f = (f * f + f * 2.0F) / 3.0F;
if (j < 10.0D) {
return;
}
if (j > 10.0F) {
f = 10.0F;
}
EntityBullet entityarrow = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, instakill, rad);
entityarrow.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin));
p_77615_1_.damageItem(1, p_77615_3_);
if (this == ModItems.gun_revolver || this == ModItems.gun_revolver_iron
|| this == ModItems.gun_revolver_gold || this == ModItems.gun_revolver_lead) {
// p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode",
// 1.0F, 3.0F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShoot", 1.0F, 1.0F);
}
if (this == ModItems.gun_revolver_cursed) {
// p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode",
// 3.0F, 1.5F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.heavyShoot", 3.0F, 1.0F);
}
if (this == ModItems.gun_revolver_schrabidium) {
// p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode",
// 1.0F, 3.0F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.schrabidiumShoot", 1.0F, 1.0F);
}
if (flag) {
entityarrow.canBePickedUp = 2;
} else {
p_77615_3_.inventory.consumeInventoryItem(ammo);
}
if (!p_77615_2_.isRemote) {
p_77615_2_.spawnEntityInWorld(entityarrow);
if (this == ModItems.gun_revolver_cursed && rand.nextInt(3) == 0) {
p_77615_3_.addPotionEffect(new PotionEffect(Potion.wither.id, 5 * 20, 0));
}
}
}
}
@Override
public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_) {
return p_77654_1_;
}
/**
* How long it takes to use or consume an item
*/
@Override
public int getMaxItemUseDuration(ItemStack p_77626_1_) {
return 72000;
}
/**
* returns the action that specifies what animation to play when the items
* is being used
*/
@Override
public EnumAction getItemUseAction(ItemStack p_77661_1_) {
return EnumAction.bow;
}
/**
* Called whenever this item is equipped and the right mouse button is
* pressed. Args: itemStack, world, entityPlayer
*/
@Override
public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
MinecraftForge.EVENT_BUS.post(event);
if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ammo)) {
p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
}
return p_77659_1_;
}
/**
* Return the enchantability factor of the item, most of the time is based
* on material.
*/
@Override
public int getItemEnchantability() {
return 1;
}
=======
return EnumRarity.uncommon;
}
@ -81,10 +252,27 @@ public class GunSuicide extends Item {
}
p_77615_1_.damageItem(1, p_77615_3_);
<<<<<<< HEAD:com/hbm/items/weapon/GunSuicide.java
//if(this == ModItems.gun_revolver || this == ModItems.gun_revolver_iron || this == ModItems.gun_revolver_gold || this == ModItems.gun_revolver_lead)
{
//p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", 1.0F, 3.0F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShoot", 1.0F, 1.0F);
=======
if(this == ModItems.gun_revolver || this == ModItems.gun_revolver_iron || this == ModItems.gun_revolver_gold || this == ModItems.gun_revolver_lead)
{
//p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", 1.0F, 3.0F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShoot", 1.0F, 1.0F);
}
if(this == ModItems.gun_revolver_cursed)
{
//p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", 3.0F, 1.5F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.heavyShoot", 3.0F, 1.0F);
}
if(this == ModItems.gun_revolver_schrabidium)
{
//p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", 1.0F, 3.0F);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.schrabidiumShoot", 1.0F, 1.0F);
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af:com/hbm/items/GunRevolver.java
}
if (flag)
@ -150,10 +338,12 @@ public class GunSuicide extends Item {
{
return 1;
}
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
<<<<<<< HEAD:com/hbm/items/weapon/GunSuicide.java
//if(this == ModItems.gun_revolver)
{
list.add("I've seen things...");
@ -161,6 +351,46 @@ public class GunSuicide extends Item {
list.add("");
list.add("Ammo: Lead Bullets");
list.add("Damage: infinite");
=======
if (this == ModItems.gun_revolver_iron) {
list.add("Cheap.");
list.add("");
list.add("Ammo: Iron Bullets");
list.add("Damage: 5 - 15");
}
if (this == ModItems.gun_revolver) {
list.add("I feel like a cowboy!");
list.add("");
list.add("Ammo: Lead Bullets");
list.add("Damage: 10 - 25");
}
if (this == ModItems.gun_revolver_gold) {
list.add("GoldenEye would be proud!");
list.add("");
list.add("Ammo: Golden Bullets");
list.add("Damage: 20 - 30");
}
if (this == ModItems.gun_revolver_lead) {
list.add("Made from lead for your safety!");
list.add("");
list.add("Ammo: Atomic Bullets");
list.add("Damage: 5 - 15");
list.add("Bullets are radioactive.");
}
if (this == ModItems.gun_revolver_schrabidium) {
list.add("Kills everyone and everything.");
list.add("");
list.add("Ammo: Schrabidium Bullets");
list.add("Damage: 10000 - 100000");
list.add("Sets enemy's health to zero.");
}
if (this == ModItems.gun_revolver_cursed) {
list.add("You're dead.");
list.add("");
list.add("Ammo: Steel Bullets");
list.add("Damage: 25 - 40");
list.add("33% chance of user being withered.");
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af:com/hbm/items/GunRevolver.java
}
}
}

21
com/hbm/items/weapon/ItemGrenade.java
View File

@ -1,5 +1,6 @@
package com.hbm.items.weapon;
<<<<<<< HEAD:com/hbm/items/weapon/ItemGrenade.java
import com.hbm.entity.grenade.EntityGrenadeASchrab;
import com.hbm.entity.grenade.EntityGrenadeCluster;
import com.hbm.entity.grenade.EntityGrenadeElectric;
@ -19,6 +20,26 @@ import com.hbm.entity.grenade.EntityGrenadeStrong;
import com.hbm.entity.grenade.EntityGrenadeTau;
import com.hbm.entity.grenade.EntityGrenadeZOMG;
import com.hbm.items.ModItems;
=======
import com.hbm.entity.EntityGrenadeASchrab;
import com.hbm.entity.EntityGrenadeCluster;
import com.hbm.entity.EntityGrenadeElectric;
import com.hbm.entity.EntityGrenadeFire;
import com.hbm.entity.EntityGrenadeFlare;
import com.hbm.entity.EntityGrenadeFrag;
import com.hbm.entity.EntityGrenadeGas;
import com.hbm.entity.EntityGrenadeGeneric;
import com.hbm.entity.EntityGrenadeLemon;
import com.hbm.entity.EntityGrenadeMk2;
import com.hbm.entity.EntityGrenadeNuclear;
import com.hbm.entity.EntityGrenadeNuke;
import com.hbm.entity.EntityGrenadePlasma;
import com.hbm.entity.EntityGrenadePoison;
import com.hbm.entity.EntityGrenadeSchrabidium;
import com.hbm.entity.EntityGrenadeStrong;
import com.hbm.entity.EntityGrenadeTau;
import com.hbm.entity.EntityGrenadeZOMG;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af:com/hbm/items/ItemGrenade.java
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;

178
com/hbm/lib/HbmChestContents.java
View File

@ -12,6 +12,7 @@ public class HbmChestContents {
static Random rand = new Random();
<<<<<<< HEAD
private static WeightedRandomChestContent[] modGeneric = new WeightedRandomChestContent[] {
new WeightedRandomChestContent(ModItems.ingot_steel, 0, 10, 15, 5),
new WeightedRandomChestContent(ModItems.ingot_red_copper, 0, 5, 10, 3),
@ -176,10 +177,176 @@ public class HbmChestContents {
new WeightedRandomChestContent(ModItems.powder_astatine, 0, 1, 32, 1),
new WeightedRandomChestContent(ModItems.powder_neodymium, 0, 1, 32, 1) };
=======
private static WeightedRandomChestContent[] modGeneric = new WeightedRandomChestContent[]
{new WeightedRandomChestContent(ModItems.ingot_steel, 0, 10, 15, 5),
new WeightedRandomChestContent(ModItems.ingot_red_copper, 0, 5, 10, 3),
new WeightedRandomChestContent(ModItems.ingot_tungsten, 0, 5, 15, 3),
new WeightedRandomChestContent(ModItems.ingot_beryllium, 0, 1, 5, 2),
new WeightedRandomChestContent(ModItems.ingot_titanium, 0, 7, 10, 4),
new WeightedRandomChestContent(ModItems.gun_revolver, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.gun_revolver_ammo, 0, 2, 6, 2),
new WeightedRandomChestContent(ModItems.battery_generic, 50, 1, 1, 4),
new WeightedRandomChestContent(ModItems.battery_advanced, 200, 1, 1, 1),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.block_titanium), 0, 0, 3, 1)};
private static WeightedRandomChestContent[] antenna = new WeightedRandomChestContent[]
{new WeightedRandomChestContent(ModItems.ingot_steel, 0, 3, 7, 5),
new WeightedRandomChestContent(ModItems.ingot_red_copper, 0, 3, 10, 3),
new WeightedRandomChestContent(ModItems.ingot_titanium, 0, 3, 5, 4),
new WeightedRandomChestContent(ModItems.wire_red_copper, 0, 3, 7, 4),
new WeightedRandomChestContent(ModItems.circuit_aluminium, 0, 1, 5, 3),
new WeightedRandomChestContent(ModItems.circuit_copper, 0, 1, 3, 2),
new WeightedRandomChestContent(ModItems.circuit_red_copper, 0, 1, 2, 1),
new WeightedRandomChestContent(ModItems.battery_generic, 50, 1, 1, 5),
new WeightedRandomChestContent(ModItems.battery_advanced, 200, 1, 1, 3),
new WeightedRandomChestContent(ModItems.powder_iodine, 0, 1, 1, 1),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.block_titanium), 0, 1, 2, 2),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.steel_poles), 0, 4, 9, 5),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.steel_scaffold), 0, 4, 6, 3),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.pole_top), 0, 2, 4, 4),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.pole_satellite_receiver), 0, 3, 5, 3)};
private static WeightedRandomChestContent[] expensive = new WeightedRandomChestContent[]
{new WeightedRandomChestContent(ModItems.nugget_schrabidium, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.circuit_gold, 0, 1, 2, 3),
new WeightedRandomChestContent(ModItems.circuit_schrabidium, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.nuke_starter_kit, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.nuke_commercially_kit, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.nuke_electric_kit, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.gun_revolver_gold, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.gun_revolver_gold_ammo, 0, 1, 6, 5),
new WeightedRandomChestContent(ModItems.gun_revolver_lead, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.gun_revolver_lead_ammo, 0, 1, 6, 5),
new WeightedRandomChestContent(ModItems.gun_rpg, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.gun_rpg_ammo, 0, 1, 32, 5),
new WeightedRandomChestContent(ModItems.gun_fatman, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.gun_fatman_ammo, 0, 1, 8, 2),
new WeightedRandomChestContent(ModItems.gun_xvl1456, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.gun_xvl1456_ammo, 0, 16, 64, 2),
new WeightedRandomChestContent(ModItems.grenade_nuclear, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.stealth_boy, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.battery_advanced, 200, 1, 1, 3),
new WeightedRandomChestContent(ModItems.battery_schrabidium, 1000, 1, 1, 1),
new WeightedRandomChestContent(ModItems.syringe_awesome, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.crate_caller, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.fusion_core, 0, 1, 1, 4),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.red_barrel), 0, 1, 3, 1)};
private static WeightedRandomChestContent[] nukeTrash = new WeightedRandomChestContent[]
{new WeightedRandomChestContent(ModItems.nugget_u238, 0, 3, 12, 5),
new WeightedRandomChestContent(ModItems.nugget_pu240, 0, 3, 8, 5),
new WeightedRandomChestContent(ModItems.nugget_neptunium, 0, 1, 4, 3),
new WeightedRandomChestContent(ModItems.rod_u238, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_neptunium, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.rod_pu240, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_dual_u238, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_dual_pu240, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_quad_u238, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_quad_pu240, 0, 1, 1, 3),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.yellow_barrel), 0, 1, 1, 2)};
private static WeightedRandomChestContent[] nuclear = new WeightedRandomChestContent[]
{new WeightedRandomChestContent(ModItems.nugget_u235, 0, 3, 12, 5),
new WeightedRandomChestContent(ModItems.nugget_pu238, 0, 3, 12, 5),
new WeightedRandomChestContent(ModItems.nugget_pu239, 0, 3, 12, 5),
new WeightedRandomChestContent(ModItems.rod_u235, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_pu239, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_dual_u235, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_dual_pu239, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_quad_u235, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_quad_pu239, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_uranium_fuel, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.rod_plutonium_fuel, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.rod_mox_fuel, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.rod_dual_uranium_fuel, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_dual_plutonium_fuel, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_dual_mox_fuel, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.rod_quad_uranium_fuel, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.rod_quad_plutonium_fuel, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.rod_quad_mox_fuel, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.pellet_rtg, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.powder_thorium, 0, 1, 1, 1),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.yellow_barrel), 0, 1, 3, 3)};
private static WeightedRandomChestContent[] vertibird = new WeightedRandomChestContent[]
{new WeightedRandomChestContent(ModItems.t45_helmet, 0, 1, 1, 15),
new WeightedRandomChestContent(ModItems.t45_plate, 0, 1, 1, 15),
new WeightedRandomChestContent(ModItems.t45_legs, 0, 1, 1, 15),
new WeightedRandomChestContent(ModItems.t45_boots, 0, 1, 1, 15),
new WeightedRandomChestContent(ModItems.fusion_core, 0, 1, 1, 10),
new WeightedRandomChestContent(ModItems.circuit_red_copper, 0, 1, 3, 3),
new WeightedRandomChestContent(ModItems.circuit_gold, 0, 1, 3, 3),
new WeightedRandomChestContent(ModItems.gun_revolver, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.gun_revolver_ammo, 0, 1, 24, 4),
new WeightedRandomChestContent(ModItems.gun_rpg, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.gun_rpg_ammo, 0, 1, 6, 3),
new WeightedRandomChestContent(ModItems.rod_uranium_fuel, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.rod_dual_uranium_fuel, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.rod_quad_uranium_fuel, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.gun_fatman_ammo, 0, 1, 2, 2),
new WeightedRandomChestContent(ModItems.gun_fatman, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.crate_caller, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.grenade_nuclear, 0, 1, 2, 2)};
private static WeightedRandomChestContent[] missile = new WeightedRandomChestContent[]
{new WeightedRandomChestContent(ModItems.missile_generic, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.missile_incendiary, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.missile_cluster, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.missile_buster, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.missile_strong, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.missile_incendiary_strong, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.missile_cluster_strong, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.missile_buster_strong, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.missile_burst, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.missile_inferno, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.missile_rain, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.missile_drill, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.missile_nuclear, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.missile_nuclear_cluster, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.missile_endo, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.missile_exo, 0, 1, 1, 1),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.launch_pad), 0, 1, 1, 5),
new WeightedRandomChestContent(ModItems.battery_advanced, 0, 1, 1, 5),
new WeightedRandomChestContent(ModItems.designator, 0, 1, 1, 5),
new WeightedRandomChestContent(ModItems.crate_caller, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.thruster_small, 0, 1, 1, 5),
new WeightedRandomChestContent(ModItems.thruster_medium, 0, 1, 1, 5),
new WeightedRandomChestContent(ModItems.thruster_large, 0, 1, 1, 5),
new WeightedRandomChestContent(ModItems.fuel_tank_small, 0, 1, 1, 5),
new WeightedRandomChestContent(ModItems.fuel_tank_medium, 0, 1, 1, 5),
new WeightedRandomChestContent(ModItems.fuel_tank_small, 0, 1, 1, 5)};
private static WeightedRandomChestContent[] spaceship = new WeightedRandomChestContent[]
{new WeightedRandomChestContent(ModItems.battery_advanced, 0, 1, 1, 5),
new WeightedRandomChestContent(ModItems.ingot_advanced_alloy, 0, 2, 16, 5),
new WeightedRandomChestContent(ModItems.wire_advanced_alloy, 0, 8, 32, 5),
new WeightedRandomChestContent(ModItems.coil_advanced_alloy, 0, 2, 16, 5),
new WeightedRandomChestContent(ModItems.cell_deuterium, 0, 1, 8, 5),
new WeightedRandomChestContent(ModItems.cell_tritium, 0, 1, 8, 5),
new WeightedRandomChestContent(ModItems.cell_antimatter, 0, 1, 4, 5),
new WeightedRandomChestContent(ModItems.cell_anti_schrabidium, 0, 1, 2, 5),
new WeightedRandomChestContent(ModItems.powder_neodymium, 0, 1, 1, 1),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.fusion_conductor), 0, 4, 8, 5),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.fusion_heater), 0, 1, 6, 5),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.reactor_element), 0, 1, 2, 5),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.block_tungsten), 0, 8, 32, 5),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.red_wire_coated), 0, 4, 16, 5),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.red_cable), 0, 8, 32, 5)};
private static WeightedRandomChestContent[] powder = new WeightedRandomChestContent[]
{new WeightedRandomChestContent(ModItems.powder_neptunium, 0, 1, 32, 1),
new WeightedRandomChestContent(ModItems.powder_iodine, 0, 1, 32, 1),
new WeightedRandomChestContent(ModItems.powder_thorium, 0, 1, 32, 1),
new WeightedRandomChestContent(ModItems.powder_astatine, 0, 1, 32, 1),
new WeightedRandomChestContent(ModItems.powder_neodymium, 0, 1, 32, 1)};
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
/**
* @param i
* @return WeightedRandomChestContent array with custom loot
*
<<<<<<< HEAD
* case 1: modGeneric loot (ingots, few blocks)
* case 2: antenna loot (spare parts, electronics)
* case 3: expensive loot (revolers, circuits, schrabidium nuggets)
@ -189,6 +356,17 @@ public class HbmChestContents {
* case 7: missile loot (missiles, designators, missile parts)
* case 8: spaceship loot (reactor elements, super conductors)
* case 9: powder loot (secret chest with the five powders for NITAN)
=======
* case 1: modGeneric loot (ingots, few blocks)
* case 2: antenna loot (spare parts, electronics)
* case 3: expensive loot (revolers, circuits, schrabidium nuggets)
* case 4: nukeTrash loot (U238 and Pu240 nuggets and rods)
* case 5: nuclear loot (U235 and Pu239 nuggets and rods, fuel rods)
* case 6: vertibrid loot (T45 power armor, fusion cores, circuits, nuclear material)
* case 7: missile loot (missiles, designators, missile parts)
* case 8: spaceship loot (reactor elements, super conductors)
* case 9: powder loot (secret chest with the five powders for NITAN)
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
**/
public static WeightedRandomChestContent[] getLoot(int i) {

8
com/hbm/lib/HbmWorldGen.java
View File

@ -125,13 +125,21 @@ public class HbmWorldGen implements IWorldGenerator {
(new WorldGenMinable(ModBlocks.ore_beryllium, 4)).generate(world, rand, randPosX, randPosY, randPosZ);
}
<<<<<<< HEAD
if (MainRegistry.enableBarrels && rand.nextInt(5) == 0) {
=======
if (MainRegistry.enableBarrels) {
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
for (int k = 0; k < 1; k++) {
int randPosX = i + rand.nextInt(16);
int randPosY = rand.nextInt(25);
int randPosZ = j + rand.nextInt(16);
<<<<<<< HEAD
(new WorldGenMinable(ModBlocks.yellow_barrel, 10)).generate(world, rand, randPosX, randPosY, randPosZ);
=======
(new WorldGenMinable(ModBlocks.yellow_barrel, 20)).generate(world, rand, randPosX, randPosY, randPosZ);
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
}
}

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

@ -6,8 +6,13 @@ import java.util.UUID;
import com.hbm.blocks.ModBlocks;
import com.hbm.calc.UnionOfTileEntitiesAndBooleans;
<<<<<<< HEAD
import com.hbm.entity.mob.EntityHunterChopper;
import com.hbm.entity.projectile.EntityChopperMine;
=======
import com.hbm.entity.EntityChopperMine;
import com.hbm.entity.EntityHunterChopper;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.interfaces.IConductor;
import com.hbm.interfaces.IConsumer;
import com.hbm.interfaces.ISource;
@ -31,12 +36,98 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public class Library {
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
public static List<String> book1 = new ArrayList<String>();
public static List<String> book2 = new ArrayList<String>();
public static List<String> book3 = new ArrayList<String>();
public static List<String> book4 = new ArrayList<String>();
public static List<String> book5 = new ArrayList<String>();
<<<<<<< HEAD
=======
=======
public static String book11 = "Resources\nHbm's Nuclear Tech Mod features eleven different ores and 13 materials which are used to craft machines and bombs. Most of them can be obtained from ores or various machines. This book will provide information about all of them.";
public static String book12 = "Uranium\nUranium is a rather rare ore found deep underground. Smelting the ore will give you a raw uranium ingot which can later be processed into fissile material that can be used for energy production or nuclear weapons.";
public static String book13 = "Titanium\nTitanium is a material mainly used for crafting machines and bomb hulls. You can get it from smelting titanium ore.";
public static String book14 = "Steel\nSteel is a commonly used material for building bombs, machines and decorative elements. It can be obtained by combining a lump of coal and an iron ingot in the alloy furnace.";
public static String book15 = "Sulfur\nSulfur is a powder which will directly drop from it's ore. Sulfur is used for extracting deuterium with the deuterium extractor, crafting gunpowder or Schrabidiumtrisulfite.";
public static String book16 = "Niter\nNiter also drops directly from the ore, it's only uses are for crafting det cords and gunpowder.";
public static String book17 = "Industrial Grade Copper\nIndustrial Grade Copper (mainly just referred to as Copper) is an importand ingot used for crafting electronic components and creating Minecraft Grade Copper. It can be obtained by simply smelting copper ore.";
public static String book18 = "Minecraft Grade Copper\nMinecraft Grade Copper (aka Red Copper) can be created by combining copper ingots and redstone in the alloy furnace. It is used for crafting advanced electronics and batteries.";
public static String book19 = "Tungsten\nTungsten can be used to make neutron reflectors by combining it in the alloy furnace with coal. It is also needed for heating coils, which are importand for storing uranium and plutonium hexafluorite.";
public static String book110 = "Aluminium\nAluminium is a commonly found metal that is used for crafting hulls and machines. Basic circuits are also made out of aluminium wires.";
public static String book111 = "Fuorite\nFluorite is a powder which can be found in form of ores. It is used to make uranium and plutonium hexafluorite, gasses which can be enriched in a gas centrifuge.";
public static String book112 = "Beryllium\nBeryllium is an ingot which can be simply obtained from it's ore. Beryllium is used for Schrabidium fuel and plutonium cores.";
public static String book113 = "Lead\nLead is a very common ore that can be smelted into an ingot. It can be used to craft breeding reactors, RTG-Units and if combined with copper in the alloy furnace, it can be processed into neutron reflectors.";
public static String book114 = "Schrabidium\nSchrabidium is a very odd element only found near nuclear testing sites. It has violent behaviours if used the right way, making it perfect for bombs. If a big ammount is hit by neutrons, it will create other elements.";
public static String book115 = "Advanced Alloy\nThe advanced alloy is a very durable and useful material, only used for the best factories which can handle four operations at once. It is composed of Minecraft grade copper and steel, combined by an alloy furnace.";
public static String book116 = "Fuel\nFuel is obtained by combining an empty canister and a piece of coal in the alloy furnace. It is used for crafting explosive barrels and missiles.";
public static String book21 = "Machines\nAs an essential part of technic mods, Hbm's Nuclear Tech Mod also features many machines. They are either used to smelt or refine items or to store hazardous materials or even generate electricity.";
public static String book22 = "Alloy Furnace\nThe alloy furnace is the most importand machine as it is used to create alloys like red copper or neutron reflectors. It uses different kinds of fuel such as coal, netherrack, lava or even redstone.";
public static String book23 = "Gas Centrifuge\nThe gas centrifuge is a requirement for any advanced nuclear tech as it can be used to enrich uranium and plutonium. It uses the same fuel as the alloy furnace. It can process uranium and plutonium hexafluorite.";
public static String book24 = "Hexafluorite Tanks\nThese tanks can store uranium or plutonium hexafluorite. By placing a filled cell into the upper-left slot, the gas will be transfered into the tank. Placing empty cells into the upper-right slot will drain the tank's content.";
public static String book25 = "Breeding Reactor\nThe breeding reactor is used to breed uranium into plutonium. By filling the lower slot with a radioactive rod it will supply it with power, the rod which shall be breeded goes into the upper slot.";
public static String book26 = "Nuclear Powered Furnace\nThis furnace works like the regular furnace, but uses fissile material as fuel instead. Each smelting process only takes arround 1.5 seconds.";
public static String book27 = "RTG-Furnace\nThe RGT-Furnace also works like a normal furnace, but uses three plutonium 238 pellets as fuel. Those pellets never deplete, making this furnace last forever. Smelting an item takes 2.5 seconds.";
public static String book28 = "Coal Generator\nThe coal generator can generate electricity by burning coal. It needs a constant water supply for successfully providing energy, it can use water buckets or cells. You can transport it's energy either with wires or batteries.";
public static String book29 = "Nuclear Reactor\nThe nuclear reactor uses special fuel cells to generate energy. It needs water to do so and coolant to prevent it from overheating.";
public static String book210 = "Coated Wire\nThis wire is made from red copper and can transfer electricity. It can take energy from various generators and transport it to machines.";
public static String book211 = "Energy Storage Block\nThis battery block will collect electricity from wires. Applying a redstone signal will prevent it from getting more energy and make it release it's electricity again.";
public static String book212 = "Electric Furnace\nThe electric furnace works like a normal furnace, but uses electricity instead of fuel items. It can be powered either with wires or with battery items.";
public static String book213 = "Deuterium Extractor\nThis machine needs electricity, water, sulfur and empty cells to extract deuterium from the water. Water will deplete much faster than sulfur.";
public static String book214 = "Factories\nFactories are big 3x3x3 furnaces on steroids. Depending on what type you use, it can smelt 2 or 4 items at the same time, while having nine additional in and output slots!";
public static String book215 = "Large Nuclear Reactor\nThese big machines work like regular nuclear reactors, but can store much more energy, water, coolant and up to 30 slots of fuel! Be sure to protect it with a concrete shell, or else it will emit deadly doses of radiation.";
public static String book216 = "Fusion Reactor\nHarness the mighty power of the sun with this high-tech machinery! It will not present any danger as it can not explode or radiate, unlike other reactors. It needs deuterium, tritium, a fuse and four energy cores to start the fusion process.";
public static String book217 = "Schrabidium Transmutator\nThis new innovaion turns regular impure uranium into schrabidium! It needs almost 500MHE and a neutral redcoil capacitor to work. The capacitors can be discharged, but it is very dangerous to do so.";
public static String book31 = "Bombs\nThis mod also features many different bombs, some of them work like regular TNT, others are nukes and need additional items to ignite.";
public static String book32 = "The Gadget\nThe Gadget was the first functional nuclear explosive ever built. It needs four special propellants, a plutonium core and a cable drum. It's crater has a radius up to 150 meters.";
public static String book33 = "Little Boy\nLittle Boy is a gun-type nuke which uses a tungsten-carbide neutron reflector, two different uranium 235 elements, a propellant and it's igniter. It has an explosion radius of 120.";
public static String book34 = "Fat Man\nFat Man is very similar to the Gadged in terms of it's inner parts, even though it uses alternate versions of these items. It's explosion radius is 175 meters.";
public static String book35 = "Ivy Mike\nIvy Mike is a hydrogen bomb which needs Fat Man's parts to work. Additionally, you can add an uranium tank, deuterium and a cooler to increase the radius by a lot. Radius with Fat Man parts: 175 meters, radius with additional items: 250 meters.";
public static String book36 = "Tsar Bomba\nThe Tsar Bomba was the strongest bomb ever built and is a hydrogen bomb much like Ivy Mike. It needs Fat Man's parts to work and with the fusion core, the explosion radius reaches an astounding 500 meters.";
public static String book37 = "The Prototype\nThe Prototype was the first (and strongest) Schrabidium-powered bomb. It was made from a pimped makeshift nuclear reactor using liquid Schrabidiumtrisulfide. Like any other Schrabidium bomb, the Prototype's crater is 100% spherical,";
public static String book38 = "leaving no blocks untouched, besides Bedrock on Y: 0. It needs four quad rods of regular uranium, four quad rods filled with lead, two quad rods of neptunium and four Schrabidiumtrisulfide cells in order to explode. It has a crater radius of only";
public static String book39 = "150 meters, but because it's shape, it can destroy a whopping 14 million blocks, the seven million blocks of the bottom half are ten times more than the ammount of blocks the Gadget will destroy below it's Y axis.";
public static String book310 = "F.L.E.I.J.A.\nF.L.E.I.J.A. (pronounced <20>oFre-ja<6A>r) is a high-tech Schrabidium bomb which consists of two special impulse igniters, three Schrabidium propellants and six magnetized F.L.E.I.J.A. uranium 235 cores. It has a range of 50 meters.";
public static String book311 = "Multi Purpose Bomb\nThe multi purpose bomb is a small customizable explosive which requires four blocks of TNT to work. It has a base explosion value which can be modified with different items. You can either use two of a kind (the small box will show";
public static String book312 = "you what kind of explosion it will create), only one item (with half the radius/effect of the modifier) or two different items (two different items or one single are part of scambled mode, indicated by a question mark. It will have two different effects.)";
public static String book313 = "Modifying items:\nBase Value: 8\nGunpowder: +1\nTNT: +4\nExplosive Pellets: +50 bomblets\nFire Powder: +10 fire radius\nPoison Powder: +15 poison radius\nGas Cartridge: +15 gas radius";
public static String book314 = "Flame War in a Box\nEverything explodes, everything is on fire. Enough desription.";
public static String book315 = "Levitation Bomb\nThis bomb uses a Schrabidium powered modified thermal distribution unit to lift the surrounding area 50 meters up. It will mess with entities caught in it's radius, making them...weird.";
public static String book316 = "Endothermic Bomb\nThis bomb contains an ice-filled thermal distribution unit and will freeze blocks and entities close to it. Entities will get a slowness effect and freeze to a big ice cube.";
public static String book317 = "Exothermic Bomb\nThe exothermic bomb needs a thermal distribution unit filled with lava in order to burn and/or melt nearby blocks. Living creatures will get a slowness and weakness effect.";
public static String book318 = "Det Cord\nThe det cord is a TNT like block with a much smaller explosion radius. It will explode right after ignition. It can be triggered by redstone or other explosions and is ideal to trigger far away TNT chrages.";
public static String book319 = "Explosive Barrel\nThis is a red barrel filled with fuel. It will explode if it catches fire, explodes or gets shot with a revolver. It will blow up in a big firey explosion, great for demolishing houses or forests.";
public static String book320 = "Radioactive Barrel\nA yellow barrel filled to the top with nuclear waste. It has a much bigger explosion radius than it's non-nuclear counterpart, and can only be triggered by explosions. It will give creatures bad effects when they stay to close.";
public static String book41 = "Missiles\nThere are four different tiers and four major groups of missiles. They need a launch pad to work and will fly to a maked target where they will explode. Most missiles are easily recognizable by their shape and color.";
public static String book42 = "HE Missiles\nHE missiles (often just referred to as generic missiles) are the simplest type of missiles. They will fly in an arc shape and explode on impact. There are three different HE missiles, one for each of the first three tiers.";
public static String book43 = "Incendiary Missiles\nIncendiary missiles work just like generic missiles, with the slight difference that the explosion will spawn fire. The higher the tier, the more fire the impact will create. There are three different tiers of incendiary missiles.";
public static String book44 = "Cluster Missiles\nCluster missiles will fly the same arc shape as all the other missiles do, with the exception that it will explode just before impact, releasing hundrets of small bomblets. They are avalible in three different sizes (tiers)";
public static String book45 = "Bunker Busters\nA bunker buster behaves much like a normal missile, except that it's explosion goes further down, digging holes and revealing underground structures or destroying bunkers. They also come in three different sizes.";
public static String book46 = "Endothermic Missile\nA tier 3 missile which works exactly like an endothermic bomb, but has double the effect radius.";
public static String book47 = "Exothermic Missile\nAnother tier 3 missile with an exothermic warhead and double the radius of it's stationary counterpart.";
public static String book48 = "Nuclear Missile\nIt's basically a small nuke mounted on a missile. It has an explosion radius of 100 meters, making it the smallest nuke (next to the waffle of mass destruction, the nuclear creeper and the MIRV.)";
public static String book49 = "Nuclear MIRV Missile\nThe nuclear MIRV is the most destructive intercontinental ballistic missile ever created. It combines a cluster bomb with the destructive force of a nuke, splitting into eight small warheads just before impact.";
public static String book51 = "Misc\nNext to nuclear technology and weapons of mass destruction, this mod also offers some gimmicks, handguns, different armor sets, randomly generated dungeons and more! (Please, do not touch any objects you don't know. You will probably explode and die.)";
public static String book52 = "Revolvers\nLike in the good old Western films, you can shoot with your own revolver! There are four different tiers of revolvers, dealing about 5 - infinite damage, depending on the tier. Note: A revolver can not hurt mobs like the ender dragon!";
public static String book53 = "RPG\nTo use the RPG, charge it like a bow and release the charge when it reached it's maximum. The rocket will cause a small explosion about half the size of a creeper's explosion.";
public static String book54 = "Nuke Launcher\nThe M42 Nuclear Catapult \"Fat Man\" is the perfect christmas present for every small child! It shoots small tactical nuclear warheads causing chaos and destrucion. (What did you expect?)";
public static String book55 = "Grenades\nA grenade is a very easy-to-use type of explosive. Simply throw it like a snowball and watch the explosion. Remember: Never, NEVER throw a Schrabidium Grenade.";
public static String book56 = "Syringes\nDon't do drugs! (except in Minecraft) Need some health? Take a Stimpak. You demand damage resistance? Inject a Med-X. Want to go nuts? Take AWESOME (only one dose per hour will help) Warning: Hitting enemies with syinges will give them the effect!";
public static String book57 = "Mobile Stealth Device\nThis useful machine will make you invisibile, even without the annoying particles! Just remember that the effect will wear off in 30 seconds, so don't rely too much on it.";
public static String book58 = "Food\nSurprisingly enough, this mod offers a great variety of different food. Be sure not to eat anything, you may explode/combust/die of radiation poisoning/starve to death/experience a rare case of waffles taking over the world.";
public static String book61;
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
public static String HbMinecraft = "192af5d7-ed0f-48d8-bd89-9d41af8524f8";
public static String LPkukin = "937c9804-e11f-4ad2-a5b1-42e62ac73077";
@ -142,11 +233,14 @@ public class Library {
book5.add("Detonator\nRight click a block to set the position, shift-right click to detonate.");
book5.add("Supply Drop Requester\nRight click to call in a supply drop, has five uses in survival mode.");
book5.add("Magazines\nRight click to retrieve ammo for a specific gun.");
<<<<<<< HEAD
book5.add("Syringes\nRight click to inject the syringe's content, hit somebody else to give them the effects.");
book5.add("");
book5.add("");
book5.add("");
book5.add("Coincidences are less likely than most people believe, don't you think? Look at things twice. Try imagining what the creators and inventors were thinking. All things happen for a reason, tough sometimes they are not as clear. \n\nPPPPPPP");
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
}
public static boolean checkArmor(EntityPlayer player, Item helmet, Item plate, Item legs, Item boots) {
@ -375,6 +469,7 @@ public class Library {
return entity;
}
<<<<<<< HEAD
public static MovingObjectPosition rayTrace(EntityPlayer player, double d, float f) {
Vec3 vec3 = player.getPosition(f);
@ -383,4 +478,6 @@ public class Library {
Vec3 vec32 = vec3.addVector(vec31.xCoord * d, vec31.yCoord * d, vec31.zCoord * d);
return player.worldObj.func_147447_a(vec3, vec32, false, false, true);
}
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
}

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

@ -23,7 +23,10 @@ public class ModDamageSource extends DamageSource {
public static DamageSource tauBlast = (new DamageSource("tauBlast")).setDamageBypassesArmor();
public static DamageSource radiation = (new DamageSource("radiation")).setDamageBypassesArmor();
public static DamageSource suicide = (new DamageSource("suicide")).setProjectile();
<<<<<<< HEAD
public static DamageSource teleporter = (new DamageSource("teleporter")).setDamageIsAbsolute();
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
public ModDamageSource(String p_i1566_1_) {
super(p_i1566_1_);
@ -130,6 +133,7 @@ public class ModDamageSource extends DamageSource {
{
String s = ((EntityDamageSourceIndirect)source).damageType;
return s.equals("subAtomic") || s.equals("subAtomic2") || s.equals("subAtomic3") || s.equals("subAtomic4") || s.equals("subAtomic5");
<<<<<<< HEAD
}
return false;
}
@ -162,6 +166,8 @@ public class ModDamageSource extends DamageSource {
if(source instanceof EntityDamageSourceIndirect)
{
return ((EntityDamageSourceIndirect)source).damageType.equals("ice");
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
}
return false;
}

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

@ -3,7 +3,15 @@ package com.hbm.lib;
public class RefStrings {
public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod";
<<<<<<< HEAD
public static final String VERSION = "1.0.22";
=======
<<<<<<< HEAD
public static final String VERSION = "1.0.23";
=======
public static final String VERSION = "1.0.22";
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
public static final String CLIENTSIDE = "com.hbm.main.ClientProxy";
public static final String SERVERSIDE = "com.hbm.main.ServerProxy";
}

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

@ -6,6 +6,7 @@ import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.MinecraftForge;
import com.hbm.blocks.ModBlocks;
<<<<<<< HEAD
import com.hbm.entity.effect.EntityCloudFleija;
import com.hbm.entity.effect.EntityEMPBlast;
import com.hbm.entity.effect.EntityFalloutRain;
@ -155,6 +156,138 @@ import com.hbm.render.tileentity.RenderTestRender;
import com.hbm.render.tileentity.RenderUF6Tank;
import com.hbm.render.tileentity.RenderYellowBarrel;
import com.hbm.render.tileentity.RendererObjTester;
=======
import com.hbm.entity.EntityBullet;
import com.hbm.entity.EntityChopperMine;
import com.hbm.entity.EntityCloudFleija;
import com.hbm.entity.EntityCombineBall;
<<<<<<< HEAD
import com.hbm.entity.EntityFalloutRain;
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
import com.hbm.entity.EntityGrenadeASchrab;
import com.hbm.entity.EntityGrenadeCluster;
import com.hbm.entity.EntityGrenadeElectric;
import com.hbm.entity.EntityGrenadeFire;
import com.hbm.entity.EntityGrenadeFlare;
import com.hbm.entity.EntityGrenadeFrag;
import com.hbm.entity.EntityGrenadeGas;
import com.hbm.entity.EntityGrenadeGeneric;
import com.hbm.entity.EntityGrenadeLemon;
import com.hbm.entity.EntityGrenadeMk2;
import com.hbm.entity.EntityGrenadeNuclear;
import com.hbm.entity.EntityGrenadeNuke;
import com.hbm.entity.EntityGrenadePlasma;
import com.hbm.entity.EntityGrenadePoison;
import com.hbm.entity.EntityGrenadeSchrabidium;
import com.hbm.entity.EntityGrenadeStrong;
import com.hbm.entity.EntityGrenadeTau;
import com.hbm.entity.EntityGrenadeZOMG;
import com.hbm.entity.EntityHunterChopper;
import com.hbm.entity.EntityMiniNuke;
import com.hbm.entity.EntityMirv;
import com.hbm.entity.EntityMissileAntiBallistic;
import com.hbm.entity.EntityMissileBunkerBuster;
import com.hbm.entity.EntityMissileBurst;
import com.hbm.entity.EntityMissileBusterStrong;
import com.hbm.entity.EntityMissileCluster;
import com.hbm.entity.EntityMissileClusterStrong;
import com.hbm.entity.EntityMissileDrill;
import com.hbm.entity.EntityMissileEndo;
import com.hbm.entity.EntityMissileExo;
import com.hbm.entity.EntityMissileGeneric;
import com.hbm.entity.EntityMissileIncendiary;
import com.hbm.entity.EntityMissileIncendiaryStrong;
import com.hbm.entity.EntityMissileInferno;
import com.hbm.entity.EntityMissileMirv;
import com.hbm.entity.EntityMissileNuclear;
import com.hbm.entity.EntityMissileRain;
import com.hbm.entity.EntityMissileStrong;
import com.hbm.entity.EntityNuclearCreeper;
import com.hbm.entity.EntityNukeCloudBig;
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityRainbow;
import com.hbm.entity.EntityRocket;
import com.hbm.entity.EntitySchrab;
import com.hbm.entity.EntityTestMissile;
import com.hbm.items.ModItems;
import com.hbm.particles.EntityBSmokeFX;
import com.hbm.particles.EntitySmokeFX;
import com.hbm.render.ItemRenderRevolverCursed;
import com.hbm.render.ItemRenderRevolverIron;
import com.hbm.render.ItemRenderRevolverLead;
import com.hbm.render.BSmokeRenderer;
import com.hbm.render.ItemRenderBigSword;
import com.hbm.render.ItemRenderDecoBlock;
import com.hbm.render.ItemRenderFatMan;
import com.hbm.render.ItemRenderMP;
import com.hbm.render.ItemRenderMiniNuke;
import com.hbm.render.ItemRenderOSIPR;
import com.hbm.render.ItemRenderPoleTop;
import com.hbm.render.ItemRenderRedstoneSword;
import com.hbm.render.ItemRenderRevolver;
import com.hbm.render.ItemRenderRevolverGold;
import com.hbm.render.ItemRenderRevolverInverted;
import com.hbm.render.ItemRenderRevolverSchrabidium;
import com.hbm.render.ItemRenderRocket;
import com.hbm.render.ItemRenderRpg;
import com.hbm.render.ItemRenderSatelliteReceiver;
import com.hbm.render.ItemRenderSteelPoles;
import com.hbm.render.ItemRenderTapeRecorder;
import com.hbm.render.ItemRenderTestBombAdvanced;
import com.hbm.render.ItemRenderTestContainer;
import com.hbm.render.ItemRenderXVL1456;
import com.hbm.render.ItemRenderZOMG;
import com.hbm.render.ModEffectRenderer;
import com.hbm.render.RenderBigNuke;
import com.hbm.render.RenderBombMulti;
import com.hbm.render.RenderCable;
import com.hbm.render.RenderCentrifuge;
import com.hbm.render.RenderChopperMine;
import com.hbm.render.RenderCloudFleija;
import com.hbm.render.RenderCrashedBomb;
import com.hbm.render.RenderDecoBlock;
import com.hbm.render.RenderDecoBlockAlt;
import com.hbm.render.RenderFallout;
import com.hbm.render.RenderFlare;
import com.hbm.render.RenderHunterChopper;
import com.hbm.render.RenderLaunchPadTier1;
import com.hbm.render.RenderMiniNuke;
import com.hbm.render.RenderMirv;
import com.hbm.render.RenderMissileGeneric;
import com.hbm.render.RenderMissileHuge;
import com.hbm.render.RenderMissileMirv;
import com.hbm.render.RenderMissileNuclear;
import com.hbm.render.RenderMissileStrong;
import com.hbm.render.RenderMissileThermo;
import com.hbm.render.RenderNoCloud;
import com.hbm.render.RenderNuclearCreeper;
import com.hbm.render.RenderNukeBoy;
import com.hbm.render.RenderNukeFleija;
import com.hbm.render.RenderNukeGadget;
import com.hbm.render.RenderNukeMan;
import com.hbm.render.RenderNukeMike;
import com.hbm.render.RenderNukePrototype;
import com.hbm.render.RenderNukeTsar;
import com.hbm.render.RenderPoleSatelliteReceiver;
import com.hbm.render.RenderPoleTop;
import com.hbm.render.RenderPuF6Tank;
import com.hbm.render.RenderRainbow;
import com.hbm.render.RenderRedBarrel;
import com.hbm.render.RenderRocket;
import com.hbm.render.RenderRotationTester;
import com.hbm.render.RenderSmallNukeAlt;
import com.hbm.render.RenderSteelPoles;
import com.hbm.render.RenderTapeRecorder;
import com.hbm.render.RenderTestBombAdvanced;
import com.hbm.render.RenderTestContainer;
import com.hbm.render.RenderTestMissile;
import com.hbm.render.RenderTestRender;
import com.hbm.render.RenderUF6Tank;
import com.hbm.render.RenderYellowBarrel;
import com.hbm.render.RendererObjTester;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.tileentity.TileEntityBombMulti;
import com.hbm.tileentity.TileEntityCable;
import com.hbm.tileentity.TileEntityCrashedBomb;
@ -260,7 +393,14 @@ public class ClientProxy extends ServerProxy
RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudBig.class, new RenderBigNuke());
RenderingRegistry.registerEntityRenderingHandler(EntityCloudFleija.class, new RenderCloudFleija());
RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudNoShroom.class, new RenderNoCloud());
<<<<<<< HEAD
RenderingRegistry.registerEntityRenderingHandler(EntityFalloutRain.class, new RenderFallout());
=======
<<<<<<< HEAD
RenderingRegistry.registerEntityRenderingHandler(EntityFalloutRain.class, new RenderFallout());
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoTapeRecorder.class, new RenderTapeRecorder());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoSteelPoles.class, new RenderSteelPoles());
@ -286,10 +426,13 @@ public class ClientProxy extends ServerProxy
MinecraftForgeClient.registerItemRenderer(ModItems.gun_osipr, new ItemRenderOSIPR());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_mp, new ItemRenderMP());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_inverted, new ItemRenderRevolverInverted());
<<<<<<< HEAD
MinecraftForgeClient.registerItemRenderer(ModItems.gun_mp40, new ItemRenderMP40());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_emp, new ItemRenderEMPRay());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_immolator, new ItemRenderImmolator());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_cryolator, new ItemRenderCryolator());
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
RenderingRegistry.registerEntityRenderingHandler(EntityBullet.class, new RenderRocket());
RenderingRegistry.registerEntityRenderingHandler(EntityMiniNuke.class, new RenderMiniNuke());

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

@ -358,9 +358,12 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(ModItems.chopper_tail, 1), new Object[] { "PPP", "IIM", " PR", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel, 'M', ModItems.motor, 'R', ModItems.chopper_blades });
GameRegistry.addRecipe(new ItemStack(ModItems.chopper_torso, 1), new Object[] { "IMI", "MBB", "RCI", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel, 'M', ModItems.motor, 'B', ModBlocks.block_combine_steel, 'R', ModItems.chopper_blades, 'C', ModBlocks.fwatz_computer });
GameRegistry.addRecipe(new ItemStack(ModItems.chopper_wing, 1), new Object[] { "III", " PP", " PP", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel });
<<<<<<< HEAD
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.telepad, 1), new Object[] { "CPC", "SUS", "WWW", 'C', ModItems.plate_combine_steel, 'P', ModItems.plate_schrabidium, 'S', "plateSteel", 'U', ModItems.circuit_schrabidium, 'W', ModItems.wire_gold }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.entanglement_kit, 1), new Object[] { "CEC", "PDP", "CSC", 'C', ModItems.coil_magnetized_tungsten, 'P', "plateDenseLead", 'S', ModItems.singularity_super_heated, 'E', ModItems.singularity_counter_resonant, 'D', ModItems.powder_power }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.entanglement_kit, 1), new Object[] { "CSC", "PDP", "CEC", 'C', ModItems.coil_magnetized_tungsten, 'P', "plateDenseLead", 'S', ModItems.singularity_super_heated, 'E', ModItems.singularity_counter_resonant, 'D', ModItems.powder_power }));
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
GameRegistry.addRecipe(new ItemStack(ModItems.missile_generic, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_generic_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small });
GameRegistry.addRecipe(new ItemStack(ModItems.missile_incendiary, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_incendiary_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small });
@ -400,7 +403,10 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_diesel), 1), new Object[] { "HTH", "PRP", "SFS", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'H', ModItems.hull_small_steel, 'P', Item.getItemFromBlock(Blocks.piston), 'R', "ingotRedstoneAlloy", 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) }));
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_shredder), 1), new Object[] { "SHS", "MBM", "CFC", 'H', ModItems.hull_big_steel, 'S', ModBlocks.steel_beam, 'M', ModItems.motor, 'B', Blocks.iron_bars, 'C', ModBlocks.red_wire_coated, 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_combine_factory), 1), new Object[] { "HCH", "STS", "RFR", 'H', ModItems.tank_steel, 'C', ModItems.coil_advanced_torus, 'S', "plateSteel", 'T', ModBlocks.block_magnetized_tungsten, 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off) }));
<<<<<<< HEAD
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_teleporter), 1), new Object[] { "TPT", "EKE", "AMA", 'T', "plateTitanium", 'P', ModItems.telepad, 'E', ModItems.powder_power, 'K', ModItems.entanglement_kit, 'A', "plateAdvanced", 'M', ModBlocks.fwatz_computer }));
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 1), new Object[] { "PIP", "I I", "PIP", 'P', "plateTitanium", 'I', "ingotTitanium" }));
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_furnace), 1), new Object[] { "HMH", "MFM", "HMH", 'H', Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 'M', ModItems.motor, 'F', Item.getItemFromBlock(Blocks.furnace) });
@ -466,10 +472,23 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_computer), 1), new Object[] { "DTD", "TMT", "DTD", 'D', "dustDiamond", 'T', "dustMagnetizedTungsten", 'M', ModBlocks.block_meteor }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_core), 1), new Object[] { "CMC", "MAM", "CMC", 'C', ModItems.circuit_schrabidium, 'M', ModBlocks.fwatz_computer, 'A', ModBlocks.fwatz_conductor }));
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_light), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.fence, 'B', Blocks.brick_block });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.stone });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_obsidian), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick), 4), new Object[] { "PPP", "PIP", "PPP", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel });
<<<<<<< HEAD
=======
=======
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_light), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.fence, 'B', Blocks.brick_block });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.stone });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_obsidian), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick), 8), new Object[] { "PPP", "PIP", "PPP", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel });
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick_reinforced), 8), new Object[] { "TBT", "BCB", "TBT", 'T', ModBlocks.block_magnetized_tungsten, 'B', ModBlocks.brick_concrete, 'C', ModBlocks.cmb_brick });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_brick), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', ModBlocks.brick_concrete });
@ -524,6 +543,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_osipr_ammo, 16), new Object[] { "G", "R", "S", 'G', "dustGlowstone", 'R', "dustRedstone", 'S', "plateSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_osipr_ammo, 16), new Object[] { "R", "G", "S", 'G', "dustGlowstone", 'R', "dustRedstone", 'S', "plateSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_osipr_ammo2, 1), new Object[] { " C ", "PPP", " C ", 'C', ModItems.plate_combine_steel, 'P', ModItems.powder_power }));
<<<<<<< HEAD
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_immolator, 1), new Object[] { "WCC", "PMT", "WAA", 'W', ModItems.wire_gold, 'C', "plateCopper", 'P', "plateAdvanced", 'M', ModItems.motor, 'T', ModItems.tank_steel, 'A', "plateSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_immolator_ammo, 16), new Object[] { "SPS", "PCP", "SPS", 'S', "plateSteel", 'C', "dustCoal", 'P', ModItems.powder_fire }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_immolator_ammo, 16), new Object[] { " F ", "SFS", " F ", 'S', "plateSteel", 'F', ModItems.canister_fuel }));
@ -534,6 +554,11 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp_ammo, 32), new Object[] { "G", "C", 'G', "plateGold", 'C', "plateCopper", 'S', Items.gunpowder }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_emp, 1), new Object[] { "CPG", "CMF", "CPI", 'C', ModItems.coil_copper, 'P', "plateLead", 'G', ModItems.circuit_gold, 'M', ModItems.magnetron, 'I', "ingotTungsten", 'F', ModItems.fuse }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_emp_ammo, 8), new Object[] { "IGI", "IPI", "IPI", 'G', "plateGold", 'I', "plateIron", 'P', ModItems.powder_power }));
=======
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_zomg, 1), new Object[] { "PRR", "CCS", "PXX", 'P', ModItems.plate_paa, 'R', "plateDenseLead", 'S', ModItems.singularity_counter_resonant, 'X', ModItems.crystal_xen, 'C', ModItems.coil_magnetized_tungsten}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp, 1), new Object[] { "EEE", "SSM", "III", 'E', ModItems.ingot_euphemium, 'S', "plateSteel", 'I', "ingotSteel", 'M', ModItems.motor}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp_ammo, 32), new Object[] { "G", "C", 'G', "plateGold", 'C', "plateCopper", 'S', Items.gunpowder }));
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_generic, 4), new Object[] { "RS ", "ITI", " I ", 'I', "plateIron", 'R', ModItems.wire_red_copper, 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt) }));
GameRegistry.addRecipe(new ItemStack(ModItems.grenade_strong, 2), new Object[] { " G ", "SGS", " S ", 'G', ModItems.grenade_generic, 'S', Items.gunpowder });
@ -712,9 +737,12 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_paa_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.plate_paa });
GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_paa_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.plate_paa });
GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_paa_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.plate_paa });
<<<<<<< HEAD
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.paa_plate, 1), new Object[] { "E E", "NEN", "ENE", 'E', ModItems.plate_paa, 'N', "plateDenseLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.paa_legs, 1), new Object[] { "EEE", "N N", "E E", 'E', ModItems.plate_paa, 'N', "plateDenseLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.paa_boots, 1), new Object[] { "E E", "N N", 'E', ModItems.plate_paa, 'N', "plateDenseLead" }));
=======
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.goggles, 1), new Object[] { "P P", "GPG", 'G', "paneGlass", 'P', "plateSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gas_mask, 1), new Object[] { "PPP", "GPG", "FPF", 'G', "paneGlass", 'P', "plateSteel", 'F', ModItems.filter_coal }));
@ -766,8 +794,16 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_magnetized_tungsten, 1), new Object[] { "dustTungsten", "nuggetSchrabidium" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_red_copper, 2), new Object[] { "dustRedstone", "dustCopper" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_steel, 2), new Object[] { "dustIron", "dustCoal" }));
<<<<<<< HEAD
GameRegistry.addRecipe(new ItemStack(ModItems.chopper, 1), new Object[] { "BBB", "HTF", "GWW", 'B', ModItems.chopper_blades, 'H', ModItems.chopper_head, 'T', ModItems.chopper_torso, 'F', ModItems.chopper_tail, 'G', ModItems.chopper_gun, 'W', ModItems.chopper_wing });
=======
<<<<<<< HEAD
GameRegistry.addRecipe(new ItemStack(ModItems.chopper, 1), new Object[] { "BBB", "HTF", "GWW", 'B', ModItems.chopper_blades, 'H', ModItems.chopper_head, 'T', ModItems.chopper_torso, 'F', ModItems.chopper_tail, 'G', ModItems.chopper_gun, 'W', ModItems.chopper_wing });
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
}
public static void AddSmeltingRec()
@ -805,7 +841,14 @@ public class CraftingManager {
GameRegistry.addSmelting(ModItems.powder_lithium, new ItemStack(ModItems.lithium), 1.0F);
GameRegistry.addSmelting(ModItems.combine_scrap, new ItemStack(ModItems.ingot_combine_steel), 1.0F);
<<<<<<< HEAD
GameRegistry.addSmelting(ModItems.tank_waste, new ItemStack(ModItems.tank_waste), 0.0F);
=======
<<<<<<< HEAD
GameRegistry.addSmelting(ModItems.tank_waste, new ItemStack(ModItems.tank_waste), 0.0F);
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
GameRegistry.addSmelting(Items.bone, new ItemStack(Items.slime_ball, 3), 0.0F);
GameRegistry.addSmelting(new ItemStack(Items.dye, 1, 15), new ItemStack(Items.slime_ball, 1), 0.0F);

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

@ -25,6 +25,7 @@ import com.hbm.creativetabs.BlockTab;
import com.hbm.creativetabs.NukeTab;
import com.hbm.creativetabs.PartsTab;
import com.hbm.creativetabs.TestTab;
<<<<<<< HEAD
import com.hbm.entity.effect.EntityCloudFleija;
import com.hbm.entity.effect.EntityEMPBlast;
import com.hbm.entity.effect.EntityFalloutRain;
@ -87,6 +88,64 @@ import com.hbm.entity.projectile.EntityPlasmaBeam;
import com.hbm.entity.projectile.EntityRainbow;
import com.hbm.entity.projectile.EntityRocket;
import com.hbm.entity.projectile.EntitySchrab;
=======
import com.hbm.entity.EntityBullet;
import com.hbm.entity.EntityChopperMine;
import com.hbm.entity.EntityCloudFleija;
import com.hbm.entity.EntityCombineBall;
<<<<<<< HEAD
import com.hbm.entity.EntityFalloutRain;
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
import com.hbm.entity.EntityGrenadeASchrab;
import com.hbm.entity.EntityGrenadeCluster;
import com.hbm.entity.EntityGrenadeElectric;
import com.hbm.entity.EntityGrenadeFire;
import com.hbm.entity.EntityGrenadeFlare;
import com.hbm.entity.EntityGrenadeFrag;
import com.hbm.entity.EntityGrenadeGas;
import com.hbm.entity.EntityGrenadeGeneric;
import com.hbm.entity.EntityGrenadeLemon;
import com.hbm.entity.EntityGrenadeMk2;
import com.hbm.entity.EntityGrenadeNuclear;
import com.hbm.entity.EntityGrenadeNuke;
import com.hbm.entity.EntityGrenadePlasma;
import com.hbm.entity.EntityGrenadePoison;
import com.hbm.entity.EntityGrenadeSchrabidium;
import com.hbm.entity.EntityGrenadeStrong;
import com.hbm.entity.EntityGrenadeTau;
import com.hbm.entity.EntityGrenadeZOMG;
import com.hbm.entity.EntityHunterChopper;
import com.hbm.entity.EntityMiniNuke;
import com.hbm.entity.EntityMirv;
import com.hbm.entity.EntityMissileAntiBallistic;
import com.hbm.entity.EntityMissileBunkerBuster;
import com.hbm.entity.EntityMissileBurst;
import com.hbm.entity.EntityMissileBusterStrong;
import com.hbm.entity.EntityMissileCluster;
import com.hbm.entity.EntityMissileClusterStrong;
import com.hbm.entity.EntityMissileDrill;
import com.hbm.entity.EntityMissileEndo;
import com.hbm.entity.EntityMissileExo;
import com.hbm.entity.EntityMissileGeneric;
import com.hbm.entity.EntityMissileIncendiary;
import com.hbm.entity.EntityMissileIncendiaryStrong;
import com.hbm.entity.EntityMissileInferno;
import com.hbm.entity.EntityMissileMirv;
import com.hbm.entity.EntityMissileNuclear;
import com.hbm.entity.EntityMissileRain;
import com.hbm.entity.EntityMissileStrong;
import com.hbm.entity.EntityNuclearCreeper;
import com.hbm.entity.EntityNukeCloudBig;
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.entity.EntityNukeCloudSmall;
import com.hbm.entity.EntityNukeExplosion;
import com.hbm.entity.EntityNukeExplosionAdvanced;
import com.hbm.entity.EntityRainbow;
import com.hbm.entity.EntityRocket;
import com.hbm.entity.EntitySchrab;
import com.hbm.entity.EntityTestMissile;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.gui.MachineRecipes;
import com.hbm.gui.MachineRecipes.ShredderRecipe;
import com.hbm.handler.FuelHandler;
@ -184,7 +243,15 @@ public class MainRegistry
public static ArmorMaterial enumArmorMaterialT45 = EnumHelper.addArmorMaterial("T45", 1000, new int[] {2, 5, 4, 1}, 0);
public static ArmorMaterial enumArmorMaterialSteel = EnumHelper.addArmorMaterial("STEEL", 20, new int[] {2, 6, 5, 2}, 5);
public static ArmorMaterial enumArmorMaterialTitanium = EnumHelper.addArmorMaterial("TITANIUM", 25, new int[] {3, 8, 6, 3}, 9);
<<<<<<< HEAD
public static ArmorMaterial enumArmorMaterialAlloy = EnumHelper.addArmorMaterial("ALLOY", 40, new int[] {3, 8, 6, 3}, 12);
=======
<<<<<<< HEAD
public static ArmorMaterial enumArmorMaterialAlloy = EnumHelper.addArmorMaterial("ALLOY", 40, new int[] {3, 8, 6, 3}, 12);
=======
public static ArmorMaterial enumArmorMaterialAlloy = EnumHelper.addArmorMaterial("ALLOY", 50, new int[] {3, 8, 6, 3}, 12);
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
public static ArmorMaterial enumArmorMaterialPaa = EnumHelper.addArmorMaterial("PAA", 75, new int[] {3, 8, 6, 3}, 25);
public static ArmorMaterial enumArmorMaterialCmb = EnumHelper.addArmorMaterial("CMB", 60, new int[] {3, 8, 6, 3}, 50);
@ -380,6 +447,7 @@ public class MainRegistry
EntityRegistry.registerModEntity(EntityGrenadeZOMG.class, "entity_grenade_zomg", 49, this, 500, 1, true);
EntityRegistry.registerModEntity(EntityGrenadeASchrab.class, "entity_grenade_aschrab", 50, this, 500, 1, true);
EntityRegistry.registerModEntity(EntityNukeCloudNoShroom.class, "entity_nuke_cloud_no", 51, this, 1000, 1, true);
<<<<<<< HEAD
EntityRegistry.registerModEntity(EntityFalloutRain.class, "entity_fallout", 52, this, 1000, 1, true);
EntityRegistry.registerModEntity(EntityDischarge.class, "entity_emp_discharge", 53, this, 500, 1, true);
EntityRegistry.registerModEntity(EntityEMPBlast.class, "entity_emp_blast", 54, this, 1000, 1, true);
@ -389,6 +457,14 @@ public class MainRegistry
EntityRegistry.registerModEntity(EntityPlasmaBeam.class, "entity_immolator_beam", 58, this, 1000, 1, true);
EntityRegistry.registerModEntity(EntityLN2.class, "entity_LN2", 59, this, 1000, 1, true);
=======
<<<<<<< HEAD
EntityRegistry.registerModEntity(EntityFalloutRain.class, "entity_fallout", 52, this, 1000, 1, true);
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
EntityRegistry.registerGlobalEntityID(EntityNuclearCreeper.class, "entity_mob_nuclear_creeper", EntityRegistry.findGlobalUniqueEntityId(), 0x204131, 0x75CE00);
EntityRegistry.registerGlobalEntityID(EntityHunterChopper.class, "entity_mob_hunter_chopper", EntityRegistry.findGlobalUniqueEntityId(), 0x000020, 0x2D2D72);
}
@ -542,6 +618,10 @@ public class MainRegistry
recipes.overridePreSetRecipe(new ItemStack(Items.quartz), new ItemStack(ModItems.powder_quartz));
recipes.overridePreSetRecipe(new ItemStack(Blocks.quartz_ore), new ItemStack(ModItems.powder_quartz, 2));
recipes.overridePreSetRecipe(new ItemStack(ModBlocks.ore_nether_fire), new ItemStack(ModItems.powder_fire, 6));
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
recipes.overridePreSetRecipe(new ItemStack(ModBlocks.brick_light), new ItemStack(Items.clay_ball, 4));
recipes.overridePreSetRecipe(new ItemStack(ModBlocks.brick_concrete), new ItemStack(Blocks.gravel, 1));
recipes.overridePreSetRecipe(new ItemStack(ModBlocks.brick_obsidian), new ItemStack(ModBlocks.gravel_obsidian, 1));
@ -574,6 +654,11 @@ public class MainRegistry
recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 14), new ItemStack(Items.clay_ball, 4));
recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 15), new ItemStack(Items.clay_ball, 4));
recipes.overridePreSetRecipe(new ItemStack(Blocks.tnt), new ItemStack(Items.gunpowder, 5));
<<<<<<< HEAD
=======
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
recipes.PrintRecipes();
}

27
com/hbm/main/ModEventHandlerClient.java
View File

@ -1,10 +1,21 @@
package com.hbm.main;
<<<<<<< HEAD
import java.util.ArrayList;
import java.util.List;
import com.hbm.entity.mob.EntityHunterChopper;
import com.hbm.entity.projectile.EntityChopperMine;
=======
<<<<<<< HEAD
import java.util.ArrayList;
import java.util.List;
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
import com.hbm.entity.EntityChopperMine;
import com.hbm.entity.EntityHunterChopper;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.lib.Library;
import com.hbm.sound.MovingSoundChopper;
import com.hbm.sound.MovingSoundChopperMine;
@ -22,7 +33,14 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.sound.PlaySoundEvent17;
<<<<<<< HEAD
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
=======
<<<<<<< HEAD
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
public class ModEventHandlerClient {
@ -32,11 +50,20 @@ public class ModEventHandlerClient {
WorldClient wc = Minecraft.getMinecraft().theWorld;
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
//Alright, alright, I give the fuck up, you've wasted my time enough with this bullshit. You win.
//A winner is you.
//Conglaturations.
//Fuck you.
<<<<<<< HEAD
=======
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
if(r.toString().equals("hbm:misc.nullTau") && Library.getClosestPlayerForSound(wc, e.sound.getXPosF(), e.sound.getYPosF(), e.sound.getZPosF(), 2) != null)
{
EntityPlayer ent = Library.getClosestPlayerForSound(wc, e.sound.getXPosF(), e.sound.getYPosF(), e.sound.getZPosF(), 2);

68
com/hbm/render/ItemRenderRevolverInverted.java Normal file
View File

@ -0,0 +1,68 @@
package com.hbm.render;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
import net.minecraftforge.client.IItemRenderer.ItemRendererHelper;
public class ItemRenderRevolverInverted implements IItemRenderer {
protected ModelRevolver swordModel;
public ItemRenderRevolverInverted() {
swordModel = new ModelRevolver();
}
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
switch(type) {
case EQUIPPED:
case EQUIPPED_FIRST_PERSON:
case ENTITY:
return true;
default: return false;
}
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
return false;
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
switch(type) {
case EQUIPPED_FIRST_PERSON:
GL11.glPushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolver.png"));
GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(-0.5F, 0.0F, -0.2F);
//GL11.glScalef(2.0F, 2.0F, 2.0F);
GL11.glScalef(0.5F, 0.5F, 0.5F);
GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
GL11.glPopMatrix();
break;
case EQUIPPED:
case ENTITY:
GL11.glPushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolver.png"));
GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F);
GL11.glTranslatef(0.0F, -0.2F, -0.5F);
//GL11.glScalef(2.0F, 2.0F, 2.0F);
GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
GL11.glPopMatrix();
default: break;
}
}
}

287
com/hbm/render/RenderFallout.java Normal file
View File

@ -0,0 +1,287 @@
package com.hbm.render;
import java.util.Random;
import org.lwjgl.opengl.GL11;
import com.hbm.entity.EntityFalloutRain;
import com.hbm.lib.RefStrings;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Timer;
import net.minecraft.util.Vec3;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.client.IRenderHandler;
public class RenderFallout extends Render {
private Minecraft mc;
private Random random = new Random();
float[] rainXCoords;
float[] rainYCoords;
private int rendererUpdateCount;
long lastTime = System.nanoTime();
private static final ResourceLocation falloutTexture = new ResourceLocation(RefStrings.MODID,
"textures/entity/fallout.png");
@Override
public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
float p_76986_9_) {
if (p_76986_1_ instanceof EntityFalloutRain)
this.render((EntityFalloutRain) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
public void render(EntityFalloutRain p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
float p_76986_8_, float p_76986_9_) {
this.mc = Minecraft.getMinecraft();
EntityLivingBase entitylivingbase = this.mc.renderViewEntity;
Vec3 vector = Vec3.createVectorHelper(entitylivingbase.posX - p_76986_1_.posX,
entitylivingbase.posY - p_76986_1_.posY, entitylivingbase.posZ - p_76986_1_.posZ);
double d = vector.lengthVector();
if (d <= p_76986_1_.getScale()) {
rendererUpdateCount++;
long time = System.nanoTime();
float t = (time - lastTime) / 50000000;
if (t <= 1.0F)
renderRainSnow(t);
else
renderRainSnow(1.0F);
lastTime = time;
}
}
@Override
protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
return null;
}
protected void renderRainSnow(float p_78474_1_) {
IRenderHandler renderer = null;
if ((renderer = this.mc.theWorld.provider.getWeatherRenderer()) != null) {
renderer.render(p_78474_1_, this.mc.theWorld, mc);
return;
}
// float f1 = this.mc.theWorld.getRainStrength(p_78474_1_);
float f1 = 1;
if (f1 > 0.0F) {
// this.enableLightmap((double)p_78474_1_);
if (this.rainXCoords == null) {
this.rainXCoords = new float[1024];
this.rainYCoords = new float[1024];
for (int i = 0; i < 32; ++i) {
for (int j = 0; j < 32; ++j) {
float f2 = (float) (j - 16);
float f3 = (float) (i - 16);
float f4 = MathHelper.sqrt_float(f2 * f2 + f3 * f3);
this.rainXCoords[i << 5 | j] = -f3 / f4;
this.rainYCoords[i << 5 | j] = f2 / f4;
}
}
}
EntityLivingBase entitylivingbase = this.mc.renderViewEntity;
WorldClient worldclient = this.mc.theWorld;
int k2 = MathHelper.floor_double(entitylivingbase.posX);
int l2 = MathHelper.floor_double(entitylivingbase.posY);
int i3 = MathHelper.floor_double(entitylivingbase.posZ);
Tessellator tessellator = Tessellator.instance;
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glNormal3f(0.0F, 1.0F, 0.0F);
GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
double d0 = entitylivingbase.lastTickPosX
+ (entitylivingbase.posX - entitylivingbase.lastTickPosX) * (double) p_78474_1_;
double d1 = entitylivingbase.lastTickPosY
+ (entitylivingbase.posY - entitylivingbase.lastTickPosY) * (double) p_78474_1_;
double d2 = entitylivingbase.lastTickPosZ
+ (entitylivingbase.posZ - entitylivingbase.lastTickPosZ) * (double) p_78474_1_;
int k = MathHelper.floor_double(d1);
byte b0 = 5;
if (this.mc.gameSettings.fancyGraphics) {
b0 = 10;
}
boolean flag = false;
byte b1 = -1;
float f5 = (float) this.rendererUpdateCount + p_78474_1_;
if (this.mc.gameSettings.fancyGraphics) {
b0 = 10;
}
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
flag = false;
for (int l = i3 - b0; l <= i3 + b0; ++l) {
for (int i1 = k2 - b0; i1 <= k2 + b0; ++i1) {
int j1 = (l - i3 + 16) * 32 + i1 - k2 + 16;
float f6 = this.rainXCoords[j1] * 0.5F;
float f7 = this.rainYCoords[j1] * 0.5F;
BiomeGenBase biomegenbase = worldclient.getBiomeGenForCoords(i1, l);
if (true) {
int k1 = worldclient.getPrecipitationHeight(i1, l);
int l1 = l2 - b0;
int i2 = l2 + b0;
if (l1 < k1) {
l1 = k1;
}
if (i2 < k1) {
i2 = k1;
}
float f8 = 1.0F;
int j2 = k1;
if (k1 < k) {
j2 = k;
}
if (l1 != i2) {
this.random.setSeed((long) (i1 * i1 * 3121 + i1 * 45238971 ^ l * l * 418711 + l * 13761));
float f9 = biomegenbase.getFloatTemperature(i1, l1, l);
float f10;
double d4;
/*
* if (false) { if (b1 != 0) { if (b1 >= 0) {
* tessellator.draw(); }
*
* b1 = 0;
* this.mc.getTextureManager().bindTexture(this.
* falloutTexture); tessellator.startDrawingQuads();
* //System.out.println("Called!"); }
*
* f10 = ((float)(this.rendererUpdateCount + i1 * i1
* * 3121 + i1 * 45238971 + l * l * 418711 + l *
* 13761 & 31) + p_78474_1_) / 32.0F * (3.0F +
* this.random.nextFloat()); double d3 =
* (double)((float)i1 + 0.5F) -
* entitylivingbase.posX; d4 = (double)((float)l +
* 0.5F) - entitylivingbase.posZ; float f12 =
* MathHelper.sqrt_double(d3 * d3 + d4 * d4) /
* (float)b0; float f13 = 1.0F;
* tessellator.setBrightness(worldclient.
* getLightBrightnessForSkyBlocks(i1, j2, l, 0));
* tessellator.setColorRGBA_F(f13, f13, f13, ((1.0F
* - f12 * f12) * 0.5F + 0.5F) * f1);
* tessellator.setTranslation(-d0 * 1.0D, -d1 *
* 1.0D, -d2 * 1.0D);
* tessellator.addVertexWithUV((double)((float)i1 -
* f6) + 0.5D, (double)l1, (double)((float)l - f7) +
* 0.5D, (double)(0.0F * f8), (double)((float)l1 *
* f8 / 4.0F + f10 * f8));
* tessellator.addVertexWithUV((double)((float)i1 +
* f6) + 0.5D, (double)l1, (double)((float)l + f7) +
* 0.5D, (double)(1.0F * f8), (double)((float)l1 *
* f8 / 4.0F + f10 * f8));
* tessellator.addVertexWithUV((double)((float)i1 +
* f6) + 0.5D, (double)i2, (double)((float)l + f7) +
* 0.5D, (double)(1.0F * f8), (double)((float)i2 *
* f8 / 4.0F + f10 * f8));
* tessellator.addVertexWithUV((double)((float)i1 -
* f6) + 0.5D, (double)i2, (double)((float)l - f7) +
* 0.5D, (double)(0.0F * f8), (double)((float)i2 *
* f8 / 4.0F + f10 * f8));
* tessellator.setTranslation(0.0D, 0.0D, 0.0D); }
* else
*/
{
if (b1 != 1) {
if (b1 >= 0) {
tessellator.draw();
}
b1 = 1;
this.mc.getTextureManager().bindTexture(this.falloutTexture);
tessellator.startDrawingQuads();
}
f10 = ((float) (this.rendererUpdateCount & 511) + p_78474_1_) / 512.0F;
float f16 = this.random.nextFloat() + f5 * 0.01F * (float) this.random.nextGaussian();
float f11 = this.random.nextFloat() + f5 * (float) this.random.nextGaussian() * 0.001F;
d4 = (double) ((float) i1 + 0.5F) - entitylivingbase.posX;
double d5 = (double) ((float) l + 0.5F) - entitylivingbase.posZ;
float f14 = MathHelper.sqrt_double(d4 * d4 + d5 * d5) / (float) b0;
float f15 = 1.0F;
tessellator.setBrightness(
(worldclient.getLightBrightnessForSkyBlocks(i1, j2, l, 0) * 3 + 15728880) / 4);
tessellator.setColorRGBA_F(f15, f15, f15, ((1.0F - f14 * f14) * 0.3F + 0.5F) * f1);
tessellator.setTranslation(-d0 * 1.0D, -d1 * 1.0D, -d2 * 1.0D);
tessellator.addVertexWithUV((double) ((float) i1 - f6) + 0.5D, (double) l1,
(double) ((float) l - f7) + 0.5D, (double) (0.0F * f8 + f16),
(double) ((float) l1 * f8 / 4.0F + f10 * f8 + f11));
tessellator.addVertexWithUV((double) ((float) i1 + f6) + 0.5D, (double) l1,
(double) ((float) l + f7) + 0.5D, (double) (1.0F * f8 + f16),
(double) ((float) l1 * f8 / 4.0F + f10 * f8 + f11));
tessellator.addVertexWithUV((double) ((float) i1 + f6) + 0.5D, (double) i2,
(double) ((float) l + f7) + 0.5D, (double) (1.0F * f8 + f16),
(double) ((float) i2 * f8 / 4.0F + f10 * f8 + f11));
tessellator.addVertexWithUV((double) ((float) i1 - f6) + 0.5D, (double) i2,
(double) ((float) l - f7) + 0.5D, (double) (0.0F * f8 + f16),
(double) ((float) i2 * f8 / 4.0F + f10 * f8 + f11));
tessellator.setTranslation(0.0D, 0.0D, 0.0D);
}
}
}
}
}
if (b1 >= 0) {
tessellator.draw();
// System.out.println("Fired!");
}
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glDisable(GL11.GL_BLEND);
GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
// this.disableLightmap((double)p_78474_1_);
}
}
/*
* public void enableLightmap(double p_78463_1_) {
* OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
* GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glLoadIdentity(); float f =
* 0.00390625F; GL11.glScalef(f, f, f); GL11.glTranslatef(8.0F, 8.0F, 8.0F);
* GL11.glMatrixMode(GL11.GL_MODELVIEW);
* this.mc.getTextureManager().bindTexture(this.locationLightMap);
* GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER,
* GL11.GL_LINEAR); GL11.glTexParameteri(GL11.GL_TEXTURE_2D,
* GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
* GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER,
* GL11.GL_LINEAR); GL11.glTexParameteri(GL11.GL_TEXTURE_2D,
* GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
* GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S,
* GL11.GL_CLAMP); GL11.glTexParameteri(GL11.GL_TEXTURE_2D,
* GL11.GL_TEXTURE_WRAP_T, GL11.GL_CLAMP); GL11.glColor4f(1.0F, 1.0F, 1.0F,
* 1.0F); GL11.glEnable(GL11.GL_TEXTURE_2D);
* OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); }
*/
}

137
com/hbm/render/RenderNoCloud.java Normal file
View File

@ -0,0 +1,137 @@
package com.hbm.render;
import java.util.Random;
import org.lwjgl.opengl.GL11;
import com.hbm.entity.EntityNukeCloudNoShroom;
import com.hbm.lib.RefStrings;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
public class RenderNoCloud extends Render {
private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/NukeCloudSmall.obj");
private IModelCustom blastModel;
private ResourceLocation blastTexture;
private static final ResourceLocation ringModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/Ring.obj");
private IModelCustom ringModel;
private ResourceLocation ringTexture;
private static final ResourceLocation ringBigModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/RingBig.obj");
private IModelCustom ringBigModel;
private ResourceLocation ringBigTexture;
public float scale = 0;
public float ring = 0;
public RenderNoCloud() {
blastModel = AdvancedModelLoader.loadModel(objTesterModelRL);
blastTexture = new ResourceLocation(RefStrings.MODID, "textures/models/NukeCloudFire.png");
ringModel = AdvancedModelLoader.loadModel(ringModelRL);
ringTexture = new ResourceLocation(RefStrings.MODID, "textures/models/Ring2.png");
ringBigModel = AdvancedModelLoader.loadModel(ringBigModelRL);
ringBigTexture = new ResourceLocation(RefStrings.MODID, "textures/models/Ring2.png");
scale = 0;
ring = 0;
}
@Override
public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
if(((EntityNukeCloudNoShroom)p_76986_1_).age > 100)
{ } else {
this.renderFlare((EntityNukeCloudNoShroom)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
this.renderRing((EntityNukeCloudNoShroom)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
public void renderRing(EntityNukeCloudNoShroom p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
GL11.glPushMatrix();
GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glTranslatef(0.0F, 18F, 0.0F);
//ring += 0.1F;
GL11.glScalef(p_76986_1_.ring * 10, 30F, p_76986_1_.ring * 10);
bindTexture(ringTexture);
ringModel.renderAll();
GL11.glPopMatrix();
}
public void renderFlare(EntityNukeCloudNoShroom p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
Tessellator tessellator = Tessellator.instance;
RenderHelper.disableStandardItemLighting();
float f1 = (p_76986_1_.ticksExisted + 2.0F) / 200.0F;
float f2 = 0.0F;
int count = 250;
if(p_76986_1_.ticksExisted < 250)
{
count = p_76986_1_.ticksExisted * 3;
}
if (f1 > 0.8F)
{
f2 = (f1 - 0.8F) / 0.2F;
}
Random random = new Random(432L);
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glShadeModel(GL11.GL_SMOOTH);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glDepthMask(false);
GL11.glPushMatrix();
//GL11.glTranslatef(0.0F, -1.0F, -2.0F);
GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_ + 15, (float)p_76986_6_);
GL11.glScalef(5F, 5F, 5F);
//for (int i = 0; (float)i < (f1 + f1 * f1) / 2.0F * 60.0F; ++i)
for(int i = 0; i < count; i++)
{
GL11.glRotatef(random.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(random.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(random.nextFloat() * 360.0F + f1 * 90.0F, 0.0F, 0.0F, 1.0F);
tessellator.startDrawing(6);
float f3 = random.nextFloat() * 20.0F + 5.0F + f2 * 10.0F;
float f4 = random.nextFloat() * 2.0F + 1.0F + f2 * 2.0F;
//tessellator.setColorRGBA_I(16777215, (int)(255.0F * (1.0F - f2)));
tessellator.setColorRGBA_I(59345715, (int)(255.0F * (1.0F - f2)));
tessellator.addVertex(0.0D, 0.0D, 0.0D);
//tessellator.setColorRGBA_I(16711935, 0);
tessellator.setColorRGBA_I(59345735, 0);
tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4);
tessellator.addVertex(0.866D * f4, f3, -0.5F * f4);
tessellator.addVertex(0.0D, f3, 1.0F * f4);
tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4);
tessellator.draw();
}
GL11.glPopMatrix();
GL11.glDepthMask(true);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glDisable(GL11.GL_BLEND);
GL11.glShadeModel(GL11.GL_FLAT);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glEnable(GL11.GL_ALPHA_TEST);
RenderHelper.enableStandardItemLighting();
}
@Override
protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
return null;
}
}

4
com/hbm/sound/MovingSoundChopper.java
View File

@ -1,6 +1,10 @@
package com.hbm.sound;
<<<<<<< HEAD
import com.hbm.entity.mob.EntityHunterChopper;
=======
import com.hbm.entity.EntityHunterChopper;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.items.ModItems;
import com.hbm.sound.MovingSoundPlayerLoop.EnumHbmSound;

4
com/hbm/sound/MovingSoundChopperMine.java
View File

@ -1,6 +1,10 @@
package com.hbm.sound;
<<<<<<< HEAD
import com.hbm.entity.mob.EntityHunterChopper;
=======
import com.hbm.entity.EntityHunterChopper;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.sound.MovingSoundPlayerLoop.EnumHbmSound;
import net.minecraft.entity.Entity;

4
com/hbm/sound/MovingSoundCrashing.java
View File

@ -1,6 +1,10 @@
package com.hbm.sound;
<<<<<<< HEAD
import com.hbm.entity.mob.EntityHunterChopper;
=======
import com.hbm.entity.EntityHunterChopper;
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
import com.hbm.sound.MovingSoundPlayerLoop.EnumHbmSound;
import net.minecraft.entity.Entity;

18
com/hbm/sound/MovingSoundPlayerLoop.java
View File

@ -9,9 +9,20 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
public abstract class MovingSoundPlayerLoop extends MovingSound {
<<<<<<< HEAD
public static List<MovingSoundPlayerLoop> globalSoundList = new ArrayList<MovingSoundPlayerLoop>();
public List<Entity> playerForSound = new ArrayList<Entity>();
=======
<<<<<<< HEAD
public static List<MovingSoundPlayerLoop> globalSoundList = new ArrayList<MovingSoundPlayerLoop>();
public List<Entity> playerForSound = new ArrayList<Entity>();
=======
public static List<MovingSoundPlayerLoop> globalSoundList = new ArrayList<MovingSoundPlayerLoop>();
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
public Entity player;
public enum EnumHbmSound { soundTauLoop, soundChopperLoop, soundCrashingLoop, soundMineLoop };
public EnumHbmSound type;
@ -41,7 +52,14 @@ public abstract class MovingSoundPlayerLoop extends MovingSound {
}
public void stop() {
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
this.donePlaying = true;
this.repeat = false;
while(MovingSoundPlayerLoop.getSoundByPlayer(player, type) != null)

8
com/hbm/sound/MovingSoundXVL1456.java
View File

@ -26,7 +26,15 @@ public class MovingSoundXVL1456 extends MovingSoundPlayerLoop {
i = ((EntityPlayer)this.player).getItemInUse();
}
<<<<<<< HEAD
//this.setPitch(this.getPitch() + 0.1F);
=======
<<<<<<< HEAD
//this.setPitch(this.getPitch() + 0.1F);
=======
this.setPitch(this.getPitch() + 0.1F);
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
>>>>>>> 5525318475377d238c79edc90a14ee8fa48397af
if(i == null || (i != null && i.getItem() != ModItems.gun_xvl1456) || !((EntityPlayer)this.player).isSneaking() || ((EntityPlayer)this.player).getItemInUseDuration() <= 0)
this.stop();