%Changed the way the Foresty xmod stuff runs in a non-dev situation.

%Improved Growthcraft Booze handling

24 files changed, 140 insertions, 1619 deletions

diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index e8315a2446..570059b00c 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -15,7 +15,7 @@ public class CORE {
 
 	public static final String name = "Misc. Utils";	
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.2.2";
+	public static final String VERSION = "1.2.5";
 	public static final boolean DEBUG = false;	
 	public static final boolean LOAD_ALL_CONTENT = false;
 	public static final int GREG_FIRST_ID = 760;
diff --git a/src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java b/src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java
index 94beb5618e..50b07e7535 100644
--- a/src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java
+++ b/src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java
@@ -1,22 +1,20 @@
 package miscutil.core.xmod.forestry;
 
 import miscutil.core.lib.LoadedMods;
-import miscutil.core.xmod.forestry.apiculture.blocks.FR_BlockRegistryApiculture;
-import miscutil.core.xmod.forestry.apiculture.items.FR_ItemRegistryApiculture;
-import miscutil.core.xmod.forestry.apiculture.tiles.FR_TileHandler;
+import miscutil.core.xmod.forestry.apiculture.items.FR_ItemRegistry;
 
 public class HANDLER_Forestry {
 
 	public static void preInit(){		
 		if (LoadedMods.Forestry){
-			FR_ItemRegistryApiculture.RegisterApiculture();
-			FR_BlockRegistryApiculture.RegistryApiculture();
+			FR_ItemRegistry.Register();
+			//FR_BlockRegistryApiculture.RegistryApiculture();
 		}		
 	}
 
 	public static void Init(){
 		if (LoadedMods.Forestry){
-			FR_TileHandler.init();			
+			//FR_TileHandler.init();			
 		}		
 	}
 
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockAlveary.java b/src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockAlveary.java
deleted file mode 100644
index 62669ef8d0..0000000000
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockAlveary.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package miscutil.core.xmod.forestry.apiculture.blocks;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import miscutil.core.creative.AddToCreativeTab;
-import miscutil.core.xmod.forestry.apiculture.multiblock.TileAlvearyMutatron;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import forestry.apiculture.MaterialBeehive;
-import forestry.apiculture.multiblock.TileAlveary;
-import forestry.core.blocks.BlockStructure;
-import forestry.core.render.TextureManager;
-
-public class FR_BlockAlveary extends BlockStructure {
-	public enum Type {
-		PLAIN,
-		MUTATRON;
-		public static final Type[] VALUES = values();
-	}
-
-	public FR_BlockAlveary() {
-		super(new MaterialBeehive(false));
-		setHardness(1.0f);
-		setCreativeTab(AddToCreativeTab.tabMisc);
-		setHarvestLevel("axe", 0);
-	}
-
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
-		for (int i = 0; i < 8; i++) {
-			if (i == 1) {
-				continue;
-			}
-			list.add(new ItemStack(item, 1, i));
-		}
-	}
-
-	@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<>();
-		drop.add(new ItemStack(this, 1, metadata != 1 ? metadata : 0));
-		return drop;
-	}
-
-	@Override
-	public int getDamageValue(World world, int x, int y, int z) {
-		int meta = world.getBlockMetadata(x, y, z);
-		return meta != 1 ? meta : 0;
-	}
-
-	/* TILE ENTITY CREATION */
-	@Override
-	public TileEntity createTileEntity(World world, int metadata) {
-		if (metadata < 0 || metadata > Type.VALUES.length) {
-			return null;
-		}	
-			return new TileAlvearyMutatron();
-	}
-
-	@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 MUTATRON_OFF = 5;
-	public static final int MUTATRON_ON = 6;
-
-	@SideOnly(Side.CLIENT)
-	private IIcon[] icons;
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void registerBlockIcons(IIconRegister register) {
-		icons = new IIcon[7];
-		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.mutatron.off");
-		icons[6] = TextureManager.registerTex(register, "apiculture/alveary.mutatron.on");
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public IIcon getIcon(int side, int metadata) {
-		if ((metadata <= 1	/*|| metadata == Type.MUTATRON.ordinal()*/) && (side == 1 || side == 0)) {
-			return icons[BOTTOM];
-		}
-		return icons[MUTATRON_OFF];
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	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);
-		}
-
-		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 switchForSide(42, side);
-				} else {
-					return switchForSide(41, side);
-				}
-
-			} else {
-				return this.getIcon(side, meta);
-			}
-
-		} 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);
-				} else {
-					return switchForSide(42, side);
-				}
-
-			} else {
-				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);
-		if (!(tile instanceof TileAlveary)) {
-			return getIcon(side, 0);
-		}
-
-		return icons[((TileAlveary) tile).getIcon(side)];
-	}
-
-	@SideOnly(Side.CLIENT)
-	private IIcon switchForSide(int textureId, int side) {
-
-		if (side == 4 || side == 5) {
-			if (textureId == 41) {
-				return icons[LEFT];
-			} else {
-				return icons[RIGHT];
-			}
-		} else if (textureId == 41) {
-			return icons[RIGHT];
-		} else {
-			return icons[LEFT];
-		}
-
-	}
-
-	@Override
-	public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
-		super.onNeighborBlockChange(world, x, y, z, block);
-
-		TileEntity tileEntity = world.getTileEntity(x, y, z);
-		if (tileEntity instanceof TileAlveary) {
-			TileAlveary tileAlveary = (TileAlveary) tileEntity;
-
-			// We must check that the slabs on top were not removed
-			tileAlveary.getMultiblockLogic().getController().reassemble();
-		}
-	}
-
-	public ItemStack get(Type type) {
-		return new ItemStack(this, 1, type.ordinal());
-	}
-}
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java b/src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java
deleted file mode 100644
index ebde18655f..0000000000
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package miscutil.core.xmod.forestry.apiculture.blocks;
-
-import miscutil.core.lib.CORE;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-import cpw.mods.fml.common.registry.GameRegistry;
-import forestry.core.blocks.BlockRegistry;
-import forestry.core.items.ItemBlockForestry;
-import forestry.core.utils.StringUtil;
-public class FR_BlockRegistryApiculture extends BlockRegistry {
-
-	public static FR_BlockAlveary alveary;
-
-	public static void RegistryApiculture() {
-		if (CORE.DEBUG){
-			alveary = registerBlock2(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary");	
-		}
-	}
-
-	protected static <T extends Block> T registerBlock2(T block, Class<? extends ItemBlock> itemClass, String name, Object... itemCtorArgs) {
-		block.setBlockName(name);
-		GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs);
-		return block;
-	}
-
-	protected static void registerOreDictWildcard(String oreDictName, Block block) {
-		OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE));
-	}
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemHiveFrame.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemHiveFrame.java
deleted file mode 100644
index cd517fd1ad..0000000000
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemHiveFrame.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package miscutil.core.xmod.forestry.apiculture.items;
-
-import miscutil.core.creative.AddToCreativeTab;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import forestry.api.apiculture.DefaultBeeModifier;
-import forestry.api.apiculture.IBee;
-import forestry.api.apiculture.IBeeGenome;
-import forestry.api.apiculture.IBeeHousing;
-import forestry.api.apiculture.IBeeModifier;
-import forestry.api.apiculture.IHiveFrame;
-
-public class FR_ItemHiveFrame extends Item implements IHiveFrame {
-
-	private final IBeeModifier beeModifier;
-
-	public FR_ItemHiveFrame(int maxDamage, float geneticDecay) {
-		setMaxStackSize(1);
-		setMaxDamage(maxDamage);
-		setCreativeTab(AddToCreativeTab.tabMisc);
-
-		this.beeModifier = new HiveFrameBeeModifier(geneticDecay);
-	}
-
-	@Override
-	public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) {
-		frame.setItemDamage(frame.getItemDamage() + wear);
-		if (frame.getItemDamage() >= frame.getMaxDamage()) {
-			return null;
-		} else {
-			return frame;
-		}
-	}
-
-	@Override
-	public IBeeModifier getBeeModifier() {
-		return beeModifier;
-	}
-
-	private static class HiveFrameBeeModifier extends DefaultBeeModifier {
-		private final float geneticDecay;
-
-		public HiveFrameBeeModifier(float geneticDecay) {
-			this.geneticDecay = geneticDecay;
-		}
-
-		@Override
-		public float getProductionModifier(IBeeGenome genome, float currentModifier) {
-			return (currentModifier < 10f) ? 2f : 1f;
-		}
-
-		@Override
-		public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
-			return this.geneticDecay;
-		}
-	}
-}
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistryApiculture.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistry.java
index f2a64a9f90..3772d70918 100644
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistryApiculture.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistry.java
@@ -9,28 +9,28 @@
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
 package miscutil.core.xmod.forestry.apiculture.items;
