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

fixed radsavedata, added geiger to structures, pip-esque revolvers

Browse Source
This commit is contained in:
HbmMods 2018-12-08 17:39:50 +01:00
parent e3eac72e4e
commit ec269c0101
39 changed files with 288 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,9 +338,9 @@ tile.machine_lithium_battery.name=Li-Ion-Energiespeicherblock
tile.machine_schrabidium_battery.name=Schrabidium-Energiespeicherblock
tile.machine_dineutronium_battery.name=Spark Energiespeicherblock
container.battery=Energiespeicher
tile.machine_coal_off.name=Kohlegenerator
tile.machine_coal_on.name=Kohlegenerator
container.machineCoal=Kohlegenerator
tile.machine_coal_off.name=Verbrennungsgenerator
tile.machine_coal_on.name=Verbrennungsgenerator
container.machineCoal=Verbrennungsgenerator
tile.machine_boiler_off.name=Dampfkessel
tile.machine_boiler_on.name=Dampfkessel
container.machineBoiler=Dampfkessel
@ -400,8 +400,8 @@ tile.crate_steel.name=Stahlkiste
container.crateSteel=Stahlkiste
tile.safe.name=Panzerschrank
container.safe=Panzerschrank
tile.machine_press.name=Dampfpresse
container.press=Dampfpresse
tile.machine_press.name=Befeuerte Presse
container.press=Befeuerte Presse
tile.machine_siren.name=Sirene
container.siren=Sirene
tile.machine_radgen.name=Strahlenbetriebener Generator
@ -1194,6 +1194,9 @@ item.gun_revolver_cursed.name=Verfluchte Pistole
item.gun_revolver_nightmare.name=Nightmare-Revolver (Original)
item.gun_revolver_nightmare2.name=Nightmare-Revolver (Dunkel)
item.gun_revolver_pip.name=Lil' Pipsqueak
item.gun_revolver_nopip.name=Novac
item.gun_revolver_blackjack.name=Blackjack Five-Shooter
item.gun_revolver_red.name=Roter Schlüssel-Revolver
item.gun_calamity.name=Calamity
item.gun_calamity_dual.name=Sattelkanone
item.gun_fatman.name=M42 Nukleares Katapult "Fat Man"
@ -1241,6 +1244,7 @@ item.gun_revolver_cursed_ammo.name=Stahlpatrone
item.gun_revolver_nightmare_ammo.name=Nightmare-Kugel
item.gun_revolver_nightmare2_ammo.name=Laserschrot
item.gun_revolver_pip_ammo.name=Verdorbene Patrone
item.gun_revolver_nopip_ammo.name=.44 Magnumpatrone
item.gun_calamity_ammo.name=.50 BMG Patrone
item.gun_fatman_ammo.name=Miniatombombe
item.gun_mirv_ammo.name=Achtfaches MIRV

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

@ -338,9 +338,9 @@ tile.machine_lithium_battery.name=Li-Ion Energy Storage Block
tile.machine_schrabidium_battery.name=Schrabidium Energy Storage Block
tile.machine_dineutronium_battery.name=Spark Energy Storage Block
container.battery=Energy Storage
tile.machine_coal_off.name=Coal Generator
tile.machine_coal_on.name=Coal Generator
container.machineCoal=Coal Generator
tile.machine_coal_off.name=Combustion Generator
tile.machine_coal_on.name=Combustion Generator
container.machineCoal=Combustion Generator
tile.machine_boiler_off.name=Boiler
tile.machine_boiler_on.name=Boiler
container.machineBoiler=Boiler
@ -400,8 +400,8 @@ tile.crate_steel.name=Steel Crate
container.crateSteel=Steel Crate
tile.safe.name=Safe
container.safe=Safe
tile.machine_press.name=Steam Press
container.press=Steam Press
tile.machine_press.name=Burner Press
container.press=Burner Press
tile.machine_siren.name=Siren
container.siren=Siren
tile.machine_radgen.name=Radiation-Powered Engine
@ -1194,6 +1194,9 @@ item.gun_revolver_cursed.name=Cursed Revolver
item.gun_revolver_nightmare.name=Nightmare Revolver (Original)
item.gun_revolver_nightmare2.name=Nightmare Revolver (Dark)
item.gun_revolver_pip.name=Lil' Pipsqueak
item.gun_revolver_nopip.name=Novac
item.gun_revolver_blackjack.name=Blackjack Five-Shooter
item.gun_revolver_red.name=Red Key Revolver
item.gun_calamity.name=Calamity
item.gun_calamity_dual.name=Saddle Gun
item.gun_fatman.name=M42 Nuclear Catapult "Fat Man"
@ -1241,6 +1244,7 @@ item.gun_revolver_cursed_ammo.name=Steel Bullet
item.gun_revolver_nightmare_ammo.name=Nightmare Bullet
item.gun_revolver_nightmare2_ammo.name=Laser Buckshot
item.gun_revolver_pip_ammo.name=Tainted Bullet
item.gun_revolver_nopip_ammo.name=.44 Magnum Bullet
item.gun_calamity_ammo.name=.50 BMG Round
item.gun_fatman_ammo.name=Mini Nuke
item.gun_mirv_ammo.name=Eightfold MIRV

3
assets/hbm/sounds.json
View File

@ -135,5 +135,6 @@
"alarm.foKlaxonB": {"category": "record", "sounds": [{"name": "alarm/foKlaxonB", "stream": false}]},
"alarm.nostromoSiren": {"category": "record", "sounds": [{"name": "alarm/nostromoSiren", "stream": false}]},
"alarm.easAlarm": {"category": "record", "sounds": [{"name": "alarm/easAlarm", "stream": false}]},
"alarm.airRaid": {"category": "record", "sounds": [{"name": "alarm/airRaid", "stream": true}]}
"alarm.airRaid": {"category": "record", "sounds": [{"name": "alarm/airRaid", "stream": true}]},
"alarm.classic": {"category": "record", "sounds": [{"name": "alarm/classicSiren", "stream": true}]}
}

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 421 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 274 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 260 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 212 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 283 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 275 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

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

