Cleaner sub-item implementation

Todo: Move more sub items to use it

src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java

@@ -19,46 +19,13 @@ import org.apache.commons.lang3.tuple.Pair;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVariantProvider {
-    public static final ArrayList<String> NAMES = Lists.newArrayList();
-
-    public static final String CRYSTAL_DEFAULT = "crystalDefault";
-    public static final String CRYSTAL_CORROSIVE = "crystalCorrosive";
-    public static final String CRYSTAL_VENGEFUL = "crystalVengeful";
-    public static final String CRYSTAL_DESTRUCTIVE = "crystalDestructive";
-    public static final String CRYSTAL_STEADFAST = "crystalSteadfast";
+public class ItemDemonCrystal extends ItemEnum<EnumDemonWillType> implements IDiscreteDemonWill, IVariantProvider {
 
     public ItemDemonCrystal() {
-        super();
+        super(EnumDemonWillType.class, "demonCrystal");
 
-        setUnlocalizedName(BloodMagic.MODID + ".demonCrystal.");
         setHasSubtypes(true);
         setCreativeTab(BloodMagic.TAB_BM);
-
-        buildItemList();
-    }
-
-    private void buildItemList() {
-        NAMES.add(0, CRYSTAL_DEFAULT);
-        NAMES.add(1, CRYSTAL_CORROSIVE);
-        NAMES.add(2, CRYSTAL_DESTRUCTIVE);
-        NAMES.add(3, CRYSTAL_VENGEFUL);
-        NAMES.add(4, CRYSTAL_STEADFAST);
-    }
-
-    @Override
-    public String getUnlocalizedName(ItemStack stack) {
-        return super.getUnlocalizedName(stack) + NAMES.get(stack.getItemDamage());
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> list) {
-        if (!isInCreativeTab(creativeTab))
-            return;
-
-        for (int i = 0; i < NAMES.size(); i++)
-            list.add(new ItemStack(this, 1, i));
     }
 
     @Override
@@ -88,16 +55,4 @@ public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVaria
     public EnumDemonWillType getType(ItemStack willStack) {
         return EnumDemonWillType.values()[MathHelper.clamp(willStack.getMetadata(), 0, EnumDemonWillType.values().length - 1)];
     }
-
-    @Override
-    public List<Pair<Integer, String>> getVariants() {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        for (String name : NAMES)
-            ret.add(new ImmutablePair<Integer, String>(NAMES.indexOf(name), "type=" + name));
-        return ret;
-    }
-
-    public static ItemStack getStack(String name) {
-        return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, NAMES.indexOf(name));
-    }
 }

src/main/java/WayofTime/bloodmagic/item/ItemEnum.java

@@ -0,0 +1,59 @@
+package WayofTime.bloodmagic.item;
+
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.item.types.ISubItem;
+import com.google.common.collect.Lists;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.math.MathHelper;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.List;
+
+public class ItemEnum<T extends Enum<T> & ISubItem> extends Item implements IVariantProvider {
+
+    protected final T[] types;
+
+    public ItemEnum(Class<T> enumClass, String baseName) {
+        super();
+
+        this.types = enumClass.getEnumConstants();
+
+        setUnlocalizedName(BloodMagic.MODID + "." + baseName);
+        setHasSubtypes(types.length > 1);
+        setCreativeTab(BloodMagic.TAB_BM);
+    }
+
+    @Override
+    public String getUnlocalizedName(ItemStack stack) {
+        return super.getUnlocalizedName(stack) + "." + getItemType(stack).getInternalName();
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> subItems) {
+        if (!isInCreativeTab(tab))
+            return;
+
+        for (T type : types)
+            subItems.add(new ItemStack(this, 1, type.ordinal()));
+    }
+
+    public T getItemType(ItemStack stack) {
+        return types[MathHelper.clamp(stack.getItemDamage(), 0, types.length)];
+    }
+
+    @Override
+    public List<Pair<Integer, String>> getVariants() {
+        List<Pair<Integer, String>> variants = Lists.newArrayList();
+        for (int i = 0; i < types.length; i++)
+            variants.add(Pair.of(i, "type=" + types[i].getInternalName()));
+
+        return variants;
+    }
+}

src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java

@@ -0,0 +1,64 @@
+package WayofTime.bloodmagic.item.types;
+
+import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
+import net.minecraft.item.ItemStack;
+
+import javax.annotation.Nonnull;
+import java.util.Locale;
+
+public enum ComponentTypes implements ISubItem {
+
+    REAGENT_WATER,
+    REAGENT_LAVA,
+    REAGENT_AIR,
+    REAGENT_FAST_MINER,
+    REAGENT_VOID,
+    REAGENT_GROWTH,
+    REAGENT_AFFINITY,
+    REAGENT_SIGHT,
+    REAGENT_BINDING,
+    REAGENT_SUPPRESSION,
+    FRAME_PART,
+    REAGENT_BLOOD_LIGHT,
+    REAGENT_MAGNETISM,
+    REAGENT_HASTE,
+    REAGENT_COMPRESSION,
+    REAGENT_BRIDGE,
+    REAGENT_SEVERANCE,
+    REAGENT_TELEPOSITION,
+    REAGENT_TRANSPOSITION,
+    SAND_IRON,
+    SAND_GOLD,
+    SAND_COAL,
+    PLANT_OIL,
+    SULFUR,
+    SALTPETER,
+    NEURO_TOXIN,
+    ANTISEPTIC,
+    REAGENT_HOLDING,
+    CATALYST_LENGTH_1,
+    CATALYST_POWER_1,
+    REAGENT_CLAW,
+    REAGENT_BOUNCE,
+    REAGENT_FROST,
+    ;
+
+    @Nonnull
+    @Override
+    public String getInternalName() {
+        return name().toLowerCase(Locale.ROOT);
+    }
+
+    @Nonnull
+    @Override
+    public ItemStack getStack() {
+        return getStack(1);
+    }
+
+    @Nonnull
+    @Override
+    public ItemStack getStack(int count) {
+        return new ItemStack(RegistrarBloodMagicItems.COMPONENT, count, ordinal());
+    }
+}
+

src/main/java/WayofTime/bloodmagic/item/types/ISubItem.java

@@ -0,0 +1,19 @@
+package WayofTime.bloodmagic.item.types;
+
+import net.minecraft.item.ItemStack;
+
+import javax.annotation.Nonnull;
+
+public interface ISubItem {
+
+    @Nonnull
+    String getInternalName();
+
+    @Nonnull
+    default ItemStack getStack() {
+        return getStack(1);
+    }
+
+    @Nonnull
+    ItemStack getStack(int count);
+}