Revert "$ Cleaned up the entire project."

This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747.

# Conflicts:
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java

Revert "% Cleaned up Imports."

This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966.

17 files changed, 1048 insertions, 892 deletions

diff --git a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
index 8052b98dac..ff26064e98 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
@@ -1,34 +1,34 @@
 package gtPlusPlus.xmod.forestry;
 
-import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
 import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
 import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 public class HANDLER_FR {
 
-	public static void Init() {
-		if (LoadedMods.Forestry) {
-			// FR_TileHandler.init();
-			// new FR_GuiIDRegistry();
-		}
-	}
-
-	public static void postInit() {
-		if (LoadedMods.Forestry) {
-			FR_Gregtech_Recipes.registerItems();
-		}
-	}
-
-	public static void preInit() {
-		if (LoadedMods.Forestry) {
+	public static void preInit(){		
+		if (LoadedMods.Forestry){
 			FR_ItemRegistry.Register();
-			if (CORE.configSwitches.enableCustomAlvearyBlocks) {
+			if (CORE.configSwitches.enableCustomAlvearyBlocks){
 				GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing");
 			}
-			// FR_BlockRegistryApiculture.RegistryApiculture();
-		}
+			//FR_BlockRegistryApiculture.RegistryApiculture();
+		}		
+	}
+
+	public static void Init(){
+		if (LoadedMods.Forestry){
+			//FR_TileHandler.init();	
+			//new FR_GuiIDRegistry();
+		}		
 	}
+
+	public static void postInit(){
+		if (LoadedMods.Forestry){
+			FR_Gregtech_Recipes.registerItems();	
+		}		
+	}	
 }
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java
index 039c80fe00..6736c54309 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java
@@ -6,13 +6,13 @@ import gtPlusPlus.xmod.forestry.bees.alveary.gui.InventoryFrameHousing;
 public class AlvearyBeeListener extends DefaultBeeListener {
 	private final IAlvearyFrameHousing apiary;
 
-	public AlvearyBeeListener(final IAlvearyFrameHousing apiary) {
+	public AlvearyBeeListener(IAlvearyFrameHousing apiary) {
 		this.apiary = apiary;
 	}
 
 	@Override
-	public void wearOutEquipment(final int amount) {
-		final InventoryFrameHousing apiaryInventory = this.apiary.getAlvearyInventory();
-		apiaryInventory.wearOutFrames(this.apiary, amount);
+	public void wearOutEquipment(int amount) {
+		InventoryFrameHousing apiaryInventory = apiary.getAlvearyInventory();
+		apiaryInventory.wearOutFrames(apiary, amount);
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java
index 5c6956ec86..2f4437afd1 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java
@@ -1,11 +1,15 @@
 package gtPlusPlus.xmod.forestry.bees.alveary;
 
+import net.minecraft.util.ChunkCoordinates;
+
 import com.mojang.authlib.GameProfile;
 
-import forestry.api.multiblock.*;
-import net.minecraft.util.ChunkCoordinates;
+import forestry.api.multiblock.IAlvearyComponent;
+import forestry.api.multiblock.IMultiblockComponent;
+import forestry.api.multiblock.IMultiblockController;
+import forestry.api.multiblock.IMultiblockLogicAlveary;
 
-public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockComponent {
+public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockComponent{
 
 	@Override
 	public ChunkCoordinates getCoordinates() {
@@ -14,28 +18,28 @@ public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockCompo
 	}
 
 	@Override
-	public IMultiblockLogicAlveary getMultiblockLogic() {
+	public GameProfile getOwner() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public GameProfile getOwner() {
+	public void onMachineAssembled(IMultiblockController arg0,
+			ChunkCoordinates arg1, ChunkCoordinates arg2) {
 		// TODO Auto-generated method stub
-		return null;
+		
 	}
 
 	@Override
-	public void onMachineAssembled(final IMultiblockController arg0, final ChunkCoordinates arg1,
-			final ChunkCoordinates arg2) {
+	public void onMachineBroken() {
 		// TODO Auto-generated method stub
-
+		
 	}
 
 	@Override
-	public void onMachineBroken() {
+	public IMultiblockLogicAlveary getMultiblockLogic() {
 		// TODO Auto-generated method stub
-
+		return null;
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java
index d4fce6465b..f087ad75f4 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java
@@ -3,15 +3,6 @@ package gtPlusPlus.xmod.forestry.bees.alveary;
 import java.util.ArrayList;
 import java.util.List;
 
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import forestry.apiculture.MaterialBeehive;
-import forestry.apiculture.multiblock.TileAlvearyPlain;
-import forestry.core.blocks.BlockStructure;
-import forestry.core.render.TextureManager;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.core.creative.AddToCreativeTab;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -22,250 +13,262 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import forestry.apiculture.MaterialBeehive;
+import forestry.apiculture.multiblock.TileAlvearyPlain;
+import forestry.core.blocks.BlockStructure;
+import forestry.core.render.TextureManager;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.creative.AddToCreativeTab;
 
-public class FR_BlockAlveary extends BlockStructure {
-
-	public static enum Type {
-		PLAIN, ERROR, FRAME, MUTATOR,
+public class FR_BlockAlveary extends BlockStructure
+{
 
-		// Placeholder Values
+	public static enum Type
+	{
+		PLAIN,
+		ERROR,
+		FRAME,
+		MUTATOR, 
+		
+		//Placeholder Values
 		HEATER, HYGRO, STABILIZER, SIEVE;
 
-		public static final Type[] VALUES = Type.values();
+		public static final Type[] VALUES = values();
 
-		private Type() {
-		}
+		private Type() {}
 	}
 
-	/* ICONS */
-	public static final int	PLAIN				= 0;
-
-	public static final int	ENTRANCE			= 1;
-
-	public static final int	BOTTOM				= 2;
-
-	public static final int	LEFT				= 3;
-
-	public static final int	RIGHT				= 4;
-
-	public static final int	ALVEARY_FRAME_OFF	= 5;
-
-	public static final int	ALVEARY_FRAME_ON	= 6;
-
-	public static final int	ALVEARY_MUTATOR_OFF	= 7;
+	public FR_BlockAlveary()
+	{
+		super(new MaterialBeehive(false));
+		setHardness(1.0F);
+		setCreativeTab(AddToCreativeTab.tabBlock);
+		setHarvestLevel("axe", 0);
+		
+	}
 
-	public static final int	ALVEARY_MUTATOR_ON	= 8;
+	@Override
+    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz)
+    {
+        if (world.isRemote) return true;
+ 
+        TileEntity te = world.getTileEntity(x, y, z);
+        if (te != null && te instanceof TileAlvearyFrameHousing)
+        {
+            player.openGui(GTplusplus.instance, 0, world, x, y, z);
+            return true;
+        }
+        /*else if (te != null && te instanceof TileAlvearyFrameHousing)
+        {
+            player.openGui(GTplusplus.instance, 0, world, x, y, z);
+            return true;
+        }*/
+        return false;
+    }
 
+	@Override
 	@SideOnly(Side.CLIENT)
-	private IIcon[]			icons;
+	public void getSubBlocks(Item item, CreativeTabs tab, List list)
+	{
+		for (int i = 0; i < 4; i++) {
+			if (i != 1 && i != 0) {
+				list.add(new ItemStack(item, 1, i));
+			}
+		}
+	}
 
-	public FR_BlockAlveary() {
-		super(new MaterialBeehive(false));
-		this.setHardness(1.0F);
-		this.setCreativeTab(AddToCreativeTab.tabBlock);
-		this.setHarvestLevel("axe", 0);
+	@Override
+	public int getRenderType()
+	{
+		return 0;
+	}
+
+	@Override
+	public boolean renderAsNormalBlock()
+	{
+		return true;
+	}
 
+	@Override
+	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
+	{
+		ArrayList<ItemStack> drop = new ArrayList<ItemStack>();
+		drop.add(new ItemStack(this, 1, metadata != 1 ? metadata : 0));
+		return drop;
 	}
+
 	@Override
-	public TileEntity createNewTileEntity(final World world, final int meta) {
-		return this.createTileEntity(world, meta);
+	public int getDamageValue(World world, int x, int y, int z)
+	{
+		int meta = world.getBlockMetadata(x, y, z);
+		return meta != 1 ? meta : 0;
 	}
+
 	@Override
-	public TileEntity createTileEntity(final World world, final int metadata) {
-		if (metadata < 0 || metadata > Type.VALUES.length) {
+	public TileEntity createTileEntity(World world, int metadata)
+	{
+		if ((metadata < 0) || (metadata > Type.VALUES.length)) {
 			return null;
 		}
-
-		final Type type = Type.VALUES[metadata];
-		switch (type) {
-			case FRAME:
-				LanguageRegistry.addName(this, "Alveary Frame Housing");
-			case MUTATOR:
-				LanguageRegistry.addName(this, "Alveary Mutator Block");
-			case ERROR:
-				LanguageRegistry.addName(this, "Invalid Alveary Block");
-			default:
-				LanguageRegistry.addName(this, "Unnamed Alveary Block");
+		
+		
+		
+		Type type = Type.VALUES[metadata];
+		switch (type)
+		{
+		case FRAME: 
+			LanguageRegistry.addName(this, "Alveary Frame Housing");
+		case MUTATOR: 
+			LanguageRegistry.addName(this, "Alveary Mutator Block");
+		case ERROR: 
+			LanguageRegistry.addName(this, "Invalid Alveary Block");
+		default:
+			LanguageRegistry.addName(this, "Unnamed Alveary Block");   
 		}
-		switch (type) {
-			case FRAME:
-				return new TileAlvearyFrameHousing();
-			case MUTATOR:
-				return new TileAlvearyPlain();
-			case ERROR:
-				return new TileAlvearyPlain();
-			default:
-				return new TileAlvearyPlain();
+		switch (type)
+		{
+		case FRAME: 
+			return new TileAlvearyFrameHousing();
+		case MUTATOR: 
+			return new TileAlvearyPlain();
+		case ERROR: 
+			return new TileAlvearyPlain();
+		default:
+			return new TileAlvearyPlain();	   
 		}
 	}
-	public ItemStack get(final Type type) {
-		return new ItemStack(this, 1, type.ordinal());
+
+	@Override
+	public Block setBlockName(String name) {
+		//int meta = this.
+		return super.setBlockName(name);
 	}
-	@SideOnly(Side.CLIENT)
-	private IIcon getBlockTextureFromSideAndTile(final IBlockAccess world, final int x, final int y, final int z,
-			final int side) {
-		final TileEntity tile = world.getTileEntity(x, y, z);
-		if (!(tile instanceof FR_TileAlveary)) {
-			return this.getIcon(side, 0);
-		}
-		return this.icons[((FR_TileAlveary) tile).getIcon(side)];
+
+	@Override
+	public TileEntity createNewTileEntity(World world, int meta)
+	{
+		return createTileEntity(world, meta);
 	}
+
+	/* ICONS */
+	public static final int PLAIN = 0;
+	public static final int ENTRANCE = 1;
+	public static final int BOTTOM = 2;
+	public static final int LEFT = 3;
+	public static final int RIGHT = 4;
+	public static final int ALVEARY_FRAME_OFF = 5;
+	public static final int ALVEARY_FRAME_ON = 6;
+	public static final int ALVEARY_MUTATOR_OFF = 7;
+	public static final int ALVEARY_MUTATOR_ON = 8;
+	@SideOnly(Side.CLIENT)
+	private IIcon[] icons;
+	@SideOnly(Side.CLIENT)
 	@Override
-	public int getDamageValue(final World world, final int x, final int y, final int z) {
-		final int meta = world.getBlockMetadata(x, y, z);
-		return meta != 1 ? meta : 0;
+	public void registerBlockIcons(IIconRegister register) {
+		icons = new IIcon[9];
+		icons[0] = TextureManager.registerTex(register, "apiculture/alveary.plain");
+		icons[1] = TextureManager.registerTex(register, "apiculture/alveary.entrance");
+		icons[2] = TextureManager.registerTex(register, "apiculture/alveary.bottom");
+		icons[3] = TextureManager.registerTex(register, "apiculture/alveary.left");
+		icons[4] = TextureManager.registerTex(register, "apiculture/alveary.right");
+		icons[5] = TextureManager.registerTex(register, "apiculture/alveary.framehousing.off");
+		icons[6] = TextureManager.registerTex(register, "apiculture/alveary.framehousing.on");
+		icons[7] = TextureManager.registerTex(register, "apiculture/alveary.mutator.off");
+		icons[8] = TextureManager.registerTex(register, "apiculture/alveary.mutator.on");
 	}
+	@SideOnly(Side.CLIENT)
 	@Override
-	public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int metadata,
-			final int fortune) {
-		final ArrayList<ItemStack> drop = new ArrayList<ItemStack>();
-		drop.add(new ItemStack(this, 1, metadata != 1 ? metadata : 0));
-		return drop;
+	public IIcon getIcon(int side, int metadata) {
+		if ((metadata <= 1
+				|| metadata == Type.FRAME.ordinal() || metadata == Type.MUTATOR.ordinal())
+				&& (side == 1 || side == 0)) {
+			return icons[BOTTOM];
+		}
+		Type type = Type.VALUES[metadata];
+		switch (type) {
+		case ERROR:
+			return icons[PLAIN];
+		case FRAME:
+			return icons[ALVEARY_FRAME_OFF];
+		case MUTATOR:
+			return icons[ALVEARY_MUTATOR_OFF];
+		case HEATER:
+			return icons[ALVEARY_MUTATOR_OFF];
+		case HYGRO:
+			return icons[ALVEARY_MUTATOR_OFF];
+		case STABILIZER:
+			return icons[PLAIN];
+		case SIEVE:
+			return icons[PLAIN];
+		default:
+			return null;
+		}
 	}
 	@SideOnly(Side.CLIENT)
 	@Override
-	public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) {
-		final int meta = world.getBlockMetadata(x, y, z);
+	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
+		int meta = world.getBlockMetadata(x, y, z);
 		if (meta == 1) {
 			return this.getIcon(side, meta);
+		} else if (meta > 1) {
+			return getBlockTextureFromSideAndTile(world, x, y, z, side);
 		}
-		else if (meta > 1) {
-			return this.getBlockTextureFromSideAndTile(world, x, y, z, side);
-		}
-		final Block blockXP = world.getBlock(x + 1, y, z);
-		final Block blockXM = world.getBlock(x - 1, y, z);
+		Block blockXP = world.getBlock(x + 1, y, z);
+		Block blockXM = world.getBlock(x - 1, y, z);
 		if (blockXP == this && blockXM != this) {
 			if (world.getBlockMetadata(x + 1, y, z) == 1) {
 				if (world.getBlock(x, y, z + 1) != this) {
-					return this.switchForSide(42, side);
+					return switchForSide(42, side);
 				}
-				return this.switchForSide(41, side);
+				return switchForSide(41, side);
 			}
 			return this.getIcon(side, meta);
-		}
-		else if (blockXP != this && blockXM == this) {
+		} else if (blockXP != this && blockXM == this) {
 			if (world.getBlockMetadata(x - 1, y, z) == 1) {
 				if (world.getBlock(x, y, z + 1) != this) {
-					return this.switchForSide(41, side);
+					return switchForSide(41, side);
 				}
-				return this.switchForSide(42, side);
+				return switchForSide(42, side);
 			}
 			return this.getIcon(side, meta);
 		}
 		return this.getIcon(side, meta);
 	}
 	@SideOnly(Side.CLIENT)
-	@Override
-	public IIcon getIcon(final int side, final int metadata) {
-		if ((metadata <= 1 || metadata == Type.FRAME.ordinal() || metadata == Type.MUTATOR.ordinal())
-				&& (side == 1 || side == 0)) {
-			return this.icons[FR_BlockAlveary.BOTTOM];
-		}
-		final Type type = Type.VALUES[metadata];
-		switch (type) {
-			case ERROR:
-				return this.icons[FR_BlockAlveary.PLAIN];
-			case FRAME:
-				return this.icons[FR_BlockAlveary.ALVEARY_FRAME_OFF];
-			case MUTATOR:
-				return this.icons[FR_BlockAlveary.ALVEARY_MUTATOR_OFF];
-			case HEATER:
-				return this.icons[FR_BlockAlveary.ALVEARY_MUTATOR_OFF];
-			case HYGRO:
-				return this.icons[FR_BlockAlveary.ALVEARY_MUTATOR_OFF];
-			case STABILIZER:
-				return this.icons[FR_BlockAlveary.PLAIN];
-			case SIEVE:
-				return this.icons[FR_BlockAlveary.PLAIN];
-			default:
-				return null;
+	private IIcon getBlockTextureFromSideAndTile(IBlockAccess world, int x, int y, int z, int side) {
+		TileEntity tile = world.getTileEntity(x, y, z);
+		if (!(tile instanceof FR_TileAlveary)) {
+			return getIcon(side, 0);
 		}
+		return icons[((FR_TileAlveary) tile).getIcon(side)];
 	}
-	@Override
-	public int getRenderType() {
-		return 0;
-	}
-
-	@Override
 	@SideOnly(Side.CLIENT)
-	public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) {
-		for (int i = 0; i < 4; i++) {
-			if (i != 1 && i != 0) {
-				list.add(new ItemStack(item, 1, i));
+	private IIcon switchForSide(int textureId, int side) {
+		if (side == 4 || side == 5) {
+			if (textureId == 41) {
+				return icons[LEFT];
 			}
+			return icons[RIGHT];
+		} else if (textureId == 41) {
+			return icons[RIGHT];
+		} else {
+			return icons[LEFT];
 		}
 	}
-
 	@Override
-	public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
-			final int side, final float lx, final float ly, final float lz) {
-		if (world.isRemote) {
-			return true;
-		}
-
-		final TileEntity te = world.getTileEntity(x, y, z);
-		if (te != null && te instanceof TileAlvearyFrameHousing) {
-			player.openGui(GTplusplus.instance, 0, world, x, y, z);
-			return true;
-		}
-		/*
-		 * else if (te != null && te instanceof TileAlvearyFrameHousing) {
-		 * player.openGui(GTplusplus.instance, 0, world, x, y, z); return true;
-		 * }
-		 */
-		return false;
-	}
-
-	@Override
-	public void onNeighborBlockChange(final World world, final int x, final int y, final int z, final Block block) {
+	public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
 		super.onNeighborBlockChange(world, x, y, z, block);
-		final TileEntity tileEntity = world.getTileEntity(x, y, z);
+		TileEntity tileEntity = world.getTileEntity(x, y, z);
 		if (tileEntity instanceof FR_TileAlveary) {
-			final FR_TileAlveary tileAlveary = (FR_TileAlveary) tileEntity;
+			FR_TileAlveary tileAlveary = (FR_TileAlveary) tileEntity;
 			// We must check that the slabs on top were not removed
 			tileAlveary.getMultiblockLogic().getController().reassemble();
 		}
 	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void registerBlockIcons(final IIconRegister register) {
-		this.icons = new IIcon[9];
-		this.icons[0] = TextureManager.registerTex(register, "apiculture/alveary.plain");
-		this.icons[1] = TextureManager.registerTex(register, "apiculture/alveary.entrance");
-		this.icons[2] = TextureManager.registerTex(register, "apiculture/alveary.bottom");
-		this.icons[3] = TextureManager.registerTex(register, "apiculture/alveary.left");
-		this.icons[4] = TextureManager.registerTex(register, "apiculture/alveary.right");
-		this.icons[5] = TextureManager.registerTex(register, "apiculture/alveary.framehousing.off");
-		this.icons[6] = TextureManager.registerTex(register, "apiculture/alveary.framehousing.on");
-		this.icons[7] = TextureManager.registerTex(register, "apiculture/alveary.mutator.off");
-		this.icons[8] = TextureManager.registerTex(register, "apiculture/alveary.mutator.on");
-	}
-
-	@Override
-	public boolean renderAsNormalBlock() {
-		return true;
-	}
-
-	@Override
-	public Block setBlockName(final String name) {
-		// int meta = this.
-		return super.setBlockName(name);
-	}
-
-	@SideOnly(Side.CLIENT)
-	private IIcon switchForSide(final int textureId, final int side) {
-		if (side == 4 || side == 5) {
-			if (textureId == 41) {
-				return this.icons[FR_BlockAlveary.LEFT];
-			}
-			return this.icons[FR_BlockAlveary.RIGHT];
-		}
-		else if (textureId == 41) {
-			return this.icons[FR_BlockAlveary.RIGHT];
-		}
-		else {
-			return this.icons[FR_BlockAlveary.LEFT];
-		}
+	public ItemStack get(Type type) {
+		return new ItemStack(this, 1, type.ordinal());
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java
index 2db809ae90..b5b3b73e6b 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java
@@ -3,160 +3,197 @@ package gtPlusPlus.xmod.forestry.bees.alveary;
 import java.io.IOException;
 import java.util.List;
 
-import forestry.api.apiculture.*;
-import forestry.api.core.*;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.biome.BiomeGenBase;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeHousingInventory;
+import forestry.api.apiculture.IBeeListener;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.api.apiculture.IBeekeepingLogic;
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.core.IErrorLogic;
 import forestry.api.multiblock.IAlvearyComponent;
 import forestry.api.multiblock.IMultiblockController;
 import forestry.apiculture.multiblock.MultiblockLogicAlveary;
-import forestry.core.access.*;
+import forestry.core.access.EnumAccess;
+import forestry.core.access.IAccessHandler;
+import forestry.core.access.IRestrictedAccess;
 import forestry.core.config.Config;
 import forestry.core.gui.IGuiHandlerForestry;
 import forestry.core.gui.IHintSource;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.multiblock.MultiblockTileEntityForestry;
-import forestry.core.network.*;
+import forestry.core.network.DataInputStreamForestry;
+import forestry.core.network.DataOutputStreamForestry;
+import forestry.core.network.IStreamableGui;
 import forestry.core.tiles.IClimatised;
 import forestry.core.tiles.ITitled;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.util.Vec3;
-import net.minecraft.world.biome.BiomeGenBase;
 
-public abstract class FR_TileAlveary extends MultiblockTileEntityForestry<MultiblockLogicAlveary>
-		implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, ITitled, IClimatised, IHintSource,
-		IGuiHandlerForestry {
+public abstract class FR_TileAlveary
+extends MultiblockTileEntityForestry<MultiblockLogicAlveary>
+implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, ITitled, IClimatised, IHintSource, IGuiHandlerForestry
+{
 	private final String unlocalizedTitle;
 
-	protected FR_TileAlveary() {
+	protected FR_TileAlveary()
+	{
 		this(FR_BlockAlveary.Type.ERROR);
 	}
 
-	protected FR_TileAlveary(final FR_BlockAlveary.Type type) {
+	protected FR_TileAlveary(FR_BlockAlveary.Type type)
+	{
 		super(new MultiblockLogicAlveary());
-		this.unlocalizedTitle = "advanced.tile.for.alveary." + type.ordinal() + ".name";
-
+		this.unlocalizedTitle = ("advanced.tile.for.alveary." + type.ordinal() + ".name");
+		
 	}
 
-	@Override
-	public boolean canBlockSeeTheSky() {
-		return this.getMultiblockLogic().getController().canBlockSeeTheSky();
+	public int getIcon(int side)
+	{
+		return 0;
 	}
 
 	@Override
-	public IAccessHandler getAccessHandler() {
-		return this.getMultiblockLogic().getController().getAccessHandler();
+	public void onMachineAssembled(IMultiblockController multiblockController, ChunkCoordinates minCoord, ChunkCoordinates maxCoord)
+	{
+		if (this.worldObj.isRemote) {
+			this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
+		}
+		this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, getBlockType());
+		markDirty();
 	}
 
 	@Override
-	public Vec3 getBeeFXCoordinates() {
-		return this.getMultiblockLogic().getController().getBeeFXCoordinates();
+	public void onMachineBroken()
+	{
+		if (this.worldObj.isRemote) {
+			this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
+		}
+		this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, getBlockType());
+		markDirty();
 	}
 
 	@Override
-	public IBeeHousingInventory getBeeInventory() {
-		return this.getMultiblockLogic().getController().getBeeInventory();
+	public BiomeGenBase getBiome()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBiome();
 	}
 
 	@Override
-	public IBeekeepingLogic getBeekeepingLogic() {
-		return this.getMultiblockLogic().getController().getBeekeepingLogic();
+	public Iterable<IBeeModifier> getBeeModifiers()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeModifiers();
 	}
 
 	@Override
-	public Iterable<IBeeListener> getBeeListeners() {
-		return this.getMultiblockLogic().getController().getBeeListeners();
+	public Iterable<IBeeListener> getBeeListeners()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeListeners();
 	}
 
 	@Override
-	public Iterable<IBeeModifier> getBeeModifiers() {
-		return this.getMultiblockLogic().getController().getBeeModifiers();
+	public IBeeHousingInventory getBeeInventory()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInventory();
 	}
 
 	@Override
-	public BiomeGenBase getBiome() {
-		return this.getMultiblockLogic().getController().getBiome();
+	public IBeekeepingLogic getBeekeepingLogic()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeekeepingLogic();
 	}
 
 	@Override
-	public int getBlockLightValue() {
-		return this.getMultiblockLogic().getController().getBlockLightValue();
+	public Vec3 getBeeFXCoordinates()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeFXCoordinates();
 	}
 
 	@Override
-	public IErrorLogic getErrorLogic() {
-		return this.getMultiblockLogic().getController().getErrorLogic();
+	public EnumTemperature getTemperature()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getTemperature();
 	}
 
 	@Override
-	public float getExactHumidity() {
-		return this.getMultiblockLogic().getController().getExactHumidity();
+	public EnumHumidity getHumidity()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getHumidity();
 	}
 
 	@Override
-	public float getExactTemperature() {
-		return this.getMultiblockLogic().getController().getExactTemperature();
+	public int getBlockLightValue()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBlockLightValue();
 	}
 
 	@Override
-	public List<String> getHints() {
-		return Config.hints.get("apiary");
+	public boolean canBlockSeeTheSky()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().canBlockSeeTheSky();
 	}
 
 	@Override
-	public EnumHumidity getHumidity() {
-		return this.getMultiblockLogic().getController().getHumidity();
+	public IErrorLogic getErrorLogic()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getErrorLogic();
 	}
 
-	public int getIcon(final int side) {
-		return 0;
+	@Override
+	public IAccessHandler getAccessHandler()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getAccessHandler();
 	}
 
 	@Override
-	public IInventoryAdapter getInternalInventory() {
-		return this.getMultiblockLogic().getController().getInternalInventory();
+	public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess)
+	{
+		((MultiblockLogicAlveary)getMultiblockLogic()).getController().onSwitchAccess(oldAccess, newAccess);
 	}
 
 	@Override
-	public EnumTemperature getTemperature() {
-		return this.getMultiblockLogic().getController().getTemperature();
+	public IInventoryAdapter getInternalInventory()
+	{
+		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getInternalInventory();
 	}
 
 	@Override
-	public String getUnlocalizedTitle() {
+	public String getUnlocalizedTitle()
+	{
 		return this.unlocalizedTitle;
 	}
 
 	@Override
-	public void onMachineAssembled(final IMultiblockController multiblockController, final ChunkCoordinates minCoord,
-			final ChunkCoordinates maxCoord) {
-		if (this.worldObj.isRemote) {
-			this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
-		}
-		this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
-		this.markDirty();
+	public List<String> getHints()
+	{
+		return Config.hints.get("apiary");
 	}
 
 	@Override
-	public void onMachineBroken() {
-		if (this.worldObj.isRemote) {
-			this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
-		}
-		this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
-		this.markDi