+ New texture for the slow builders ring.

+ Added the Alkalus Disk.
$ Fixed Frame Box Assembler Recipes.
$ Fixed Missing 7Li material.
$ Fixed Tiered Tanks not showing their capacity in the tooltip.
$ Fixed tooltips for alloys containing Bronze or Steel.
$ Fixed Clay Pipe Extruder Recipes.
- Removed a handful of Plasma cells for misc. materials.
% Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements.
% Cleaned up The Entire Project.

16 files changed, 450 insertions, 450 deletions

diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyBeeListener.java
index 6736c54309..039c80fe00 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(IAlvearyFrameHousing apiary) {
+	public AlvearyBeeListener(final IAlvearyFrameHousing apiary) {
 		this.apiary = apiary;
 	}
 
 	@Override
-	public void wearOutEquipment(int amount) {
-		InventoryFrameHousing apiaryInventory = apiary.getAlvearyInventory();
-		apiaryInventory.wearOutFrames(apiary, amount);
+	public void wearOutEquipment(final int amount) {
+		final InventoryFrameHousing apiaryInventory = this.apiary.getAlvearyInventory();
+		apiaryInventory.wearOutFrames(this.apiary, amount);
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java
index fd18f069cf..ab093645b6 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java
@@ -1,28 +1,28 @@
 package gtPlusPlus.xmod.forestry.bees.alveary;
 
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.registry.GameRegistry;
 import forestry.core.items.ItemBlockForestry;
 import forestry.core.utils.StringUtil;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 public class AlvearyHandler {
 
 	@Optional.Method(modid = "Forestry")
 	public static void run(){
 		if (!LoadedMods.ExtraBees){
-		if (CORE.configSwitches.enableCustomAlvearyBlocks){//Alveary Stuff
-			FR_BlockAlveary alveary;
-			alveary = registerBlock(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary");
-			GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing");			
-		}
+			if (CORE.configSwitches.enableCustomAlvearyBlocks){//Alveary Stuff
+				FR_BlockAlveary alveary;
+				alveary = registerBlock(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary");
+				GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing");
+			}
 		}
-	}	
+	}
 
-	protected static <T extends Block> T registerBlock(T block, Class<? extends ItemBlock> itemClass, String name, Object... itemCtorArgs) {
+	protected static <T extends Block> T registerBlock(final T block, final Class<? extends ItemBlock> itemClass, final String name, final Object... itemCtorArgs) {
 		block.setBlockName("for." + name);
 		GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs);
 		return block;
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 a322311434..06162f7dc1 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java
@@ -1,10 +1,9 @@
 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;
 
 public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockComponent{
 
@@ -21,16 +20,16 @@ public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockCompo
 	}
 
 	@Override
-	public void onMachineAssembled(IMultiblockController arg0,
-			ChunkCoordinates arg1, ChunkCoordinates arg2) {
+	public void onMachineAssembled(final IMultiblockController arg0,
+			final ChunkCoordinates arg1, final ChunkCoordinates arg2) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
 	public void onMachineBroken() {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
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 bf632ef039..cd74ec0e81 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java
@@ -3,6 +3,15 @@ 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.BlockForestry;
+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;
@@ -13,15 +22,6 @@ 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.BlockForestry;
-import forestry.core.render.TextureManager;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.core.creative.AddToCreativeTab;
 
 public class FR_BlockAlveary extends BlockForestry
 {
@@ -31,8 +31,8 @@ public class FR_BlockAlveary extends BlockForestry
 		PLAIN,
 		ERROR,
 		FRAME,
-		MUTATOR, 
-		
+		MUTATOR,
+
 		//Placeholder Values
 		HEATER, HYGRO, STABILIZER, SIEVE;
 
@@ -44,37 +44,39 @@ public class FR_BlockAlveary extends BlockForestry
 	public FR_BlockAlveary()
 	{
 		super(new MaterialBeehive(false));
-		setHardness(1.0F);
-		setCreativeTab(AddToCreativeTab.tabBlock);
-		setHarvestLevel("axe", 0);
-		
+		this.setHardness(1.0F);
+		this.setCreativeTab(AddToCreativeTab.tabBlock);
+		this.setHarvestLevel("axe", 0);
+
 	}
 
 	@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)
+	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;
-    }
+		return false;
+	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void getSubBlocks(Item item, CreativeTabs tab, List list)
+	public void getSubBlocks(final Item item, final CreativeTabs tab, final List list)
 	{
 		for (int i = 0; i < 4; i++) {
-			if (i != 1 && i != 0) {
+			if ((i != 1) && (i != 0)) {
 				list.add(new ItemStack(item, 1, i));
 			}
 		}
@@ -93,64 +95,64 @@ public class FR_BlockAlveary extends BlockForestry
 	}
 
 	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
+	public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int metadata, final int fortune)
 	{
-		ArrayList<ItemStack> drop = new ArrayList<ItemStack>();
+		final ArrayList<ItemStack> drop = new ArrayList<>();
 		drop.add(new ItemStack(this, 1, metadata != 1 ? metadata : 0));
 		return drop;
 	}
 
 	@Override
-	public int getDamageValue(World world, int x, int y, int z)
+	public int getDamageValue(final World world, final int x, final int y, final int z)
 	{
-		int meta = world.getBlockMetadata(x, y, z);
+		final int meta = world.getBlockMetadata(x, y, z);
 		return meta != 1 ? meta : 0;
 	}
 
 	@Override
-	public TileEntity createTileEntity(World world, int metadata)
+	public TileEntity createTileEntity(final World world, final int metadata)
 	{
 		if ((metadata < 0) || (metadata > Type.VALUES.length)) {
 			return null;
 		}
-		
-		
-		
-		Type type = Type.VALUES[metadata];
+
+
+
+		final Type type = Type.VALUES[metadata];
 		switch (type)
 		{
-		case FRAME: 
+		case FRAME:
 			LanguageRegistry.addName(this, "Alveary Frame Housing");
-		case MUTATOR: 
+		case MUTATOR:
 			LanguageRegistry.addName(this, "Alveary Mutator Block");
-		case ERROR: 
+		case ERROR:
 			LanguageRegistry.addName(this, "Invalid Alveary Block");
 		default:
-			LanguageRegistry.addName(this, "Unnamed Alveary Block");   
+			LanguageRegistry.addName(this, "Unnamed Alveary Block");
 		}
 		switch (type)
 		{
-		case FRAME: 
+		case FRAME:
 			return new TileAlvearyFrameHousing();
-		case MUTATOR: 
+		case MUTATOR:
 			return new TileAlvearyPlain();
-		case ERROR: 
+		case ERROR:
 			return new TileAlvearyPlain();
 		default:
-			return new TileAlvearyPlain();	   
+			return new TileAlvearyPlain();
 		}
 	}
 
 	@Override
-	public Block setBlockName(String name) {
+	public Block setBlockName(final String name) {
 		//int meta = this.
 		return super.setBlockName(name);
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
+	public TileEntity createNewTileEntity(final World world, final int meta)
 	{
-		return createTileEntity(world, meta);
+		return this.createTileEntity(world, meta);
 	}
 
 	/* ICONS */
@@ -167,108 +169,108 @@ public class FR_BlockAlveary extends BlockForestry
 	private IIcon[] icons;
 	@SideOnly(Side.CLIENT)
 	@Override
-	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");
+	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");
 	}
 	@SideOnly(Side.CLIENT)
 	@Override
-	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];
+	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[BOTTOM];
 		}
-		Type type = Type.VALUES[metadata];
+		final Type type = Type.VALUES[metadata];
 		switch (type) {
 		case ERROR:
-			return icons[PLAIN];
+			return this.icons[PLAIN];
 		case FRAME:
-			return icons[ALVEARY_FRAME_OFF];
+			return this.icons[ALVEARY_FRAME_OFF];
 		case MUTATOR:
-			return icons[ALVEARY_MUTATOR_OFF];
+			return this.icons[ALVEARY_MUTATOR_OFF];
 		case HEATER:
-			return icons[ALVEARY_MUTATOR_OFF];
+			return this.icons[ALVEARY_MUTATOR_OFF];
 		case HYGRO:
-			return icons[ALVEARY_MUTATOR_OFF];
+			return this.icons[ALVEARY_MUTATOR_OFF];
 		case STABILIZER:
-			return icons[PLAIN];
+			return this.icons[PLAIN];
 		case SIEVE:
-			return icons[PLAIN];
+			return this.icons[PLAIN];
 		default:
 			return null;
 		}
 	}
 	@SideOnly(Side.CLIENT)
 	@Override
-	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
-		int meta = world.getBlockMetadata(x, y, z);
+	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);
 		if (meta == 1) {
 			return this.getIcon(side, meta);
 		} else if (meta > 1) {
-			return getBlockTextureFromSideAndTile(world, x, y, z, side);
+			return this.getBlockTextureFromSideAndTile(world, x, y, z, side);
 		}
-		Block blockXP = world.getBlock(x + 1, y, z);
-		Block blockXM = world.getBlock(x - 1, y, z);
-		if (blockXP == this && blockXM != this) {
+		final Block blockXP = world.getBlock(x + 1, y, z);
+		final 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 switchForSide(42, side);
+					return this.switchForSide(42, side);
 				}
-				return switchForSide(41, side);
+				return this.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 switchForSide(41, side);
+					return this.switchForSide(41, side);
 				}
-				return switchForSide(42, side);
+				return this.switchForSide(42, side);
 			}
 			return this.getIcon(side, meta);
 		}
 		return this.getIcon(side, meta);
 	}
 	@SideOnly(Side.CLIENT)
