diff --git a/src/main/java/com/hbm/items/machine/ItemDepletedWaste.java b/src/main/java/com/hbm/items/machine/ItemDepletedWaste.java deleted file mode 100644 index ee4f49c0b..000000000 --- a/src/main/java/com/hbm/items/machine/ItemDepletedWaste.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hbm.items.machine; - -import java.util.List; - -import com.hbm.items.ItemEnumMulti; -import com.hbm.items.machine.ItemZirnoxRod.EnumZirnoxType; -import com.hbm.util.EnumUtil; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemDepletedWaste extends ItemEnumMulti { - - public ItemDepletedWaste(Class theEnum, boolean multiName, boolean multiTexture) { - super(theEnum, multiName, multiTexture); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { - for(int i = 0; i < theEnum.getEnumConstants().length; i++) { - if(theEnum == ItemZirnoxRod.EnumZirnoxType.class) { //i could make an interface or a base enum, but it's only used for 'nox rods anyway - EnumZirnoxType num = EnumUtil.grabEnumSafely(EnumZirnoxType.class, i); - if(!num.breeding) list.add(new ItemStack(item, 1, i)); //wastes' ordinals are always equal to their fuels' ordinals - } else - list.add(new ItemStack(item, 1, i)); - } - } - - //TODO: cooling stuff -} diff --git a/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java b/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java index 6f15c59f8..d2abfda19 100644 --- a/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java +++ b/src/main/java/com/hbm/items/machine/ItemZirnoxRod.java @@ -64,26 +64,18 @@ public class ItemZirnoxRod extends ItemEnumMulti { public static enum EnumZirnoxType { NATURAL_URANIUM_FUEL(250_000, 30), URANIUM_FUEL(200_000, 50), - TH232(20_000, 0, true), + TH232(20_000, 0), THORIUM_FUEL(200_000, 40), MOX_FUEL(165_000, 75), PLUTONIUM_FUEL(175_000, 65), U233_FUEL(150_000, 100), U235_FUEL(165_000, 85), LES_FUEL(150_000, 150), - LITHIUM(20_000, 0, true), + LITHIUM(20_000, 0), ZFB_MOX(50_000, 35); public int maxLife; public int heat; - /** Doesn't auto-generate a waste type, waste rods, etc. */ - public boolean breeding = false; - - private EnumZirnoxType(int life, int heat, boolean breeding) { - this.maxLife = life; - this.heat = heat; - this.breeding = breeding; - } private EnumZirnoxType(int life, int heat) { this.maxLife = life;