@ -715,18 +715,18 @@ public class ModBlocks {
block_meteor_molten = new BlockOre(Material.rock, true).setBlockName("block_meteor_molten").setLightLevel(0.75F).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":block_meteor_molten");
block_meteor_treasure = new BlockOre(Material.rock).setBlockName("block_meteor_treasure").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":block_meteor_treasure");
tape_recorder = new DecoTapeRecorder(Material.rock).setBlockName("tape_recorder").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_tape_recorder");
steel_poles = new DecoSteelPoles(Material.rock).setBlockName("steel_poles").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_steel_poles");
pole_top = new DecoPoleTop(Material.rock).setBlockName("pole_top").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_pole_top");
pole_satellite_receiver = new DecoPoleSatelliteReceiver(Material.rock).setBlockName("pole_satellite_receiver").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_satellite_receiver");
steel_wall = new DecoBlock(Material.rock).setBlockName("steel_wall").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_wall");
tape_recorder = new DecoTapeRecorder(Material.rock).setBlockName("tape_recorder").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_tape_recorder");
steel_poles = new DecoSteelPoles(Material.rock).setBlockName("steel_poles").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_steel_poles");
pole_top = new DecoPoleTop(Material.rock).setBlockName("pole_top").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_pole_top");
pole_satellite_receiver = new DecoPoleSatelliteReceiver(Material.rock).setBlockName("pole_satellite_receiver").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_satellite_receiver");
steel_wall = new DecoBlock(Material.rock).setBlockName("steel_wall").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_wall");
steel_corner = new DecoBlock(Material.rock).setBlockName("steel_corner").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_corner");
steel_roof = new DecoBlock(Material.rock).setBlockName("steel_roof").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_roof");
steel_beam = new DecoBlock(Material.rock).setBlockName("steel_beam").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_beam");
steel_scaffold = new DecoBlock(Material.rock).setBlockName("steel_scaffold").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_scaffold");
steel_roof = new DecoBlock(Material.rock).setBlockName("steel_roof").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_roof");
steel_beam = new DecoBlock(Material.rock).setBlockName("steel_beam").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_beam");
steel_scaffold = new DecoBlock(Material.rock).setBlockName("steel_scaffold").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_scaffold");
broadcaster_pc = new PinkCloudBroadcaster(Material.rock).setBlockName("broadcaster_pc").setCreativeTab(MainRegistry.machineTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":broadcaster_pc");
geiger = new GeigerCounter(Material.rock).setBlockName("geiger").setCreativeTab(MainRegistry.machineTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":geiger");
broadcaster_pc = new PinkCloudBroadcaster(Material.rock).setBlockName("broadcaster_pc").setCreativeTab(MainRegistry.machineTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":broadcaster_pc");
geiger = new GeigerCounter(Material.rock).setBlockName("geiger").setCreativeTab(MainRegistry.machineTab).setHardness(15.0F).setResistance(0.25F).setBlockTextureName(RefStrings.MODID + ":geiger");
mush = new BlockMush(Material.plants).setBlockName("mush").setCreativeTab(MainRegistry.blockTab).setLightLevel(0.5F).setStepSound(Block.soundTypeGrass).setBlockTextureName(RefStrings.MODID + ":mush");
mush_block = new BlockMushHuge(Material.plants).setBlockName("mush_block").setLightLevel(1.0F).setStepSound(Block.soundTypeGrass).setHardness(0.2F).setBlockTextureName(RefStrings.MODID + ":mush_block_skin");
@ -828,7 +828,7 @@ public class ModBlocks {
machine_diesel = new MachineDiesel(Material.iron).setBlockName("machine_diesel").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
machine_shredder = new MachineShredder(Material.iron).setBlockName("machine_shredder").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
machine_shredder_large = new MachineShredderLarge(Material.iron).setBlockName("machine_shredder_large").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
machine_shredder_large = new MachineShredderLarge(Material.iron).setBlockName("machine_shredder_large").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":code");
machine_combine_factory = new MachineCMBFactory(Material.iron).setBlockName("machine_combine_factory").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);

2
com/hbm/blocks/generic/BlockMush.java
View File