-	private IIcon getBlockTextureFromSideAndTile(IBlockAccess world, int x, int y, int z, int side) {
-		TileEntity tile = world.getTileEntity(x, y, z);
+	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 getIcon(side, 0);
+			return this.getIcon(side, 0);
 		}
-		return icons[((FR_TileAlveary) tile).getIcon(side)];
+		return this.icons[((FR_TileAlveary) tile).getIcon(side)];
 	}
 	@SideOnly(Side.CLIENT)
-	private IIcon switchForSide(int textureId, int side) {
-		if (side == 4 || side == 5) {
+	private IIcon switchForSide(final int textureId, final int side) {
+		if ((side == 4) || (side == 5)) {
 			if (textureId == 41) {
-				return icons[LEFT];
+				return this.icons[LEFT];
 			}
-			return icons[RIGHT];
+			return this.icons[RIGHT];
 		} else if (textureId == 41) {
-			return icons[RIGHT];
+			return this.icons[RIGHT];
 		} else {
-			return icons[LEFT];
+			return this.icons[LEFT];
 		}
 	}
 	@Override
-	public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
+	public void onNeighborBlockChange(final World world, final int x, final int y, final int z, final Block block) {
 		super.onNeighborBlockChange(world, x, y, z, block);
-		TileEntity tileEntity = world.getTileEntity(x, y, z);
+		final TileEntity tileEntity = world.getTileEntity(x, y, z);
 		if (tileEntity instanceof FR_TileAlveary) {
-			FR_TileAlveary tileAlveary = (FR_TileAlveary) tileEntity;
+			final FR_TileAlveary tileAlveary = (FR_TileAlveary) tileEntity;
 			// We must check that the slabs on top were not removed
 			tileAlveary.getMultiblockLogic().getController().reassemble();
 		}
 	}
-	public ItemStack get(Type type) {
+	public ItemStack get(final 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 62b54ade3c..b5e7845dab 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_TileAlveary.java
@@ -3,9 +3,6 @@ package gtPlusPlus.xmod.forestry.bees.alveary;
 import java.io.IOException;
 import java.util.List;
 
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.util.Vec3;
-import net.minecraft.world.biome.BiomeGenBase;
 import forestry.api.apiculture.*;
 import forestry.api.core.*;
 import forestry.api.multiblock.IAlvearyComponent;
@@ -20,6 +17,9 @@ import forestry.core.multiblock.MultiblockTileEntityForestry;
 import forestry.core.network.*;
 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>
@@ -32,26 +32,26 @@ implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, IT
 		this(FR_BlockAlveary.Type.ERROR);
 	}
 
-	protected FR_TileAlveary(FR_BlockAlveary.Type type)
+	protected FR_TileAlveary(final FR_BlockAlveary.Type type)
 	{
 		super(new MultiblockLogicAlveary());
 		this.unlocalizedTitle = ("advanced.tile.for.alveary." + type.ordinal() + ".name");
-		
+
 	}
 
-	public int getIcon(int side)
+	public int getIcon(final int side)
 	{
 		return 0;
 	}
 
 	@Override
-	public void onMachineAssembled(IMultiblockController multiblockController, ChunkCoordinates minCoord, ChunkCoordinates maxCoord)
+	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, getBlockType());
-		markDirty();
+		this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
+		this.markDirty();
 	}
 
 	@Override
@@ -60,92 +60,92 @@ implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, IT
 		if (this.worldObj.isRemote) {
 			this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
 		}
-		this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, getBlockType());
-		markDirty();
+		this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
+		this.markDirty();
 	}
 
 	@Override
 	public BiomeGenBase getBiome()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBiome();
