4 files changed, 22 insertions, 47 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
index 6791289f9f..cf7c90eca5 100644
--- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
@@ -32,6 +32,9 @@ 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.gui.ContainerFastAlchemyFurnace;
+import gtPlusPlus.xmod.thaumcraft.gui.GuiFastAlchemyFurnace;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChunkCoordinates;
@@ -94,6 +97,9 @@ public class GuiHandler implements IGuiHandler {
 			else if (ID == GUI7){
 				return new Container_TradeTable(player.inventory, (TileEntityTradeTable)te);
 			}
+			else if (ID == GUI8){
+				return new ContainerFastAlchemyFurnace(player.inventory, (TileFastAlchemyFurnace)te);
+			}
 		}
 
 		if (ID == GUI9){
@@ -143,6 +149,9 @@ public class GuiHandler implements IGuiHandler {
 			else if (ID == GUI7){
 				return new GUI_TradeTable(player.inventory, (TileEntityTradeTable)te, ((TileEntityBase) te).getOwner());
 			}
+			else if (ID == GUI8){
+				return new GuiFastAlchemyFurnace(player.inventory, (TileFastAlchemyFurnace)te);
+			}
 		}
 
 		if (ID == GUI9){
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBase.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java
index 372539ca7d..43a37b423c 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBase.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java
@@ -5,11 +5,13 @@ import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-public class ItemBlockBase extends ItemBlock {
+public class ItemBlockEntityBase extends ItemBlock {
 
-	public ItemBlockBase(final Block block) {
+	public ItemBlockEntityBase(final Block block) {
 		super(block);
-		this.setCreativeTab(AddToCreativeTab.tabBlock);
+		this.setMaxDamage(0);
+		this.setHasSubtypes(true);
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockTileEntity.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockTileEntity.java
deleted file mode 100644
index 7a5f20833f..0000000000
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockTileEntity.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package gtPlusPlus.core.item.base.itemblock;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-public class ItemBlockTileEntity extends ItemBlock{
-
-	String[] description;
-
-	public ItemBlockTileEntity(final Block block) {
-		super(block);
-	}
-
-	@Override
-	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		for (int i =0; i< this.description.length; i++){
-			if (!this.description[i].equals("")){
-				list.add(this.description[i]);
-			}
-		}
-
-
-		super.addInformation(stack, aPlayer, list, bool);
-	}
-
-	@Override
-	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) {
-
-	}
-
-	public void setDecription(final String[] description){
-		for (int i =0; i< description.length; i++){
-			this.description[i] = description[i];
-		}
-	}
-
-}
diff --git a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
index 6dd948bcd1..83d274473c 100644
--- a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -1,13 +1,18 @@
 package gtPlusPlus.core.tileentities;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.tileentities.general.*;
+import gtPlusPlus.core.tileentities.general.TileEntityFirepit;
+import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
+import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator;
+import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid;
 import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
 import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
 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;
 
 public class ModTileEntities {
 
@@ -30,6 +35,8 @@ public class ModTileEntities {
 		GameRegistry.registerTileEntity(TileEntityProjectTable.class, "TileProjectTable");
 		GameRegistry.registerTileEntity(TileEntityTradeTable.class, "TileTradeTable");
 		GameRegistry.registerTileEntity(TileEntityModularityTable.class, "TileEntityModularityTable");
+		GameRegistry.registerTileEntity(TileFastAlchemyFurnace.class, "TileFastAlchemyFurnace");
+		GameRegistry.registerTileEntity(TileFastArcaneAlembic.class, "TileFastArcaneAlembic");
 
 	}