diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/creative')
6 files changed, 30 insertions, 9 deletions
diff --git a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java index 8e6d38f301..218bef46bd 100644 --- a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java +++ b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java @@ -1,7 +1,7 @@ package gtPlusPlus.core.creative; import net.minecraft.creativetab.CreativeTabs; - +import gregtech.api.util.GT_CreativeTab; import gtPlusPlus.core.creative.tabs.*; import gtPlusPlus.xmod.bop.creative.MiscUtilsBOPTab; @@ -16,11 +16,20 @@ public class AddToCreativeTab { public static CreativeTabs tabBOP; public static void initialiseTabs() { - tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); + //GT_CreativeTab + /*tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab"); tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab"); - tabBOP = new MiscUtilsBOPTab("MiscUtilBOP"); + tabBOP = new MiscUtilsBOPTab("MiscUtilBOP");*/ + + tabBlock = new GT_CreativeTab("GTPP_BLOCKS", "GT++ Blocks"); + tabMisc = new GT_CreativeTab("GTPP_MISC", "GT++ Misc"); + tabTools = new GT_CreativeTab("GTPP_TOOLS", "GT++ Tools"); + tabMachines = new GT_CreativeTab("GTPP_MACHINES", "GT++ Machines"); + tabOther = new GT_CreativeTab("GTPP_OTHER", "GT++ Other"); + tabBOP = new GT_CreativeTab("GTPP_OTHER_2", "GT++ Other II"); + } } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java index 3af79c7305..2851a514d0 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java @@ -1,8 +1,10 @@ package gtPlusPlus.core.creative.tabs; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.block.ModBlocks; public class MiscUtilCreativeTabBlock extends CreativeTabs { @@ -13,7 +15,13 @@ public class MiscUtilCreativeTabBlock extends CreativeTabs { @Override public Item getTabIconItem() { - return Item.getItemFromBlock(ModBlocks.blockCompressedObsidian); + return Item.getItemFromBlock(Blocks.bedrock); } + + @SideOnly(Side.CLIENT) + @Override + public int func_151243_f(){ + return 0; + } } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java index 9f145cf581..96c809c4da 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.creative.tabs; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Items; import net.minecraft.item.Item; import gtPlusPlus.core.item.ModItems; @@ -14,7 +15,7 @@ public class MiscUtilCreativeTabMachines extends CreativeTabs { @Override public Item getTabIconItem() { - return ModItems.itemAlkalusDisk; + return Items.netherbrick; } } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java index 17c56f68af..a67668bbf0 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.creative.tabs; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Items; import net.minecraft.item.Item; import gtPlusPlus.core.item.ModItems; @@ -13,7 +14,7 @@ public class MiscUtilCreativeTabMisc extends CreativeTabs { @Override public Item getTabIconItem() { - return ModItems.AAA_Broken; + return Items.painting; } } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java index 156086081e..afd89346c0 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.creative.tabs; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Items; import net.minecraft.item.Item; import gtPlusPlus.core.item.ModItems; @@ -13,7 +14,7 @@ public class MiscUtilCreativeTabOther extends CreativeTabs { @Override public Item getTabIconItem() { - return ModItems.backpack_Green; + return Items.repeater; } } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java index b68eccd0e4..ab1ab069de 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.creative.tabs; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Items; import net.minecraft.item.Item; import gtPlusPlus.core.item.ModItems; @@ -13,7 +14,7 @@ public class MiscUtilCreativeTabTools extends CreativeTabs { @Override public Item getTabIconItem() { - return ModItems.itemStaballoyPickaxe; + return Items.diamond_pickaxe; } } |