Merge branch 'GTNewHorizons:master' into master

6 files changed, 143 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java
new file mode 100644
index 0000000000..218bef46bd
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java
@@ -0,0 +1,35 @@
+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;
+
+public class AddToCreativeTab {
+
+	public static CreativeTabs tabBlock;
+	public static CreativeTabs tabMisc;
+	public static CreativeTabs tabCombat;
+	public static CreativeTabs tabTools;
+	public static CreativeTabs tabMachines;
+	public static CreativeTabs tabOther;
+	public static CreativeTabs tabBOP;
+
+	public static void initialiseTabs() {
+		//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");*/
+		
+		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/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
new file mode 100644
index 0000000000..2851a514d0
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
@@ -0,0 +1,27 @@
+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 {
+
+	public MiscUtilCreativeTabBlock(final String lable) {
+		super(lable);
+	}
+
+	@Override
+	public Item getTabIconItem() {
+		return Item.getItemFromBlock(Blocks.bedrock);
+	}
+	
+    @SideOnly(Side.CLIENT)
+	@Override
+    public int func_151243_f(){
+        return 0;
+    }
+
+}
diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java
new file mode 100644
index 0000000000..96c809c4da
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java
@@ -0,0 +1,21 @@
+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;
+
+public class MiscUtilCreativeTabMachines extends CreativeTabs {
+
+
+	public MiscUtilCreativeTabMachines(final String lable) {
+		super(lable);
+	}
+
+	@Override
+	public Item getTabIconItem() {
+		return Items.netherbrick;
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java
new file mode 100644
index 0000000000..a67668bbf0
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java
@@ -0,0 +1,20 @@
+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;
+
+public class MiscUtilCreativeTabMisc extends CreativeTabs {
+
+	public MiscUtilCreativeTabMisc(final String lable) {
+		super(lable);
+	}
+
+	@Override
+	public Item getTabIconItem() {
+		return Items.painting;
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java
new file mode 100644
index 0000000000..afd89346c0
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java
@@ -0,0 +1,20 @@
+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;
+
+public class MiscUtilCreativeTabOther extends CreativeTabs {
+
+	public MiscUtilCreativeTabOther(final String lable) {
+		super(lable);
+	}
+
+	@Override
+	public Item getTabIconItem() {
+		return Items.repeater;
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java
new file mode 100644
index 0000000000..ab1ab069de
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java
@@ -0,0 +1,20 @@
+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;
+
+public class MiscUtilCreativeTabTools extends CreativeTabs {
+
+	public MiscUtilCreativeTabTools(final String lable) {
+		super(lable);
+	}
+
+	@Override
+	public Item getTabIconItem() {
+		return Items.diamond_pickaxe;
+	}
+
+}