From cbe0e497be8e466c380a5b4fa781b314ede9ada3 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 6 Nov 2016 19:32:27 +1000 Subject: Revert "$ Cleaned up the entire project." This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747. # Conflicts: # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java Revert "% Cleaned up Imports." This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966. --- .../gtPlusPlus/core/creative/AddToCreativeTab.java | 36 ++++++++++++---------- .../creative/tabs/MiscUtilCreativeTabBlock.java | 2 +- .../creative/tabs/MiscUtilCreativeTabMachines.java | 5 +-- .../creative/tabs/MiscUtilCreativeTabMisc.java | 2 +- .../creative/tabs/MiscUtilCreativeTabOther.java | 2 +- .../creative/tabs/MiscUtilCreativeTabTools.java | 2 +- 6 files changed, 27 insertions(+), 22 deletions(-) (limited to 'src/Java/gtPlusPlus/core/creative') diff --git a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java index b036a2a959..31613f2b85 100644 --- a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java +++ b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java @@ -1,27 +1,31 @@ package gtPlusPlus.core.creative; -import gtPlusPlus.core.creative.tabs.*; +import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabBlock; +import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabMachines; +import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabMisc; +import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabOther; +import gtPlusPlus.core.creative.tabs.MiscUtilCreativeTabTools; import gtPlusPlus.core.lib.CORE; import net.minecraft.creativetab.CreativeTabs; 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 tabBlock; + public static CreativeTabs tabMisc; + public static CreativeTabs tabCombat; + public static CreativeTabs tabTools; + public static CreativeTabs tabMachines; + public static CreativeTabs tabOther; - public static void initialiseTabs() { - AddToCreativeTab.tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); - AddToCreativeTab.tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab"); - AddToCreativeTab.tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); - AddToCreativeTab.tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); - AddToCreativeTab.tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab"); - - if (CORE.DEBUG) { - // tabCombat = new MiscUtilCreativeTabCombat("MiscUtilCombatTab"); + public static void initialiseTabs(){ + tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); + tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab"); + tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); + tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); + tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab"); + + if (CORE.DEBUG){ + //tabCombat = new MiscUtilCreativeTabCombat("MiscUtilCombatTab"); } } } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java index cd13e8cd6d..1220fb1af8 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java @@ -6,7 +6,7 @@ import net.minecraft.item.Item; public class MiscUtilCreativeTabBlock extends CreativeTabs { - public MiscUtilCreativeTabBlock(final String lable) { + public MiscUtilCreativeTabBlock(String lable) { super(lable); } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java index 42a24418cf..932f80ed7f 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java @@ -6,12 +6,13 @@ import net.minecraft.item.Item; public class MiscUtilCreativeTabMachines extends CreativeTabs { - public MiscUtilCreativeTabMachines(final String lable) { + + public MiscUtilCreativeTabMachines(String lable) { super(lable); } @Override - public Item getTabIconItem() { + public Item getTabIconItem() { return ModItems.itemPLACEHOLDER_Circuit; } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java index 2a819865fa..619803e6e1 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java @@ -6,7 +6,7 @@ import net.minecraft.item.Item; public class MiscUtilCreativeTabMisc extends CreativeTabs { - public MiscUtilCreativeTabMisc(final String lable) { + public MiscUtilCreativeTabMisc(String lable) { super(lable); } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java index 135a1ce0c9..6b7c55fcb8 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java @@ -6,7 +6,7 @@ import net.minecraft.item.Item; public class MiscUtilCreativeTabOther extends CreativeTabs { - public MiscUtilCreativeTabOther(final String lable) { + public MiscUtilCreativeTabOther(String lable) { super(lable); } diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java index 738266f381..fe61ea6f11 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java +++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java @@ -6,7 +6,7 @@ import net.minecraft.item.Item; public class MiscUtilCreativeTabTools extends CreativeTabs { - public MiscUtilCreativeTabTools(final String lable) { + public MiscUtilCreativeTabTools(String lable) { super(lable); } -- cgit