aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/tileentities
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-11-27 13:57:02 +1000
committerAlkalus <draknyte1@hotmail.com>2017-11-27 13:57:02 +1000
commit5d4f2648ceb147aae7ce00241ebfb34919dbb1bf (patch)
tree40bdc575d777e31d62b66584dcf34baa962a2691 /src/Java/gtPlusPlus/core/tileentities
parente4bbd99f81d62907d5d19aad220a74718fb05c71 (diff)
downloadGT5-Unofficial-5d4f2648ceb147aae7ce00241ebfb34919dbb1bf.tar.gz
GT5-Unofficial-5d4f2648ceb147aae7ce00241ebfb34919dbb1bf.tar.bz2
GT5-Unofficial-5d4f2648ceb147aae7ce00241ebfb34919dbb1bf.zip
$ Hopefully fixed crash when Thaumcraft wasn't loaded.
$ Hopefully fixed crash when Forestry wasn't loaded.
Diffstat (limited to 'src/Java/gtPlusPlus/core/tileentities')
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java13
1 files changed, 8 insertions, 5 deletions
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();
+ }
}
}