From 479c659d503d0020d5041bad95aa4ba34c88b33d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 10 Dec 2017 19:30:22 -0600 Subject: [PATCH] Fix startup crash --- .../vazkii/botania/common/item/ModItems.java | 47 +++++++++---------- .../item/material/ItemManaResource.java | 8 +--- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index d6736a709..b5612d7f8 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -93,7 +93,6 @@ import vazkii.botania.common.item.rod.ItemTerraformRod; import vazkii.botania.common.item.rod.ItemTornadoRod; import vazkii.botania.common.item.rod.ItemWaterRod; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; @Mod.EventBusSubscriber @@ -104,29 +103,29 @@ public final class ModItems { public static final Item pestleAndMortar = new ItemPestleAndMortar(); public static final Item twigWand = new ItemTwigWand(); - public static final Item manaSteel = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[0]); - public static final Item manaPearl = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[1]); - public static final Item manaDiamond = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[2]); - public static final Item livingwoodTwig = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[3]); - public static final Item terrasteel = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[4]); - public static final Item lifeEssence = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[5]); - public static final Item redstoneRoot = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[6]); - public static final Item elementium = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[7]); - public static final Item pixieDust = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[8]); - public static final Item dragonstone = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[9]); - public static final Item placeholder = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[11]); - public static final Item redString = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[12]); - public static final Item dreamwoodTwig = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[13]); - public static final Item gaiaIngot = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[14]); - public static final Item enderAirBottle = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[15]); - public static final Item manaString = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[16]); - public static final Item manasteelNugget = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[17]); - public static final Item terrasteelNugget = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[18]); - public static final Item elementiumNugget = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[19]); - public static final Item livingroot = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[20]); - public static final Item pebble = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[21]); - public static final Item manaweaveCloth = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[22]); - public static final Item manaPowder = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[23]); + public static final Item manaSteel = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[0]); + public static final Item manaPearl = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[1]); + public static final Item manaDiamond = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[2]); + public static final Item livingwoodTwig = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[3]); + public static final Item terrasteel = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[4]); + public static final Item lifeEssence = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[5]); + public static final Item redstoneRoot = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[6]); + public static final Item elementium = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[7]); + public static final Item pixieDust = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[8]); + public static final Item dragonstone = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[9]); + public static final Item placeholder = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[11]); + public static final Item redString = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[12]); + public static final Item dreamwoodTwig = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[13]); + public static final Item gaiaIngot = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[14]); + public static final Item enderAirBottle = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[15]); + public static final Item manaString = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[16]); + public static final Item manasteelNugget = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[17]); + public static final Item terrasteelNugget = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[18]); + public static final Item elementiumNugget = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[19]); + public static final Item livingroot = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[20]); + public static final Item pebble = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[21]); + public static final Item manaweaveCloth = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[22]); + public static final Item manaPowder = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[23]); public static final Item lens = new ItemLens(); public static final Item rune = new ItemRune(); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 219c6293b..61279ca86 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -48,12 +48,8 @@ import javax.annotation.Nonnull; @Mod.EventBusSubscriber public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem { - - final int types = 24; - - public ItemManaResource() { - super(LibItemNames.MANA_RESOURCE); - setHasSubtypes(true); + public ItemManaResource(String registryName) { + super(registryName); } @SubscribeEvent