+		return this.getMultiblockLogic().getController().getBiome();
 	}
 
 	@Override
 	public Iterable<IBeeModifier> getBeeModifiers()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeModifiers();
+		return this.getMultiblockLogic().getController().getBeeModifiers();
 	}
 
 	@Override
 	public Iterable<IBeeListener> getBeeListeners()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeListeners();
+		return this.getMultiblockLogic().getController().getBeeListeners();
 	}
 
 	@Override
 	public IBeeHousingInventory getBeeInventory()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInventory();
+		return this.getMultiblockLogic().getController().getBeeInventory();
 	}
 
 	@Override
 	public IBeekeepingLogic getBeekeepingLogic()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeekeepingLogic();
+		return this.getMultiblockLogic().getController().getBeekeepingLogic();
 	}
 
 	@Override
 	public Vec3 getBeeFXCoordinates()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeFXCoordinates();
+		return this.getMultiblockLogic().getController().getBeeFXCoordinates();
 	}
 
 	@Override
 	public EnumTemperature getTemperature()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getTemperature();
+		return this.getMultiblockLogic().getController().getTemperature();
 	}
 
 	@Override
 	public EnumHumidity getHumidity()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getHumidity();
+		return this.getMultiblockLogic().getController().getHumidity();
 	}
 
 	@Override
 	public int getBlockLightValue()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBlockLightValue();
