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

thorium blocks and items, new dud texture, radiation absorbers

Browse Source
This commit is contained in:
HbmMods 2018-12-29 01:51:12 +01:00
parent 33d749a7b4
commit 109769bf59
35 changed files with 766 additions and 836 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1111,6 +1111,11 @@ item.waste_thorium.name=Erschöpfter Thoriumkernbrennstoff
item.waste_plutonium.name=Erschöpfter Plutoniumkernbrennstoff
item.waste_mox.name=Erschöpfter MOX-Kernbrennstoff
item.waste_schrabidium.name=Erschöpfter Schrabidiumkernbrennstoff
item.waste_uranium_hot.name=Erschöpfter Urankernbrennstoff (Heiß)
item.waste_thorium_hot.name=Erschöpfter Thoriumkernbrennstoff (Heiß)
item.waste_plutonium_hot.name=Erschöpfter Plutoniumkernbrennstoff (Heiß)
item.waste_mox_hot.name=Erschöpfter MOX-Kernbrennstoff (Heiß)
item.waste_schrabidium_hot.name=Erschöpfter Schrabidiumkernbrennstoff (Heiß)
item.scrap.name=Schrott
item.ingot_uranium_fuel.name=Urankernbrennstoffbarren

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

@ -1111,6 +1111,11 @@ item.waste_thorium.name=Depleted Thorium Fuel
item.waste_plutonium.name=Depleted Plutonium Fuel
item.waste_mox.name=Depleted MOX Fuel
item.waste_schrabidium.name=Depleted Schrabidium Fuel
item.waste_uranium_hot.name=Depleted Uranium Fuel (Hot)
item.waste_thorium_hot.name=Depleted Thorium Fuel (Hot)
item.waste_plutonium_hot.name=Depleted Plutonium Fuel (Hot)
item.waste_mox_hot.name=Depleted MOX Fuel (Hot)
item.waste_schrabidium_hot.name=Depleted Schrabidium Fuel (Hot)
item.scrap.name=Scrap
item.ingot_uranium_fuel.name=Ingot of Uranium Fuel

1392
assets/hbm/models/BalefireCrashed.obj
View File

File diff suppressed because it is too large Load Diff

BIN
assets/hbm/sounds/block/dam1.ogg Normal file
View File

Binary file not shown.

BIN
assets/hbm/sounds/block/dam2.ogg Normal file
View File

Binary file not shown.

BIN
assets/hbm/sounds/block/dam3.ogg Normal file
View File

Binary file not shown.

BIN
assets/hbm/sounds/block/dam4.ogg Normal file
View File

Binary file not shown.

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 285 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 322 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 322 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 305 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 388 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 763 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 461 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 470 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 244 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 208 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 214 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 215 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 254 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 305 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 205 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 379 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 377 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 384 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 357 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 376 B

BIN
assets/hbm/textures/models/BalefireCrashed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 298 KiB

After

Width:  |  Height:  |  Size: 12 KiB

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

