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

Removed redundant code from GunSuicide, fixed regular fuel rods

Browse Source
This commit is contained in:
HbmMods 2018-02-20 21:27:22 +01:00
parent d6e7a4be79
commit 53223ce017
8 changed files with 154 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 286 B

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

@ -1662,18 +1662,18 @@ public class ModItems {
rod_quad_lead = new Item().setUnlocalizedName("rod_quad_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_lead");
rod_quad_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_quad_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium");
rod_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_uranium_fuel").setMaxStackSize(1).setMaxDamage(10000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel");
rod_dual_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_uranium_fuel").setMaxStackSize(1).setMaxDamage(20000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel");
rod_quad_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_uranium_fuel").setMaxStackSize(1).setMaxDamage(40000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium_fuel");
rod_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_plutonium_fuel").setMaxStackSize(1).setMaxDamage(25000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium_fuel");
rod_dual_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_plutonium_fuel").setMaxStackSize(1).setMaxDamage(50000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium_fuel");
rod_quad_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_plutonium_fuel").setMaxStackSize(1).setMaxDamage(100000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium_fuel");
rod_mox_fuel = new ItemFuelRod().setUnlocalizedName("rod_mox_fuel").setMaxStackSize(1).setMaxDamage(100000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_mox_fuel");
rod_dual_mox_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_mox_fuel").setMaxStackSize(1).setMaxDamage(200000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_mox_fuel");
rod_quad_mox_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_mox_fuel").setMaxStackSize(1).setMaxDamage(400000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_mox_fuel");
rod_schrabidium_fuel = new ItemFuelRod().setUnlocalizedName("rod_schrabidium_fuel").setMaxStackSize(1).setMaxDamage(2500000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium_fuel");
rod_dual_schrabidium_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_schrabidium_fuel").setMaxStackSize(1).setMaxDamage(5000000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium_fuel");
rod_quad_schrabidium_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_schrabidium_fuel").setMaxStackSize(1).setMaxDamage(10000000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium_fuel");
rod_uranium_fuel = new ItemFuelRod(10000).setUnlocalizedName("rod_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel");
rod_dual_uranium_fuel = new ItemFuelRod(20000).setUnlocalizedName("rod_dual_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel");
rod_quad_uranium_fuel = new ItemFuelRod(40000).setUnlocalizedName("rod_quad_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium_fuel");
rod_plutonium_fuel = new ItemFuelRod(25000).setUnlocalizedName("rod_plutonium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium_fuel");
rod_dual_plutonium_fuel = new ItemFuelRod(50000).setUnlocalizedName("rod_dual_plutonium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium_fuel");
rod_quad_plutonium_fuel = new ItemFuelRod(100000).setUnlocalizedName("rod_quad_plutonium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium_fuel");
rod_mox_fuel = new ItemFuelRod(100000).setUnlocalizedName("rod_mox_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_mox_fuel");
rod_dual_mox_fuel = new ItemFuelRod(200000).setUnlocalizedName("rod_dual_mox_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_mox_fuel");
rod_quad_mox_fuel = new ItemFuelRod(400000).setUnlocalizedName("rod_quad_mox_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_mox_fuel");
rod_schrabidium_fuel = new ItemFuelRod(2500000).setUnlocalizedName("rod_schrabidium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium_fuel");
rod_dual_schrabidium_fuel = new ItemFuelRod(5000000).setUnlocalizedName("rod_dual_schrabidium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium_fuel");
rod_quad_schrabidium_fuel = new ItemFuelRod(10000000).setUnlocalizedName("rod_quad_schrabidium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium_fuel");
rod_water = new ItemCustomLore().setUnlocalizedName("rod_water").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_water");
rod_dual_water = new ItemCustomLore().setUnlocalizedName("rod_dual_water").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_water");

6
com/hbm/items/food/ItemLemon.java
View File

@ -39,10 +39,8 @@ public class ItemLemon extends ItemFood {
}
if(this == ModItems.med_ptsd) {
list.add("I don't get why I have to take PTSD mediaction");
list.add("and Vee doesn't, I mean, he saw things wayyy worse");
list.add("and he got away with it. This isn't even PTSD");
list.add("mediaction, it's just Ipecac in a different bottle!");
list.add("This isn't even PTSD mediaction, it's just");
list.add("Ipecac in a different bottle!");
}
if(this == ModItems.med_schizophrenia) {

32
com/hbm/items/special/ItemFuelRod.java
View File

@ -6,9 +6,17 @@ import com.hbm.items.ModItems;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
public class ItemFuelRod extends ItemRadioactive {
public int lifeTime;
public ItemFuelRod(int life) {
this.lifeTime = life;
this.setMaxDamage(100);
}
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool)
{
@ -99,4 +107,28 @@ public class ItemFuelRod extends ItemRadioactive {
}
}
public static void setLifeTime(ItemStack stack, int time) {
if(!stack.hasTagCompound())
stack.stackTagCompound = new NBTTagCompound();
stack.stackTagCompound.setInteger("life", time);
}
public static void updateDamage(ItemStack stack) {
if(!stack.hasTagCompound())
stack.stackTagCompound = new NBTTagCompound();
stack.setItemDamage((int)((double)getLifeTime(stack) / (double)((ItemFuelRod)stack.getItem()).lifeTime * 100D));
}
public static int getLifeTime(ItemStack stack) {
if(!stack.hasTagCompound()) {
stack.stackTagCompound = new NBTTagCompound();
return 0;
}
return stack.stackTagCompound.getInteger("life");
}
}

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