+		return this.getMultiblockLogic().getController().getBlockLightValue();
 	}
 
 	@Override
 	public boolean canBlockSeeTheSky()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().canBlockSeeTheSky();
+		return this.getMultiblockLogic().getController().canBlockSeeTheSky();
 	}
 
 	@Override
 	public IErrorLogic getErrorLogic()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getErrorLogic();
+		return this.getMultiblockLogic().getController().getErrorLogic();
 	}
 
 	@Override
 	public IAccessHandler getAccessHandler()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getAccessHandler();
+		return this.getMultiblockLogic().getController().getAccessHandler();
 	}
 
 	@Override
-	public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess)
+	public void onSwitchAccess(final EnumAccess oldAccess, final EnumAccess newAccess)
 	{
-		((MultiblockLogicAlveary)getMultiblockLogic()).getController().onSwitchAccess(oldAccess, newAccess);
+		this.getMultiblockLogic().getController().onSwitchAccess(oldAccess, newAccess);
 	}
 
 	@Override
 	public IInventoryAdapter getInternalInventory()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getInternalInventory();
+		return this.getMultiblockLogic().getController().getInternalInventory();
 	}
 
 	@Override
@@ -163,27 +163,27 @@ implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, IT
 	@Override
 	public float getExactTemperature()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getExactTemperature();
+		return this.getMultiblockLogic().getController().getExactTemperature();
 	}
 
 	@Override
 	public float getExactHumidity()
 	{
-		return ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getExactHumidity();
+		return this.getMultiblockLogic().getController().getExactHumidity();
 	}
 
 	@Override
-	public void writeGuiData(DataOutputStreamForestry data)
+	public void writeGuiData(final DataOutputStreamForestry data)
 			throws IOException
 	{
-		((MultiblockLogicAlveary)getMultiblockLogic()).getController().writeGuiData(data);
+		this.getMultiblockLogic().getController().writeGuiData(data);
 	}
 
 	@Override
