Fix creative tab item registration

10 files changed, 21 insertions, 22 deletions

diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index b45e8bd532..7a9ab2cdb6 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -60,6 +60,7 @@ public final class MainLoader {
     }
 
     public static void preLoad(){
+        creativeTabTecTech =new CreativeTabTecTech("TecTech");
 
         //set expanded texture arrays for tiers
         try {
@@ -115,7 +116,7 @@ public final class MainLoader {
     }
 
     public static void postLoad() {
-        ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 6);
+        ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 5);
 
         progressBarPostLoad.step("Dreamcraft Compatibility");
         if(Loader.isModLoaded(Reference.DREAMCRAFT)){
@@ -141,13 +142,8 @@ public final class MainLoader {
 
         progressBarPostLoad.step("Recipes");
         new RecipeLoader().run();
-
         TecTech.LOGGER.info("Recipe Init Done");
 
-        progressBarPostLoad.step("Creative Tab");
-        creativeTabTecTech =new CreativeTabTecTech("TecTech");
-        TecTech.LOGGER.info("CreativeTab initiation complete");
-
         progressBarPostLoad.step("Register Extra Hazmat Suits");
         registerExtraHazmats();
         TecTech.LOGGER.info("Hazmat additions done");
diff --git a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java
index 295e1aeb7d..d360162fb6 100644
--- a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java
+++ b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java
@@ -1,12 +1,7 @@
 package com.github.technus.tectech.loader.gui;
 
 import com.github.technus.tectech.thing.CustomItemList;
-import com.github.technus.tectech.thing.block.QuantumGlassBlock;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
-import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
-import com.github.technus.tectech.thing.item.ElementalDefinitionScanStorage_EM;
-import com.github.technus.tectech.thing.item.ParametrizerMemoryCard;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
@@ -20,7 +15,6 @@ public class CreativeTabTecTech extends CreativeTabs {
 
     public CreativeTabTecTech(String name) {
         super(name);
-        registerThingsInTabs();
     }
 
     @SideOnly(Side.CLIENT)
@@ -38,14 +32,4 @@ public class CreativeTabTecTech extends CreativeTabs {
         }
         super.displayAllReleventItems(stuffToShow);
     }
-
-    private static void registerThingsInTabs() {
-        QuantumGlassBlock.INSTANCE.setCreativeTab(creativeTabTecTech);
-        TT_Container_Casings.sBlockCasingsTT.setCreativeTab(creativeTabTecTech);
-        TT_Container_Casings.sHintCasingsTT.setCreativeTab(creativeTabTecTech);
-        DebugElementalInstanceContainer_EM.INSTANCE.setCreativeTab(creativeTabTecTech);
-        ConstructableTriggerItem.INSTANCE.setCreativeTab(creativeTabTecTech);
-        ParametrizerMemoryCard.INSTANCE.setCreativeTab(creativeTabTecTech);
-        ElementalDefinitionScanStorage_EM.INSTANCE.setCreativeTab(creativeTabTecTech);
-    }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
index 1a08bdbeec..d34d12c754 100644
--- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
+++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
@@ -13,6 +13,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import static com.github.technus.tectech.Reference.MODID;
+import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
 
 /**
  * Created by danie_000 on 17.12.2016.
@@ -32,6 +33,7 @@ public final class QuantumGlassBlock extends BlockBase {
         setLightOpacity(0);
         setStepSound(Block.soundTypeMetal);
         setBlockTextureName(MODID + ":blockQuantumGlass");
+        setCreativeTab(creativeTabTecTech);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java
index 78b0a2a6a9..bac2dfb9ac 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java
@@ -10,6 +10,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
 import static com.github.technus.tectech.thing.metaTileEntity.Textures.*;
 
 /**
@@ -21,6 +22,8 @@ public class GT_Block_CasingsNH
 
     public GT_Block_CasingsNH() {
         super(GT_Item_CasingsNH.class, "gt.blockcasingsNH", GT_Material_Casings.INSTANCE);
+        setCreativeTab(creativeTabTecTech);
+
         for (byte b = 0; b < 16; b = (byte) (b + 1)) {
             Textures.BlockIcons.casingTexturePages[8][b+64] = new GT_CopiedBlockTexture(this, 6, b);
             /*IMPORTANT for block recoloring*/
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
index 2ea22b625d..09dc49b5a5 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
@@ -18,6 +18,7 @@ import net.minecraft.world.IBlockAccess;
 import java.util.List;
 
 import static com.github.technus.tectech.TecTech.tectechTexturePage1;
+import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
 
 /**
  * Created by danie_000 on 03.10.2016.
@@ -30,6 +31,8 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
 
     public GT_Block_CasingsTT() {
         super(GT_Item_CasingsTT.class, "gt.blockcasingsTT", GT_Material_Casings.INSTANCE);
+        setCreativeTab(creativeTabTecTech);
+
         for (byte b = 0; b < 16; b = (byte) (b + 1)) {
             Textures.BlockIcons.casingTexturePages[texturePage][b] = new GT_CopiedBlockTexture(this, 6, b);
             /*IMPORTANT for block recoloring**/
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
index dc9e809b46..c65870eeb7 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
@@ -16,6 +16,8 @@ import net.minecraft.world.IBlockAccess;
 
 import java.util.List;
 
+import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+
 /**
  * Created by danie_000 on 03.10.2016.
  */
@@ -24,6 +26,7 @@ public class GT_Block_HintTT extends GT_Block_Casings_Abstract {
 
     public GT_Block_HintTT() {
         super(GT_Item_HintTT.class, "gt.blockhintTT", GT_Material_Casings.INSTANCE);
+        setCreativeTab(creativeTabTecTech);
 
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Hint 1 dot");//id is -1
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Hint 2 dots");
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
index 33f0d34ad5..57f3bbade1 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.Util.StructureBuilder;
+import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
 import static gregtech.api.GregTech_API.sBlockCasings1;
 
 /**
@@ -37,6 +38,7 @@ public final class ConstructableTriggerItem extends Item {
     private ConstructableTriggerItem() {
         setUnlocalizedName("em.constructable");
         setTextureName(MODID + ":itemConstructable");
+        setCreativeTab(creativeTabTecTech);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index 286b21f4e2..3b09d37a33 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -29,6 +29,7 @@ import java.util.TreeSet;
 
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
 
 /**
  * Created by Tec on 15.03.2017.
@@ -42,6 +43,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         setMaxStackSize(1);
         setUnlocalizedName("em.debugContainer");
         setTextureName(MODID + ":itemDebugContainer");
+        setCreativeTab(creativeTabTecTech);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index 564209062a..87b76696bb 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -25,6 +25,7 @@ import net.minecraft.world.World;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
+import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
 
 /**
  * Created by Tec on 15.03.2017.
@@ -37,6 +38,7 @@ public final class ElementalDefinitionScanStorage_EM extends Item implements IEl
         setMaxStackSize(1);
         setUnlocalizedName("em.definitionScanStorage");
         setTextureName(MODID + ":itemDefinitionScanStorage");
+        setCreativeTab(creativeTabTecTech);
     }
 
     //return previous thing
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
index b13ef6b574..c12d2707c6 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
@@ -25,6 +25,7 @@ import net.minecraft.world.World;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
+import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
 import static com.github.technus.tectech.thing.CustomItemList.parametrizerMemory;
 
 /**
@@ -39,6 +40,7 @@ public final class ParametrizerMemoryCard extends Item {
         setHasSubtypes(true);
         setUnlocalizedName("em.parametrizerMemoryCard");
         setTextureName(MODID + ":itemParametrizerMemoryCardUnlocked");
+        setCreativeTab(creativeTabTecTech);
     }
 
     @Override