@ -78,15 +78,13 @@ public class GunLeverActionS extends Item {
p_77615_3_.motionY += vec.yCoord * 0.75;
p_77615_3_.motionZ += vec.zCoord * 0.75;
p_77615_3_.attackEntityFrom(ModDamageSource.suicide, 1000);
p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_lever_action_ammo);
p_77615_1_.damageItem(1, p_77615_3_);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShootAlt", 5.0F, 0.75F);
p_77615_3_.attackEntityFrom(ModDamageSource.suicide, 1000);
if (flag) { } else {
p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_lever_action_ammo);
}
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShootAlt", 5.0F, 0.75F);
setAnim(p_77615_1_, 1);
}

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

@ -44,20 +44,6 @@ public class GunSuicide extends Item {
this.ammo = ModItems.gun_revolver_ammo;
}
@Override
public EnumRarity getRarity(ItemStack p_77613_1_) {
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
*/
@ -89,26 +75,7 @@ public class GunSuicide extends Item {
}
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 || 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);
}
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShoot", 1.0F, 1.0F);
if (flag)
{ }
@ -177,53 +144,11 @@ public class GunSuicide extends Item {
@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: 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.");
}
list.add("I've seen things...");
list.add("...I shouldn't have seen.");
list.add("");
list.add("Ammo: Lead Bullets");
list.add("Damage: Infinite");
}
@Override

84
com/hbm/tileentity/machine/TileEntityMachineGenerator.java
View File

@ -299,144 +299,156 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve
{
if(slots[i] != null && slots[i].getItem() == ModItems.rod_uranium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(100);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_uranium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_dual_uranium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(100);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_dual_uranium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_quad_uranium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(100);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_quad_uranium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_plutonium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(2);
attemptPower(150);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_plutonium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_dual_plutonium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(2);
attemptPower(150);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_dual_plutonium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_quad_plutonium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(2);
attemptPower(150);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_quad_plutonium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_mox_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(50);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_mox_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_dual_mox_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(50);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_dual_mox_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_quad_mox_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(50);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_quad_mox_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_schrabidium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(10);
attemptPower(25000);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_schrabidium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_dual_schrabidium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(10);
attemptPower(25000);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_dual_schrabidium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_quad_schrabidium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(10);
attemptPower(25000);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_quad_schrabidium_fuel_depleted);
}

84
com/hbm/tileentity/machine/TileEntityReactorMultiblock.java
View File

@ -243,144 +243,156 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv
{
if(slots[i] != null && slots[i].getItem() == ModItems.rod_uranium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(250);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_uranium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_dual_uranium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(250);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_dual_uranium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_quad_uranium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(250);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_quad_uranium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_plutonium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(2);
attemptPower(375);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_plutonium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_dual_plutonium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(2);
attemptPower(375);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_dual_plutonium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_quad_plutonium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(2);
attemptPower(375);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_quad_plutonium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_mox_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(125);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_mox_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_dual_mox_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(125);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_dual_mox_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_quad_mox_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(1);
attemptPower(125);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_quad_mox_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_schrabidium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(10);
attemptPower(62500);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_schrabidium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_dual_schrabidium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(10);
attemptPower(62500);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_dual_schrabidium_fuel_depleted);
}
}
if(slots[i] != null && slots[i].getItem() == ModItems.rod_quad_schrabidium_fuel)
{
int j = slots[i].getItemDamage();
this.slots[i].setItemDamage(j += 1);
int j = ItemFuelRod.getLifeTime(slots[i]);
ItemFuelRod.setLifeTime(slots[i], j + 1);
ItemFuelRod.updateDamage(slots[i]);
attemptHeat(10);
attemptPower(62500);
if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage())
if(ItemFuelRod.getLifeTime(slots[i]) == ((ItemFuelRod)slots[i].getItem()).lifeTime)
{
this.slots[i] = new ItemStack(ModItems.rod_quad_schrabidium_fuel_depleted);
}