-	public void readGuiData(DataInputStreamForestry data)
+	public void readGuiData(final DataInputStreamForestry data)
 			throws IOException
 	{
-		((MultiblockLogicAlveary)getMultiblockLogic()).getController().readGuiData(data);
+		this.getMultiblockLogic().getController().readGuiData(data);
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java
index b55d2d37a6..a214263d0b 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java
@@ -11,14 +11,14 @@ extends IMultiblockComponent
 	@Override
 	public abstract T getMultiblockLogic();
 
-	
+
 	public static abstract interface FrameHouse
 	extends IAlvearyComponentAdvanced
 	{
 		public abstract void changeClimate(int paramInt, IClimateControlled paramIClimateControlled);
 	}
 
-	
+
 	public static abstract interface BeeModifier
 	extends IAlvearyComponentAdvanced
 	{
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java
index 523c3e2434..2cc5e58ef7 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java
@@ -1,10 +1,10 @@
 package gtPlusPlus.xmod.forestry.bees.alveary;
 
-import net.minecraft.inventory.ISidedInventory;
 import forestry.api.apiculture.IBeeHousing;
+import net.minecraft.inventory.ISidedInventory;
 
 public abstract interface ISidedFrameWearingInventory
-  extends ISidedInventory
+extends ISidedInventory
 {
-  public abstract void wearOutFrames(IBeeHousing paramIBeeHousing, int paramInt);
+	public abstract void wearOutFrames(IBeeHousing paramIBeeHousing, int paramInt);
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java
index 3b09fc80e1..ff323632f5 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java
@@ -2,18 +2,11 @@ package gtPlusPlus.xmod.forestry.bees.alveary;
 
 import java.util.*;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
 import forestry.api.apiculture.*;
 import forestry.api.arboriculture.EnumGermlingType;
 import forestry.api.genetics.*;
 import forestry.api.multiblock.IAlvearyComponent;
 import forestry.apiculture.AlvearyBeeModifier;
-import forestry.apiculture.multiblock.MultiblockLogicAlveary;
 import forestry.apiculture.network.packets.PacketActiveUpdate;
 import forestry.apiculture.worldgen.*;
 import forestry.core.inventory.IInventoryAdapter;
@@ -24,6 +17,12 @@ import forestry.core.tiles.IActivatable;
 import forestry.core.utils.ItemStackUtil;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.forestry.bees.alveary.gui.*;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 
 public class TileAlvearyFrameHousing
 extends FR_TileAlveary
@@ -31,7 +30,7 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active,
 {
 	private final InventoryFrameHousing inventory;
 	private final IBeeListener beeListener;
-	private final Stack<ItemStack> pendingSpawns = new Stack<ItemStack>();
+	private final Stack<ItemStack> pendingSpawns = new Stack<>();
 	private boolean active;
 
 	public TileAlvearyFrameHousing()
@@ -55,19 +54,19 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active,
 	}
 
 	@Override
-	public void updateServer(int tickCount)
+	public void updateServer(final int tickCount)
 	{
 
-		if (getInternalInventory() == null) {
+		if (this.getInternalInventory() == null) {
 			return;
 		}
 
 		if (this.inventory.getStackInSlot(0) != null)
 		{
-			if (((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeekeepingLogic().canWork()){
-				setActive(true);
-				if (tickCount % 1000 == 0) {
-					wearOutFrames(this, 1);
+			if (this.getMultiblockLogic().getController().getBeekeepingLogic().canWork()){
+				this.setActive(true);
+				if ((tickCount % 1000) == 0) {
+					this.wearOutFrames(this, 1);
 				}
 			}
 			else {
@@ -77,20 +76,20 @@ implements ISidedFrameWearingInventory, IActivatable, IAlvearyComponent.Active,
 		}
 		else
 		{
-			setActive(false);
+			this.setActive(false);
 		}
-		if (tickCount % 500 != 0) {
+		if ((tickCount % 500) != 0) {
 			return;
 		}
 
 	}
 
 	@Override
-	public void updateClient(int tickCount) {}
+	public void updateClient(final int tickCount) {}
 
 	private ItemStack getPrincessStack()
 	{
-		ItemStack princessStack = ((MultiblockLogicAlveary)getMultiblockLogic()).getController().getBeeInventory().getQueen();
+		final ItemStack princessStack = this.getMultiblockLogic().getController().getBeeInventory().getQueen();
 		if (BeeManager.beeRoot.isMated(princessStack)) {
 			return princessStack;
 		}
@@ -99,55 +98,55 @@ implement