From a7f4b7ab7b537d67619a686d1883f8484e5330b2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Dec 2017 22:00:17 -0600 Subject: [PATCH] Minor cleanup --- .../vazkii/botania/common/item/ItemTwigWand.java | 14 +------------- .../java/vazkii/botania/common/item/ModItems.java | 10 ++++++---- .../vazkii/botania/common/lib/LibItemNames.java | 2 -- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 5a70dabc4..79b6430e6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -59,7 +59,7 @@ import javax.annotation.Nonnull; import java.awt.Color; import java.util.List; -public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { +public class ItemTwigWand extends ItemMod implements ICoordBoundItem { private static final String TAG_COLOR1 = "color1"; private static final String TAG_COLOR2 = "color2"; @@ -238,12 +238,6 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } } - @Nonnull - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack); - } - @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { @@ -315,10 +309,4 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return null; } - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); - } - } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 7f0abd992..b2a989e46 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; @@ -521,10 +522,11 @@ public final class ModItems { BotaniaAPI.blackListItemFromLoonium(lexicon); BotaniaAPI.blackListItemFromLoonium(overgrowthSeed); BotaniaAPI.blackListItemFromLoonium(blackLotus); - int min = Item.getIdFromItem(Items.RECORD_13); - int max = Item.getIdFromItem(Items.RECORD_WAIT); - for(int i = min; i <= max; i++) - BotaniaAPI.blackListItemFromLoonium(Item.getItemById(i)); + for(Item i : Item.REGISTRY) { + if("minecraft".equals(i.getRegistryName().getResourceDomain()) & i instanceof ItemRecord) { + BotaniaAPI.blackListItemFromLoonium(i); + } + } OreDictionary.registerOre("rodBlaze", Items.BLAZE_ROD); OreDictionary.registerOre("powderBlaze", Items.BLAZE_POWDER); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 66959ea2b..1e6b10343 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -17,9 +17,7 @@ public final class LibItemNames { public static final String DYE = "dye"; public static final String PESTLE_AND_MORTAR = "pestleAndMortar"; public static final String TWIG_WAND = "twigWand"; - public static final String MANA_RESOURCE = "manaResource"; public static final String LENS = "lens"; - public static final String MANA_PETAL = "manaPetal"; public static final String RUNE = "rune"; public static final String MANA_TABLET = "manaTablet"; public static final String MANA_GUN = "manaGun";