@ -49,6 +49,7 @@ public class ModBlocks {
public static Block ore_uranium;
public static Block ore_titanium;
public static Block ore_sulfur;
public static Block ore_thorium;
public static Block ore_niter;
public static Block ore_copper;
@ -80,6 +81,7 @@ public class ModBlocks {
public static Block ore_tikite;
public static Block block_thorium;
public static Block block_uranium;
public static Block block_titanium;
public static Block block_sulfur;
@ -531,6 +533,9 @@ public class ModBlocks {
public static Block machine_forcefield;
public static final int guiID_forcefield = 75;
public static Block machine_waste_drum;
public static final int guiID_waste_drum = 79;
public static Block turret_light;
public static Block turret_heavy;
public static Block turret_rocket;
@ -562,6 +567,11 @@ public class ModBlocks {
public static Block vent_cloud;
public static Block vent_pink_cloud;
public static Block absorber;
public static Block absorber_red;
public static Block absorber_green;
public static Block absorber_pink;
public static Block mud_block;
public static Fluid mud_fluid;
public static final Material fluidmud = (new MaterialLiquid(MapColor.adobeColor));
@ -636,6 +646,7 @@ public class ModBlocks {
ore_uranium = new BlockGeneric(Material.rock).setBlockName("ore_uranium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_uranium");
ore_titanium = new BlockGeneric(Material.rock).setBlockName("ore_titanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_titanium");
ore_sulfur = new BlockOre(Material.rock).setBlockName("ore_sulfur").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_sulfur");
ore_thorium = new BlockGeneric(Material.rock).setBlockName("ore_thorium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_thorium");
ore_niter = new BlockOre(Material.rock).setBlockName("ore_niter").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_niter");
ore_copper = new BlockGeneric(Material.rock).setBlockName("ore_copper").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_copper");
@ -668,6 +679,7 @@ public class ModBlocks {
ore_tikite = new BlockGeneric(Material.rock).setBlockName("ore_tikite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_tikite_alt");
block_uranium = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_uranium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium");
block_thorium = new BlockGeneric(Material.iron).setBlockName("block_thorium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_thorium");
block_titanium = new BlockGeneric(Material.iron).setBlockName("block_titanium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_titanium");
block_sulfur = new BlockGeneric(Material.iron).setBlockName("block_sulfur").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_sulfur");
block_niter = new BlockGeneric(Material.iron).setBlockName("block_niter").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_niter");
@ -1001,6 +1013,8 @@ public class ModBlocks {
machine_boiler_electric_on = new MachineBoiler(true).setBlockName("machine_boiler_electric_on").setHardness(5.0F).setResistance(10.0F).setLightLevel(1.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":machine_boiler_electric_on");
machine_turbine = new MachineTurbine(Material.iron).setBlockName("machine_turbine").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_turbine");
machine_waste_drum = new WasteDrum(Material.iron).setBlockName("machine_waste_drum").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":waste_drum");
machine_schrabidium_transmutator = new MachineSchrabidiumTransmutator(Material.iron).setBlockName("machine_schrabidium_transmutator").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab);
@ -1028,6 +1042,11 @@ public class ModBlocks {
vent_cloud = new BlockVent(Material.iron).setBlockName("vent_cloud").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_cloud");
vent_pink_cloud = new BlockVent(Material.iron).setBlockName("vent_pink_cloud").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_pink_cloud");
absorber = new BlockAbsorber(Material.iron, 2.5F).setBlockName("absorber").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber");
absorber_red = new BlockAbsorber(Material.iron, 10F).setBlockName("absorber_red").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_red");
absorber_green = new BlockAbsorber(Material.iron, 100F).setBlockName("absorber_green").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_green");
absorber_pink = new BlockAbsorber(Material.iron, 10000F).setBlockName("absorber_pink").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_pink");
statue_elb = new DecoBlockAlt(Material.iron).setBlockName("#null").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY);
statue_elb_g = new DecoBlockAlt(Material.iron).setBlockName("#void").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY);
statue_elb_w = new DecoBlockAlt(Material.iron).setBlockName("#ngtv").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY);
@ -1106,6 +1125,7 @@ public class ModBlocks {
//Ores
GameRegistry.registerBlock(ore_uranium, ore_uranium.getUnlocalizedName());
GameRegistry.registerBlock(ore_thorium, ore_thorium.getUnlocalizedName());
GameRegistry.registerBlock(ore_titanium, ore_titanium.getUnlocalizedName());
GameRegistry.registerBlock(ore_sulfur, ore_sulfur.getUnlocalizedName());
GameRegistry.registerBlock(ore_niter, ore_niter.getUnlocalizedName());
@ -1142,6 +1162,7 @@ public class ModBlocks {
//Blocks
GameRegistry.registerBlock(block_uranium, block_uranium.getUnlocalizedName());
GameRegistry.registerBlock(block_thorium, block_thorium.getUnlocalizedName());
GameRegistry.registerBlock(block_titanium, block_titanium.getUnlocalizedName());
GameRegistry.registerBlock(block_sulfur, block_sulfur.getUnlocalizedName());
GameRegistry.registerBlock(block_niter, block_niter.getUnlocalizedName());
@ -1394,6 +1415,7 @@ public class ModBlocks {
GameRegistry.registerBlock(machine_boiler_electric_on, machine_boiler_electric_on.getUnlocalizedName());
GameRegistry.registerBlock(machine_boiler_electric_off, machine_boiler_electric_off.getUnlocalizedName());
GameRegistry.registerBlock(machine_turbine, machine_turbine.getUnlocalizedName());
GameRegistry.registerBlock(machine_waste_drum, machine_waste_drum.getUnlocalizedName());
GameRegistry.registerBlock(machine_shredder, machine_shredder.getUnlocalizedName());
GameRegistry.registerBlock(machine_shredder_large, machine_shredder_large.getUnlocalizedName());
//GameRegistry.registerBlock(machine_deuterium, machine_deuterium.getUnlocalizedName());
@ -1419,6 +1441,12 @@ public class ModBlocks {
//Multiblock Helpers
GameRegistry.registerBlock(marker_structure, marker_structure.getUnlocalizedName());
//Absorbers
GameRegistry.registerBlock(absorber, absorber.getUnlocalizedName());
GameRegistry.registerBlock(absorber_red, absorber_red.getUnlocalizedName());
GameRegistry.registerBlock(absorber_green, absorber_green.getUnlocalizedName());
GameRegistry.registerBlock(absorber_pink, absorber_pink.getUnlocalizedName());
//Industrial Factories
GameRegistry.registerBlock(factory_titanium_hull, factory_titanium_hull.getUnlocalizedName());
GameRegistry.registerBlock(factory_titanium_furnace, factory_titanium_furnace.getUnlocalizedName());

40
com/hbm/blocks/generic/BlockAbsorber.java Normal file
View File

@ -0,0 +1,40 @@
package com.hbm.blocks.generic;
import java.util.Random;
import com.hbm.saveddata.RadiationSavedData;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.World;
public class BlockAbsorber extends Block {
float absorb = 0;
public BlockAbsorber(Material mat, float ab) {
super(mat);
this.setTickRandomly(true);
absorb = ab;
}
@Override
public int tickRate(World world) {
return 10;
}
@Override
public void updateTick(World world, int x, int y, int z, Random rand) {
RadiationSavedData.decrementRad(world, x, z, absorb);
world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world));
}
public void onBlockAdded(World world, int x, int y, int z) {
super.onBlockAdded(world, x, y, z);
world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world));
}
}

41
com/hbm/blocks/machine/WasteDrum.java Normal file
View File

@ -0,0 +1,41 @@
package com.hbm.blocks.machine;
import java.util.Random;
import com.hbm.lib.RefStrings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
public class WasteDrum extends Block {
private final Random field_149933_a = new Random();
@SideOnly(Side.CLIENT)
private IIcon iconTop;
public WasteDrum(Material p_i45386_1_) {
super(p_i45386_1_);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":waste_drum");
this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":waste_drum_side");
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int metadata) {
if(side == 0 || side == 1)
return this.iconTop;
return blockIcon;
}
}

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

@ -1,5 +1,6 @@
package com.hbm.entity.projectile;
import java.lang.reflect.Field;
import java.util.List;
import net.minecraft.block.Block;
@ -39,6 +40,7 @@ import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.lib.ModDamageSource;
import cpw.mods.fml.relauncher.ReflectionHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -585,11 +587,30 @@ public class EntityBullet extends Entity implements IProjectile {
;
}
} else {
if(movingobjectposition.entityHit instanceof EntityLivingBase) {
try {
Field lastDamage = ReflectionHelper.findField(EntityLivingBase.class, "lastDamage", "field_110153_bc");
float dmg = (float) damage + lastDamage.getFloat(movingobjectposition.entityHit);
movingobjectposition.entityHit.attackEntityFrom(damagesource, dmg);
} catch (Exception x) { }
}
}
/* else {
if (movingobjectposition.entityHit instanceof EntityLivingBase && !(movingobjectposition.entityHit instanceof EntityHunterChopper)) {
EntityLivingBase target = (EntityLivingBase) movingobjectposition.entityHit;
target.setHealth((float) (target.getHealth() - damage));
}
}
}*/
} else {
this.setDead();
}

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

