aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/creative
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-11-06 19:32:27 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-11-06 19:32:27 +1000
commitcbe0e497be8e466c380a5b4fa781b314ede9ada3 (patch)
treeb85848b432adf458e3abda466ee46d9dfc3e454b /src/Java/gtPlusPlus/core/creative
parentc40416b036c0e89451e1558253ccf07bbee028d0 (diff)
downloadGT5-Unofficial-cbe0e497be8e466c380a5b4fa781b314ede9ada3.tar.gz
GT5-Unofficial-cbe0e497be8e466c380a5b4fa781b314ede9ada3.tar.bz2
GT5-Unofficial-cbe0e497be8e466c380a5b4fa781b314ede9ada3.zip
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.
Diffstat (limited to 'src/Java/gtPlusPlus/core/creative')
-rw-r--r--src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java36
-rw-r--r--src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java2
-rw-r--r--src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java5
-rw-r--r--src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java2
-rw-r--r--src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java2
-rw-r--r--src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java2
6 files changed, 27 insertions, 22 deletions
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);
}