diff --git a/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java b/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java index bc1584e9d..1ac0d7620 100644 --- a/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java +++ b/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java @@ -15,14 +15,8 @@ float target; @Override public float modify(ItemStack stack, EntityLivingBase holder, float level) { - - if(stack.getItem() instanceof ItemFuelRod) { - ItemFuelRod fuel = (ItemFuelRod) stack.getItem(); - double depletion = Math.pow(fuel.getDurabilityForDisplay(stack), 0.4D); - - level = (float) (level + (this.target - level) * depletion); - - } + double depletion = Math.pow(stack.getItem().getDurabilityForDisplay(stack), 0.4D); + level = (float) (level + (this.target - level) * depletion); return level; } diff --git a/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java b/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java index d98f0c5b5..689593e97 100644 --- a/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java +++ b/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java @@ -65,6 +65,11 @@ public class ItemZirnoxRod extends ItemEnumMulti { EnumZirnoxType num = EnumUtil.grabEnumSafely(theEnum, stack.getItemDamage()); String[] loc = I18nUtil.resolveKeyArray("desc.item.zirnox" + (num.breeding ? "BreedingRod" : "Rod"), BobMathUtil.getShortNumber(num.maxLife)); + if(num.breeding) + loc = I18nUtil.resolveKeyArray("desc.item.zirnoxBreedingRod", BobMathUtil.getShortNumber(num.maxLife)); + else + loc = I18nUtil.resolveKeyArray("desc.item.zirnoxRod", num.heat, BobMathUtil.getShortNumber(num.maxLife)); + for(String s : loc) { list.add(s); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index 62be6c67e..3f8eaa2ac 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -298,7 +298,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF for(int i = 0; i < decay; i++) { this.heat += num.heat; - ItemZirnoxRod.incrementLifeTime(slots[id]);; + ItemZirnoxRod.incrementLifeTime(slots[id]); if(ItemZirnoxRod.getLifeTime(slots[id]) > num.maxLife) { slots[id] = fuelMap.get(new ComparableStack(getStackInSlot(id))).copy();