-import miscutil.core.xmod.forestry.apiculture.items.magicbees.MB_HiveFrameType;
-import miscutil.core.xmod.forestry.apiculture.items.magicbees.MB_ItemMagicHiveFrame;
+import miscutil.core.xmod.forestry.apiculture.items.magicbees.MB_FrameType;
+import miscutil.core.xmod.forestry.apiculture.items.magicbees.MB_ItemFrame;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraftforge.common.ChestGenHooks;
 import cpw.mods.fml.common.registry.GameRegistry;
-import forestry.core.items.ItemRegistry;
 import forestry.core.utils.StringUtil;
 
-public class FR_ItemRegistryApiculture extends ItemRegistry {
+public class FR_ItemRegistry {
 
 
 	//----- Apiary Frames ----------------------
-	public static FR_ItemHiveFrame frameUntreated;
-	public static FR_ItemHiveFrame frameImpregnated;
-	public static FR_ItemHiveFrame frameProven;
+	//public static FR_ItemHiveFrame frameUntreated;
+	//public static FR_ItemHiveFrame frameImpregnated;
+	//public static FR_ItemHiveFrame frameProven;
+	
 	//Magic Bee Frame Items
-	public static MB_ItemMagicHiveFrame hiveFrameMetabolic;
-	public static MB_ItemMagicHiveFrame hiveFrameOblivion;
+	public static MB_ItemFrame hiveFrameAccelerated;
+	public static MB_ItemFrame hiveFrameVoid;
 
-	public static void RegisterApiculture() {		
+	public static void Register() {		
 
 		//Forestry Frames
 		//frameUntreated = registerItem(new FR_ItemHiveFrame(80, 0.9f), "frameUntreated");
@@ -38,10 +38,10 @@ public class FR_ItemRegistryApiculture extends ItemRegistry {
 		//frameProven = registerItem(new FR_ItemHiveFrame(720, 0.3f), "frameProven");
 
 		//Magic Bee like Frames
-		hiveFrameMetabolic = new MB_ItemMagicHiveFrame(MB_HiveFrameType.ACCELERATED);
-		hiveFrameOblivion = new MB_ItemMagicHiveFrame(MB_HiveFrameType.VOID);
-		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameOblivion), 1, 1, 18));
-		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameOblivion), 1, 3, 23));
+		hiveFrameAccelerated = new MB_ItemFrame(MB_FrameType.ACCELERATED);
+		hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID);
+		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 18));
+		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 23));
 
 
 
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringManager.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringUtil.java
index f08f1fd542..235566f4ef 100644
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringManager.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringUtil.java
@@ -2,7 +2,7 @@ package miscutil.core.xmod.forestry.apiculture.items.magicbees;
 
 import net.minecraft.util.StatCollector;
 