@ -67,6 +67,7 @@ public class ModItems {
public static Item ingot_schrabidium_fuel;
public static Item ingot_thorium_fuel;
public static Item nugget_uranium_fuel;
public static Item nugget_thorium_fuel;
public static Item nugget_plutonium_fuel;
public static Item nugget_mox_fuel;
public static Item nugget_schrabidium_fuel;
@ -106,7 +107,9 @@ public class ModItems {
public static Item ingot_saturnite;
public static Item plate_saturnite;
public static Item nugget_th232;
public static Item nugget_uranium;
public static Item nugget_u233;
public static Item nugget_u235;
public static Item nugget_u238;
public static Item nugget_plutonium;
@ -596,6 +599,7 @@ public class ModItems {
public static Item rod_empty;
public static Item rod_uranium;
public static Item rod_u233;
public static Item rod_u235;
public static Item rod_u238;
public static Item rod_plutonium;
@ -616,6 +620,7 @@ public class ModItems {
public static Item rod_dual_empty;
public static Item rod_dual_uranium;
public static Item rod_dual_u233;
public static Item rod_dual_u235;
public static Item rod_dual_u238;
public static Item rod_dual_plutonium;
@ -629,6 +634,7 @@ public class ModItems {
public static Item rod_quad_empty;
public static Item rod_quad_uranium;
public static Item rod_quad_u233;
public static Item rod_quad_u235;
public static Item rod_quad_u238;
public static Item rod_quad_plutonium;
@ -684,6 +690,11 @@ public class ModItems {
public static Item waste_plutonium;
public static Item waste_mox;
public static Item waste_schrabidium;
public static Item waste_uranium_hot;
public static Item waste_thorium_hot;
public static Item waste_plutonium_hot;
public static Item waste_mox_hot;
public static Item waste_schrabidium_hot;
public static Item rod_lithium;
public static Item rod_dual_lithium;
@ -1468,6 +1479,7 @@ public class ModItems {
ingot_schrabidium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium_fuel");
ingot_thorium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_thorium_fuel");
nugget_uranium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_uranium_fuel");
nugget_thorium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_thorium_fuel");
nugget_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_plutonium_fuel");
nugget_mox_fuel = new ItemRadioactive().setUnlocalizedName("nugget_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_mox_fuel");
nugget_schrabidium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium_fuel");
@ -1544,7 +1556,9 @@ public class ModItems {
nugget_daffergon = new ItemCustomLore().setUnlocalizedName("nugget_daffergon").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_daffergon");
nugget_verticium = new ItemCustomLore().setUnlocalizedName("nugget_verticium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_verticium");
nugget_th232 = new Item().setUnlocalizedName("nugget_th232").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_th232");
nugget_uranium = new ItemRadioactive().setUnlocalizedName("nugget_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_uranium");
nugget_u233 = new ItemRadioactive().setUnlocalizedName("nugget_u233").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u233");
nugget_u235 = new ItemRadioactive().setUnlocalizedName("nugget_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u235");
nugget_u238 = new ItemRadioactive().setUnlocalizedName("nugget_u238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u238");
nugget_plutonium = new ItemRadioactive().setUnlocalizedName("nugget_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_plutonium");
@ -1964,6 +1978,7 @@ public class ModItems {
rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_empty");
rod_uranium = new ItemCustomLore().setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium");
rod_u233 = new ItemCustomLore().setUnlocalizedName("rod_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u233");
rod_u235 = new ItemCustomLore().setUnlocalizedName("rod_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u235");
rod_u238 = new ItemCustomLore().setUnlocalizedName("rod_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u238");
rod_plutonium = new ItemCustomLore().setUnlocalizedName("rod_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium");
@ -1984,6 +1999,7 @@ public class ModItems {
rod_dual_empty = new Item().setUnlocalizedName("rod_dual_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_dual_empty");
rod_dual_uranium = new ItemCustomLore().setUnlocalizedName("rod_dual_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium");
rod_dual_u233 = new ItemCustomLore().setUnlocalizedName("rod_dual_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u233");
rod_dual_u235 = new ItemCustomLore().setUnlocalizedName("rod_dual_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u235");
rod_dual_u238 = new ItemCustomLore().setUnlocalizedName("rod_dual_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u238");
rod_dual_plutonium = new ItemCustomLore().setUnlocalizedName("rod_dual_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium");
@ -1997,6 +2013,7 @@ public class ModItems {
rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_quad_empty");
rod_quad_uranium = new ItemCustomLore().setUnlocalizedName("rod_quad_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium");
rod_quad_u233 = new ItemCustomLore().setUnlocalizedName("rod_quad_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u233");
rod_quad_u235 = new ItemCustomLore().setUnlocalizedName("rod_quad_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u235");
rod_quad_u238 = new ItemCustomLore().setUnlocalizedName("rod_quad_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u238");
rod_quad_plutonium = new ItemCustomLore().setUnlocalizedName("rod_quad_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium");
@ -2044,6 +2061,11 @@ public class ModItems {
waste_plutonium = new ItemCustomLore().setUnlocalizedName("waste_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium");
waste_mox = new ItemCustomLore().setUnlocalizedName("waste_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox");
waste_schrabidium = new ItemCustomLore().setUnlocalizedName("waste_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium");
waste_uranium_hot = new ItemCustomLore().setUnlocalizedName("waste_uranium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium_hot");
waste_thorium_hot = new ItemCustomLore().setUnlocalizedName("waste_thorium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium_hot");
waste_plutonium_hot = new ItemCustomLore().setUnlocalizedName("waste_plutonium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium_hot");
waste_mox_hot = new ItemCustomLore().setUnlocalizedName("waste_mox_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox_hot");
waste_schrabidium_hot = new ItemCustomLore().setUnlocalizedName("waste_schrabidium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium_hot");
scrap = new Item().setUnlocalizedName("scrap").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":scrap");
rod_uranium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel_depleted");
rod_dual_uranium_fuel_depleted = new ItemCustomLore().setUnlocalizedName("rod_dual_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel_depleted");
@ -2831,12 +2853,12 @@ public class ModItems {
GameRegistry.registerItem(test_nuke_tier2_target, test_nuke_tier2_target.getUnlocalizedName());
//Ingots
GameRegistry.registerItem(ingot_th232, ingot_th232.getUnlocalizedName());
GameRegistry.registerItem(ingot_uranium, ingot_uranium.getUnlocalizedName());
GameRegistry.registerItem(ingot_u233, ingot_u233.getUnlocalizedName());
GameRegistry.registerItem(ingot_u235, ingot_u235.getUnlocalizedName());
GameRegistry.registerItem(ingot_u238, ingot_u238.getUnlocalizedName());
GameRegistry.registerItem(ingot_u238m2, ingot_u238m2.getUnlocalizedName());
GameRegistry.registerItem(ingot_th232, ingot_th232.getUnlocalizedName());
GameRegistry.registerItem(ingot_plutonium, ingot_plutonium.getUnlocalizedName());
GameRegistry.registerItem(ingot_pu238, ingot_pu238.getUnlocalizedName());
GameRegistry.registerItem(ingot_pu239, ingot_pu239.getUnlocalizedName());
@ -2971,8 +2993,10 @@ public class ModItems {
//Nuggets
GameRegistry.registerItem(nugget_uranium, nugget_uranium.getUnlocalizedName());
GameRegistry.registerItem(nugget_u233, nugget_u233.getUnlocalizedName());
GameRegistry.registerItem(nugget_u235, nugget_u235.getUnlocalizedName());
GameRegistry.registerItem(nugget_u238, nugget_u238.getUnlocalizedName());
GameRegistry.registerItem(nugget_th232, nugget_th232.getUnlocalizedName());
GameRegistry.registerItem(nugget_plutonium, nugget_plutonium.getUnlocalizedName());
GameRegistry.registerItem(nugget_pu238, nugget_pu238.getUnlocalizedName());
GameRegistry.registerItem(nugget_pu239, nugget_pu239.getUnlocalizedName());
@ -2983,6 +3007,7 @@ public class ModItems {
GameRegistry.registerItem(nugget_schrabidium, nugget_schrabidium.getUnlocalizedName());
GameRegistry.registerItem(nugget_solinium, nugget_solinium.getUnlocalizedName());
GameRegistry.registerItem(nugget_uranium_fuel, nugget_uranium_fuel.getUnlocalizedName());
GameRegistry.registerItem(nugget_thorium_fuel, nugget_thorium_fuel.getUnlocalizedName());
GameRegistry.registerItem(nugget_plutonium_fuel, nugget_plutonium_fuel.getUnlocalizedName());
GameRegistry.registerItem(nugget_mox_fuel, nugget_mox_fuel.getUnlocalizedName());
GameRegistry.registerItem(nugget_schrabidium_fuel, nugget_schrabidium_fuel.getUnlocalizedName());
@ -3483,6 +3508,10 @@ public class ModItems {
GameRegistry.registerItem(rod_dual_u235, rod_dual_u235.getUnlocalizedName());
GameRegistry.registerItem(rod_quad_u235, rod_quad_u235.getUnlocalizedName());
GameRegistry.registerItem(rod_u233, rod_u233.getUnlocalizedName());
GameRegistry.registerItem(rod_dual_u233, rod_dual_u233.getUnlocalizedName());
GameRegistry.registerItem(rod_quad_u233, rod_quad_u233.getUnlocalizedName());
GameRegistry.registerItem(rod_u238, rod_u238.getUnlocalizedName());
GameRegistry.registerItem(rod_dual_u238, rod_dual_u238.getUnlocalizedName());
GameRegistry.registerItem(rod_quad_u238, rod_quad_u238.getUnlocalizedName());
@ -3583,6 +3612,11 @@ public class ModItems {
GameRegistry.registerItem(rod_quad_waste, rod_quad_waste.getUnlocalizedName());
GameRegistry.registerItem(scrap, scrap.getUnlocalizedName());
GameRegistry.registerItem(waste_uranium_hot, waste_uranium_hot.getUnlocalizedName());
GameRegistry.registerItem(waste_thorium_hot, waste_thorium_hot.getUnlocalizedName());
GameRegistry.registerItem(waste_plutonium_hot, waste_plutonium_hot.getUnlocalizedName());
GameRegistry.registerItem(waste_mox_hot, waste_mox_hot.getUnlocalizedName());
GameRegistry.registerItem(waste_schrabidium_hot, waste_schrabidium_hot.getUnlocalizedName());
GameRegistry.registerItem(waste_uranium, waste_uranium.getUnlocalizedName());
GameRegistry.registerItem(waste_thorium, waste_thorium.getUnlocalizedName());
GameRegistry.registerItem(waste_plutonium, waste_plutonium.getUnlocalizedName());

13
com/hbm/items/special/ItemRadioactive.java
View File

@ -49,12 +49,16 @@ public class ItemRadioactive extends Item {
//Strong
if (this == ModItems.ingot_u235 ||
if (this == ModItems.ingot_u233 ||
this == ModItems.ingot_u235 ||
this == ModItems.ingot_pu239 ||
this == ModItems.ingot_pu239 ||
this == ModItems.ingot_pu240 ||
this == ModItems.ingot_uranium_fuel ||
this == ModItems.ingot_plutonium_fuel ||
this == ModItems.ingot_mox_fuel ||
this == ModItems.rod_quad_u233 ||
this == ModItems.rod_dual_u233 ||
this == ModItems.rod_quad_u235 ||
this == ModItems.rod_dual_u235 ||
this == ModItems.rod_quad_pu239 ||
@ -88,12 +92,14 @@ public class ItemRadioactive extends Item {
//Strong Nuggets
if (this == ModItems.nugget_u235 ||
if (this == ModItems.nugget_u233 ||
this == ModItems.nugget_u235 ||
this == ModItems.nugget_pu239 ||
this == ModItems.nugget_pu240 ||
this == ModItems.nugget_uranium_fuel ||
this == ModItems.nugget_plutonium_fuel ||
this == ModItems.nugget_mox_fuel ||
this == ModItems.rod_u233 ||
this == ModItems.rod_u235 ||
this == ModItems.rod_pu239 ||
this == ModItems.rod_pu240 ||
@ -171,7 +177,8 @@ public class ItemRadioactive extends Item {
if (this == ModItems.cell_tritium ||
this == ModItems.rod_tritium ||
this == ModItems.rod_dual_tritium ||
this == ModItems.rod_quad_tritium) {
this == ModItems.rod_quad_tritium ||
this == ModItems.nugget_thorium_fuel) {
//Library.applyRadiation(living, 10, 4, 0, 0);
Library.applyRadData(living, 0.75F/20F * mod);
}

19
com/hbm/saveddata/RadiationSavedData.java
View File

@ -188,5 +188,24 @@ public class RadiationSavedData extends WorldSavedData {
data.setRadForCoord(chunk.xPosition, chunk.zPosition, r + rad);
}
}
public static void decrementRad(World worldObj, int x, int z, float rad) {
RadiationSavedData data = getData(worldObj);
Chunk chunk = worldObj.getChunkFromBlockCoords(x, z);
float r = data.getRadNumFromCoord(chunk.xPosition, chunk.zPosition);
r -= rad;
if(r > 0) {
data.setRadForCoord(chunk.xPosition, chunk.zPosition, r);
} else {
data.setRadForCoord(chunk.xPosition, chunk.zPosition, 0);
}
System.out.println(r);
}
}