From 81360a320daf83530cc9260068e13111759d2212 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Mon, 2 Jul 2018 00:36:10 +1000
Subject: % Hopefully improved recipe loading by several factors. % Re-arranged
 spawner code during loading. $ Hopefully recipe Creative Tabs issues. $ Fixed
 profession of one of the new villagers.

---
 src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java        | 10 +---------
 .../core/creative/tabs/MiscUtilCreativeTabBlock.java           |  2 +-
 .../core/creative/tabs/MiscUtilCreativeTabMachines.java        |  2 +-
 .../gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java |  2 +-
 .../core/creative/tabs/MiscUtilCreativeTabTools.java           |  2 +-
 5 files changed, 5 insertions(+), 13 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 0f3be72c69..8e6d38f301 100644
--- a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java
+++ b/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java
@@ -3,8 +3,6 @@ package gtPlusPlus.core.creative;
 import net.minecraft.creativetab.CreativeTabs;
 
 import gtPlusPlus.core.creative.tabs.*;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.xmod.bop.creative.MiscUtilsBOPTab;
 
 public class AddToCreativeTab {
@@ -23,12 +21,6 @@ public class AddToCreativeTab {
 		tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab");
 		tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab");
 		tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab");
-		if (LoadedMods.BiomesOPlenty) {
-			tabBOP = new MiscUtilsBOPTab("MiscUtilBOP");
-		}
-
-		if (CORE.DEBUG) {
-			// tabCombat = new MiscUtilCreativeTabCombat("MiscUtilCombatTab");
-		}
+		tabBOP = new MiscUtilsBOPTab("MiscUtilBOP");
 	}
 }
diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
index 39d5108dea..3af79c7305 100644
--- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
@@ -13,7 +13,7 @@ public class MiscUtilCreativeTabBlock extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return Item.getItemFromBlock(ModBlocks.MatterFabricatorEffectBlock);
+		return Item.getItemFromBlock(ModBlocks.blockCompressedObsidian);
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java
index 285ef8af0a..9f145cf581 100644
--- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java
@@ -14,7 +14,7 @@ public class MiscUtilCreativeTabMachines extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return ModItems.itemPLACEHOLDER_Circuit;
+		return ModItems.itemAlkalusDisk;
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java
index da60afe511..17c56f68af 100644
--- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java
@@ -13,7 +13,7 @@ public class MiscUtilCreativeTabMisc extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return ModItems.itemFoodCurriedSausages;
+		return ModItems.AAA_Broken;
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java
index 649316a220..b68eccd0e4 100644
--- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java
+++ b/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java
@@ -13,7 +13,7 @@ public class MiscUtilCreativeTabTools extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return ModItems.itemStaballoyAxe;
+		return ModItems.itemStaballoyPickaxe;
 	}
 
 }
-- 
cgit