-public class FR_StringManager
+public class FR_StringUtil
 {
 	public static String getLocalizedString(String key)
 	{
@@ -10,10 +10,7 @@ public class FR_StringManager
 		{
 			return StatCollector.translateToLocal(key);
 		}
-		else
-		{
-			return StatCollector.translateToFallback(key);
-		}
+		return StatCollector.translateToFallback(key);
 	}
 
 	public static String getLocalizedString(String key, Object... objects)
@@ -22,9 +19,6 @@ public class FR_StringManager
 		{
 			return String.format(StatCollector.translateToLocal(key), objects);
 		}
-		else
-		{
-			return String.format(StatCollector.translateToFallback(key), objects);
-		}
+		return String.format(StatCollector.translateToFallback(key), objects);
 	}
 }
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_HiveFrameType.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_FrameType.java
index 5921867eae..0d322d4498 100644
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_HiveFrameType.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_FrameType.java
@@ -3,7 +3,7 @@ package miscutil.core.xmod.forestry.apiculture.items.magicbees;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeModifier;
 
-public enum MB_HiveFrameType implements IBeeModifier
+public enum MB_FrameType implements IBeeModifier
 {
 	ACCELERATED("Accelerated", 175, 1f, 2.5f, 0.9f, 1.8f, 1f),
 	VOID("Void", 20, 1f, 1f, 0.0001f, 10f, 1f);
@@ -22,11 +22,11 @@ public enum MB_HiveFrameType implements IBeeModifier
 	private final boolean isSunlit;
 	private final boolean isHellish;
 	
-	MB_HiveFrameType(String name, int damage, float territory, float mutation, float lifespan, float production, float geneticDecay) {
+	MB_FrameType(String name, int damage, float territory, float mutation, float lifespan, float production, float geneticDecay) {
 		this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false);
 	}
 	
-	MB_HiveFrameType(String name, int damage,
+	MB_FrameType(String name, int damage,
 						  float territory, float mutation, float lifespan, float production, float flowering, float geneticDecay,
 						  boolean sealed, boolean lit, boolean sunlit, boolean hellish)
 	{
@@ -52,7 +52,7 @@ public enum MB_HiveFrameType implements IBeeModifier
 	
 	public String getLocalizedName()
 	{
-		return FR_StringManager.getLocalizedString("frame." + this.frameName);
+		return FR_StringUtil.getLocalizedString("frame." + this.frameName);
 	}
 
 	@Override
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemMagicHiveFrame.java b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemFrame.java
index 78e0afb55b..b12f29340c 100644
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemMagicHiveFrame.java
+++ b/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemFrame.java
@@ -9,15 +9,16 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.apiculture.IHiveFrame;
 
-public class MB_ItemMagicHiveFrame extends Item implements IHiveFrame
+public class MB_ItemFrame extends Item implements IHiveFrame
 {
-	private MB_HiveFrameType type;
+	private MB_FrameType type;
 
-	public MB_ItemMagicHiveFrame(MB_HiveFrameType frameType)
+	public MB_ItemFrame(MB_FrameType frameType)
 	{
 		super();
 		this.type = frameType;
@@ -28,6 +29,7 @@ public class MB_ItemMagicHiveFrame extends Item implements IHiveFrame
 		GameRegistry.registerItem(this, "frame" + frameType.getName());
 	}
 	
+	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(IIconRegister par1IconRegister)
 	{
@@ -48,7 +50,6 @@ public class MB_ItemMagicHiveFrame extends Item implements IHiveFrame
 		return frame;
 	}
 
-	@Override
 	public IBeeModifier getBeeModifier() {
 		return type;
 	}
@@ -58,5 +59,45 @@ public class MB_ItemMagicHiveFrame extends Item implements IHiveFrame
 	{
 		return false;
 	}
+	
+	public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
+		return type.getTerritoryModifier(genome, currentModifier);
+	}
+
+	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return type.getMutationModifier(genome, mate, currentModifier);
+	}
+
+	public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return type.getLifespanModifier(genome, mate, currentModifier);
+	}
+
+	public float getProductionModifier(IBeeGenome genome, float currentModifier) {
+		return type.getProductionModifier(genome, currentModifier);
+	}
+
+	public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
+		return type.getFloweringModifier(genome, currentModifier);
+	}
+
+	public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
+		return type.getGeneticDecay(genome, currentModifier);
+	}
+
+	public boolean isSealed() {
+		return type.isSealed();
+	}
+
+	public boolean isSelfLighted() {
+		return type.isSelfLighted();
+	}
+
+	public boolean isSunlightSimulated() {
+		return type.isSunlightSimulated();
+	}
+	
+	public boolean isHellish(){
+		return type.isHellish();
+	}
 
 }
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/FR_TileAlveary.java b/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/FR_TileAlveary.java
deleted file mode 100644
index 06633a87cf..0000000000
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/FR_TileAlveary.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package miscutil.core.xmod.forestry.apiculture.multiblock;
-
-import java.io.IOException;
-import java.util.List;
-
-import miscutil.core.xmod.forestry.apiculture.blocks.FR_BlockAlveary;
-import net.minecraft.entity.player.EntityPlayer;
-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.EnumAccess;
-import forestry.core.access.IAccessHandler;
-import forestry.core.access.IRestrictedAccess;
-import forestry.core.config.Config;
-import forestry.core.gui.IHintSource;
-import forestry.core.inventory.IInventoryAdapter;
-import forestry.core.multiblock.MultiblockTileEntityForestry;
-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;
-
-public abstract class FR_TileAlveary extends MultiblockTileEntityForestry<MultiblockLogicAlveary> implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, ITitled, IClimatised, IHintSource {
-	private final String unlocalizedTitle;
-
-	protected FR_TileAlveary() {
-		this(FR_BlockAlveary.Type.PLAIN);
-	}
-
-	protected FR_TileAlveary(FR_BlockAlveary.Type type) {
-		super(new MultiblockLogicAlveary());
-		this.unlocalizedTitle = "tile.alveary." + type.ordinal() + ".name";
-	}
-
-	/* TEXTURES */
-	public int getIcon(int side) {
-		return FR_BlockAlveary.PLAIN;
-	}
-
-	@Override
-	public void onMachineAssembled(IMultiblockController multiblockController, ChunkCoordinates minCoord, ChunkCoordinates maxCoord) {
-		// Re-render this block on the client
-		if (worldObj.isRemote) {
-			this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
-		}
-		worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType());
-		markDirty();
-	}
-
-	@Override
-	public void onMachineBroken() {
-		// Re-render this block on the client
-		if (worldObj.isRemote) {
-			this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
-		}
-		worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType());
-		markDirty();
-	}
-
-	/* IHousing */
-	@Override
-	public BiomeGenBase getBiome() {
-		return getMultiblockLogic().getController().getBiome();
-	}
-
-	/* IBeeHousing */
-	@Override
-	public Iterable<IBeeModifier> getBeeModifiers() {
-		return getMultiblockLogic().getController().getBeeModifiers();
-	}
-
-	@Override
-	public Iterable<IBeeListener> getBeeListeners() {
-		return getMultiblockLogic().getController().getBeeListeners();
-	}
-
-	@Override
-	public IBeeHousingInventory getBeeInventory() {
-		return getMultiblockLogic().getController().getBeeInventory();
-	}
-
-	@Override
-	public IBeekeepingLogic getBeekeepingLogic() {
-		return getMultiblockLogic().getController().getBeekeepingLogic();
-	}
-
-	@Override
-	public Vec3 getBeeFXCoordinates() {
-		return getMultiblockLogic().getController().getBeeFXCoordinates();
-	}
-
-	/* IClimatised */
-	@Override
-	public EnumTemperature getTemperature() {
-		return getMultiblockLogic().getController().getTemperature();
-	}
-
-	@Override
-	public EnumHumidity getHumidity() {
-		re