diff --git a/assets/hbm/textures/blocks/machine_radar.png b/assets/hbm/textures/blocks/machine_radar.png new file mode 100644 index 000000000..7d1a2237b Binary files /dev/null and b/assets/hbm/textures/blocks/machine_radar.png differ diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index fcebc0f62..8d623fe84 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -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"); diff --git a/com/hbm/items/food/ItemLemon.java b/com/hbm/items/food/ItemLemon.java index 49db68996..0956c3b73 100644 --- a/com/hbm/items/food/ItemLemon.java +++ b/com/hbm/items/food/ItemLemon.java @@ -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) { diff --git a/com/hbm/items/special/ItemFuelRod.java b/com/hbm/items/special/ItemFuelRod.java index dec390986..4797df0f6 100644 --- a/com/hbm/items/special/ItemFuelRod.java +++ b/com/hbm/items/special/ItemFuelRod.java @@ -6,8 +6,16 @@ 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) @@ -98,5 +106,29 @@ public class ItemFuelRod extends ItemRadioactive { list.add("Lasts 10000000 ticks"); } } + + 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"); + } } diff --git a/com/hbm/items/weapon/GunLeverActionS.java b/com/hbm/items/weapon/GunLeverActionS.java index d9b0a4da0..ca0be3801 100644 --- a/com/hbm/items/weapon/GunLeverActionS.java +++ b/com/hbm/items/weapon/GunLeverActionS.java @@ -77,16 +77,14 @@ public class GunLeverActionS extends Item { p_77615_3_.motionX += vec.xCoord * 0.75; p_77615_3_.motionY += vec.yCoord * 0.75; p_77615_3_.motionZ += vec.zCoord * 0.75; + + p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_lever_action_ammo); + + p_77615_1_.damageItem(1, p_77615_3_); p_77615_3_.attackEntityFrom(ModDamageSource.suicide, 1000); - p_77615_1_.damageItem(1, p_77615_3_); - p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShootAlt", 5.0F, 0.75F); - - if (flag) { } else { - p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_lever_action_ammo); - } setAnim(p_77615_1_, 1); } diff --git a/com/hbm/items/weapon/GunSuicide.java b/com/hbm/items/weapon/GunSuicide.java index 6c72cba74..eb0a54bc9 100644 --- a/com/hbm/items/weapon/GunSuicide.java +++ b/com/hbm/items/weapon/GunSuicide.java @@ -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 diff --git a/com/hbm/tileentity/machine/TileEntityMachineGenerator.java b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java index fa7237ad2..debe1822a 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGenerator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java @@ -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); } diff --git a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java index 07a6d6239..a7a2f0784 100644 --- a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java @@ -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); }