@ -125,7 +125,7 @@ public class BlockMush extends Block implements IGrowable {
public void updateTick(World world, int x, int y, int z, Random rand)
{
this.checkAndDropBlock(world, x, y, z);
if(world.getBlock(x, y - 1, z) == ModBlocks.waste_earth && rand.nextInt(5) == 0 && MainRegistry.enableMycelium)
if(world.getBlock(x, y - 1, z) == ModBlocks.waste_earth && rand.nextInt(5) == 0)
{
world.setBlock(x, y - 1, z, ModBlocks.waste_mycelium);
}

2
com/hbm/blocks/generic/WasteEarth.java
View File

@ -132,7 +132,7 @@ public class WasteEarth extends Block {
world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world));
}
if((this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium) && world.getBlock(x, y + 1, z) == Blocks.air && rand.nextInt(10) == 0 && MainRegistry.enableMycelium)
if((this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium) && world.getBlock(x, y + 1, z) == Blocks.air && rand.nextInt(1000) == 0)
{
Block b0;
int count = 0;

2
com/hbm/blocks/machine/MachineShredderLarge.java
View File

@ -1,6 +1,6 @@
package com.hbm.blocks.machine;
import com.hbm.tileentity.machinee.TileEntityMachineShredderLarge;
import com.hbm.tileentity.machine.TileEntityMachineShredderLarge;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;

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

@ -2670,6 +2670,16 @@ public class MachineRecipes {
list.add(new ItemStack(ModItems.powder_tungsten, 6));
list.add(new ItemStack(ModItems.ingot_desh, 4));
break;
case UPGRADE_RANGE:
list.add(new ItemStack(ModItems.upgrade_template, 1));
list.add(new ItemStack(Items.glowstone_dust, 6));
list.add(new ItemStack(ModItems.powder_diamond, 4));
break;
case UPGRADE_HEALTH:
list.add(new ItemStack(ModItems.upgrade_template, 1));
list.add(new ItemStack(Items.glowstone_dust, 6));
list.add(new ItemStack(ModItems.powder_titanium, 4));
break;
case FUSE:
list.add(new ItemStack(ModItems.plate_steel, 2));
list.add(new ItemStack(Blocks.glass_pane, 1));
@ -3753,6 +3763,17 @@ public class MachineRecipes {
list.add(new ItemStack(ModItems.circuit_gold, 4));
list.add(new ItemStack(ModItems.coil_copper, 12));
break;
case FORCEFIELD:
list.add(new ItemStack(ModItems.plate_advanced_alloy, 8));
list.add(new ItemStack(ModItems.plate_desh, 4));
list.add(new ItemStack(ModItems.coil_gold_torus, 6));
list.add(new ItemStack(ModItems.coil_magnetized_tungsten, 12));
list.add(new ItemStack(ModItems.motor, 1));
list.add(new ItemStack(ModItems.upgrade_radius, 1));
list.add(new ItemStack(ModItems.upgrade_health, 1));
list.add(new ItemStack(ModItems.circuit_targeting_tier5, 1));
list.add(new ItemStack(ModBlocks.machine_transformer, 1));
break;
default:
list.add(new ItemStack(Items.stick));
break;
@ -4105,6 +4126,12 @@ public class MachineRecipes {
case UPGRADE_PINK_III:
output = new ItemStack(ModItems.upgrade_afterburn_3, 1);
break;
case UPGRADE_RANGE:
output = new ItemStack(ModItems.upgrade_radius, 1);
break;
case UPGRADE_HEALTH:
output = new ItemStack(ModItems.upgrade_health, 1);
break;
case FUSE:
output = new ItemStack(ModItems.fuse, 1);
break;
@ -4576,6 +4603,9 @@ public class MachineRecipes {
case RADAR:
output = new ItemStack(ModBlocks.machine_radar, 1);
break;
case FORCEFIELD:
output = new ItemStack(ModBlocks.machine_forcefield, 1);
break;
default:
output = new ItemStack(Items.stick, 1);
break;

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

@ -751,6 +751,10 @@ public class ModItems {
public static Item gun_revolver_nightmare2_ammo;
public static Item gun_revolver_pip;
public static Item gun_revolver_pip_ammo;
public static Item gun_revolver_nopip;
public static Item gun_revolver_blackjack;
public static Item gun_revolver_red;
public static Item gun_revolver_nopip_ammo;
public static Item gun_calamity;
public static Item gun_calamity_dual;
public static Item gun_calamity_ammo;
@ -1192,6 +1196,8 @@ public class ModItems {
public static Item euphemium_kit;
public static Item solinium_kit;
public static Item hazmat_kit;
public static Item hazmat_red_kit;
public static Item hazmat_grey_kit;
public static Item clip_revolver_iron;
public static Item clip_revolver;
@ -2063,6 +2069,10 @@ public class ModItems {
gun_revolver_nightmare2 = new GunNightmare().setMaxDamage(6).setUnlocalizedName("gun_revolver_nightmare2").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2");
gun_revolver_pip_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_pip_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_pip_ammo");
gun_revolver_pip = new GunRevolver(gun_revolver_pip_ammo, 25, 35, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_pip");
gun_revolver_nopip_ammo = new Item().setUnlocalizedName("gun_revolver_nopip_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nopip_ammo");
gun_revolver_nopip = new GunRevolver(gun_revolver_nopip_ammo, 25, 35, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_nopip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nopip");
gun_revolver_blackjack = new GunRevolver(gun_revolver_nopip_ammo, 35, 45, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_blackjack").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_blackjack");
gun_revolver_red = new GunRevolver(gun_revolver_nopip_ammo, 100, 105, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_red").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_red");
gun_calamity_ammo = new ItemCustomLore().setUnlocalizedName("gun_calamity_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_calamity_ammo");
gun_calamity = new GunCalamity().setUnlocalizedName("gun_calamity").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_calamity");
gun_calamity_dual = new GunCalamity().setUnlocalizedName("gun_calamity_dual").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_calamity_dual");
@ -2345,6 +2355,8 @@ public class ModItems {
euphemium_kit = new ItemStarterKit().setUnlocalizedName("euphemium_kit").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":code");
solinium_kit = new ItemStarterKit().setUnlocalizedName("solinium_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_kit");
hazmat_kit = new ItemStarterKit().setUnlocalizedName("hazmat_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":hazmat_kit");
hazmat_red_kit = new ItemStarterKit().setUnlocalizedName("hazmat_red_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":hazmat_red_kit");
hazmat_grey_kit = new ItemStarterKit().setUnlocalizedName("hazmat_grey_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":hazmat_grey_kit");
clip_revolver_iron = new ItemClip().setUnlocalizedName("clip_revolver_iron").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":clip_revolver_iron");
clip_revolver = new ItemClip().setUnlocalizedName("clip_revolver").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":clip_revolver");
@ -3539,6 +3551,9 @@ public class ModItems {
GameRegistry.registerItem(gun_revolver_nightmare, gun_revolver_nightmare.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_nightmare2, gun_revolver_nightmare2.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_pip, gun_revolver_pip.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_nopip, gun_revolver_nopip.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_blackjack, gun_revolver_blackjack.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_red, gun_revolver_red.getUnlocalizedName());
GameRegistry.registerItem(gun_calamity, gun_calamity.getUnlocalizedName());
GameRegistry.registerItem(gun_calamity_dual, gun_calamity_dual.getUnlocalizedName());
GameRegistry.registerItem(gun_b92, gun_b92.getUnlocalizedName());
@ -3592,6 +3607,7 @@ public class ModItems {
GameRegistry.registerItem(gun_revolver_nightmare_ammo, gun_revolver_nightmare_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_nightmare2_ammo, gun_revolver_nightmare2_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_pip_ammo, gun_revolver_pip_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_nopip_ammo, gun_revolver_nopip_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_calamity_ammo, gun_calamity_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_b92_ammo, gun_b92_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName());
@ -4027,6 +4043,8 @@ public class ModItems {
GameRegistry.registerItem(grenade_kit, grenade_kit.getUnlocalizedName());
GameRegistry.registerItem(t45_kit, t45_kit.getUnlocalizedName());
GameRegistry.registerItem(hazmat_kit, hazmat_kit.getUnlocalizedName());
GameRegistry.registerItem(hazmat_red_kit, hazmat_red_kit.getUnlocalizedName());
GameRegistry.registerItem(hazmat_grey_kit, hazmat_grey_kit.getUnlocalizedName());
GameRegistry.registerItem(euphemium_kit, euphemium_kit.getUnlocalizedName());
GameRegistry.registerItem(letter, letter.getUnlocalizedName());

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

@ -25,10 +25,9 @@ public class ItemStarterKit extends Item {
public ItemStarterKit()
{
this.maxStackSize = 1;
this.setMaxDamage(1);
}
private void giveHaz(World world, EntityPlayer p) {
private void giveHaz(World world, EntityPlayer p, int tier) {
for(int i = 0; i < 4; i++) {
@ -37,10 +36,26 @@ public class ItemStarterKit extends Item {
}
}
p.inventory.armorInventory[3] = new ItemStack(ModItems.hazmat_helmet);
p.inventory.armorInventory[2] = new ItemStack(ModItems.hazmat_plate);
p.inventory.armorInventory[1] = new ItemStack(ModItems.hazmat_legs);
p.inventory.armorInventory[0] = new ItemStack(ModItems.hazmat_boots);
switch(tier) {
case 0:
p.inventory.armorInventory[3] = new ItemStack(ModItems.hazmat_helmet);
p.inventory.armorInventory[2] = new ItemStack(ModItems.hazmat_plate);
p.inventory.armorInventory[1] = new ItemStack(ModItems.hazmat_legs);
p.inventory.armorInventory[0] = new ItemStack(ModItems.hazmat_boots);
break;
case 1:
p.inventory.armorInventory[3] = new ItemStack(ModItems.hazmat_helmet_red);
p.inventory.armorInventory[2] = new ItemStack(ModItems.hazmat_plate_red);
p.inventory.armorInventory[1] = new ItemStack(ModItems.hazmat_legs_red);
p.inventory.armorInventory[0] = new ItemStack(ModItems.hazmat_boots_red);
break;
case 2:
p.inventory.armorInventory[3] = new ItemStack(ModItems.hazmat_helmet_grey);
p.inventory.armorInventory[2] = new ItemStack(ModItems.hazmat_plate_grey);
p.inventory.armorInventory[1] = new ItemStack(ModItems.hazmat_legs_grey);
p.inventory.armorInventory[0] = new ItemStack(ModItems.hazmat_boots_grey);
break;
}
}
@Override
@ -96,7 +111,9 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_assembler, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_chemplant, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_reactor_small, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_turbine, 2));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.radaway, 8));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.radx, 2));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.stamp_titanium_flat, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.stamp_titanium_flat, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.stamp_titanium_flat, 1));
@ -106,7 +123,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.gas_mask_m65, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.geiger_counter, 1));
giveHaz(world, player);
giveHaz(world, player, 1);
}
if(this == ModItems.nuke_advanced_kit)
@ -167,6 +184,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_reactor, 2));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_rtg_furnace_off, 2));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_reactor_small, 4));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_turbine, 4));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_radgen, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_rtg_grey, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_assembler, 3));
@ -181,14 +199,15 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.cell_empty, 32));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.rod_empty, 32));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 4, FluidType.COOLANT.getID()));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.radaway, 4));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.radaway_strong, 4));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.radx, 4));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.pill_iodine, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.tritium_deuterium_cake, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.geiger_counter, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.survey_scanner, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.gas_mask_m65, 1));
giveHaz(world, player);
giveHaz(world, player, 2);
}
if(this == ModItems.nuke_commercially_kit)
@ -237,6 +256,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_rtg_furnace_off, 3));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_rtg_grey, 2));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_reactor_small, 8));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_turbine, 16));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_lithium_battery, 4));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.red_cable, 32));
player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.red_wire_coated, 8));
@ -249,11 +269,13 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.pellet_rtg_weak, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.pellet_rtg_weak, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.pellet_rtg_weak, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.radaway, 4));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.radaway_strong, 8));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.radaway_flush, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.radx, 2));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.pill_iodine, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.geiger_counter, 1));
giveHaz(world, player);
giveHaz(world, player, 2);
}
if(this == ModItems.nuke_electric_kit)
@ -324,7 +346,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.gadget_wireing, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.gadget_core, 1));
giveHaz(world, player);
giveHaz(world, player, 0);
}
if(this == ModItems.boy_kit)
@ -336,7 +358,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.boy_propellant, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.boy_igniter, 1));
giveHaz(world, player);
giveHaz(world, player, 0);
}
if(this == ModItems.man_kit)
@ -349,7 +371,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_igniter, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_core, 1));
giveHaz(world, player);
giveHaz(world, player, 0);
}
if(this == ModItems.mike_kit)
@ -364,7 +386,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.mike_deut, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.mike_cooling_unit, 1));
giveHaz(world, player);
giveHaz(world, player, 0);
}
if(this == ModItems.tsar_kit)
@ -377,7 +399,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_core, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.tsar_core, 1));
giveHaz(world, player);
giveHaz(world, player, 0);
}
if(this == ModItems.multi_kit)
@ -462,7 +484,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.fleija_core, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.fleija_core, 1));
giveHaz(world, player);
giveHaz(world, player, 2);
}
if(this == ModItems.solinium_kit)
@ -478,7 +500,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.solinium_propellant, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.solinium_core, 1));
giveHaz(world, player);
giveHaz(world, player, 1);
}
if(this == ModItems.prototype_kit)
@ -497,7 +519,7 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.rod_quad_uranium, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.rod_quad_uranium, 1));
giveHaz(world, player);
giveHaz(world, player, 2);
}
if(this == ModItems.missile_kit)
@ -564,7 +586,17 @@ public class ItemStarterKit extends Item {
if(this == ModItems.hazmat_kit)
{
giveHaz(world, player);
giveHaz(world, player, 0);
}
if(this == ModItems.hazmat_red_kit)
{
giveHaz(world, player, 1);
}
if(this == ModItems.hazmat_grey_kit)
{
giveHaz(world, player, 2);
}
if(this == ModItems.letter && world.isRemote)

11
com/hbm/items/tool/ItemAssemblyTemplate.java
View File

@ -134,6 +134,8 @@ public class ItemAssemblyTemplate extends Item {
UPGRADE_PINK_I,
UPGRADE_PINK_II,
UPGRADE_PINK_III,
UPGRADE_RANGE,
UPGRADE_HEALTH,
FUSE,
REDCOIL_CAPACITOR,
TITANIUM_FILTER,
@ -289,7 +291,8 @@ public class ItemAssemblyTemplate extends Item {
COMPONENT_EMITTER,
AMS_LIMITER,
AMS_EMITTER,
RADAR;
RADAR,
FORCEFIELD;
//private final int value;
//private EnumAssemblyTemplate(int value) {
@ -568,6 +571,10 @@ public class ItemAssemblyTemplate extends Item {
return 300;
case UPGRADE_PINK_III:
return 500;
case UPGRADE_RANGE:
return 500;
case UPGRADE_HEALTH:
return 500;
case FUSE:
return 100;
case REDCOIL_CAPACITOR:
@ -880,6 +887,8 @@ public class ItemAssemblyTemplate extends Item {
return 6000;
case RADAR:
return 300;
case FORCEFIELD:
return 1000;
default:
return 100;
}

1
com/hbm/items/tool/ItemCassette.java
View File

@ -34,6 +34,7 @@ public class ItemCassette extends Item {
KLAXON_A( "Vault Door Alarm", new ResourceLocation("hbm:alarm.foKlaxonA"), SoundType.LOOP, 0x8c810b, 50),
KLAXON_B( "Security Alert", new ResourceLocation("hbm:alarm.foKlaxonB"), SoundType.LOOP, 0x76818e, 50),
SIREN( "Standard Siren", new ResourceLocation("hbm:alarm.regularSiren"), SoundType.LOOP, 6684672, 100),
CLASSIC( "Classic Siren", new ResourceLocation("hbm:alarm.classic"), SoundType.LOOP, 0xc0cfe8, 100),
BANK_ALARM( "Bank Alarm", new ResourceLocation("hbm:alarm.bankAlarm"), SoundType.LOOP, 3572962, 100),
BEEP_SIREN( "Beep Siren", new ResourceLocation("hbm:alarm.beepSiren"), SoundType.LOOP, 13882323, 100),
CONTAINER_ALARM( "Container Alarm", new ResourceLocation("hbm:alarm.containerAlarm"), SoundType.LOOP, 14727839, 100),

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

@ -136,9 +136,14 @@ public class GunRevolver extends Item {
if (this == ModItems.gun_revolver_schrabidium) {
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.schrabidiumShoot", 1.0F, 1.0F);
}
if (this == ModItems.gun_revolver_pip) {
if(this == ModItems.gun_revolver_pip ||
this == ModItems.gun_revolver_nopip ||
this == ModItems.gun_revolver_red) {
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShootAlt", 1.0F, 1.0F);
}
if (this == ModItems.gun_revolver_blackjack) {
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShootAlt", 1.0F, 0.75F);
}
if (flag) {
entityarrow.canBePickedUp = 2;
@ -266,6 +271,24 @@ public class GunRevolver extends Item {
list.add("");
list.add("[LEGENDARY WEAPON]");
}
if (this == ModItems.gun_revolver_nopip) {
list.add("The 'No' stands for 'NoSQL'");
list.add("");
list.add("Ammo: .44 Magnum");
list.add("Damage: 25 - 35");
}
if (this == ModItems.gun_revolver_blackjack) {
list.add("Hol on-");
list.add("");
list.add("Ammo: .44 Magnum");
list.add("Damage: 35 - 45");
}
if (this == ModItems.gun_revolver_red) {
list.add("Explore the other-what?");
list.add("");
list.add("Ammo: .44 Magnum");
list.add("Damage: 100 - 105");
}
}
@Override

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

@ -117,6 +117,7 @@ public class HbmChestContents {
new WeightedRandomChestContent(ModItems.rod_quad_pu240, 0, 1, 1, 3),
new WeightedRandomChestContent(ModItems.bottle_quantum, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.gas_mask_m65, 60, 1, 1, 5),
new WeightedRandomChestContent(ModItems.hazmat_kit, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 5),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.yellow_barrel), 0, 1, 1, 2) };
@ -146,6 +147,7 @@ public class HbmChestContents {
new WeightedRandomChestContent(ModItems.powder_cobalt, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.bottle_quantum, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.gas_mask_m65, 60, 1, 1, 5),
new WeightedRandomChestContent(ModItems.hazmat_kit, 0, 1, 1, 2),
new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 5),
new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.yellow_barrel), 0, 1, 3, 3) };

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

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

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

@ -28,7 +28,6 @@ import com.hbm.tileentity.bomb.*;
import com.hbm.tileentity.conductor.*;
import com.hbm.tileentity.deco.*;
import com.hbm.tileentity.machine.*;
import com.hbm.tileentity.machinee.TileEntityMachineShredderLarge;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
@ -232,6 +231,9 @@ public class ClientProxy extends ServerProxy
MinecraftForgeClient.registerItemRenderer(ModItems.gun_dash, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_twigun, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_pip, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nopip, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_blackjack, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_red, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_dampfmaschine, new ItemRenderBullshit());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_lever_action, new ItemRenderGunAnim());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_bolt_action, new ItemRenderGunAnim());

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

