From 5d4f2648ceb147aae7ce00241ebfb34919dbb1bf Mon Sep 17 00:00:00 2001
From: Alkalus <draknyte1@hotmail.com>
Date: Mon, 27 Nov 2017 13:57:02 +1000
Subject: $ Hopefully fixed crash when Thaumcraft wasn't loaded. $ Hopefully
 fixed crash when Forestry wasn't loaded.

---
 .../gtPlusPlus/core/handler/COMPAT_IntermodStaging.java     |  2 +-
 src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index b534cd11cd..a615fd6022 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -6,7 +6,7 @@ import gtPlusPlus.xmod.forestry.HANDLER_FR;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.growthcraft.HANDLER_GC;
 import gtPlusPlus.xmod.ic2.HANDLER_IC2;
-import gtPlusPlus.xmod.thaumcraft.common.HANDLER_Thaumcraft;
+import gtPlusPlus.xmod.thaumcraft.HANDLER_Thaumcraft;
 import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF;
 
 public class COMPAT_IntermodStaging {
diff --git a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
index 87fb8ef76d..3d3dc66f20 100644
--- a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.tileentities;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.tileentities.general.TileEntityFirepit;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
 import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator;
@@ -12,8 +13,7 @@ import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.xmod.thaumcraft.common.tile.TileFastAlchemyFurnace;
-import gtPlusPlus.xmod.thaumcraft.common.tile.TileFastArcaneAlembic;
+import gtPlusPlus.xmod.thaumcraft.common.tile.TCTileEntities;
 
 public class ModTileEntities {
 
@@ -26,12 +26,15 @@ public class ModTileEntities {
 		GameRegistry.registerTileEntity(TileEntityFirepit.class, "TileFirePit");
 		GameRegistry.registerTileEntity(TileEntityInfiniteFluid.class, "TileInfiniteFluid");
 		GameRegistry.registerTileEntity(TileEntityProjectTable.class, "TileProjectTable");
-		GameRegistry.registerTileEntity(TileEntityTradeTable.class, "TileTradeTable");
+		GameRegistry.registerTileEntity(TileEntityTradeTable.class, "TileTradeTable");		
 		GameRegistry.registerTileEntity(TileEntityModularityTable.class, "TileEntityModularityTable");
-		GameRegistry.registerTileEntity(TileFastAlchemyFurnace.class, "TileFastAlchemyFurnace");
-		GameRegistry.registerTileEntity(TileFastArcaneAlembic.class, "TileFastArcaneAlembic");
 		GameRegistry.registerTileEntity(TileEntityXpConverter.class, "TileEntityXpConverter");
 
+		
+		//Mod TEs
+		if (LoadedMods.Thaumcraft){
+			TCTileEntities.init();
+		}
 	}
 
 }
-- 
cgit