From 33437f214c45e9edc020f64c80f90d9f3acd0546 Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Sat, 22 Nov 2014 21:05:42 -0800 Subject: [PATCH] Removing unnecessary class --- .../fox/spiteful/forbidden/Forbidden.java | 18 ++++++++++--- .../fox/spiteful/forbidden/ForbiddenTab.java | 27 ------------------- 2 files changed, 15 insertions(+), 30 deletions(-) delete mode 100644 src/main/java/fox/spiteful/forbidden/ForbiddenTab.java diff --git a/src/main/java/fox/spiteful/forbidden/Forbidden.java b/src/main/java/fox/spiteful/forbidden/Forbidden.java index 1b5ba36..0361781 100644 --- a/src/main/java/fox/spiteful/forbidden/Forbidden.java +++ b/src/main/java/fox/spiteful/forbidden/Forbidden.java @@ -1,7 +1,9 @@ package fox.spiteful.forbidden; import fox.spiteful.forbidden.potions.DarkPotions; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraftforge.common.MinecraftForge; import thaumcraft.api.wands.WandTriggerRegistry; @@ -22,8 +24,13 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; public class Forbidden { @Instance("ForbiddenMagic") public static Forbidden instance; - public static ForbiddenTab tab = new ForbiddenTab("forbidden"); - public static ForbiddenTab crysTab; + public static CreativeTabs tab = new CreativeTabs("forbidden"){ + @Override + public Item getTabIconItem() { + return ForbiddenItems.fork; + } + }; + public static CreativeTabs crysTab; @SidedProxy(clientSide = "fox.spiteful.forbidden.client.ClientProxy", serverSide = "fox.spiteful.forbidden.CommonProxy") public static CommonProxy proxy; public static WandOverlord wandLord; @@ -33,7 +40,12 @@ public class Forbidden { instance = this; Config.configurate(event.getSuggestedConfigurationFile()); if (Config.wrathCage) - crysTab = new ForbiddenTab("mobcrystal", true); + crysTab = new CreativeTabs("mobcrystal"){ + @Override + public Item getTabIconItem() { + return ForbiddenItems.mobCrystal; + } + }; Compat.initiate(); DarkAspects.initAspects(); Config.spawnilify(); diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenTab.java b/src/main/java/fox/spiteful/forbidden/ForbiddenTab.java deleted file mode 100644 index cd9f7dd..0000000 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenTab.java +++ /dev/null @@ -1,27 +0,0 @@ -package fox.spiteful.forbidden; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -import fox.spiteful.forbidden.items.ForbiddenItems; - -public final class ForbiddenTab extends CreativeTabs { - private boolean crystal = false; - - public ForbiddenTab(String tabName) { - super(tabName); - } - - public ForbiddenTab(String tabName, boolean mobCrystal) { - super(tabName); - crystal = mobCrystal; - } - - @Override - public Item getTabIconItem() { - if (!crystal) - return ForbiddenItems.fork; - else - return ForbiddenItems.mobCrystal; - } -}