@ -578,7 +578,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.crate_iron), 1), new Object[] { "PPP", "I I", "III", 'P', "plateIron", 'I', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.crate_steel), 1), new Object[] { "PPP", "I I", "III", 'P', "plateSteel", 'I', "ingotSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.safe), 1), new Object[] { "LAL", "ACA", "LAL", 'L', "plateLead", 'A', "plateAdvanced", 'C', ModBlocks.crate_steel }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_press, 1), new Object[] { "IRI", "IPI", "IBI", 'I', "ingotIron", 'R', "dustRedstone", 'B', "blockIron", 'P', Blocks.piston }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_press, 1), new Object[] { "IRI", "IPI", "IBI", 'I', "ingotIron", 'R', Blocks.furnace, 'B', "blockIron", 'P', Blocks.piston }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_siren, 1), new Object[] { "SIS", "ICI", "SRS", 'S', "plateSteel", 'I', ModItems.plate_polymer, 'C', ModItems.circuit_copper, 'R', "dustRedstone" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 1), new Object[] { "PIP", "I I", "PIP", 'P', "plateTitanium", 'I', "ingotTitanium" }));

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

@ -311,6 +311,7 @@ import com.hbm.tileentity.machine.TileEntityMachineSPP;
import com.hbm.tileentity.machine.TileEntityMachineSchrabidiumTransmutator;
import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine;
import com.hbm.tileentity.machine.TileEntityMachineShredder;
import com.hbm.tileentity.machine.TileEntityMachineShredderLarge;
import com.hbm.tileentity.machine.TileEntityMachineSiren;
import com.hbm.tileentity.machine.TileEntityMachineTeleLinker;
import com.hbm.tileentity.machine.TileEntityMachineTeleporter;
@ -328,7 +329,6 @@ import com.hbm.tileentity.machine.TileEntityMachineSatLinker;
import com.hbm.tileentity.machine.TileEntityStructureMarker;
import com.hbm.tileentity.machine.TileEntityVaultDoor;
import com.hbm.tileentity.machine.TileEntityWatzCore;
import com.hbm.tileentity.machinee.TileEntityMachineShredderLarge;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;

8
com/hbm/main/ModEventHandler.java
View File

@ -147,6 +147,11 @@ public class ModEventHandler
RadiationSavedData data = RadiationSavedData.getData(event.world);
RadEntitySavedData eData = RadEntitySavedData.getData(event.world);
if(eData.worldObj == null) {
System.out.println("shit");
eData.worldObj = event.world;
}
for(Object o : event.world.playerEntities) {
EntityPlayer player = (EntityPlayer)o;
@ -221,7 +226,8 @@ public class ModEventHandler
continue;
if(eRad >= 1000) {
entity.attackEntityFrom(ModDamageSource.radiation, 1000);
if(entity.attackEntityFrom(ModDamageSource.radiation, 1000))
eData.setRadForEntity(entity, 0);
} else if(eRad >= 800) {
if(event.world.rand.nextInt(300) == 0)
entity.addPotionEffect(new PotionEffect(Potion.confusion.id, 5 * 30, 0));

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

@ -92,6 +92,12 @@ public class ItemRenderOverkill implements IItemRenderer {
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelTwiGun.png"));
if(item.getItem() == ModItems.gun_revolver_pip)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPip.png"));
if(item.getItem() == ModItems.gun_revolver_nopip)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipNoScope.png"));
if(item.getItem() == ModItems.gun_revolver_blackjack)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipGrey.png"));
if(item.getItem() == ModItems.gun_revolver_red)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipRed.png"));
GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(-0.5F, 0.0F, -0.2F);
@ -103,7 +109,10 @@ public class ItemRenderOverkill implements IItemRenderer {
if(item.getItem() == ModItems.gun_defabricator)
GL11.glTranslatef(0, 0.5F, 0.4F);
if(item.getItem() == ModItems.gun_revolver_pip) {
if(item.getItem() == ModItems.gun_revolver_pip ||
item.getItem() == ModItems.gun_revolver_nopip ||
item.getItem() == ModItems.gun_revolver_blackjack ||
item.getItem() == ModItems.gun_revolver_red) {
GL11.glScalef(0.60F, 0.60F, 0.60F);
GL11.glTranslatef(0.0F, 0.3F, 0.2F);
}
@ -122,7 +131,10 @@ public class ItemRenderOverkill implements IItemRenderer {
dasher.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_twigun)
rgottp.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_revolver_pip)
if(item.getItem() == ModItems.gun_revolver_pip ||
item.getItem() == ModItems.gun_revolver_nopip ||
item.getItem() == ModItems.gun_revolver_blackjack ||
item.getItem() == ModItems.gun_revolver_red)
pip.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_calamity) {
@ -164,6 +176,12 @@ public class ItemRenderOverkill implements IItemRenderer {
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelTwiGun.png"));
if(item.getItem() == ModItems.gun_revolver_pip)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPip.png"));
if(item.getItem() == ModItems.gun_revolver_nopip)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipNoScope.png"));
if(item.getItem() == ModItems.gun_revolver_blackjack)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipGrey.png"));
if(item.getItem() == ModItems.gun_revolver_red)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipRed.png"));
GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F);
@ -182,7 +200,10 @@ public class ItemRenderOverkill implements IItemRenderer {
if(item.getItem() == ModItems.gun_defabricator)
GL11.glTranslatef(0.5F, 0.6F, -0.2F);
if(item.getItem() == ModItems.gun_revolver_pip) {
if(item.getItem() == ModItems.gun_revolver_pip ||
item.getItem() == ModItems.gun_revolver_nopip ||
item.getItem() == ModItems.gun_revolver_blackjack ||
item.getItem() == ModItems.gun_revolver_red) {
GL11.glScalef(0.60F, 0.60F, 0.60F);
GL11.glTranslatef(0.7F, 0.3F, 0.0F);
}
@ -209,7 +230,10 @@ public class ItemRenderOverkill implements IItemRenderer {
dasher.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_twigun)
rgottp.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_revolver_pip)
if(item.getItem() == ModItems.gun_revolver_pip ||
item.getItem() == ModItems.gun_revolver_nopip ||
item.getItem() == ModItems.gun_revolver_blackjack ||
item.getItem() == ModItems.gun_revolver_red)
pip.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_calamity) {

9
com/hbm/render/tileentity/RenderMachineShredder.java
View File

@ -19,13 +19,16 @@ public class RenderMachineShredder extends TileEntitySpecialRenderer {
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glRotatef(180, 0F, 1F, 0F);
bindTexture(ResourceManager.universal);
GL11.glTranslated(0, -0.5, 0);
GL11.glRotatef(10, -1F, 0F, 1F);
bindTexture(ResourceManager.boxcar_tex);
ResourceManager.shredder_body.renderAll();
GL11.glPushMatrix();
GL11.glTranslated(-0.25, 2.85, 0.4375/2);
GL11.glRotatef((System.currentTimeMillis() / 3) % 360, 0F, 0F, -1F);
GL11.glRotatef((System.currentTimeMillis() / 2) % 360, 0F, 0F, -1F);
bindTexture(ResourceManager.turbofan_blades_tex);
ResourceManager.shredder_blade1.renderAll();
@ -34,7 +37,7 @@ public class RenderMachineShredder extends TileEntitySpecialRenderer {
GL11.glPushMatrix();
GL11.glTranslated(0.25, 2.85, 0);
GL11.glRotatef((System.currentTimeMillis() / 3) % 360, 0F, 0F, 1F);
GL11.glRotatef((System.currentTimeMillis() / 2) % 360, 0F, 0F, 1F);
bindTexture(ResourceManager.turbofan_blades_tex);
GL11.glScaled(-1, 1, 1);
ResourceManager.shredder_blade1.renderAll();

35
com/hbm/saveddata/RadEntitySavedData.java
View File

@ -5,7 +5,9 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
@ -17,7 +19,7 @@ public class RadEntitySavedData extends WorldSavedData {
public List<RadEntry> contaminated = new ArrayList();
private World worldObj;
public World worldObj;
public RadEntitySavedData(String p_i2141_1_) {
super(p_i2141_1_);
@ -33,7 +35,7 @@ public class RadEntitySavedData extends WorldSavedData {
public float getRadFromEntity(Entity e) {
for(int i = 0; i < contaminated.size(); i++) {
if(contaminated.get(i).entID == e.getEntityId())
if(new UUID(contaminated.get(i).hID, contaminated.get(i).lID).equals(e.getUniqueID()))
return contaminated.get(i).rad;
}
@ -46,14 +48,18 @@ public class RadEntitySavedData extends WorldSavedData {
return;
for(int i = 0; i < contaminated.size(); i++) {
if(contaminated.get(i).entID == e.getEntityId()) {
if(new UUID(contaminated.get(i).hID, contaminated.get(i).lID).equals(e.getUniqueID())) {
contaminated.get(i).rad = rad;
if(contaminated.get(i).rad > 2500)
contaminated.get(i).rad = 2500;
this.markDirty();
return;
}
}
contaminated.add(new RadEntry(e.getEntityId(), rad));
contaminated.add(new RadEntry(e.getUniqueID().getMostSignificantBits(), e.getUniqueID().getLeastSignificantBits(), rad));
this.markDirty();
}
@ -69,7 +75,10 @@ public class RadEntitySavedData extends WorldSavedData {
for(int i = 0; i < count; i++) {
contaminated.add(new RadEntry(nbt.getInteger("entID_" + i), nbt.getFloat("cont_" + i)));
contaminated.add(new RadEntry(
nbt.getLong("uH_" + i),
nbt.getLong("uL_" + i),
nbt.getFloat("cont_" + i)));
}
}
@ -80,8 +89,9 @@ public class RadEntitySavedData extends WorldSavedData {
int i = 0;
for (RadEntry entry : contaminated) {
nbt.setInteger("entID_" + i, entry.entID);
nbt.setLong("uH_" + i, entry.hID);
nbt.setLong("uL_" + i, entry.lID);
nbt.setFloat("cont_" + i, entry.rad);
i++;
@ -101,14 +111,15 @@ public class RadEntitySavedData extends WorldSavedData {
}
public class RadEntry {
int entID;
long hID;
long lID;
float rad;
public RadEntry(int id, float rad) {
this.entID = id;
public RadEntry(long hID, long lID, float rad) {
this.hID = hID;
this.lID = lID;
this.rad = rad;
}
}
}

24
com/hbm/tileentity/machine/TileEntityForceField.java
View File

@ -294,11 +294,10 @@ public class TileEntityForceField extends TileEntity implements ISidedInventory,
}
private int impact(Entity e) {
Vec3 vector = Vec3.createVectorHelper(e.motionX, e.motionY, e.motionZ);
double mass = Math.pow(e.height * e.width * e.width, 2);
double speed = vector.lengthVector();
return (int)(mass * speed * 100);
double mass = e.height * e.width * e.width;
double speed = getMotionWithFallback(e);
return (int)(mass * speed * 50);
}
private void damage(int ouch) {
@ -416,6 +415,23 @@ public class TileEntityForceField extends TileEntity implements ISidedInventory,
}
}
}
private double getMotionWithFallback(Entity e) {
Vec3 v1 = Vec3.createVectorHelper(e.motionX, e.motionY, e.motionZ);
Vec3 v2 = Vec3.createVectorHelper(e.posX - e.prevPosY, e.posY - e.prevPosY, e.posZ - e.prevPosZ);
double s1 = v1.lengthVector();
double s2 = v2.lengthVector();
if(s1 == 0)
return s2;
if(s2 == 0)
return s1;
return Math.min(s1, s2);
}
@Override

9
com/hbm/tileentity/machine/TileEntityMachineBoiler.java
View File

@ -274,8 +274,13 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
burnTime = (int) (TileEntityFurnace.getItemBurnTime(slots[4]) * 0.25);
slots[4].stackSize--;
if(slots[4].stackSize <= 0)
slots[4] = null;
if(slots[4].stackSize <= 0) {
if(slots[4].getItem().getContainerItem() != null)
slots[4] = new ItemStack(slots[4].getItem().getContainerItem());
else
slots[4] = null;
}
if(!flag1) {
mark = true;

5
com/hbm/tileentity/machine/TileEntityMachineCoal.java
View File

@ -274,7 +274,10 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory
slots[1].stackSize -= 1;
if(slots[1].stackSize == 0)
{
slots[1] = null;
if(slots[1].getItem().getContainerItem() != null)
slots[1] = new ItemStack(slots[1].getItem().getContainerItem());
else
slots[1] = null;
}
}

9
com/hbm/tileentity/machine/TileEntityMachinePress.java
View File

@ -224,8 +224,13 @@ public class TileEntityMachinePress extends TileEntity implements ISidedInventor
if(slots[0] != null && this.burnTime == 0 && TileEntityFurnace.getItemBurnTime(slots[0]) > 0) {
this.maxBurn = this.burnTime = TileEntityFurnace.getItemBurnTime(slots[0]) / 8;
slots[0].stackSize--;
if(slots[0].stackSize <= 0)
slots[0] = null;
if(slots[0].stackSize <= 0) {
if(slots[0].getItem().getContainerItem() != null)
slots[0] = new ItemStack(slots[0].getItem().getContainerItem());
else
slots[0] = null;
}
}
if(power >= maxPower / 3) {

2
com/hbm/tileentity/machinee/TileEntityMachineShredderLarge.java → com/hbm/tileentity/machine/TileEntityMachineShredderLarge.java
View File

@ -1,4 +1,4 @@
package com.hbm.tileentity.machinee;
package com.hbm.tileentity.machine;
import net.minecraft.tileentity.TileEntity;

4
com/hbm/world/Bunker.java
View File

@ -299,6 +299,7 @@ public class Bunker extends WorldGenerator
{
WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(3), (TileEntityChest)world.getTileEntity(x + 2, y + -24, z + 1), rand.nextInt(2)+ 6);
}
world.setBlock(x + 2, y + -23, z + 1, ModBlocks.geiger, 2, 3);
world.setBlock(x + 3, y + -24, z + 1, Block2, 0, 3);
world.setBlock(x + 4, y + -24, z + 1, Block1, 0, 3);
world.setBlock(x + 11, y + -24, z + 1, Block1, 0, 3);
@ -490,7 +491,8 @@ public class Bunker extends WorldGenerator
world.setBlock(x + 11, y + -23, z + 13, Block1, 0, 3);
world.setBlock(x + 0, y + -23, z + 14, Block1, 0, 3);
world.setBlock(x + 1, y + -23, z + 14, Block1, 0, 3);
world.setBlock(x + 2, y + -23, z + 14, Block1, 0, 3);
//prevent geiger displacement
//world.setBlock(x + 2, y + -23, z + 14, Block1, 0, 3);
world.setBlock(x + 3, y + -23, z + 14, Block1, 0, 3);
world.setBlock(x + 4, y + -23, z + 14, Block3, 0, 3);
world.setBlock(x + 5, y + -23, z + 14, Block1, 0, 3);

6
com/hbm/world/DesertAtom002.java
View File

@ -1701,7 +1701,7 @@ public class DesertAtom002
world.setBlock(x + 22, y + 1, z + 14, Blocks.stone_brick_stairs, 4, 3);
world.setBlock(x + 23, y + 1, z + 14, Block1, 0, 3);
world.setBlock(x + 24, y + 1, z + 14, Block5, 0, 3);
world.setBlock(x + 29, y + 1, z + 14, Blocks.trapdoor, 4, 3);
world.setBlock(x + 29, y + 1, z + 14, Blocks.air, 0, 3);
world.setBlock(x + 30, y + 1, z + 14, Block1, 0, 3);
world.setBlock(x + 31, y + 1, z + 14, Blocks.vine, 2, 3);
world.setBlock(x + 36, y + 1, z + 14, Block9, 4, 3);
@ -1762,7 +1762,7 @@ public class DesertAtom002
world.setBlock(x + 22, y + 1, z + 16, Blocks.stone_brick_stairs, 4, 3);
world.setBlock(x + 23, y + 1, z + 16, Block1, 0, 3);
world.setBlock(x + 24, y + 1, z + 16, Block9, 5, 3);
world.setBlock(x + 29, y + 1, z + 16, Blocks.trapdoor, 5, 3);
world.setBlock(x + 29, y + 1, z + 16, Blocks.air, 0, 3);
world.setBlock(x + 30, y + 1, z + 16, Block1, 0, 3);
world.setBlock(x + 36, y + 1, z + 16, Block9, 4, 3);
world.setBlock(x + 37, y + 1, z + 16, Block1, 0, 3);
@ -2182,7 +2182,7 @@ public class DesertAtom002
world.setBlock(x + 23, y + 2, z + 15, Block1, 0, 3);
world.setBlock(x + 24, y + 2, z + 15, Block9, 5, 3);
world.setBlock(x + 27, y + 2, z + 15, Blocks.web, 0, 3);
world.setBlock(x + 29, y + 2, z + 15, Blocks.trapdoor, 2, 3);
world.setBlock(x + 29, y + 2, z + 15, Blocks.air, 0, 3);
world.setBlock(x + 30, y + 2, z + 15, Block1, 0, 3);
world.setBlock(x + 31, y + 2, z + 15, Blocks.vine, 2, 3);
world.setBlock(x + 36, y + 2, z + 15, Blocks.stone_brick_stairs, 0, 3);

3
com/hbm/world/DesertAtom003.java
View File

@ -443,7 +443,8 @@ public class DesertAtom003
world.setBlock(x + 33, y + 4, z + 9, Blocks.redstone_wire, 0, 3);
world.setBlock(x + 34, y + 4, z + 9, Blocks.redstone_wire, 0, 3);
world.setBlock(x + 35, y + 4, z + 9, Block12, 0, 3);
world.setBlock(x + 36, y + 4, z + 9, Blocks.chest, 3, 3);
world.setBlock(x + 35, y + 5, z + 9, ModBlocks.geiger, 2, 3);
world.setBlock(x + 36, y + 4, z + 9, Blocks.chest, 2, 3);
if(world.getBlock(x + 36, y + 4, z + 9) == Blocks.chest)
{
WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(5), (TileEntityChest)world.getTileEntity(x + 36, y + 4, z + 9), 12);