Allow Biogas Engine fuel tank to be drained externally.

(cherry picked from commit 81d2c1971c)

.gitignore

@@ -6,7 +6,6 @@
 !/gradle/wrapper
 !/src
 !/api
-!/test
 
 # files
 !/.gitignore
@@ -20,5 +19,4 @@
 !/build.gradle
 !/build.xml
 !/gradlew
-!/gradlew.bat
-.DS_Store
+!/gradlew.bat

application.properties

@@ -1,5 +1,5 @@
 mcversion=1.7.10
 forgeversion=10.13.3.1370-1.7.10
-version_major=4
-version_minor=0
-version_patch=5
+version_major=3
+version_minor=6
+version_patch=8

build.gradle

@@ -19,7 +19,6 @@ buildscript {
 
 apply plugin: 'forge'
 apply plugin: 'maven'
-apply plugin: 'java'
 
 loadProperties()
 
@@ -36,6 +35,9 @@ ext.dirLang = "./lang"
 ext.apiForestry = "./api/forestry"
 ext.apiRedstoneFlux = "./api/redstoneflux"
 
+ext.CraftGuideRepo = "https://github.com/Uristqwerty/CraftGuide.git"
+ext.CraftGuideTmp = "build/tmp/CraftGuide"
+
 minecraft {
 	version = mcversion + "-" + forgeversion
 	runDir = "run"
@@ -45,6 +47,13 @@ minecraft {
 }
 
 sourceSets {
+	api {
+		java {
+			srcDir CraftGuideTmp + "/src"
+			include '**/CraftGuide/api/**'
+		}
+	}
+	
 	main {
 		java {
 			srcDir project.apiForestry
@@ -65,10 +74,6 @@ repositories {
 		name "BuildCraft"
 		artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
 	}
-	maven {
-		name = "chickenbones"
-		url = "http://chickenbones.net/maven/"
-	}
 }
 
 configurations {
@@ -78,17 +83,7 @@ configurations {
 
 dependencies {
 	api 'net.industrial-craft:industrialcraft-2:2.2.713-experimental:api'
-	api name: "buildcraft", version: "7.0.25", classifier: "api"
-
-	// http://files.minecraftforge.net/CodeChickenLib/
-	compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
-
-	// http://chickenbones.net/maven
-	compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
-	compile "codechicken:NotEnoughItems:1.7.10-1.0.5.111:dev"
-	compile "codechicken:NotEnoughItems:1.7.10-1.0.5.111:src"
-
-	testCompile 'junit:junit:4.12'
+	api name: "buildcraft", version: "6.4.10", classifier: "dev"
 }
 
 processResources {
@@ -169,6 +164,23 @@ task bumpPatch << {
 	saveVersion()
 }
 
+import org.ajoberstar.grgit.Grgit
+
+task initCraftGuide << {
+	def localRepo = file(CraftGuideTmp)
+
+	if (localRepo.exists()) {
+		println 'Updating CraftGuide repo'
+		def grgit = Grgit.open(localRepo)
+		grgit.pull()
+		grgit.close()
+	} else {
+		println 'Cloning CraftGuide repo'
+		def grgit = Grgit.clone(dir: localRepo, uri: CraftGuideRepo)
+		grgit.close()
+	}
+}
+
 jar {
 	destinationDir = file("build/tmp")
 	archiveName = "main.jar"
@@ -185,75 +197,119 @@ jar {
 	}
 }
 
-task mainJar(type: Jar, dependsOn: 'reobf') {
+task mainJarSigned ( type: Jar, dependsOn: 'reobf' ) {
+	from (zipTree(jar.getArchivePath())) {
+		exclude '**/api/**'
+		exclude '**/codechicken/**'
+	}
+
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	destinationDir = file("build/tmp")
+	archiveName = "signed.jar"
+
+	doLast {
+		if (project.hasProperty('signingKeystore')) {
+			ant.signjar(jar: getArchivePath(),
+				alias: signingAlias,
+				keystore: signingKeystore,
+				storepass: signingStorepass)
+		} else {
+			println 'Signing disabled, gradle.properties is missing.'
+		}
+	}
+}
+
+task mainJar ( type: Zip, dependsOn: mainJarSigned ) {
+	from (zipTree(mainJarSigned.getArchivePath())) {
+		include '**'
+	}
+
 	from (zipTree(jar.getArchivePath())) {
 		include '**'
 		exclude '**/codechicken/**'
-		exclude '**/uristqwerty/**'
 	}
 
-	destinationDir = file(dirDest)
 	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	destinationDir = file(dirDest)
 	includeEmptyDirs = false
+	extension = 'jar'
 }
 
-task devJar(type: Jar, dependsOn: 'classes') {
-	from (sourceSets.main.output) {
+task devJarSigned ( type: Jar, dependsOn: 'classes' ) {
+	from(sourceSets.main.output) {
+		exclude '**/api/**'
+		exclude '**/codechicken/**'
+	}
+
+	destinationDir = file("build/tmp")
+	archiveName = "signed-dev.jar"
+
+	doLast {
+		if (project.hasProperty('signingKeystore')) {
+			ant.signjar(jar: getArchivePath(),
+				alias: signingAlias,
+				keystore: signingKeystore,
+				storepass: signingStorepass)
+		} else {
+			println 'Signing disabled, gradle.properties is missing.'
+		}
+	}
+}
+
+task devJar ( type: Zip, dependsOn: devJarSigned ) {
+	from (zipTree(devJarSigned.getArchivePath())) {
+		include '**'
+	}
+
+	from(sourceSets.main.allSource) {
+		include '**'
+		exclude '**/codechicken/**'
+	}
+
+	from(sourceSets.main.output) {
+		include '**'
 		exclude '**/codechicken/**'
-		exclude '**/uristqwerty/**'
 	}
 
-	destinationDir = file(dirDest)
 	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-	includeEmptyDirs = false
+	destinationDir = file(dirDest)
+	extension = 'jar'
 
 	classifier = 'dev'
 }
 
 task apiJar(type: Jar, dependsOn: 'classes') {
 	from project.apiForestry
-	from(sourceSets.main.output) {
+	
+	from (sourceSets.main.output) {
 		include 'forestry/api/**'
 	}
-
+	
 	destinationDir = file(dirDest)
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-	includeEmptyDirs = false
-
+	extension = 'jar'
 	classifier = 'api'
 }
 
-task sourceJar(type: Jar, dependsOn: 'classes') {
-	from (sourceSets.main.allSource) {
-		exclude '**/codechicken/**'
-		exclude '**/uristqwerty/**'
-	}
-
-	destinationDir = file(dirDest)
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-	includeEmptyDirs = false
-
-	classifier = 'sources'
-}
-
 task releaseInit << {
 	println '*************************************************************'
 	println 'This build will be version: ' +  rootProject.version
 	println '*************************************************************'
 }
 
-task release (dependsOn: [releaseInit, mainJar, apiJar, devJar, sourceJar]) {
+task release (dependsOn: [releaseInit, apiJar, devJar, mainJar]) {
 }
 
 mainJar.shouldRunAfter releaseInit
 devJar.shouldRunAfter releaseInit
 apiJar.shouldRunAfter releaseInit
-sourceJar.shouldRunAfter releaseInit
+
+afterEvaluate {
+	compileApiJava.dependsOn initCraftGuide
+}
 
 artifacts {
 	archives apiJar
 	archives devJar
-	archives sourceJar
 }
 
 uploadArchives {
@@ -268,9 +324,6 @@ uploadArchives {
 				addFilter('dev') { artifact, file ->
 					file == devJar.archivePath
 				}
-				addFilter('source') { artifact, file ->
-					file == sourceJar.archivePath
-				}
 			}
 		} else {
 			println 'Archives upload disabled, gradle.properties is missing.'

src/main/java/codechicken/nei/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Uristqwerty
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2014 ChickenBones
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/main/java/codechicken/nei/VisiblityData.java

@@ -0,0 +1,38 @@
+package codechicken.nei;
+
+public class VisiblityData
+{
+    public boolean showUtilityButtons = true;
+    public boolean showStateButtons = true;
+    /**
+     * Item panel and associated buttons
+     */
+    public boolean showItemPanel = true;
+    /**
+     * Item and search section
+     */
+    public boolean showItemSection = true;
+    /**
+     * Dropdown and Item search field
+     */
+    public boolean showSearchSection = true;
+    /**
+     * All widgets except options button
+     */
+    public boolean showWidgets = true;
+    /**
+     * The entire NEI interface, aka hidden
+     */
+    public boolean showNEI = true;
+    public boolean enableDeleteMode = true;
+    
+    public void translateDependancies()
+    {
+        if(!showNEI)
+            showWidgets = false;
+        if(!showWidgets)
+            showItemSection = showUtilityButtons = showStateButtons = false;
+        if(!showItemSection)
+            showSearchSection = showItemPanel = false;
+    }
+}

src/main/java/codechicken/nei/api/INEIGuiHandler.java

@@ -0,0 +1,49 @@
+package codechicken.nei.api;
+
+import codechicken.nei.VisiblityData;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
+
+import java.util.List;
+
+/**
+ * If this is implemented on a gui, it will be automatically registered
+ */
+public interface INEIGuiHandler
+{
+    public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility);
+    
+    /**
+     * NEI will give the specified item to the InventoryRange returned if the player's inventory is full.
+     * return null for no range
+     */
+    public Iterable<Integer> getItemSpawnSlots(GuiContainer gui, ItemStack item);
+    
+    /**
+     * @return A list of TaggedInventoryAreas that will be used with the savestates.
+     */
+    public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui);
+    
+    /**
+     * Handles clicks while an itemstack has been dragged from the item panel. Use this to set configurable slots and the like. 
+     * Changes made to the stackSize of the dragged stack will be kept
+     * @param gui The current gui instance
+     * @param mousex The x position of the mouse
+     * @param mousey The y position of the mouse
+     * @param draggedStack The stack being dragged from the item panel
+     * @param button The button presed
+     * @return True if the drag n drop was handled. False to resume processing through other routes. The held stack will be deleted if draggedStack.stackSize == 0
+     */
+    public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button);
+    
+    /**
+     * Used to prevent the item panel from drawing on top of other gui elements.
+     * This function will also be called with a 1x1 size rectangle on the mouse position for determining if the given coordinate should override item panel functions such as scrolling
+     * @param x The x coordinate of the rectangle bounding the slot
+     * @param y The y coordinate of the rectangle bounding the slot
+     * @param w The w coordinate of the rectangle bounding the slot
+     * @param h The h coordinate of the rectangle bounding the slot
+     * @return true if the item panel slot within the specified rectangle should not be rendered.
+     */
+    public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h);
+}

src/main/java/codechicken/nei/api/TaggedInventoryArea.java

@@ -0,0 +1,48 @@
+package codechicken.nei.api;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
+import java.util.HashSet;
+
+public class TaggedInventoryArea
+{
+    public HashSet<Integer> slots = new HashSet<Integer>();
+    public String tagName;
+    /**
+     * Only for player inventories.
+     */
+    private IInventory inventory;
+    /**
+     * Other inventories
+     */
+    private Container container;
+    
+    public TaggedInventoryArea(InventoryPlayer invPlayer)
+    {
+        this("InventoryPlayer", 0, 39, null);
+        inventory = invPlayer;
+    }
+    
+    public TaggedInventoryArea(String name, int first, int last, Container container)
+    {
+        this.container = container;
+        tagName = name;
+        for(int i = first; i <= last; i++)
+            slots.add(i);
+    }
+
+    public ItemStack getStackInSlot(int i)
+    {
+        if(inventory != null)
+            return inventory.getStackInSlot(i);
+        return container.getSlot(i).getStack();
+    }
+    
+    public boolean isContainer()
+    {
+        return inventory == null;
+    }
+}

src/main/java/forestry/Forestry.java

@@ -38,14 +38,14 @@ import forestry.api.fuels.GeneratorFuel;
 import forestry.api.fuels.MoistenerFuel;
 import forestry.api.fuels.RainSubstrate;
 import forestry.core.ForestryCore;
-import forestry.core.config.Constants;
+import forestry.core.config.Defaults;
 import forestry.core.config.ForestryItem;
 import forestry.core.config.Version;
 import forestry.core.network.PacketHandler;
-import forestry.core.utils.Log;
+import forestry.core.proxy.Proxies;
+import forestry.core.utils.FluidMap;
+import forestry.core.utils.ItemStackMap;
 import forestry.core.utils.StringUtil;
-import forestry.core.utils.datastructures.FluidMap;
-import forestry.core.utils.datastructures.ItemStackMap;
 
 /**
  * Forestry Minecraft Mod
@@ -53,10 +53,9 @@ import forestry.core.utils.datastructures.ItemStackMap;
  * @author SirSengir
  */
 @Mod(
-		modid = Constants.MOD,
+		modid = Defaults.MOD,
 		name = "Forestry",
 		version = Version.VERSION,
-		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
 		dependencies = "required-after:Forge@[10.13.0.1207,);"
 				+ "after:Buildcraft|Core@[6.1.7,);"
 				+ "after:ExtrabiomesXL;"
@@ -64,9 +63,10 @@ import forestry.core.utils.datastructures.ItemStackMap;
 				+ "after:IC2@[2.0.140,);"
 				+ "after:Natura@[2.2.0,);"
 				+ "after:HardcoreEnderExpansion;")
+//, certificateFingerprint = Version.FINGERPRINT)
 public class Forestry {
 
-	@Mod.Instance(Constants.MOD)
+	@Mod.Instance(Defaults.MOD)
 	public static Forestry instance;
 	private File configFolder;
 
@@ -128,7 +128,7 @@ public class Forestry {
 	}
 	/*@EventHandler
 	 public void fingerprintWarning(FMLFingerprintViolationEvent event) {
-	 Log.info("Fingerprint of the mod jar is invalid. The jar file was tampered with.");
+	 Proxies.log.info("Fingerprint of the mod jar is invalid. The jar file was tampered with.");
 	 FMLInterModComms.sendMessage("Railcraft", "securityViolation", "Fingerprint of jar file did not match.");
 	 FMLInterModComms.sendMessage("Thaumcraft", "securityViolation", "Fingerprint of jar file did not match.");
 	 FMLInterModComms.sendMessage("IC2", "securityViolation", "Fingerprint of jar file did not match.");
@@ -143,21 +143,21 @@ public class Forestry {
 	public void missingMapping(FMLMissingMappingsEvent event) {
 		for (MissingMapping mapping : event.get()) {
 			if (mapping.type == Type.BLOCK) {
-				Block block = GameRegistry.findBlock(Constants.MOD, StringUtil.cleanTags(mapping.name));
+				Block block = GameRegistry.findBlock(Defaults.MOD, StringUtil.cleanTags(mapping.name));
 				if (block != null) {
 					mapping.remap(block);
-					Log.warning("Remapping block " + mapping.name + " to " + StringUtil.cleanBlockName(block));
+					Proxies.log.warning("Remapping block " + mapping.name + " to " + StringUtil.cleanBlockName(block));
 				}
 			} else {
-				Block block = GameRegistry.findBlock(Constants.MOD, StringUtil.cleanTags(mapping.name));
+				Block block = GameRegistry.findBlock(Defaults.MOD, StringUtil.cleanTags(mapping.name));
 				if (block != null) {
 					mapping.remap(Item.getItemFromBlock(block));
-					Log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanBlockName(block));
+					Proxies.log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanBlockName(block));
 				} else {
 					ForestryItem mappedItem = mappedItems.get(mapping.name);
 					if (mappedItem != null) {
 						mapping.remap(mappedItem.item());
-						Log.warning("Remapping item " + mapping.name + " to " + mappedItem.name());
+						Proxies.log.warning("Remapping item " + mapping.name + " to " + mappedItem.name());
 					}
 				}
 			}

src/main/java/forestry/apiculture/ArmorApiaristHelper.java

@@ -1,49 +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 forestry.apiculture;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import forestry.api.apiculture.IArmorApiarist;
-import forestry.api.apiculture.IArmorApiaristHelper;
-
-public class ArmorApiaristHelper implements IArmorApiaristHelper {
-
-	@Override
-	public boolean isArmorApiarist(ItemStack stack, EntityPlayer player, String cause, boolean doProtect) {
-		if (stack == null) {
-			return false;
-		}
-
-		Item item = stack.getItem();
-		if (!(item instanceof IArmorApiarist)) {
-			return false;
-		}
-
-		IArmorApiarist armorApiarist = (IArmorApiarist) item;
-		return armorApiarist.protectPlayer(player, stack, cause, doProtect);
-	}
-
-	@Override
-	public int wearsItems(EntityPlayer player, String cause, boolean doProtect) {
-		int count = 0;
-
-		for (ItemStack armorItem : player.inventory.armorInventory) {
-			if (isArmorApiarist(armorItem, player, cause, doProtect)) {
-				count++;
-			}
-		}
-
-		return count;
-	}
-}

src/main/java/forestry/apiculture/BeeHousingInventory.java

@@ -1,78 +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 forestry.apiculture;
-
-import net.minecraft.item.ItemStack;
-
-import forestry.api.apiculture.BeeManager;
-import forestry.api.apiculture.EnumBeeType;
-import forestry.api.apiculture.IBeeHousingInventory;
-import forestry.core.access.IAccessHandler;
-import forestry.core.inventory.InventoryAdapterRestricted;
-import forestry.core.utils.InventoryUtil;
-import forestry.core.utils.SlotUtil;
-
-public class BeeHousingInventory extends InventoryAdapterRestricted implements IBeeHousingInventory {
-	public static final int SLOT_QUEEN = 0;
-	public static final int SLOT_DRONE = 1;
-	public static final int SLOT_PRODUCT_1 = 2;
-	public static final int SLOT_PRODUCT_COUNT = 7;
-
-	public BeeHousingInventory(int size, String name, IAccessHandler accessHandler) {
-		super(size, name, accessHandler);
-	}
-
-	@Override
-	public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
-		EnumBeeType beeType = BeeManager.beeRoot.getType(itemStack);
-
-		if (slotIndex == SLOT_QUEEN) {
-			return beeType == EnumBeeType.QUEEN || beeType == EnumBeeType.PRINCESS;
-		} else if (slotIndex == SLOT_DRONE) {
-			return beeType == EnumBeeType.DRONE;
-		}
-		return false;
-	}
-
-	@Override
-	public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) {
-		if (!super.canExtractItem(slotIndex, itemstack, side)) {
-			return false;
-		}
-		return SlotUtil.isSlotInRange(slotIndex, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT);
-	}
-
-	@Override
-	public final ItemStack getQueen() {
-		return getStackInSlot(SLOT_QUEEN);
-	}
-
-	@Override
-	public final ItemStack getDrone() {
-		return getStackInSlot(SLOT_DRONE);
-	}
-
-	@Override
-	public final void setQueen(ItemStack itemstack) {
-		setInventorySlotContents(SLOT_QUEEN, itemstack);
-	}
-
-	@Override
-	public final void setDrone(ItemStack itemstack) {
-		setInventorySlotContents(SLOT_DRONE, itemstack);
-	}
-
-	@Override
-	public final boolean addProduct(ItemStack product, boolean all) {
-		return InventoryUtil.tryAddStack(this, product, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, all, true);
-	}
-
-}

src/main/java/forestry/apiculture/BeeHousingListener.java

@@ -1,49 +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 forestry.apiculture;
-
-import forestry.api.apiculture.IBeeHousing;
-import forestry.api.apiculture.IBeeListener;
-import forestry.api.genetics.IIndividual;
-
-public class BeeHousingListener implements IBeeListener {
-	private final IBeeHousing beeHousing;
-
-	public BeeHousingListener(IBeeHousing beeHousing) {
-		this.beeHousing = beeHousing;
-	}
-
-	@Override
-	public void wearOutEquipment(int amount) {
-		for (IBeeListener beeListener : beeHousing.getBeeListeners()) {
-			beeListener.wearOutEquipment(amount);
-		}
-	}
-
-	@Override
-	public void onQueenDeath() {
-		for (IBeeListener beeListener : beeHousing.getBeeListeners()) {
-			beeListener.onQueenDeath();
-		}
-	}
-
-	@Override
-	public boolean onPollenRetrieved(IIndividual pollen) {
-		for (IBeeListener beeListener : beeHousing.getBeeListeners()) {
-			if (beeListener.onPollenRetrieved(pollen)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-}

src/main/java/forestry/apiculture/BeeHousingModifier.java

@@ -1,117 +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 forestry.apiculture;
-
-import forestry.api.apiculture.IBeeGenome;
-import forestry.api.apiculture.IBeeHousing;
-import forestry.api.apiculture.IBeeModifier;
-
-public class BeeHousingModifier implements IBeeModifier {
-	private final IBeeHousing beeHousing;
-
-	public BeeHousingModifier(IBeeHousing beeHousing) {
-		this.beeHousing = beeHousing;
-	}
-
-	@Override
-	public float getTerritoryModifier(IBeeGenome genome, final float currentModifier) {
-		float modifierValue = 1.0f;
-		for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-			modifierValue *= modifier.getTerritoryModifier(genome, modifierValue * currentModifier);
-		}
-		return modifierValue;
-	}
-
-	@Override
-	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, final float currentModifier) {
-		float modifierValue = 1.0f;
-		for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-			modifierValue *= modifier.getMutationModifier(genome, mate, modifierValue * currentModifier);
-		}
-		return modifierValue;
-	}
-
-	@Override
-	public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, final float currentModifier) {
-		float modifierValue = 1.0f;
-		for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-			modifierValue *= modifier.getLifespanModifier(genome, mate, modifierValue * currentModifier);
-		}
-		return modifierValue;
-	}
-
-	@Override
-	public float getProductionModifier(IBeeGenome genome, final float currentModifier) {
-		float modifierValue = 1.0f;
-		for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-			modifierValue *= modifier.getProductionModifier(genome, modifierValue * currentModifier);
-		}
-		return modifierValue;
-	}
-
-	@Override
-	public float getFloweringModifier(IBeeGenome genome, final float currentModifier) {
-		float modifierValue = 1.0f;
-		for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-			modifierValue *= modifier.getFloweringModifier(genome, modifierValue * currentModifier);
-		}
-		return modifierValue;
-	}
-
-	@Override
-	public float getGeneticDecay(IBeeGenome genome, final float currentModifier) {
-		float modifierValue = 1.0f;
-		for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-			modifierValue *= modifier.getGeneticDecay(genome, modifierValue * currentModifier);
-		}
-		return modifierValue;
-	}
-
-	@Override
-	public boolean isSealed() {
-		for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-			if (modifier.isSealed()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isSelfLighted() {
-		for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-			if (modifier.isSelfLighted()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isSunlightSimulated() {
-		for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-			if (modifier.isSunlightSimulated()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isHellish() {
-		for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-			if (modifier.isHellish()) {
-				return true;
-			}
-		}
-		return false;
-	}
-}

src/main/java/forestry/apiculture/BeekeepingLogic.java

@@ -10,9 +10,6 @@
  ******************************************************************************/
 package forestry.apiculture;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
 import java.util.Stack;
@@ -20,98 +17,77 @@ import java.util.Stack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.world.World;
 
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
 import forestry.api.apiculture.IApiaristTracker;
 import forestry.api.apiculture.IBee;
 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.IErrorLogic;
 import forestry.api.core.IErrorState;
 import forestry.api.genetics.IEffectData;
 import forestry.api.genetics.IIndividual;
-import forestry.apiculture.network.PacketBeekeepingLogicActive;
-import forestry.core.config.Constants;
+import forestry.core.EnumErrorCode;
+import forestry.core.config.Defaults;
 import forestry.core.config.ForestryItem;
-import forestry.core.errors.EnumErrorCode;
-import forestry.core.network.DataInputStreamForestry;
-import forestry.core.network.DataOutputStreamForestry;
-import forestry.core.network.IStreamable;
 import forestry.core.proxy.Proxies;
-import forestry.core.utils.Log;
 import forestry.plugins.PluginApiculture;
 
-public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
+public class BeekeepingLogic implements IBeekeepingLogic {
 
-	private static final int totalBreedingTime = Constants.APIARY_BREEDING_TIME;
+	private static final int MAX_POLLINATION_ATTEMPTS = 20;
+	private static final int totalBreedingTime = Defaults.APIARY_BREEDING_TIME;
+	private static final int ticksPerCheckQueenCanWork = 10;
 
 	private final IBeeHousing housing;
-	private final IBeeModifier beeModifier;
-	private final IBeeListener beeListener;
-
-	private int beeProgress;
-	private int beeProgressMax;
+	private final boolean housingSupportsMultipleErrorStates;
 
+	// Breeding
+	private int breedingTime;
 	private int queenWorkCycleThrottle;
 	private IEffectData effectData[] = new IEffectData[2];
-
+	private ItemStack queenStack;
+	private IBee queen;
+	private IIndividual pollen;
+	private int attemptedPollinations = 0;
 	private final Stack<ItemStack> spawn = new Stack<ItemStack>();
 
-	private final HasFlowersCache hasFlowersCache = new HasFlowersCache();
-	private final QueenCanWorkCache queenCanWorkCache = new QueenCanWorkCache();
-	private final PollenHandler pollenHandler = new PollenHandler();
-
-	// Client
-	private boolean active;
-	private IBee queen;
-	private ItemStack queenStack; // used to detect server changes and sync clientQueen
+	// Cached flowers check
+	private boolean hasFlowersCached = false;
+	private int hasFlowersCooldown = 0;
+	private Set<IErrorState> queenCanWorkCached = Collections.emptySet();
+	private int queenCanWorkCooldown = 0;
 
 	public BeekeepingLogic(IBeeHousing housing) {
 		this.housing = housing;
-		this.beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-		this.beeListener = BeeManager.beeRoot.createBeeHousingListener(housing);
+
+		Set<IErrorState> errorStateSet = null;
+		try {
+			errorStateSet = housing.getErrorStates();
+		} catch (Throwable ignored) {
+		}
+
+		housingSupportsMultipleErrorStates = (errorStateSet != null);
 	}
 
 	// / SAVING & LOADING
 	@Override
 	public void readFromNBT(NBTTagCompound nbttagcompound) {
-		beeProgress = nbttagcompound.getInteger("BreedingTime");
+		breedingTime = nbttagcompound.getInteger("BreedingTime");
 		queenWorkCycleThrottle = nbttagcompound.getInteger("Throttle");
 
-		NBTTagCompound queenNBT = nbttagcompound.getCompoundTag("queen");
-		queenStack = ItemStack.loadItemStackFromNBT(queenNBT);
-		queen = BeeManager.beeRoot.getMember(queenStack);
-
-		setActive(nbttagcompound.getBoolean("Active"));
-
-		hasFlowersCache.readFromNBT(nbttagcompound);
-
 		NBTTagList nbttaglist = nbttagcompound.getTagList("Offspring", 10);
 		for (int i = 0; i < nbttaglist.tagCount(); i++) {
 			spawn.add(ItemStack.loadItemStackFromNBT(nbttaglist.getCompoundTagAt(i)));
 		}
+
 	}
 
 	@Override
 	public void writeToNBT(NBTTagCompound nbttagcompound) {
-		nbttagcompound.setInteger("BreedingTime", beeProgress);
+		nbttagcompound.setInteger("BreedingTime", breedingTime);
 		nbttagcompound.setInteger("Throttle", queenWorkCycleThrottle);
 
-		if (queenStack != null) {
-			NBTTagCompound queenNBT = new NBTTagCompound();
-			queenStack.writeToNBT(queenNBT);
-			nbttagcompound.setTag("queen", queenNBT);
-		}
-
-		nbttagcompound.setBoolean("Active", active);
-
-		hasFlowersCache.writeToNBT(nbttagcompound);
-
 		Stack<ItemStack> spawnCopy = new Stack<ItemStack>();
 		spawnCopy.addAll(spawn);
 		NBTTagList nbttaglist = new NBTTagList();
@@ -121,106 +97,108 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 			nbttaglist.appendTag(nbttagcompound1);
 		}
 		nbttagcompound.setTag("Offspring", nbttaglist);
+		
+	}
+
+	// / STATE INFORMATION
+	@Override
+	public int getBreedingTime() {
+		return this.breedingTime;
 	}
 
 	@Override
-	public void writeData(DataOutputStreamForestry data) throws IOException {
-		data.writeBoolean(active);
-		if (active) {
-			data.writeItemStack(queenStack);
-		}
+	public int getTotalBreedingTime() {
+		return totalBreedingTime;
 	}
 
 	@Override
-	public void readData(DataInputStreamForestry data) throws IOException {
-		boolean active = data.readBoolean();
-		setActive(active);
-		if (active) {
-			queenStack = data.readItemStack();
-			queen = BeeManager.beeRoot.getMember(queenStack);
-		}
+	public IBee getQueen() {
+		return this.queen;
 	}
 
-	/* Activatable */
-	private void setActive(boolean active) {
-		if (this.active == active) {
-			return;
-		}
-		this.active = active;
+	@Override
+	public IBeeHousing getHousing() {
+		return this.housing;
+	}
 
-		syncToClient();
+	@Override
+	public IEffectData[] getEffectData() {
+		return this.effectData;
 	}
 
 	/* UPDATING */
 
 	@Override
 	public boolean canWork() {
-
-		IErrorLogic errorLogic = housing.getErrorLogic();
-		errorLogic.clearErrors();
-
-		IBeeHousingInventory beeInventory = housing.getBeeInventory();
-
-		boolean hasSpace = addPendingProducts(beeInventory, spawn);
-		errorLogic.setCondition(!hasSpace, EnumErrorCode.NOSPACE);
-
-		ItemStack queenStack = beeInventory.getQueen();
-
-		// check if we're breeding
-		if (ForestryItem.beePrincessGE.isItemEqual(queenStack)) {
-			boolean hasDrone = BeeManager.beeRoot.isDrone(beeInventory.getDrone());
-			errorLogic.setCondition(!hasDrone, EnumErrorCode.NODRONE);
-
-			setActive(false); // not active (no bee FX) when we are breeding
-			return !errorLogic.hasErrors();
-		}
-
-		if (ForestryItem.beeQueenGE.isItemEqual(queenStack)) {
-			if (!isQueenAlive(queenStack)) {
-				IBee dyingQueen = BeeManager.beeRoot.getMember(queenStack);
-				Collection<ItemStack> spawned = killQueen(dyingQueen, housing, beeListener);
-				spawn.addAll(spawned);
-				queenStack = null;
+		if (housingSupportsMultipleErrorStates) {
+			Set<IErrorState> errorStates = housing.getErrorStates();
+			for (IErrorState errorState : errorStates) {
+				housing.setErrorCondition(false, errorState);
 			}
-		} else {
-			queenStack = null;
 		}
 
-		if (!ItemStack.areItemStacksEqual(this.queenStack, queenStack)) {
-			this.queen = BeeManager.beeRoot.getMember(queenStack);
-			this.queenStack = queenStack;
+		boolean hasSpace = addPendingProducts();
+
+		if (hasBreedablePrincess()) {
+			return hasSpace;
 		}
 
-		if (errorLogic.setCondition(queen == null, EnumErrorCode.NOQUEEN)) {
-			setActive(false);
-			return false;
+		if (hasHealthyQueen()) {
+			boolean canWork = queenCanWork();
+			boolean hasFlowers = hasFlowers();
+			return hasSpace && canWork && hasFlowers;
 		}
 
-		Set<IErrorState> queenErrors = queenCanWorkCache.queenCanWork(queen, housing);
-		for (IErrorState errorState : queenErrors) {
-			errorLogic.setCondition(true, errorState);
-		}
-
-		boolean hasFlowers = hasFlowersCache.hasFlowers(queen, housing);
-		errorLogic.setCondition(!hasFlowers, EnumErrorCode.NOFLOWER);
-
-		boolean canWork = !errorLogic.hasErrors();
-		setActive(canWork);
-		return canWork;
+		return false;
 	}
 
 	@Override
 	public void doWork() {
-		IBeeHousingInventory beeInventory = housing.getBeeInventory();
-		ItemStack queenStack = beeInventory.getQueen();
-		if (ForestryItem.beePrincessGE.isItemEqual(queenStack)) {
+		if (hasBreedablePrincess()) {
 			tickBreed();
-		} else {
-			queenWorkTick(queen);
+		} else if (queen != null) {
+			queenWorkTick();
 		}
 	}
 
-	private void queenWorkTick(IBee queen) {
+	@Override
+	public void update() {
+		if (canWork()) {
+			doWork();
+		}
+	}
+
+	private boolean hasFlowers() {
+		if (queen == null) {
+			return true;
+		}
+
+		if (hasFlowersCooldown <= 0) {
+			hasFlowersCached = queen.hasFlower(housing);
+			hasFlowersCooldown = PluginApiculture.ticksPerBeeWorkCycle;
+
+			// check more often if we haven't found flowers
+			if (!hasFlowersCached) {
+				hasFlowersCooldown /= 2;
+			}
+		} else {
+			hasFlowersCooldown--;
+		}
+
+		if (housingSupportsMultipleErrorStates) {
+			housing.setErrorCondition(!hasFlowersCached, EnumErrorCode.NOFLOWER);
+		} else {
+			if (hasFlowersCached) {
+				housing.setErrorState(EnumErrorCode.OK);
+			} else {
+				housing.setErrorState(EnumErrorCode.NOFLOWER);
+			}
+		}
+
+		return hasFlowersCached;
+	}
+
+	private void queenWorkTick() {
 		if (queen == null) {
 			return;
 		}
@@ -233,53 +211,90 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 		if (queenWorkCycleThrottle >= PluginApiculture.ticksPerBeeWorkCycle) {
 			queenWorkCycleThrottle = 0;
 
-			doProduction(queen, housing, beeListener);
+			doProduction();
 			queen.plantFlowerRandom(housing);
-			pollenHandler.doPollination(queen, housing, beeListener);
+			doPollination();
 
 			// Age the queen
-			float lifespanModifier = beeModifier.getLifespanModifier(queen.getGenome(), queen.getMate(), 1.0f);
-			queen.age(housing.getWorld(), lifespanModifier);
-
-			// Write the changed queen back into the item stack.
-			NBTTagCompound nbttagcompound = new NBTTagCompound();
-			queen.writeToNBT(nbttagcompound);
-			housing.getBeeInventory().getQueen().setTagCompound(nbttagcompound);
+			queen.age(housing.getWorld(), housing.getLifespanModifier(queen.getGenome(), queen.getMate(), 0f));
+			updateQueenItemNBT();
 		}
-
-		beeProgress = queen.getHealth();
-		beeProgressMax = queen.getMaxHealth();
 	}
 
-	private static void doProduction(IBee queen, IBeeHousing beeHousing, IBeeListener beeListener) {
+	private void doProduction() {
+		if (queen == null) {
+			return;
+		}
+
 		// Produce and add stacks
-		ItemStack[] products = queen.produceStacks(beeHousing);
+		ItemStack[] products = queen.produceStacks(housing);
 		if (products == null) {
 			return;
 		}
-		beeListener.wearOutEquipment(1);
-
-		IBeeHousingInventory beeInventory = beeHousing.getBeeInventory();
-
+		housing.wearOutEquipment(1);
 		for (ItemStack stack : products) {
-			beeInventory.addProduct(stack, false);
+			housing.addProduct(stack, false);
 		}
 	}
 
-	private static boolean addPendingProducts(IBeeHousingInventory beeInventory, Stack<ItemStack> spawn) {
-		boolean housingHasSpace = true;
+	private void doPollination() {
+		if (queen == null) {
+			return;
+		}
+
+		// Get pollen if none available yet
+		if (pollen == null) {
+			pollen = queen.retrievePollen(housing);
+			attemptedPollinations = 0;
+			if (pollen != null) {
+				if (housing.onPollenRetrieved(queen, pollen, false)) {
+					pollen = null;
+				}
+			}
+		}
+		if (pollen != null) {
+			attemptedPollinations++;
+			if (queen.pollinateRandom(housing, pollen) || attemptedPollinations >= MAX_POLLINATION_ATTEMPTS) {
+				pollen = null;
+			}
+		}
+	}
+
+	private void updateQueenItemNBT() {
+		if (queen == null) {
+			return;
+		}
+
+		// Write the changed queen back into the item stack.
+		NBTTagCompound nbttagcompound = new NBTTagCompound();
+		queen.writeToNBT(nbttagcompound);
+		housing.getQueen().setTagCompound(nbttagcompound);
+	}
+
+	private boolean addPendingProducts() {
+		EnumErrorCode housingErrorState = null;
 
 		while (!spawn.isEmpty()) {
 			ItemStack next = spawn.peek();
-			if (beeInventory.addProduct(next, true)) {
+			if (housing.addProduct(next, true)) {
 				spawn.pop();
+				housingErrorState = EnumErrorCode.OK;
 			} else {
-				housingHasSpace = false;
+				housingErrorState = EnumErrorCode.NOSPACE;
 				break;
 			}
 		}
 
-		return housingHasSpace;
+		if (housingErrorState != null) {
+			if (housingSupportsMultipleErrorStates) {
+				boolean hasSpace = (housingErrorState == EnumErrorCode.OK);
+				housing.setErrorCondition(!hasSpace, EnumErrorCode.NOSPACE);
+			} else {
+				housing.setErrorState(housingErrorState);
+			}
+		}
+
+		return housingErrorState != EnumErrorCode.NOSPACE;
 	}
 
 	/** Checks if a queen is alive. Much faster than reading the whole bee nbt */
@@ -289,99 +304,205 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 		return health > 0;
 	}
 
+	private boolean hasHealthyQueen() {
+		boolean hasQueen = true;
+		EnumErrorCode housingErrorState = null;
+
+		ItemStack queenStack = housing.getQueen();
+
+		if (!ItemStack.areItemStacksEqual(this.queenStack, queenStack)) {
+			this.queen = BeeManager.beeRoot.getMember(queenStack);
+			this.queenStack = queenStack;
+		}
+
+		if (queenStack == null || !ForestryItem.beeQueenGE.isItemEqual(queenStack)) {
+			housingErrorState = EnumErrorCode.NOQUEEN;
+			hasQueen = false;
+			queen = null;
+		} else if (!isQueenAlive(queenStack)) {
+			if (queen == null) {
+				queen = BeeManager.beeRoot.getMember(queenStack);
+			}
+			killQueen();
+			housingErrorState = EnumErrorCode.OK;
+			hasQueen = false;
+			queen = null;
+		}
+
+		if (housingSupportsMultipleErrorStates) {
+			housing.setErrorCondition(!hasQueen, EnumErrorCode.NOQUEEN);
+		} else {
+			if (housingErrorState != null) {
+				housing.setErrorState(housingErrorState);
+			}
+		}
+
+		if (hasQueen && queen == null) {
+			queen = BeeManager.beeRoot.getMember(queenStack);
+		}
+
+		return hasQueen;
+	}
+
+	private boolean hasBreedablePrincess() {
+		boolean isBreedingPrincess = false;
+		if (ForestryItem.beePrincessGE.isItemEqual(housing.getQueen())) {
+			boolean hasDrone = ForestryItem.beeDroneGE.isItemEqual(housing.getDrone());
+			if (housingSupportsMultipleErrorStates) {
+				housing.setErrorCondition(!hasDrone, EnumErrorCode.NODRONE);
+			} else {
+				if (hasDrone) {
+					housing.setErrorState(EnumErrorCode.OK);
+				} else {
+					housing.setErrorState(EnumErrorCode.NODRONE);
+				}
+			}
+			isBreedingPrincess = true;
+		}
+		
+		return isBreedingPrincess;
+	}
+
+	private boolean queenCanWork() {
+		if (queenCanWorkCooldown > 0) {
+			queenCanWorkCooldown--;
+		} else {
+			if (queen == null) {
+				return false;
+			}
+			queenCanWorkCached = checkQueenCanWork();
+			queenCanWorkCooldown = ticksPerCheckQueenCanWork;
+		}
+
+		Set<IErrorState> errorStates = queenCanWorkCached;
+
+		if (errorStates.size() > 0) {
+			if (housingSupportsMultipleErrorStates) {
+				for (IErrorState errorState : errorStates) {
+					housing.setErrorCondition(true, errorState);
+				}
+			} else {
+				IErrorState state = errorStates.iterator().next();
+				housing.setErrorState(state);
+			}
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	private Set<IErrorState> checkQueenCanWork() {
+		try {
+			return queen.getCanWork(housing);
+		} catch (Throwable ignored) {
+			// queen might not support getCanWork
+		}
+
+		IErrorState state = queen.canWork(housing);
+		if (state != EnumErrorCode.OK) {
+			return Collections.singleton(state);
+		}
+
+		return Collections.emptySet();
+	}
+
 	// / BREEDING
 	private void tickBreed() {
-		beeProgressMax = totalBreedingTime;
-
-		IBeeHousingInventory beeInventory = housing.getBeeInventory();
-
-		ItemStack droneStack = beeInventory.getDrone();
-		ItemStack princessStack = beeInventory.getQueen();
-
-		if (!ForestryItem.beeDroneGE.isItemEqual(droneStack) || !ForestryItem.beePrincessGE.isItemEqual(princessStack)) {
-			beeProgress = 0;
+		if (!tryBreed()) {
+			breedingTime = 0;
 			return;
 		}
 
-		if (beeProgress < totalBreedingTime) {
-			beeProgress++;
+		if (breedingTime < totalBreedingTime) {
+			breedingTime++;
 		}
-		if (beeProgress < totalBreedingTime) {
+		if (breedingTime < totalBreedingTime) {
 			return;
 		}
 
-		// Mate and replace princess with queen
-		IBee princess = BeeManager.beeRoot.getMember(princessStack);
-		IBee drone = BeeManager.beeRoot.getMember(droneStack);
+		// Breeding done, create new queen if slot available
+		if (!ForestryItem.beePrincessGE.isItemEqual(housing.getQueen())) {
+			return;
+		}
+
+		// Replace
+		IBee princess = BeeManager.beeRoot.getMember(housing.getQueen());
+		IBee drone = BeeManager.beeRoot.getMember(housing.getDrone());
 		princess.mate(drone);
 
 		NBTTagCompound nbttagcompound = new NBTTagCompound();
 		princess.writeToNBT(nbttagcompound);
-		queenStack = ForestryItem.beeQueenGE.getItemStack();
-		queenStack.setTagCompound(nbttagcompound);
+		ItemStack queen = ForestryItem.beeQueenGE.getItemStack();
+		queen.setTagCompound(nbttagcompound);
 
-		beeInventory.setQueen(queenStack);
+		housing.setQueen(queen);
+		housing.onQueenChange(housing.getQueen());
 
 		// Register the new queen with the breeding tracker
-		BeeManager.beeRoot.getBreedingTracker(housing.getWorld(), housing.getOwner()).registerQueen(princess);
+		BeeManager.beeRoot.getBreedingTracker(housing.getWorld(), housing.getOwnerName()).registerQueen(princess);
 
 		// Remove drone
-		beeInventory.getDrone().stackSize--;
-		if (beeInventory.getDrone().stackSize <= 0) {
-			beeInventory.setDrone(null);
+		housing.getDrone().stackSize--;
+		if (housing.getDrone().stackSize <= 0) {
+			housing.setDrone(null);
 		}
 
 		// Reset breeding time
-		queen = princess;
-		beeProgress = princess.getHealth();
-		beeProgressMax = princess.getMaxHealth();
+		breedingTime = 0;
 	}
 
-	private static Collection<ItemStack> killQueen(IBee queen, IBeeHousing beeHousing, IBeeListener beeListener) {
-		if (queen == null) {
-			return Collections.emptySet();
+	private boolean tryBreed() {
+		if (housing.getDrone() == null || housing.getQueen() == null) {
+			return false;
 		}
 
-		IBeeHousingInventory beeInventory = beeHousing.getBeeInventory();
+		if (!ForestryItem.beeDroneGE.isItemEqual(housing.getDrone()) || !ForestryItem.beePrincessGE.isItemEqual(housing.getQueen())) {
+			return false;
+		}
 
-		Collection<ItemStack> spawn;
+		return housing.canBreed();
+
+	}
+
+	private void killQueen() {
+		if (queen == null) {
+			return;
+		}
 
 		if (queen.canSpawn()) {
-			spawn = spawnOffspring(queen, beeHousing);
-			beeListener.onQueenDeath();
-			beeInventory.getQueen().stackSize = 0;
-			beeInventory.setQueen(null);
+			spawnOffspring(queen);
+			housing.getQueen().stackSize = 0;
+			housing.setQueen(null);
 		} else {
-			Log.warning("Tried to spawn offspring off an unmated queen. Devolving her to a princess.");
+			Proxies.log.warning("Tried to spawn offspring off an unmated queen. Devolving her to a princess.");
 
 			ItemStack convert = ForestryItem.beePrincessGE.getItemStack();
 			NBTTagCompound nbttagcompound = new NBTTagCompound();
 			queen.writeToNBT(nbttagcompound);
 			convert.setTagCompound(nbttagcompound);
 
-			spawn = Collections.singleton(convert);
-			beeInventory.setQueen(null);
+			spawn.add(convert);
+			housing.setQueen(null);
 		}
-
-		return spawn;
+		housing.onQueenChange(housing.getQueen());
 	}
 
 	/**
 	 * Creates the succeeding princess and between one and three drones.
 	 */
-	private static Collection<ItemStack> spawnOffspring(IBee queen, IBeeHousing beeHousing) {
-
-		World world = beeHousing.getWorld();
+	private void spawnOffspring(IBee queen) {
 
 		Stack<ItemStack> offspring = new Stack<ItemStack>();
-		IApiaristTracker breedingTracker = BeeManager.beeRoot.getBreedingTracker(world, beeHousing.getOwner());
+		IApiaristTracker breedingTracker = BeeManager.beeRoot.getBreedingTracker(housing.getWorld(), housing.getOwnerName());
+
+		housing.onQueenDeath(getQueen());
 
 		// Princess
-		boolean secondPrincess = world.rand.nextInt(10000) < PluginApiculture.getSecondPrincessChance() * 100;
+		boolean secondPrincess = this.housing.getWorld().rand.nextInt(10000) < PluginApiculture.getSecondPrincessChance() * 100;
 		int count = secondPrincess ? 2 : 1;
 		while (count > 0) {
 			count--;
-			IBee heiress = queen.spawnPrincess(beeHousing);
+			IBee heiress = queen.spawnPrincess(housing);
 			if (heiress != null) {
 				ItemStack princess = BeeManager.beeRoot.getMemberStack(heiress, EnumBeeType.PRINCESS.ordinal());
 				breedingTracker.registerPrincess(heiress);
@@ -390,101 +511,21 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 		}
 
 		// Drones
-		IBee[] drones = queen.spawnDrones(beeHousing);
-		for (IBee drone : drones) {
-			ItemStack droneStack = BeeManager.beeRoot.getMemberStack(drone, EnumBeeType.DRONE.ordinal());
-			breedingTracker.registerDrone(drone);
-			offspring.push(droneStack);
+		IBee[] larvae = queen.spawnDrones(housing);
+		for (IBee larva : larvae) {
+			ItemStack drone = BeeManager.beeRoot.getMemberStack(larva, EnumBeeType.DRONE.ordinal());
+			breedingTracker.registerDrone(larva);
+			offspring.push(drone);
 		}
 
-		IBeeHousingInventory beeInventory = beeHousing.getBeeInventory();
-
-		Collection<ItemStack> spawn = new ArrayList<ItemStack>();
-
 		while (!offspring.isEmpty()) {
 			ItemStack spawned = offspring.pop();
-			if (!beeInventory.addProduct(spawned, true)) {
+			if (!housing.addProduct(spawned, true)) {
 				spawn.add(spawned);
 			}
 		}
 
-		return spawn;
+		housing.onPostQueenDeath(getQueen());
+
 	}
-
-	/* CLIENT */
-
-	@Override
-	public void syncToClient() {
-		World world = housing.getWorld();
-		if (world != null && !world.isRemote) {
-			Proxies.net.sendNetworkPacket(new PacketBeekeepingLogicActive(housing), world);
-		}
-	}
-
-	@Override
-	public int getBeeProgressPercent() {
-		if (beeProgressMax == 0) {
-			return 0;
-		}
-
-		return Math.round(beeProgress * 100f / beeProgressMax);
-	}
-
-	@Override
-	public boolean canDoBeeFX() {
-		return active;
-	}
-
-	@Override
-	public void doBeeFX() {
-		if (queen != null) {
-			queen.doFX(effectData, housing);
-		}
-	}
-
-	private static class QueenCanWorkCache {
-		private static final int ticksPerCheckQueenCanWork = 10;
-
-		private Set<IErrorState> queenCanWorkCached = Collections.emptySet();
-		private int queenCanWorkCooldown = 0;
-
-		public Set<IErrorState> queenCanWork(IBee queen, IBeeHousing beeHousing) {
-			if (queenCanWorkCooldown <= 0) {
-				queenCanWorkCached = queen.getCanWork(beeHousing);
-				queenCanWorkCooldown = ticksPerCheckQueenCanWork;
-			} else {
-				queenCanWorkCooldown--;
-			}
-
-			return queenCanWorkCached;
-		}
-	}
-
-	private static class PollenHandler {
-		private static final int MAX_POLLINATION_ATTEMPTS = 20;
-
-		private IIndividual pollen;
-		private int attemptedPollinations = 0;
-
-		public void doPollination(IBee queen, IBeeHousing beeHousing, IBeeListener beeListener) {
-			// Get pollen if none available yet
-			if (pollen == null) {
-				attemptedPollinations = 0;
-				pollen = queen.retrievePollen(beeHousing);
-				if (pollen != null) {
-					if (beeListener.onPollenRetrieved(pollen)) {
-						pollen = null;
-					}
-				}
-			}
-
-			if (pollen != null) {
-				attemptedPollinations++;
-				if (queen.pollinateRandom(beeHousing, pollen) || attemptedPollinations >= MAX_POLLINATION_ATTEMPTS) {
-					pollen = null;
-				}
-			}
-		}
-	}
-
 }

src/main/java/forestry/apiculture/FakeBeekeepingLogic.java

@@ -1,63 +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 forestry.apiculture;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-import forestry.api.apiculture.IBeekeepingLogic;
-
-public class FakeBeekeepingLogic implements IBeekeepingLogic {
-	public static final FakeBeekeepingLogic instance = new FakeBeekeepingLogic();
-
-	private FakeBeekeepingLogic() {
-
-	}
-
-	@Override
-	public boolean canWork() {
-		return false;
-	}
-
-	@Override
-	public void doWork() {
-
-	}
-
-	@Override
-	public void syncToClient() {
-
-	}
-
-	@Override
-	public int getBeeProgressPercent() {
-		return 0;
-	}
-
-	@Override
-	public boolean canDoBeeFX() {
-		return false;
-	}
-
-	@Override
-	public void doBeeFX() {
-
-	}
-
-	@Override
-	public void readFromNBT(NBTTagCompound nbttagcompound) {
-
-	}
-
-	@Override
-	public void writeToNBT(NBTTagCompound nbttagcompound) {
-
-	}
-}

src/main/java/forestry/apiculture/GuiHandlerApiculture.java

@@ -15,31 +15,31 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 import forestry.api.apiculture.BeeManager;
+import forestry.apiculture.gadgets.TileAlvearyHygroregulator;
+import forestry.apiculture.gadgets.TileAlvearyPlain;
+import forestry.apiculture.gadgets.TileAlvearySieve;
+import forestry.apiculture.gadgets.TileAlvearySwarmer;
+import forestry.apiculture.gadgets.TileApiary;
+import forestry.apiculture.gadgets.TileBeehouse;
 import forestry.apiculture.genetics.BeeHelper;
 import forestry.apiculture.gui.ContainerAlveary;
 import forestry.apiculture.gui.ContainerAlvearyHygroregulator;
 import forestry.apiculture.gui.ContainerAlvearySieve;
 import forestry.apiculture.gui.ContainerAlvearySwarmer;
-import forestry.apiculture.gui.ContainerBeeHousing;
+import forestry.apiculture.gui.ContainerApiary;
 import forestry.apiculture.gui.ContainerHabitatLocator;
 import forestry.apiculture.gui.ContainerImprinter;
 import forestry.apiculture.gui.GuiAlveary;
 import forestry.apiculture.gui.GuiAlvearyHygroregulator;
 import forestry.apiculture.gui.GuiAlvearySieve;
 import forestry.apiculture.gui.GuiAlvearySwarmer;
-import forestry.apiculture.gui.GuiBeeHousing;
+import forestry.apiculture.gui.GuiApiary;
 import forestry.apiculture.gui.GuiBeealyzer;
 import forestry.apiculture.gui.GuiHabitatLocator;
 import forestry.apiculture.gui.GuiImprinter;
 import forestry.apiculture.items.ItemBeealyzer.BeealyzerInventory;
 import forestry.apiculture.items.ItemHabitatLocator.HabitatLocatorInventory;
 import forestry.apiculture.items.ItemImprinter.ImprinterInventory;
-import forestry.apiculture.multiblock.TileAlvearyHygroregulator;
-import forestry.apiculture.multiblock.TileAlvearyPlain;
-import forestry.apiculture.multiblock.TileAlvearySieve;
-import forestry.apiculture.multiblock.TileAlvearySwarmer;
-import forestry.apiculture.tiles.TileApiary;
-import forestry.apiculture.tiles.TileBeehouse;
 import forestry.core.GuiHandlerBase;
 import forestry.core.gui.ContainerAlyzer;
 import forestry.core.network.GuiId;
@@ -59,19 +59,19 @@ public class GuiHandlerApiculture extends GuiHandlerBase {
 		switch (GuiId.values()[cleanId]) {
 
 			case AlvearyGUI:
-				return new GuiAlveary(player.inventory, getTile(world, x, y, z, player, TileAlvearyPlain.class));
+				return new GuiAlveary(player.inventory, getTileForestry(world, x, y, z, player, TileAlvearyPlain.class));
 
 			case AlvearySieveGUI:
-				return new GuiAlvearySieve(player.inventory, getTile(world, x, y, z, player, TileAlvearySieve.class));
+				return new GuiAlvearySieve(player.inventory, getTileForestry(world, x, y, z, player, TileAlvearySieve.class));
 
 			case AlvearySwarmerGUI:
-				return new GuiAlvearySwarmer(player.inventory, getTile(world, x, y, z, player, TileAlvearySwarmer.class));
+				return new GuiAlvearySwarmer(player.inventory, getTileForestry(world, x, y, z, player, TileAlvearySwarmer.class));
 
 			case ApiaristChestGUI:
 				return getNaturalistChestGui(BeeHelper.UID, player, world, x, y, z, guiData);
 
 			case ApiaryGUI:
-				return new GuiBeeHousing(player.inventory, getTile(world, x, y, z, player, TileApiary.class));
+				return new GuiApiary(player.inventory, getTileForestry(world, x, y, z, player, TileApiary.class));
 
 			case BeealyzerGUI:
 				equipped = player.getCurrentEquippedItem();
@@ -82,7 +82,7 @@ public class GuiHandlerApiculture extends GuiHandlerBase {
 				return new GuiBeealyzer(player, new BeealyzerInventory(player, equipped));
 
 			case BeehouseGUI:
-				return new GuiBeeHousing(player.inventory, getTile(world, x, y, z, player, TileBeehouse.class));
+				return new GuiApiary(player.inventory, getTileForestry(world, x, y, z, player, TileBeehouse.class));
 
 			case HabitatLocatorGUI:
 				equipped = player.getCurrentEquippedItem();
@@ -93,7 +93,7 @@ public class GuiHandlerApiculture extends GuiHandlerBase {
 				return new GuiHabitatLocator(player, new HabitatLocatorInventory(player, equipped));
 
 			case HygroregulatorGUI:
-				return new GuiAlvearyHygroregulator(player.inventory, getTile(world, x, y, z, player, TileAlvearyHygroregulator.class));
+				return new GuiAlvearyHygroregulator(player.inventory, getTileForestry(world, x, y, z, player, TileAlvearyHygroregulator.class));
 
 			case ImprinterGUI:
 				equipped = player.getCurrentEquippedItem();
@@ -122,20 +122,20 @@ public class GuiHandlerApiculture extends GuiHandlerBase {
 
 			case AlvearyGUI:
 				synchApiaristTracker(world, player);
-				return new ContainerAlveary(player.inventory, getTile(world, x, y, z, player, TileAlvearyPlain.class));
+				return new ContainerAlveary(player.inventory, getTileForestry(world, x, y, z, player, TileAlvearyPlain.class));
 
 			case AlvearySieveGUI:
-				return new ContainerAlvearySieve(player.inventory, getTile(world, x, y, z, player, TileAlvearySieve.class));
+				return new ContainerAlvearySieve(player.inventory, getTileForestry(world, x, y, z, player, TileAlvearySieve.class));
 
 			case AlvearySwarmerGUI:
-				return new ContainerAlvearySwarmer(player.inventory, getTile(world, x, y, z, player, TileAlvearySwarmer.class));
+				return new ContainerAlvearySwarmer(player.inventory, getTileForestry(world, x, y, z, player, TileAlvearySwarmer.class));
 
 			case ApiaristChestGUI:
 				return getNaturalistChestContainer(BeeHelper.UID, player, world, x, y, z, guiData);
 
 			case ApiaryGUI:
 				synchApiaristTracker(world, player);
-				return new ContainerBeeHousing(player.inventory, getTile(world, x, y, z, player, TileApiary.class), true);
+				return new ContainerApiary(player.inventory, getTileForestry(world, x, y, z, player, TileApiary.class), true);
 
 			case BeealyzerGUI:
 				equipped = player.getCurrentEquippedItem();
@@ -148,7 +148,7 @@ public class GuiHandlerApiculture extends GuiHandlerBase {
 
 			case BeehouseGUI:
 				synchApiaristTracker(world, player);
-				return new ContainerBeeHousing(player.inventory, getTile(world, x, y, z, player, TileBeehouse.class), false);
+				return new ContainerApiary(player.inventory, getTileForestry(world, x, y, z, player, TileBeehouse.class), false);
 
 			case HabitatLocatorGUI:
 				equipped = player.getCurrentEquippedItem();
@@ -159,7 +159,7 @@ public class GuiHandlerApiculture extends GuiHandlerBase {
 				return new ContainerHabitatLocator(player, new HabitatLocatorInventory(player, equipped));
 
 			case HygroregulatorGUI:
-				return new ContainerAlvearyHygroregulator(player.inventory, getTile(world, x, y, z, player, TileAlvearyHygroregulator.class));
+				return new ContainerAlvearyHygroregulator(player.inventory, getTileForestry(world, x, y, z, player, TileAlvearyHygroregulator.class));
 
 			case ImprinterGUI:
 				synchApiaristTracker(world, player);

src/main/java/forestry/apiculture/HasFlowersCache.java

@@ -1,92 +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 forestry.apiculture;
-
-import java.util.Random;
-
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
-
-import forestry.api.apiculture.FlowerManager;
-import forestry.api.apiculture.IBee;
-import forestry.api.apiculture.IBeeHousing;
-import forestry.api.core.INBTTagable;
-import forestry.api.genetics.IFlowerProvider;
-import forestry.plugins.PluginApiculture;
-
-public class HasFlowersCache implements INBTTagable {
-	private static final String nbtKey = "hasFlowerCache";
-	private static final Random random = new Random();
-	private static final int flowerCheckInterval = 128;
-
-	private final int flowerCheckTime = random.nextInt(flowerCheckInterval);
-	private ChunkCoordinates flowerCoords = null;
-	private int cooldown = 0;
-
-	public boolean hasFlowers(IBee queen, IBeeHousing beeHousing) {
-		IFlowerProvider flowerProvider = queen.getGenome().getFlowerProvider();
-		String flowerType = flowerProvider.getFlowerType();
-		World world = beeHousing.getWorld();
-
-		if (flowerCoords != null) {
-			if (world.getTotalWorldTime() % flowerCheckInterval != flowerCheckTime) {
-				return true;
-			}
-
-			if (FlowerManager.flowerRegistry.isAcceptedFlower(flowerType, world, flowerCoords.posX, flowerCoords.posY, flowerCoords.posZ)) {
-				return true;
-			} else {
-				flowerCoords = null;
-				cooldown = 0;
-			}
-		}
-
-		if (cooldown <= 0) {
-			flowerCoords = FlowerManager.flowerRegistry.getAcceptedFlowerCoordinates(beeHousing, queen, flowerType);
-			cooldown = PluginApiculture.ticksPerBeeWorkCycle;
-		} else {
-			cooldown--;
-		}
-
-		return flowerCoords != null;
-	}
-
-	@Override
-	public void readFromNBT(NBTTagCompound nbttagcompound) {
-		if (!nbttagcompound.hasKey(nbtKey)) {
-			return;
-		}
-
-		NBTTagCompound hasFlowerCacheNBT = nbttagcompound.getCompoundTag(nbtKey);
-		if (hasFlowerCacheNBT.hasKey("flowerX")) {
-			int x = hasFlowerCacheNBT.getInteger("flowerX");
-			int y = hasFlowerCacheNBT.getInteger("flowerY");
-			int z = hasFlowerCacheNBT.getInteger("flowerZ");
-			flowerCoords = new ChunkCoordinates(x, y, z);
-		}
-
-		cooldown = hasFlowerCacheNBT.getInteger("cooldown");
-	}
-
-	@Override
-	public void writeToNBT(NBTTagCompound nbttagcompound) {
-		NBTTagCompound hasFlowerCacheNBT = new NBTTagCompound();
-		if (flowerCoords != null) {
-			hasFlowerCacheNBT.setInteger("flowerX", flowerCoords.posX);
-			hasFlowerCacheNBT.setInteger("flowerY", flowerCoords.posY);
-			hasFlowerCacheNBT.setInteger("flowerZ", flowerCoords.posZ);
-		}
-		hasFlowerCacheNBT.setInteger("cooldown", cooldown);
-
-		nbttagcompound.setTag(nbtKey, hasFlowerCacheNBT);
-	}
-}

src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java

@@ -13,7 +13,7 @@ package forestry.apiculture;
 import net.minecraft.world.World;
 
 import forestry.api.apiculture.BeeManager;
-import forestry.core.ISaveEventHandler;
+import forestry.core.interfaces.ISaveEventHandler;
 
 public class SaveEventHandlerApiculture implements ISaveEventHandler {
 

src/main/java/forestry/apiculture/VillageHandlerApiculture.java

@@ -23,8 +23,6 @@ import net.minecraft.village.MerchantRecipeList;
 import net.minecraft.world.gen.structure.MapGenStructureIO;
 import net.minecraft.world.gen.structure.StructureVillagePieces;
 
-import net.minecraftforge.oredict.OreDictionary;
-
 import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler;
 import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
 
@@ -32,10 +30,10 @@ import forestry.api.apiculture.EnumBeeType;
 import forestry.apiculture.genetics.BeeDefinition;
 import forestry.apiculture.items.ItemHoneycomb;
 import forestry.apiculture.worldgen.ComponentVillageBeeHouse;
-import forestry.core.config.Constants;
+import forestry.core.config.Defaults;
 import forestry.core.config.ForestryBlock;
 import forestry.core.config.ForestryItem;
-import forestry.core.utils.Log;
+import forestry.core.proxy.Proxies;
 
 public class VillageHandlerApiculture implements IVillageCreationHandler, IVillageTradeHandler {
 
@@ -43,18 +41,18 @@ public class VillageHandlerApiculture implements IVillageCreationHandler, IVilla
 		try {
 			MapGenStructureIO.func_143031_a(ComponentVillageBeeHouse.class, "Forestry:BeeHouse");
 		} catch (Throwable e) {
-			Log.severe("Failed to register village beehouse.");
+			Proxies.log.severe("Failed to register village beehouse.");
 		}
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) {
-		recipeList.add(new MerchantRecipe(ForestryItem.beePrincessGE.getItemStack(1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.emerald, 1)));
+		recipeList.add(new MerchantRecipe(ForestryItem.beePrincessGE.getItemStack(1, Defaults.WILDCARD), new ItemStack(Items.emerald, 1)));
 		recipeList.add(new MerchantRecipe(new ItemStack(Items.wheat, 2), ItemHoneycomb.getRandomComb(1, random, false)));
-		recipeList.add(new MerchantRecipe(new ItemStack(Blocks.log, 24, OreDictionary.WILDCARD_VALUE), ForestryBlock.apiculture.getItemStack(1, Constants.DEFINITION_APIARY_META)));
+		recipeList.add(new MerchantRecipe(new ItemStack(Blocks.log, 24, Defaults.WILDCARD), ForestryBlock.apiculture.getItemStack(1, Defaults.DEFINITION_APIARY_META)));
 		recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 1), ForestryItem.frameProven.getItemStack(6)));
-		recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 12), ForestryItem.beePrincessGE.getItemStack(1, OreDictionary.WILDCARD_VALUE), BeeDefinition.MONASTIC.getMemberStack(EnumBeeType.DRONE)));
+		recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 12), ForestryItem.beePrincessGE.getItemStack(1, Defaults.WILDCARD), BeeDefinition.MONASTIC.getMemberStack(EnumBeeType.DRONE)));
 	}
 
 	@Override

src/main/java/forestry/apiculture/commands/CommandBeeGive.java

@@ -150,7 +150,7 @@ public class CommandBeeGive extends SubCommand {
 		return null;
 	}
 
-	private static String[] getSpecies() {
+	String[] getSpecies() {
 		List<String> species = new ArrayList<String>();
 
 		for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
@@ -162,7 +162,7 @@ public class CommandBeeGive extends SubCommand {
 		return species.toArray(new String[species.size()]);
 	}
 
-	private static EnumBeeType getBeeType(String beeTypeName) {
+	EnumBeeType getBeeType(String beeTypeName) {
 		for (EnumBeeType beeType : EnumBeeType.values()) {
 			if (beeType.getName().equalsIgnoreCase(beeTypeName)) {
 				return beeType;

src/main/java/forestry/apiculture/entities/EntityBee.java

@@ -22,16 +22,16 @@ import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
 import forestry.api.apiculture.IAlleleBeeSpecies;
 import forestry.api.apiculture.IBee;
-import forestry.core.config.Constants;
-import forestry.core.render.ForestryResource;
+import forestry.core.config.Defaults;
+import forestry.core.utils.ForestryResource;
 
 public class EntityBee extends EntityCreature implements IAnimals {
 
-	private static final String DEFAULT_TEXTURE = Constants.TEXTURE_PATH_ENTITIES + "/bees/honeyBee.png";
+	private static final String DEFAULT_TEXTURE = Defaults.TEXTURE_PATH_ENTITIES + "/bees/honeyBee.png";
 
-	private IBee contained;
-	private IAlleleBeeSpecies species;
-	private EnumBeeType type = EnumBeeType.DRONE;
+	IBee contained;
+	IAlleleBeeSpecies species;
+	EnumBeeType type = EnumBeeType.DRONE;
 
 	private String beeTexture = DEFAULT_TEXTURE;
 	private long lastUpdate;

src/main/java/forestry/apiculture/flowers/Flower.java

@@ -10,8 +10,6 @@
  ******************************************************************************/
 package forestry.apiculture.flowers;
 
-import com.google.common.base.Objects;
-
 import net.minecraft.block.Block;
 
 import net.minecraftforge.oredict.OreDictionary;
@@ -50,11 +48,6 @@ final class Flower implements IFlower {
 		return this.weight.compareTo(other.getWeight());
 	}
 
-	@Override
-	public int hashCode() {
-		return Objects.hashCode(block);
-	}
-
 	@Override
 	public Block getBlock() {
 		return block;
@@ -74,10 +67,4 @@ final class Flower implements IFlower {
 	public void setWeight(double weight) {
 		this.weight = weight;
 	}
-
-	@Override
-	public String toString() {
-		return Objects.toStringHelper(this).add("block", block).add("meta", meta).add("weight", weight).toString();
-	}
-
 }

src/main/java/forestry/apiculture/flowers/FlowerProvider.java

@@ -11,7 +11,7 @@
 package forestry.apiculture.flowers;
 
 import java.util.EnumSet;
-import java.util.Set;
+import java.util.List;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
@@ -36,8 +36,8 @@ public class FlowerProvider implements IFlowerProvider {
 	}
 
 	@Override
-	public String getFlowerType() {
-		return flowerType;
+	public boolean isAcceptedFlower(World world, IIndividual individual, int x, int y, int z) {
+		return FlowerManager.flowerRegistry.isAcceptedFlower(this.flowerType, world, individual, x, y, z);
 	}
 
 	@Override
@@ -70,7 +70,7 @@ public class FlowerProvider implements IFlowerProvider {
 	}
 
 	@Override
-	public Set<IFlower> getFlowers() {
+	public List<IFlower> getFlowers() {
 		return FlowerManager.flowerRegistry.getAcceptableFlowers(this.flowerType);
 	}
 

src/main/java/forestry/apiculture/flowers/FlowerRegistry.java

@@ -11,73 +11,46 @@
 package forestry.apiculture.flowers;
 
 import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import java.util.Set;
 import java.util.TreeMap;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockFlowerPot;
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityFlowerPot;
-import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 
 import net.minecraftforge.oredict.OreDictionary;
 
-import cpw.mods.fml.common.registry.GameRegistry;
-
-import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.FlowerManager;
-import forestry.api.apiculture.IBee;
-import forestry.api.apiculture.IBeeGenome;
-import forestry.api.apiculture.IBeeHousing;
-import forestry.api.apiculture.IBeeModifier;
 import forestry.api.genetics.IFlower;
 import forestry.api.genetics.IFlowerGrowthRule;
 import forestry.api.genetics.IFlowerRegistry;
 import forestry.api.genetics.IIndividual;
-import forestry.core.utils.vect.MutableVect;
-import forestry.core.utils.vect.Vect;
-import forestry.plugins.PluginManager;
 
 public final class FlowerRegistry implements IFlowerRegistry {
 
-	private final Set<String> defaultFlowerTypes = ImmutableSet.of(
-			FlowerManager.FlowerTypeVanilla,
-			FlowerManager.FlowerTypeNether,
-			FlowerManager.FlowerTypeCacti,
-			FlowerManager.FlowerTypeMushrooms,
-			FlowerManager.FlowerTypeEnd,
-			FlowerManager.FlowerTypeJungle,
-			FlowerManager.FlowerTypeSnow,
-			FlowerManager.FlowerTypeWheat,
-			FlowerManager.FlowerTypeGourd
-	);
-
-	private final HashMultimap<String, Block> registeredBlocks; // quick first check
-	private final HashMultimap<String, IFlower> registeredFlowers; // full check
-
+	private final ArrayListMultimap<String, IFlower> registeredFlowers;
 	private final ArrayListMultimap<String, IFlowerGrowthRule> growthRules;
 	private final Map<String, TreeMap<Double, IFlower>> chances;
 
+	private boolean hasDeprecatedFlowersImported;
+
 	public FlowerRegistry() {
-		this.registeredBlocks = HashMultimap.create();
-		this.registeredFlowers = HashMultimap.create();
+		this.registeredFlowers = ArrayListMultimap.create();
 		this.growthRules = ArrayListMultimap.create();
 		this.chances = new HashMap<String, TreeMap<Double, IFlower>>();
 
+		this.hasDeprecatedFlowersImported = false;
+
+		registerVanillaFlowers();
 		registerVanillaGrowthRules();
 	}
 
@@ -108,107 +81,61 @@ public final class FlowerRegistry implements IFlowerRegistry {
 		}
 
 		Flower newFlower = new Flower(block, meta, weight);
-
+		Integer index;
+		
 		for (String flowerType : flowerTypes) {
-			if (flowerType == null) {
-				throw new NullPointerException("Tried to register flower with null type. " + block);
+			List<IFlower> flowers = this.registeredFlowers.get(flowerType);
+
+			index = flowers.indexOf(newFlower);
+			if (index == -1) {
+				flowers.add(newFlower);
+			} else if (flowers.get(index).getMeta() != newFlower.getMeta()) {
+				flowers.add(newFlower);
+			} else if (flowers.get(index).getWeight() < newFlower.getWeight() && flowers.get(index).getMeta() == newFlower.getMeta()) {
+				flowers.get(index).setWeight(newFlower.getWeight());
 			}
 
-			Set<IFlower> flowers = this.registeredFlowers.get(flowerType);
-			flowers.add(newFlower);
-
-			Set<Block> blocks = this.registeredBlocks.get(flowerType);
-			blocks.add(block);
-
 			if (this.chances.containsKey(flowerType)) {
 				this.chances.remove(flowerType);
 			}
-		}
-	}
 
-	private static Vect getArea(IBeeGenome genome, IBeeModifier beeModifier) {
-		int[] genomeTerritory = genome.getTerritory();
-		float housingModifier = beeModifier.getTerritoryModifier(genome, 1f);
-		return new Vect(genomeTerritory).multiply(housingModifier * 3.0f);
+			Collections.sort(this.registeredFlowers.get(flowerType));
+		}
 	}
 
 	@Override
-	public ChunkCoordinates getAcceptedFlowerCoordinates(IBeeHousing beeHousing, IBee bee, String flowerType) {
-		if (!this.registeredFlowers.containsKey(flowerType)) {
-			return null;
-		}
-
-		Set<Block> acceptedBlocks = this.registeredBlocks.get(flowerType);
-		Set<IFlower> acceptedFlowers = this.registeredFlowers.get(flowerType);
-		World world = beeHousing.getWorld();
-
-		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(beeHousing);
-
-		Vect area = getArea(bee.getGenome(), beeModifier);
-		Vect housingPos = new Vect(beeHousing.getCoordinates()).add(-area.x / 2, -area.y / 2, -area.z / 2);
-
-		MutableVect posCurrent = new MutableVect(0, 0, 0);
-		while (posCurrent.advancePositionInArea(area)) {
-
-			Vect posBlock = Vect.add(housingPos, posCurrent);
-
-			if (isAcceptedFlower(flowerType, acceptedBlocks, acceptedFlowers, world, posBlock.x, posBlock.y, posBlock.z)) {
-				return new ChunkCoordinates(posBlock.x, posBlock.y, posBlock.z);
-			}
-		}
-
-		return null;
-	}
-
-	@Override
-	public boolean isAcceptedFlower(String flowerType, World world, int x, int y, int z) {
+	public boolean isAcceptedFlower(String flowerType, World world, IIndividual individual, int x, int y, int z) {
+		internalInitialize();
 		if (!this.registeredFlowers.containsKey(flowerType)) {
 			return false;
 		}
 
-		Set<Block> acceptedBlocks = this.registeredBlocks.get(flowerType);
-		Set<IFlower> acceptedFlowers = this.registeredFlowers.get(flowerType);
-
-		return isAcceptedFlower(flowerType, acceptedBlocks, acceptedFlowers, world, x, y, z);
-	}
-
-	private static boolean isAcceptedFlower(String flowerType, Set<Block> acceptedBlocks, Set<IFlower> acceptedFlowers, World world, int x, int y, int z) {
 		Block block = world.getBlock(x, y, z);
 
-		final int meta;
+		if (block.isAir(world, x, y, z) || block.equals(Blocks.bedrock) || block.equals(Blocks.dirt) || block.equals(Blocks.grass)) {
+			return false;
+		}
 
-		if (block instanceof BlockFlowerPot) {
-			TileEntity tile = world.getTileEntity(x, y, z);
+		int meta;
+
+		TileEntity tile = world.getTileEntity(x, y, z);
+		if (tile instanceof TileEntityFlowerPot) {
 			TileEntityFlowerPot tileFlowerPot = (TileEntityFlowerPot) tile;
 			Item item = tileFlowerPot.getFlowerPotItem();
 			block = Block.getBlockFromItem(item);
 			meta = tileFlowerPot.getFlowerPotData();
 		} else {
-			if (!acceptedBlocks.contains(block)) {
-				return false;
-			}
 			meta = world.getBlockMetadata(x, y, z);
 		}
 
-		if (PluginManager.Module.AGRICRAFT.isEnabled() && (flowerType.equals(FlowerManager.FlowerTypeWheat) || flowerType.equals(FlowerManager.FlowerTypeNether))) {
-			Block cropBlock = GameRegistry.findBlock("AgriCraft", "crops");
-			if (block == cropBlock) {
-				ArrayList<ItemStack> drops = block.getDrops(world, x, y, z, 7, 0);
-				if (drops.get(1).getItem() == Items.wheat_seeds && flowerType.equals(FlowerManager.FlowerTypeWheat)) {
-					return true;
-				}
-				if (drops.get(1).getItem() == Items.nether_wart && flowerType.equals(FlowerManager.FlowerTypeNether)) {
-					return true;
-				}
-			}
-		}
-
 		Flower flower = new Flower(block, meta, 0);
+		List<IFlower> acceptedFlowers = this.registeredFlowers.get(flowerType);
 		return acceptedFlowers.contains(flower);
 	}
 
 	@Override
 	public boolean growFlower(String flowerType, World world, IIndividual individual, int x, int y, int z) {
+		internalInitialize();
 		if (!this.growthRules.containsKey(flowerType)) {
 			return false;
 		}
@@ -223,7 +150,9 @@ public final class FlowerRegistry implements IFlowerRegistry {
 	}
 
 	@Override
-	public Set<IFlower> getAcceptableFlowers(String flowerType) {
+	public List<IFlower> getAcceptableFlowers(String flowerType) {
+		internalInitialize();
+
 		return this.registeredFlowers.get(flowerType);
 	}
 
@@ -245,11 +174,6 @@ public final class FlowerRegistry implements IFlowerRegistry {
 		return chancesMap.get(chancesMap.lowerKey(rand.nextDouble() * maxKey));
 	}
 
-	@Override
-	public Collection<String> getFlowerTypes() {
-		return new ArrayList<String>(Sets.union(defaultFlowerTypes, registeredFlowers.keySet()));
-	}
-
 	private TreeMap<Double, IFlower> getChancesMap(String flowerType) {
 		if (!this.chances.containsKey(flowerType)) {
 			TreeMap<Double, IFlower> flowerChances = new TreeMap<Double, IFlower>();
@@ -265,6 +189,55 @@ public final class FlowerRegistry implements IFlowerRegistry {
 		return this.chances.get(flowerType);
 	}
 
+	/*
+	 * Method to support deprecated FlowerManager.plainFlowers
+	 */
+	@SuppressWarnings("deprecation")
+	private void internalInitialize() {
+		if (!hasDeprecatedFlowersImported) {
+			for (ItemStack plainFlower : FlowerManager.plainFlowers) {
+				Block flowerBlock = Block.getBlockFromItem(plainFlower.getItem());
+				int meta = plainFlower.getItemDamage();
+				registerPlantableFlower(flowerBlock, meta, 1.0, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);
+			}
+
+			hasDeprecatedFlowersImported = true;
+		}
+	}
+
+	private void registerVanillaFlowers() {
+		// Register acceptable plants
+		registerAcceptableFlower(Blocks.red_flower, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);
+		registerAcceptableFlower(Blocks.yellow_flower, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);
+		registerAcceptableFlower(Blocks.brown_mushroom, FlowerManager.FlowerTypeMushrooms);
+		registerAcceptableFlower(Blocks.red_mushroom, FlowerManager.FlowerTypeMushrooms);
+		registerAcceptableFlower(Blocks.cactus, FlowerManager.FlowerTypeCacti);
+
+		registerAcceptableFlower(Blocks.dragon_egg, FlowerManager.FlowerTypeEnd);
+		registerAcceptableFlower(Blocks.vine, FlowerManager.FlowerTypeJungle);
+		registerAcceptableFlower(Blocks.tallgrass, FlowerManager.FlowerTypeJungle);
+		registerAcceptableFlower(Blocks.wheat, FlowerManager.FlowerTypeWheat);
+		registerAcceptableFlower(Blocks.pumpkin_stem, FlowerManager.FlowerTypeGourd);
+		registerAcceptableFlower(Blocks.melon_stem, FlowerManager.FlowerTypeGourd);
+		registerAcceptableFlower(Blocks.nether_wart, FlowerManager.FlowerTypeNether);
+
+		registerAcceptableFlower(Blocks.double_plant, 0, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);
+		registerAcceptableFlower(Blocks.double_plant, 1, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);
+		registerAcceptableFlower(Blocks.double_plant, 4, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);
+		registerAcceptableFlower(Blocks.double_plant, 5, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);
+
+		// Register plantable plants
+		for (int meta = 0; meta <= 8; meta++) {
+			registerPlantableFlower(Blocks.red_flower, meta, 1.0, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);
+		}
+
+		registerPlantableFlower(Blocks.yellow_flower, 0, 1.0, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);
+		registerPlantableFlower(Blocks.brown_mushroom, 0, 1.0, FlowerManager.FlowerTypeMushrooms);
+		registerPlantableFlower(Blocks.red_mushroom, 0, 1.0, FlowerManager.FlowerTypeMushrooms);
+		registerPlantableFlower(Blocks.cactus, 0, 1.0, FlowerManager.FlowerTypeCacti);
+
+	}
+
 	private void registerVanillaGrowthRules() {
 		registerGrowthRule(new VanillaDirtGrassGrowthRule(), FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);
 		registerGrowthRule(new VanillaSnowGrowthRule(), FlowerManager.FlowerTypeSnow);

src/main/java/forestry/apiculture/flowers/VanillaDirtGrassGrowthRule.java

@@ -18,7 +18,7 @@ import forestry.api.genetics.IFlower;
 import forestry.api.genetics.IFlowerGrowthRule;
 import forestry.api.genetics.IFlowerRegistry;
 import forestry.api.genetics.IIndividual;
-import forestry.core.config.Constants;
+import forestry.core.config.Defaults;
 
 public class VanillaDirtGrassGrowthRule implements IFlowerGrowthRule {
 
@@ -34,7 +34,7 @@ public class VanillaDirtGrassGrowthRule implements IFlowerGrowthRule {
 		}
 
 		IFlower flower = flowerRegistry.getRandomPlantableFlower(flowerType, world.rand);
-		return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Constants.FLAG_BLOCK_SYNCH);
+		return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Defaults.FLAG_BLOCK_SYNCH);
 	}
 
 }

src/main/java/forestry/apiculture/flowers/VanillaMyceliumGrowthRule.java

@@ -18,7 +18,7 @@ import forestry.api.genetics.IFlower;
 import forestry.api.genetics.IFlowerGrowthRule;
 import forestry.api.genetics.IFlowerRegistry;
 import forestry.api.genetics.IIndividual;
-import forestry.core.config.Constants;
+import forestry.core.config.Defaults;
 
 public class VanillaMyceliumGrowthRule implements IFlowerGrowthRule {
 
@@ -34,7 +34,7 @@ public class VanillaMyceliumGrowthRule implements IFlowerGrowthRule {
 		}
 
 		IFlower flower = fr.getRandomPlantableFlower(flowerType, world.rand);
-		return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Constants.FLAG_BLOCK_SYNCH);
+		return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Defaults.FLAG_BLOCK_SYNCH);
 	}
 
 }

src/main/java/forestry/apiculture/flowers/VanillaSnowGrowthRule.java

@@ -18,7 +18,7 @@ import forestry.api.genetics.IFlower;
 import forestry.api.genetics.IFlowerGrowthRule;
 import forestry.api.genetics.IFlowerRegistry;
 import forestry.api.genetics.IIndividual;
-import forestry.core.config.Constants;
+import forestry.core.config.Defaults;
 
 public class VanillaSnowGrowthRule implements IFlowerGrowthRule {
 
@@ -34,7 +34,7 @@ public class VanillaSnowGrowthRule implements IFlowerGrowthRule {
 		}
 
 		IFlower flower = fr.getRandomPlantableFlower(flowerType, world.rand);
-		return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Constants.FLAG_BLOCK_SYNCH);
+		return world.setBlock(x, y, z, flower.getBlock(), flower.getMeta(), Defaults.FLAG_BLOCK_SYNCH);
 	}
 
 }

src/main/java/forestry/apiculture/gadgets/BlockAlveary.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.blocks;
+package forestry.apiculture.gadgets;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,16 +28,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 import forestry.api.core.Tabs;
 import forestry.apiculture.MaterialBeehive;
-import forestry.apiculture.multiblock.TileAlveary;
-import forestry.apiculture.multiblock.TileAlvearyFan;
-import forestry.apiculture.multiblock.TileAlvearyHeater;
-import forestry.apiculture.multiblock.TileAlvearyHygroregulator;
-import forestry.apiculture.multiblock.TileAlvearyPlain;
-import forestry.apiculture.multiblock.TileAlvearySieve;
-import forestry.apiculture.multiblock.TileAlvearyStabiliser;
-import forestry.apiculture.multiblock.TileAlvearySwarmer;
-import forestry.core.blocks.BlockStructure;
-import forestry.core.multiblock.MultiblockRegistry;
+import forestry.core.gadgets.BlockStructure;
 import forestry.core.render.TextureManager;
 
 public class BlockAlveary extends BlockStructure {
@@ -87,17 +78,17 @@ public class BlockAlveary extends BlockStructure {
 	@Override
 	public TileEntity createTileEntity(World world, int metadata) {
 		switch (metadata) {
-			case TileAlveary.SWARMER_META:
+			case TileAlvearySwarmer.BLOCK_META:
 				return new TileAlvearySwarmer();
-			case TileAlveary.FAN_META:
+			case TileAlvearyFan.BLOCK_META:
 				return new TileAlvearyFan();
-			case TileAlveary.HEATER_META:
+			case TileAlvearyHeater.BLOCK_META:
 				return new TileAlvearyHeater();
-			case TileAlveary.HYGRO_META:
+			case TileAlvearyHygroregulator.BLOCK_META:
 				return new TileAlvearyHygroregulator();
-			case TileAlveary.STABILIZER_META:
+			case TileAlvearyStabiliser.BLOCK_META:
 				return new TileAlvearyStabiliser();
-			case TileAlveary.SIEVE_META:
+			case TileAlvearySieve.BLOCK_META:
 				return new TileAlvearySieve();
 			default:
 				return new TileAlvearyPlain();
@@ -152,27 +143,27 @@ public class BlockAlveary extends BlockStructure {
 	@Override
 	public IIcon getIcon(int side, int metadata) {
 		if ((metadata <= 1
-				|| metadata == TileAlveary.SIEVE_META || metadata == TileAlveary.SWARMER_META || metadata == TileAlveary.STABILIZER_META)
+				|| metadata == TileAlvearySieve.BLOCK_META || metadata == TileAlvearySwarmer.BLOCK_META || metadata == TileAlvearyStabiliser.BLOCK_META)
 				&& (side == 1 || side == 0)) {
 			return icons[BOTTOM];
 		}
 
 		switch (metadata) {
-			case TileAlveary.PLAIN_META:
+			case TileAlvearyPlain.BLOCK_META:
 				return icons[PLAIN];
-			case TileAlveary.ENTRANCE_META:
+			case 1:
 				return icons[ENTRANCE];
-			case TileAlveary.SWARMER_META:
+			case TileAlvearySwarmer.BLOCK_META:
 				return icons[ALVEARY_SWARMER_OFF];
-			case TileAlveary.FAN_META:
+			case TileAlvearyFan.BLOCK_META:
 				return icons[ALVEARY_FAN_OFF];
-			case TileAlveary.HEATER_META:
+			case TileAlvearyHeater.BLOCK_META:
 				return icons[ALVEARY_HEATER_OFF];
-			case TileAlveary.HYGRO_META:
+			case TileAlvearyHygroregulator.BLOCK_META:
 				return icons[ALVEARY_HYGRO];
-			case TileAlveary.STABILIZER_META:
+			case TileAlvearyStabiliser.BLOCK_META:
 				return icons[STABILISER];
-			case TileAlveary.SIEVE_META:
+			case TileAlvearySieve.BLOCK_META:
 				return icons[SIEVE];
 			default:
 				return null;
@@ -232,7 +223,7 @@ public class BlockAlveary extends BlockStructure {
 			return getIcon(side, 0);
 		}
 
-		return icons[((TileAlveary) tile).getIcon(side)];
+		return icons[((TileAlveary) tile).getIcon(side, world.getBlockMetadata(x, y, z))];
 	}
 
 	@SideOnly(Side.CLIENT)
@@ -251,17 +242,4 @@ public class BlockAlveary extends BlockStructure {
 		}
 
 	}
-
-	@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
-			MultiblockRegistry.addDirtyController(world, tileAlveary.getMultiblockController());
-		}
-	}
 }

src/main/java/forestry/apiculture/gadgets/BlockBeehives.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.blocks;
+package forestry.apiculture.gadgets;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,12 +32,11 @@ import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.apiculture.IHiveDrop;
 import forestry.api.core.Tabs;
 import forestry.apiculture.MaterialBeehive;
-import forestry.apiculture.tiles.TileSwarm;
 import forestry.apiculture.worldgen.HiveRegistry;
 import forestry.core.config.Config;
+import forestry.core.inventory.InvTools;
 import forestry.core.render.TextureManager;
-import forestry.core.utils.InventoryUtil;
-import forestry.core.utils.ItemStackUtil;
+import forestry.core.utils.StackUtils;
 import forestry.plugins.PluginApiculture;
 
 public class BlockBeehives extends BlockContainer {
@@ -69,9 +68,9 @@ public class BlockBeehives extends BlockContainer {
 			if (tile instanceof TileSwarm) {
 				TileSwarm swarm = (TileSwarm) tile;
 				if (swarm.containsBees()) {
-					for (ItemStack beeStack : InventoryUtil.getStacks(swarm.contained)) {
+					for (ItemStack beeStack : InvTools.getStacks(swarm.contained)) {
 						if (beeStack != null) {
-							ItemStackUtil.dropItemStackAsEntity(beeStack, world, x, y, z);
+							StackUtils.dropItemStackAsEntity(beeStack, world, x, y, z);
 						}
 					}
 				}
@@ -133,7 +132,7 @@ public class BlockBeehives extends BlockContainer {
 		return meta;
 	}
 
-	private static List<IHiveDrop> getDropsForHive(int meta) {
+	private List<IHiveDrop> getDropsForHive(int meta) {
 		String hiveName = getHiveNameForMeta(meta);
 		if (hiveName == null) {
 			return Collections.emptyList();
@@ -141,7 +140,7 @@ public class BlockBeehives extends BlockContainer {
 		return PluginApiculture.hiveRegistry.getDrops(hiveName);
 	}
 
-	private static String getHiveNameForMeta(int meta) {
+	private String getHiveNameForMeta(int meta) {
 		switch (meta) {
 			case 1:
 				return HiveRegistry.forest;

src/main/java/forestry/apiculture/gadgets/BlockCandle.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.blocks;
+package forestry.apiculture.gadgets;
 
 import com.google.common.collect.ImmutableMap;
 
@@ -43,10 +43,9 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 import forestry.api.core.Tabs;
-import forestry.apiculture.tiles.TileCandle;
 import forestry.core.ForestryClient;
 import forestry.core.render.TextureManager;
-import forestry.core.utils.ItemStackUtil;
+import forestry.core.utils.StackUtils;
 import forestry.core.utils.StringUtil;
 
 public class BlockCandle extends BlockTorch {
@@ -175,13 +174,13 @@ public class BlockCandle extends BlockTorch {
 		if (!isLit) {
 			if (heldItem == null || !lightingItems.contains(heldItem.getItem())) {
 				toggleLitState = false;
-			} else if (ItemStackUtil.equals(this, heldItem) && isLit(heldItem)) {
+			} else if (StackUtils.equals(this, heldItem) && isLit(heldItem)) {
 				toggleLitState = true;
 			}
 		}
 
 		if (heldItem != null) {
-			if (ItemStackUtil.equals(this, heldItem)) {
+			if (StackUtils.equals(this, heldItem)) {
 				if (!isLit(heldItem)) {
 					// Copy the colour of an unlit, coloured candle.
 					if (heldItem.hasTagCompound() && heldItem.getTagCompound().hasKey(colourTagName)) {
@@ -214,6 +213,7 @@ public class BlockCandle extends BlockTorch {
 
 	private static boolean tryDye(ItemStack held, boolean isLit, TileCandle tileCandle) {
 		// Check for dye-able ness.
+		boolean matched = false;
 		for (Map.Entry<String, Integer> colour : colours.entrySet()) {
 			String colourName = colour.getKey();
 			for (ItemStack stack : OreDictionary.getOres(colourName)) {
@@ -233,7 +233,7 @@ public class BlockCandle extends BlockTorch {
 	/* DROP HANDLING */
 	// Hack: 	When harvesting we need to get the drops in onBlockHarvested,
 	// 			because Mojang destroys the block and tile before calling getDrops.
-	private final ThreadLocal<ItemStack> drop = new ThreadLocal<ItemStack>();
+	protected ThreadLocal<ItemStack> drop = new ThreadLocal<ItemStack>();
 
 	@Override
 	public void onBlockHarvested(World world, int x, int y, int z, int metadata, EntityPlayer player) {
@@ -301,7 +301,7 @@ public class BlockCandle extends BlockTorch {
 		}
 	}
 
-	private static int getColourValueFromItemStack(ItemStack itemStack) {
+	protected static int getColourValueFromItemStack(ItemStack itemStack) {
 		int value = 0xffffff; // default to white.
 		if (itemStack.hasTagCompound()) {
 			NBTTagCompound tag = itemStack.getTagCompound();

src/main/java/forestry/apiculture/gadgets/BlockStump.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.blocks;
+package forestry.apiculture.gadgets;
 
 import java.util.List;
 import java.util.Random;
@@ -27,11 +27,10 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 import forestry.api.core.Tabs;
-import forestry.apiculture.tiles.TileCandle;
-import forestry.core.config.Constants;
+import forestry.core.config.Defaults;
 import forestry.core.config.ForestryBlock;
 import forestry.core.render.TextureManager;
-import forestry.core.utils.ItemStackUtil;
+import forestry.core.utils.StackUtils;
 import forestry.core.utils.StringUtil;
 
 public class BlockStump extends BlockTorch {
@@ -62,8 +61,8 @@ public class BlockStump extends BlockTorch {
 		if (held != null &&
 				(held.getItem() == Items.flint_and_steel ||
 						held.getItem() == Items.flint ||
-						ItemStackUtil.equals(Blocks.torch, held))) {
-			world.setBlock(x, y, z, ForestryBlock.candle.block(), world.getBlockMetadata(x, y, z) | 0x08, Constants.FLAG_BLOCK_SYNCH);
+						StackUtils.equals(Blocks.torch, held))) {
+			world.setBlock(x, y, z, ForestryBlock.candle.block(), world.getBlockMetadata(x, y, z) | 0x08, Defaults.FLAG_BLOCK_SYNCH);
 			TileCandle tc = new TileCandle();
 			tc.setColour(0); // default to white
 			world.setTileEntity(x, y, z, tc);

src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java

@@ -0,0 +1,149 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.gadgets;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+
+import net.minecraftforge.oredict.OreDictionary;
+
+import forestry.api.apiculture.IAlvearyComponent;
+import forestry.api.core.ITileStructure;
+import forestry.core.gadgets.BlockStructure.EnumStructureState;
+import forestry.core.gadgets.StructureLogic;
+import forestry.core.utils.Schemata;
+import forestry.core.utils.Schemata.EnumStructureBlock;
+import forestry.core.vect.Vect;
+
+public class StructureLogicAlveary extends StructureLogic {
+
+	/* CONSTANTS */
+	public static final String UID_ALVEARY = "alveary";
+	public static final Schemata SCHEMATA_ALVEARY = new Schemata("alveary3x3", 5, 6, 5,
+			"FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF",
+			"FFFFF", "FAAAF", "FAAAF", "FABAF", "FCCCF", "FFFFF",
+			"FFFFF", "FAAAF", "FAAAF", "FBMBF", "FCCCF", "FFFFF",
+			"FFFFF", "FAAAF", "FAAAF", "FABAF", "FCCCF", "FFFFF",
+			"FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF").setOffsets(-2, -3, -2);
+
+	private static final Set<Block> slabBlocks = new HashSet<Block>();
+	private static final Set<Integer> slabOreDictIds = new HashSet<Integer>();
+
+	static {
+		int slabWoodId = OreDictionary.getOreID("slabWood");
+		slabOreDictIds.add(slabWoodId);
+	}
+
+	public StructureLogicAlveary(ITileStructure structure) {
+		super(UID_ALVEARY, structure);
+		schematas = new Schemata[]{SCHEMATA_ALVEARY};
+		metaOnValid.put(EnumStructureBlock.BLOCK_B, 1);
+	}
+
+	@Override
+	protected EnumStructureState determineMasterState(Schemata schemata, boolean rotate) {
+
+		Vect dimensions = schemata.getDimensions(rotate);
+		int offsetX = schemata.getxOffset();
+		int offsetZ = schemata.getzOffset();
+		if (rotate) {
+			offsetX = schemata.getzOffset();
+			offsetZ = schemata.getxOffset();
+		}
+
+		for (int i = 0; i < dimensions.x; i++) {
+			for (int j = 0; j < schemata.getHeight(); j++) {
+				for (int k = 0; k < dimensions.z; k++) {
+					int x = structureTile.xCoord + i + offsetX;
+					int y = structureTile.yCoord + j + schemata.getyOffset();
+					int z = structureTile.zCoord + k + offsetZ;
+
+					if (!structureTile.getWorldObj().blockExists(x, y, z)) {
+						return EnumStructureState.INDETERMINATE;
+					}
+
+					EnumStructureBlock required = schemata.getAt(i, j, k, rotate);
+					if (required == EnumStructureBlock.ANY) {
+						continue;
+					}
+
+					TileEntity tile = structureTile.getWorldObj().getTileEntity(x, y, z);
+					Block block = structureTile.getWorldObj().getBlock(x, y, z);
+
+					switch (required) {
+						case AIR:
+							if (!block.isAir(structureTile.getWorldObj(), x, y, z)) {
+								return EnumStructureState.INVALID;
+							}
+							break;
+						case BLOCK_A:
+							if (tile == null || !(tile instanceof IAlvearyComponent)) {
+								return EnumStructureState.INVALID;
+							}
+							if (!((ITileStructure) tile).getTypeUID().equals(UID_ALVEARY)) {
+								return EnumStructureState.INVALID;
+							}
+							break;
+						case MASTER:
+						case BLOCK_B:
+							if (tile == null || !(tile instanceof TileAlvearyPlain)) {
+								return EnumStructureState.INVALID;
+							}
+							break;
+						case BLOCK_C:
+							if (!isWoodSlabBlock(block)) {
+								return EnumStructureState.INVALID;
+							}
+							if ((structureTile.getWorldObj().getBlockMetadata(x, y, z) & 8) != 0) {
+								return EnumStructureState.INVALID;
+							}
+							break;
+						case BLOCK_D:
+							if (block != Blocks.spruce_stairs) {
+								return EnumStructureState.INVALID;
+							}
+							break;
+						case FOREIGN:
+							if (tile instanceof ITileStructure) {
+								return EnumStructureState.INVALID;
+							}
+							break;
+						default:
+							return EnumStructureState.INDETERMINATE;
+					}
+				}
+			}
+		}
+
+		return EnumStructureState.VALID;
+	}
+
+	private static boolean isWoodSlabBlock(Block block) {
+		int[] oreIds = OreDictionary.getOreIDs(new ItemStack(block));
+		for (int oreId : oreIds) {
+			if (slabOreDictIds.contains(oreId)) {
+				return true;
+			}
+		}
+
+		return slabBlocks.contains(block);
+	}
+
+	public static void addSlabBlock(Block block) {
+		slabBlocks.add(block);
+	}
+
+}

src/main/java/forestry/apiculture/gadgets/TileAlveary.java

@@ -0,0 +1,267 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.gadgets;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.LinkedList;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+import cpw.mods.fml.common.Optional;
+
+import forestry.api.apiculture.IAlvearyComponent;
+import forestry.api.apiculture.IBeeListener;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.api.core.IStructureLogic;
+import forestry.api.core.ITileStructure;
+import forestry.apiculture.trigger.ApicultureTriggers;
+import forestry.core.config.Defaults;
+import forestry.core.config.ForestryBlock;
+import forestry.core.gadgets.TileForestry;
+import forestry.core.inventory.FakeInventoryAdapter;
+import forestry.core.inventory.IInventoryAdapter;
+import forestry.core.network.DataInputStreamForestry;
+import forestry.core.network.DataOutputStreamForestry;
+import forestry.core.proxy.Proxies;
+
+import buildcraft.api.statements.ITriggerExternal;
+
+public abstract class TileAlveary extends TileForestry implements IAlvearyComponent {
+
+	private final IStructureLogic structureLogic;
+	private boolean isMaster;
+	protected int masterX, masterZ;
+	protected int masterY = -99;
+	protected final int componentBlockMeta;
+
+	public TileAlveary(int componentBlockMeta) {
+		this.structureLogic = new StructureLogicAlveary(this);
+		this.componentBlockMeta = componentBlockMeta;
+	}
+
+	/* UPDATING */
+	@Override
+	public void initialize() {
+		if (!ForestryBlock.alveary.isBlockEqual(worldObj, xCoord, yCoord, zCoord)) {
+			Proxies.log.info("Updating alveary block at %s/%s/%s.", xCoord, yCoord, zCoord);
+			worldObj.setBlock(xCoord, yCoord, zCoord, ForestryBlock.alveary.block(), componentBlockMeta, Defaults.FLAG_BLOCK_SYNCH);
+			validate();
+			worldObj.setTileEntity(xCoord, yCoord, zCoord, this);
+		}
+	}
+
+	protected void updateServerSide() {
+		// Periodic validation if needed
+		if (updateOnInterval(200) && (!isIntegratedIntoStructure() || isMaster())) {
+			validateStructure();
+		}
+	}
+
+	/* TEXTURES */
+	public int getIcon(int side, int metadata) {
+		return BlockAlveary.PLAIN;
+	}
+
+	/* LOADING & SAVING */
+	@Override
+	public void readFromNBT(NBTTagCompound nbttagcompound) {
+		this.isMaster = nbttagcompound.getBoolean("IsMaster");
+		this.masterX = nbttagcompound.getInteger("MasterX");
+		this.masterY = nbttagcompound.getInteger("MasterY");
+		this.masterZ = nbttagcompound.getInteger("MasterZ");
+
+		// Init for master state
+		if (isMaster) {
+			makeMaster();
+		}
+		
+		super.readFromNBT(nbttagcompound);
+
+		structureLogic.readFromNBT(nbttagcompound);
+	}
+
+	@Override
+	public void writeToNBT(NBTTagCompound nbttagcompound) {
+		super.writeToNBT(nbttagcompound);
+
+		nbttagcompound.setBoolean("IsMaster", isMaster);
+		nbttagcompound.setInteger("MasterX", masterX);
+		nbttagcompound.setInteger("MasterY", masterY);
+		nbttagcompound.setInteger("MasterZ", masterZ);
+
+		structureLogic.writeToNBT(nbttagcompound);
+	}
+
+	protected void createInventory() {
+	}
+
+	@Override
+	public void writeData(DataOutputStreamForestry data) throws IOException {
+		super.writeData(data);
+		data.writeBoolean(isMaster);
+
+		// so the client can know if it is part of an integrated structure
+		data.writeVarInt(masterY);
+	}
+
+	@Override
+	public void readData(DataInputStreamForestry data) throws IOException {
+		super.readData(data);
+		if (data.readBoolean()) {
+			makeMaster();
+		}
+
+		// so the client can know if it is part of an integrated structure
+		masterY = data.readVarInt();
+	}
+
+	/* ITILESTRUCTURE */
+	@Override
+	public String getTypeUID() {
+		return structureLogic.getTypeUID();
+	}
+
+	@Override
+	public void validateStructure() {
+		structureLogic.validateStructure();
+	}
+
+	@Override
+	public void makeMaster() {
+		setCentralTE(null);
+		isMaster = true;
+
+		if (getInternalInventory() instanceof FakeInventoryAdapter) {
+			createInventory();
+		}
+
+		if (worldObj != null && !worldObj.isRemote) {
+			setNeedsNetworkUpdate();
+		}
+	}
+
+	@Override
+	public void onStructureReset() {
+		setCentralTE(null);
+		if (worldObj.getBlockMetadata(xCoord, yCoord, zCoord) == 1) {
+			worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 0, 0);
+		}
+		isMaster = false;
+		worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
+	}
+
+	@Override
+	public ITileStructure getCentralTE() {
+
+		if (!isIntegratedIntoStructure()) {
+			return null;
+		}
+
+		if (!isMaster()) {
+			TileEntity tile = worldObj.getTileEntity(masterX, masterY, masterZ);
+			if (tile instanceof ITileStructure) {
+				ITileStructure master = (ITileStructure) worldObj.getTileEntity(masterX, masterY, masterZ);
+				if (master.isMaster()) {
+					return master;
+				} else {
+					return null;
+				}
+			} else {
+				return null;
+			}
+		} else {
+			return this;
+		}
+
+	}
+
+	private boolean isSameTile(TileEntity tile) {
+		return tile.xCoord == xCoord && tile.yCoord == yCoord && tile.zCoord == zCoord;
+	}
+
+	@Override
+	public void setCentralTE(TileEntity tile) {
+		if (tile == null || tile == this || isSameTile(tile)) {
+			this.masterX = this.masterZ = 0;
+			this.masterY = -99;
+			return;
+		}
+
+		this.isMaster = false;
+		this.masterX = tile.xCoord;
+		this.masterY = tile.yCoord;
+		this.masterZ = tile.zCoord;
+	}
+
+	@Override
+	public boolean isMaster() {
+		return isMaster;
+	}
+
+	protected boolean hasMaster() {
+		return masterY >= 0;
+	}
+
+	@Override
+	public boolean isIntegratedIntoStructure() {
+		return isMaster || masterY >= 0;
+	}
+
+	@Override
+	public IInventoryAdapter getStructureInventory() {
+		return getInternalInventory();
+	}
+
+	/* IALVEARY COMPONENT */
+	@Override
+	public boolean hasFunction() {
+		return false;
+	}
+
+	@Override
+	public void addTemperatureChange(float change, float boundaryDown, float boundaryUp) {
+	}
+
+	@Override
+	public void addHumidityChange(float change, float boundaryDown, float boundaryUp) {
+	}
+
+	@Override
+	public void registerBeeModifier(IBeeModifier modifier) {
+	}
+
+	@Override
+	public void removeBeeModifier(IBeeModifier modifier) {
+	}
+
+	@Override
+	public void registerBeeListener(IBeeListener event) {
+	}
+
+	@Override
+	public void removeBeeListener(IBeeListener event) {
+	}
+
+	/* ITRIGGERPROVIDER */
+	@Optional.Method(modid = "BuildCraftAPI|statements")
+	@Override
+	public Collection<ITriggerExternal> getExternalTriggers(ForgeDirection side, TileEntity tile) {
+		LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
+		res.add(ApicultureTriggers.missingQueen);
+		res.add(ApicultureTriggers.missingDrone);
+		return res;
+	}
+
+}

src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java

@@ -8,77 +8,94 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.multiblock;
+package forestry.apiculture.gadgets;
+
+import java.io.IOException;
 
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ChunkCoordinates;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
 import forestry.api.apiculture.IAlvearyComponent;
-import forestry.api.core.IClimateControlled;
 import forestry.apiculture.network.PacketActiveUpdate;
+import forestry.core.interfaces.IActivatable;
+import forestry.core.network.DataInputStreamForestry;
+import forestry.core.network.DataOutputStreamForestry;
 import forestry.core.proxy.Proxies;
-import forestry.core.tiles.IActivatable;
 import forestry.energy.EnergyManager;
 
 import cofh.api.energy.IEnergyHandler;
 
-public abstract class TileAlvearyClimatiser extends TileAlveary implements IEnergyHandler, IActivatable, IAlvearyComponent.Climatiser {
+public abstract class TileAlvearyClimatiser extends TileAlveary implements IEnergyHandler, IActivatable {
 
-	private static final int WORK_CYCLES = 1;
-	private static final int ENERGY_PER_OPERATION = 50;
+	public static class ClimateControl {
 
-	protected interface IClimitiserDefinition {
-		float getChangePerTransfer();
+		final float changePerTransfer;
+		final float boundaryUp;
+		final float boundaryDown;
 
-		float getBoundaryUp();
-
-		float getBoundaryDown();
-
-		int getIconOff();
-
-		int getIconOn();
+		public ClimateControl(float changePerTransfer, float boundaryDown, float boundaryUp) {
+			this.changePerTransfer = changePerTransfer;
+			this.boundaryDown = boundaryDown;
+			this.boundaryUp = boundaryUp;
+		}
 	}
 
-	private final EnergyManager energyManager;
-	private final IClimitiserDefinition definition;
-
+	protected final EnergyManager energyManager;
+	private final ClimateControl climateControl;
 	private int workingTime = 0;
+	private final int textureOff;
+	private final int textureOn;
 
 	// CLIENT
 	private boolean active;
 
-	protected TileAlvearyClimatiser(IClimitiserDefinition definition) {
-		this.definition = definition;
-
-		this.energyManager = new EnergyManager(1000, 2000);
-		this.energyManager.setReceiveOnly();
+	public TileAlvearyClimatiser(ClimateControl control, int textureOff, int textureOn, int componentBlockMeta) {
+		super(componentBlockMeta);
+		this.climateControl = control;
+		energyManager = new EnergyManager(1000, 50, 2000);
+		energyManager.setReceiveOnly();
+		this.textureOff = textureOff;
+		this.textureOn = textureOn;
 	}
 
 	/* UPDATING */
 	@Override
-	public void changeClimate(int tick, IClimateControlled climateControlled) {
-		if (workingTime < 20 && energyManager.consumeEnergyToDoWork(WORK_CYCLES, ENERGY_PER_OPERATION)) {
-			// one tick of work for every 10 RF
-			workingTime += ENERGY_PER_OPERATION / 10;
+	protected void updateServerSide() {
+		super.updateServerSide();
+
+		if (!this.hasMaster()) {
+			return;
+		}
+
+		if (workingTime < 20 && energyManager.consumeEnergyToDoWork()) {
+			// consume 10 RF per tick of work
+			workingTime += energyManager.getEnergyPerWork() / 10;
 		}
 
 		if (workingTime > 0) {
 			workingTime--;
-			climateControlled.addTemperatureChange(definition.getChangePerTransfer(), definition.getBoundaryDown(), definition.getBoundaryUp());
+			IAlvearyComponent component = (IAlvearyComponent) this.getCentralTE();
+			if (component != null) {
+				component.addTemperatureChange(climateControl.changePerTransfer, climateControl.boundaryDown, climateControl.boundaryUp);
+			}
 		}
 
 		setActive(workingTime > 0);
 	}
 
+	@Override
+	public boolean hasFunction() {
+		return true;
+	}
+
 	/* TEXTURES */
 	@Override
-	public int getIcon(int side) {
+	public int getIcon(int side, int metadata) {
 		if (active) {
-			return definition.getIconOn();
+			return textureOn;
 		} else {
-			return definition.getIconOff();
+			return textureOff;
 		}
 	}
 
@@ -98,20 +115,19 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner
 		nbttagcompound.setInteger("Heating", workingTime);
 	}
 
-	/* Network */
+	/* NETWORK */
 	@Override
-	protected void encodeDescriptionPacket(NBTTagCompound packetData) {
-		super.encodeDescriptionPacket(packetData);
-		packetData.setBoolean("Active", active);
+	public void writeData(DataOutputStreamForestry data) throws IOException {
+		super.writeData(data);
+		data.writeBoolean(active);
 	}
 
 	@Override
-	protected void decodeDescriptionPacket(NBTTagCompound packetData) {
-		super.decodeDescriptionPacket(packetData);
-		setActive(packetData.getBoolean("Active"));
+	public void readData(DataInputStreamForestry data) throws IOException {
+		super.readData(data);
+		setActive(data.readBoolean());
 	}
 
-	/* IActivatable */
 	@Override
 	public boolean isActive() {
 		return active;
@@ -129,16 +145,11 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner
 			if (worldObj.isRemote) {
 				worldObj.func_147479_m(xCoord, yCoord, zCoord);
 			} else {
-				Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this), worldObj);
+				Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this));
 			}
 		}
 	}
 
-	@Override
-	public ChunkCoordinates getCoordinates() {
-		return new ChunkCoordinates(xCoord, yCoord, zCoord);
-	}
-
 	/* IEnergyHandler */
 	@Override
 	public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
@@ -164,5 +175,4 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner
 	public boolean canConnectEnergy(ForgeDirection from) {
 		return energyManager.canConnectEnergy(from);
 	}
-
 }

src/main/java/forestry/apiculture/gadgets/TileAlvearyFan.java

@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.gadgets;
+
+public class TileAlvearyFan extends TileAlvearyClimatiser {
+	
+	/* CONSTANTS */
+	public static final int BLOCK_META = 3;
+
+	public TileAlvearyFan() {
+		super(new ClimateControl(-0.01f, 0.05f, 2.5f), BlockAlveary.ALVEARY_FAN_OFF, BlockAlveary.ALVEARY_FAN_ON, BLOCK_META);
+	}
+
+}

src/main/java/forestry/apiculture/gadgets/TileAlvearyHeater.java

@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.gadgets;
+
+public class TileAlvearyHeater extends TileAlvearyClimatiser {
+
+	/* CONSTANTS */
+	public static final int BLOCK_META = 4;
+
+	public TileAlvearyHeater() {
+		super(new ClimateControl(0.01f, 0.0f, 2.5f), BlockAlveary.ALVEARY_HEATER_OFF, BlockAlveary.ALVEARY_HEATER_ON, BLOCK_META);
+	}
+
+}

src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java

@@ -8,8 +8,9 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.multiblock;
+package forestry.apiculture.gadgets;
 
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.IInventory;
@@ -22,55 +23,69 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
 import forestry.api.apiculture.IAlvearyComponent;
-import forestry.api.core.IClimateControlled;
-import forestry.apiculture.blocks.BlockAlveary;
-import forestry.core.config.Constants;
+import forestry.api.core.ForestryAPI;
+import forestry.core.config.Defaults;
 import forestry.core.fluids.FluidHelper;
 import forestry.core.fluids.Fluids;
 import forestry.core.fluids.TankManager;
 import forestry.core.fluids.tanks.FilteredTank;
+import forestry.core.interfaces.ILiquidTankContainer;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.inventory.TileInventoryAdapter;
 import forestry.core.network.GuiId;
-import forestry.core.tiles.ILiquidTankTile;
 
-public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IInventory, ILiquidTankTile, IAlvearyComponent.Climatiser {
+public class TileAlvearyHygroregulator extends TileAlveary implements IInventory, ILiquidTankContainer {
+
+	/* CONSTANTS */
+	public static final int BLOCK_META = 5;
+
+	/* RECIPE MANAGMENT */
+	private static class HygroregulatorRecipe {
+
+		public final FluidStack liquid;
+		public final int transferTime;
+		public final float humidChange;
+		public final float tempChange;
+
+		public HygroregulatorRecipe(FluidStack liquid, int transferTime, float humidChange, float tempChange) {
+			this.liquid = liquid;
+			this.transferTime = transferTime;
+			this.humidChange = humidChange;
+			this.tempChange = tempChange;
+		}
+	}
+
+	public static final short SLOT_INPUT = 0;
 
 	private final HygroregulatorRecipe[] recipes;
 
 	/* MEMBERS */
 	private final TankManager tankManager;
 	private final FilteredTank liquidTank;
-	private final IInventoryAdapter inventory;
 
 	private HygroregulatorRecipe currentRecipe;
 	private int transferTime;
 
 	public TileAlvearyHygroregulator() {
-		super(TileAlveary.HYGRO_META, GuiId.HygroregulatorGUI);
+		super(BLOCK_META);
 
-		this.inventory = new HygroInventory(this);
+		setInternalInventory(new HygroInventoryAdapter(this));
 
 		Fluid water = Fluids.WATER.getFluid();
 		Fluid lava = Fluids.LAVA.getFluid();
 		Fluid liquidIce = Fluids.ICE.getFluid();
 
-		this.liquidTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, water, lava, liquidIce);
-		this.tankManager = new TankManager(liquidTank);
+		liquidTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, water, lava, liquidIce);
+		tankManager = new TankManager(liquidTank);
 
-		this.recipes = new HygroregulatorRecipe[]{new HygroregulatorRecipe(new FluidStack(water, 1), 1, 0.01f, -0.005f),
+		recipes = new HygroregulatorRecipe[]{new HygroregulatorRecipe(new FluidStack(water, 1), 1, 0.01f, -0.005f),
 				new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.005f),
 				new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, 0.02f, -0.01f)};
 	}
 
 	@Override
-	public IInventoryAdapter getInternalInventory() {
-		return inventory;
-	}
-
-	@Override
-	public boolean allowsAutomation() {
-		return true;
+	public void openGui(EntityPlayer player) {
+		player.openGui(ForestryAPI.instance, GuiId.HygroregulatorGUI.ordinal(), worldObj, xCoord, yCoord, zCoord);
 	}
 
 	/* UPDATING */
@@ -86,7 +101,9 @@ public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IIn
 	}
 
 	@Override
-	public void changeClimate(int tickCount, IClimateControlled climateControlled) {
+	protected void updateServerSide() {
+		super.updateServerSide();
+
 		if (transferTime <= 0 && liquidTank.getFluidAmount() > 0) {
 			currentRecipe = getRecipe(liquidTank.getFluid());
 
@@ -100,14 +117,17 @@ public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IIn
 
 			transferTime--;
 			if (currentRecipe != null) {
-				climateControlled.addHumidityChange(currentRecipe.humidChange, 0.0f, 1.0f);
-				climateControlled.addTemperatureChange(currentRecipe.tempChange, 0.0f, 2.0f);
+				IAlvearyComponent component = (IAlvearyComponent) this.getCentralTE();
+				if (component != null) {
+					component.addHumidityChange(currentRecipe.humidChange, 0.0f, 1.0f);
+					component.addTemperatureChange(currentRecipe.tempChange, 0.0f, 2.0f);
+				}
 			} else {
 				transferTime = 0;
 			}
 		}
 
-		if (tickCount % 20 == 0) {
+		if (updateOnInterval(20)) {
 			IInventoryAdapter canInventory = getInternalInventory();
 
 			// Check if we have suitable items waiting in the item slot
@@ -117,6 +137,11 @@ public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IIn
 		}
 	}
 
+	@Override
+	public boolean hasFunction() {
+		return true;
+	}
+
 	/* SAVING & LOADING */
 	@Override
 	public void readFromNBT(NBTTagCompound nbttagcompound) {
@@ -142,11 +167,12 @@ public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IIn
 			currentRecipe.liquid.writeToNBT(subcompound);
 			nbttagcompound.setTag("CurrentLiquid", subcompound);
 		}
+
 	}
 
 	/* TEXTURES */
 	@Override
-	public int getIcon(int side) {
+	public int getIcon(int side, int metadata) {
 		return BlockAlveary.ALVEARY_HYGRO;
 	}
 
@@ -194,26 +220,8 @@ public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IIn
 	public void sendGUINetworkData(Container container, ICrafting iCrafting) {
 	}
 
-	/* RECIPE MANAGMENT */
-	private static class HygroregulatorRecipe {
-
-		public final FluidStack liquid;
-		public final int transferTime;
-		public final float humidChange;
-		public final float tempChange;
-
-		public HygroregulatorRecipe(FluidStack liquid, int transferTime, float humidChange, float tempChange) {
-			this.liquid = liquid;
-			this.transferTime = transferTime;
-			this.humidChange = humidChange;
-			this.tempChange = tempChange;
-		}
-	}
-
-	public static class HygroInventory extends TileInventoryAdapter<TileAlvearyHygroregulator> {
-		public static final short SLOT_INPUT = 0;
-
-		public HygroInventory(TileAlvearyHygroregulator alvearyHygroregulator) {
+	private static class HygroInventoryAdapter extends TileInventoryAdapter<TileAlvearyHygroregulator> {
+		public HygroInventoryAdapter(TileAlvearyHygroregulator alvearyHygroregulator) {
 			super(alvearyHygroregulator, 1, "CanInv");
 		}
 

src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java

@@ -0,0 +1,716 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.gadgets;
+
+import java.io.IOException;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+
+import com.mojang.authlib.GameProfile;
+
+import forestry.api.apiculture.BeeManager;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeListener;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.api.apiculture.IBeekeepingLogic;
+import forestry.api.core.BiomeHelper;
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.core.ForestryAPI;
+import forestry.api.core.IErrorState;
+import forestry.api.core.ITileStructure;
+import forestry.api.genetics.IIndividual;
+import forestry.apiculture.gui.ContainerAlveary;
+import forestry.apiculture.network.PacketActiveUpdate;
+import forestry.core.EnumErrorCode;
+import forestry.core.config.Config;
+import forestry.core.interfaces.IActivatable;
+import forestry.core.interfaces.IClimatised;
+import forestry.core.interfaces.IErrorSource;
+import forestry.core.interfaces.IHintSource;
+import forestry.core.inventory.IInventoryAdapter;
+import forestry.core.inventory.InvTools;
+import forestry.core.inventory.TileInventoryAdapter;
+import forestry.core.network.DataInputStreamForestry;
+import forestry.core.network.DataOutputStreamForestry;
+import forestry.core.network.GuiId;
+import forestry.core.proxy.Proxies;
+
+public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IBeeHousing, IClimatised, IHintSource, IActivatable {
+
+	// / CONSTANTS
+	public static final int SLOT_QUEEN = 0;
+	public static final int SLOT_DRONE = 1;
+	public static final int SLOT_PRODUCT_1 = 2;
+	public static final int SLOT_PRODUCT_COUNT = 7;
+	public static final int BLOCK_META = 0;
+
+	// / MEMBERS
+	protected IBeekeepingLogic beekeepingLogic;
+	protected BiomeGenBase biome;
+	protected float tempChange = 0.0f;
+	protected float humidChange = 0.0f;
+
+	// CLIENT
+	private boolean active;
+	private int displayHealthMax = 0;
+	private int displayHealth = 0;
+	private IBee displayQueen;
+
+	public TileAlvearyPlain() {
+		super(0);
+	}
+
+	@Override
+	public void openGui(EntityPlayer player) {
+		if (isMaster()) {
+			player.openGui(ForestryAPI.instance, GuiId.AlvearyGUI.ordinal(), worldObj, xCoord, yCoord, zCoord);
+		} else if (this.hasMaster()) {
+			player.openGui(ForestryAPI.instance, GuiId.AlvearyGUI.ordinal(), worldObj, masterX, masterY, masterZ);
+		}
+	}
+
+	@Override
+	public void validate() {
+		super.validate();
+		setBiomeInformation();
+	}
+
+	private void setBiomeInformation() {
+		this.biome = worldObj.getBiomeGenForCoordsBody(xCoord, zCoord);
+	}
+
+	/* LOADING & SAVING */
+	@Override
+	public void readFromNBT(NBTTagCompound nbttagcompound) {
+		super.readFromNBT(nbttagcompound);
+
+		this.tempChange = nbttagcompound.getFloat("TempChange");
+		this.humidChange = nbttagcompound.getFloat("HumidChange");
+
+		if (beekeepingLogic != null) {
+			beekeepingLogic.readFromNBT(nbttagcompound);
+		}
+	}
+
+	@Override
+	public void writeToNBT(NBTTagCompound nbttagcompound) {
+		super.writeToNBT(nbttagcompound);
+
+		nbttagcompound.setFloat("TempChange", tempChange);
+		nbttagcompound.setFloat("HumidChange", humidChange);
+
+		if (beekeepingLogic != null) {
+			beekeepingLogic.writeToNBT(nbttagcompound);
+		}
+	}
+
+	@Override
+	public void writeData(DataOutputStreamForestry data) throws IOException {
+		super.writeData(data);
+		data.writeBoolean(active);
+		if (active) {
+			ItemStack queen = getStackInSlot(SLOT_QUEEN);
+			data.writeItemStack(queen);
+		}
+	}
+
+	@Override
+	public void readData(DataInputStreamForestry data) throws IOException {
+		super.readData(data);
+		active = data.readBoolean();
+		if (active) {
+			ItemStack queen = data.readItemStack();
+			setInventorySlotContents(SLOT_QUEEN, queen);
+		}
+	}
+
+	@Override
+	public boolean isActive() {
+		return active;
+	}
+
+	@Override
+	public void setActive(boolean active) {
+		if (this.active == active) {
+			return;
+		}
+		this.active = active;
+
+		if (worldObj != null && !worldObj.isRemote) {
+			Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this));
+		}
+	}
+
+	/* UPDATING */
+	@Override
+	public void initialize() {
+		super.initialize();
+		setBiomeInformation();
+	}
+
+	@Override
+	protected void updateServerSide() {
+		super.updateServerSide();
+
+		if (beekeepingLogic == null) {
+			return;
+		}
+		if (!isMaster()) {
+			return;
+		}
+
+		boolean canWork = beekeepingLogic.canWork();
+		setActive(canWork);
+		if (canWork) {
+			beekeepingLogic.doWork();
+		}
+
+		// Equalize humidity and temperature
+		equalizeTemperature();
+		equalizeHumidity();
+	}
+
+	@Override
+	protected void updateClientSide() {
+		if (isMaster() && active && (displayQueen != null) && updateOnInterval(2)) {
+			displayQueen.doFX(beekeepingLogic.getEffectData(), this);
+
+			if (updateOnInterval(50)) {
+				float fxX = xCoord + 0.5F;
+				float fxY = yCoord + 0.25F + (worldObj.rand.nextFloat() * 6F) / 16F;
+				float fxZ = zCoord + 0.5F;
+				float f3 = 1.6F;
+				float f4 = worldObj.rand.nextFloat() * f3 - 0.5F;
+
+				Proxies.common.addEntitySwarmFX(worldObj, (fxX - f3), fxY, (fxZ + f4), 0F, 0F, 0F);
+				Proxies.common.addEntitySwarmFX(worldObj, (fxX + f3), fxY, (fxZ + f4), 0F, 0F, 0F);
+				Proxies.common.addEntitySwarmFX(worldObj, (fxX + f4), fxY, (fxZ - f3), 0F, 0F, 0F);
+				Proxies.common.addEntitySwarmFX(worldObj, (fxX + f4), fxY, (fxZ + f3), 0F, 0F, 0F);
+			}
+		}
+	}
+
+	private void equalizeTemperature() {
+		if (tempChange == 0) {
+			return;
+		}
+
+		tempChange -= 0.05f * tempChange;
+		if (tempChange <= 0.001f && tempChange >= -0.001f) {
+			tempChange = 0;
+		}
+	}
+
+	private void equalizeHumidity() {
+		if (humidChange == 0) {
+			return;
+		}
+
+		humidChange -= 0.05f * humidChange;
+		if (humidChange <= 0.001f && humidChange >= 0.001f) {
+			humidChange = 0;
+		}
+	}
+
+	/* STATE INFORMATION */
+	private int getHealthDisplay() {
+		if (displayQueen == null) {
+			return 0;
+		}
+
+		if (displayQueen.getMate() != null) {
+			return displayQueen.getHealth();
+		} else {
+			return displayHealth;
+		}
+	}
+
+	private int getMaxHealthDisplay() {
+		if (displayQueen == null) {
+			return 0;
+		}
+
+		if (displayQueen.getMate() != null) {
+			return displayQueen.getMaxHealth();
+		} else {
+			return displayHealthMax;
+		}
+	}
+
+	public int getHealthScaled(int i) {
+		if (getMaxHealthDisplay() == 0) {
+			return 0;
+		}
+
+		return (getHealthDisplay() * i) / getMaxHealthDisplay();
+	}
+
+	/* STRUCTURE MANAGMENT */
+	@Override
+	protected void createInventory() {
+		setInternalInventory(new AlvearyInventoryAdapter(this));
+	}
+
+	@Override
+	public void makeMaster() {
+		super.makeMaster();
+		if (beekeepingLogic == null) {
+			this.beekeepingLogic = BeeManager.beeRoot.createBeekeepingLogic(this);
+		}
+	}
+
+	@Override
+	public void onStructureReset() {
+		super.onStructureReset();
+		modifiers.clear();
+		eventHandlers.clear();
+
+		setActive(false);
+	}
+
+	/* IALVEARYCOMPONENT */
+	private final Set<IBeeModifier> modifiers = new LinkedHashSet<IBeeModifier>();
+	private final Set<IBeeListener> eventHandlers = new LinkedHashSet<IBeeListener>();
+
+	@Override
+	public void registerBeeModifier(IBeeModifier modifier) {
+		modifiers.add(modifier);
+	}
+
+	@Override
+	public void removeBeeModifier(IBeeModifier modifier) {
+		modifiers.remove(modifier);
+	}
+
+	@Override
+	public void registerBeeListener(IBeeListener modifier) {
+		eventHandlers.add(modifier);
+	}
+
+	@Override
+	public void removeBeeListener(IBeeListener modifier) {
+		eventHandlers.remove(modifier);
+	}
+
+	@Override
+	public void addTemperatureChange(float change, float boundaryDown, float boundaryUp) {
+		float temperature = biome.getFloatTemperature(xCoord, yCoord, zCoord);
+		tempChange = Math.min(boundaryUp - temperature, Math.max(boundaryDown - temperature, tempChange + change));
+	}
+
+	@Override
+	public void addHumidityChange(float change, float boundaryDown, float boundaryUp) {
+		float humidity = biome.rainfall;
+		humidChange = Math.min(boundaryUp - humidity, Math.max(boundaryDown - humidity, humidChange + change));
+	}
+
+	/* IBEEHOUSING */
+	@Override
+	public int getXCoord() {
+		return xCoord;
+	}
+
+	@Override
+	public int getYCoord() {
+		return yCoord;
+	}
+
+	@Override
+	public int getZCoord() {
+		return zCoord;
+	}
+
+	@Override
+	public ItemStack getQueen() {
+		return getStackInSlot(SLOT_QUEEN);
+	}
+
+	@Override
+	public ItemStack getDrone() {
+		return getStackInSlot(SLOT_DRONE);
+	}
+
+	@Override
+	public void setQueen(ItemStack itemstack) {
+		setInventorySlotContents(SLOT_QUEEN, itemstack);
+	}
+
+	@Override
+	public ItemStack decrStackSize(int slotIndex, int amount) {
+		ItemStack itemStack = super.decrStackSize(slotIndex, amount);
+		if (slotIndex == SLOT_QUEEN) {
+			handleQueenChange();
+		}
+		return itemStack;
+	}
+
+	@Override
+	public void setInventorySlotContents(int slotIndex, ItemStack itemStack) {
+		super.setInventorySlotContents(slotIndex, itemStack);
+		if (slotIndex == SLOT_QUEEN) {
+			handleQueenChange();
+		}
+	}
+
+	private void handleQueenChange() {
+		if (!Proxies.common.isSimulating(worldObj)) {
+			TileAlvearyPlain master = (TileAlvearyPlain) getCentralTE();
+			if (master != null) {
+				ItemStack itemStack = getStackInSlot(SLOT_QUEEN);
+				master.displayQueen = BeeManager.beeRoot.getMember(itemStack);
+			}
+		}
+	}
+
+	@Override
+	public void setDrone(ItemStack itemstack) {
+		setInventorySlotContents(SLOT_DRONE, itemstack);
+	}
+
+	@Override
+	public BiomeGenBase getBiome() {
+		return biome;
+	}
+
+	@Override
+	public EnumTemperature getTemperature() {
+		if (isHellish() && tempChange >= 0) {
+			return EnumTemperature.HELLISH;
+		}
+
+		return EnumTemperature.getFromValue(getExactTemperature());
+	}
+
+	@Override
+	public EnumHumidity getHumidity() {
+		return EnumHumidity.getFromValue(getExactHumidity());
+	}
+
+	@Override
+	public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
+		float mod = 2.0f;
+		for (IBeeModifier modifier : modifiers) {
+			mod *= modifier.getTerritoryModifier(genome, mod);
+		}
+		return mod;
+	}
+
+	@Override
+	public float getProductionModifier(IBeeGenome genome, float currentModifier) {
+		float mod = 1.0f;
+		for (IBeeModifier modifier : modifiers) {
+			mod *= modifier.getProductionModifier(genome, mod);
+		}
+		return mod;
+	}
+
+	@Override
+	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		float mod = 1.0f;
+		for (IBeeModifier modifier : modifiers) {
+			mod *= modifier.getMutationModifier(genome, mate, mod);
+		}
+		return mod;
+	}
+
+	@Override
+	public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		float mod = 1.0f;
+		for (IBeeModifier modifier : modifiers) {
+			mod *= modifier.getLifespanModifier(genome, mate, mod);
+		}
+		return mod;
+	}
+
+	@Override
+	public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
+		float mod = 1.0f;
+		for (IBeeModifier modifier : modifiers) {
+			mod *= modifier.getFloweringModifier(genome, mod);
+		}
+		return mod;
+	}
+
+	@Override
+	public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
+		float mod = 1.0f;
+		for (IBeeModifier modifier : modifiers) {
+			mod *= modifier.getGeneticDecay(genome, mod);
+		}
+		return mod;
+	}
+
+	@Override
+	public World getWorld() {
+		return worldObj;
+	}
+
+	@Override
+	public boolean canBreed() {
+		return true;
+	}
+
+	@Override
+	public boolean addProduct(ItemStack product, boolean all) {
+		IInventoryAdapter inventory = getStructureInventory();
+		if (inventory == null) {
+			return false;
+		}
+
+		return InvTools.tryAddStack(inventory, product, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, all);
+	}
+
+	@Deprecated
+	@Override
+	public void setErrorState(IErrorState state) {
+		removeErrorStates();
+		if (state != EnumErrorCode.OK) {
+			addErrorState(state);
+		}
+	}
+
+	@Override
+	public void wearOutEquipment(int amount) {
+		for (IBeeListener eventHandler : eventHandlers) {
+			eventHandler.wearOutEquipment(amount);
+		}
+	}
+
+	@Override
+	public void onQueenChange(ItemStack queenStack) {
+		if (!Proxies.common.isSimulating(worldObj)) {
+			return;
+		}
+
+		for (IBeeListener eventHandler : eventHandlers) {
+			eventHandler.onQueenChange(queenStack);
+		}
+	}
+
+	@Override
+	public void onQueenDeath(IBee queen) {
+		for (IBeeListener eventHandler : eventHandlers) {
+			eventHandler.onQueenDeath(queen);
+		}
+	}
+
+	@Override
+	public void onPostQueenDeath(IBee queen) {
+		for (IBeeListener eventHandler : eventHandlers) {
+			eventHandler.onPostQueenDeath(queen);
+		}
+	}
+
+	@Override
+	public boolean onPollenRetrieved(IBee queen, IIndividual pollen, boolean isHandled) {
+
+		for (IBeeListener eventHandler : eventHandlers) {
+			if (eventHandler.onPollenRetrieved(queen, pollen, isHandled)) {
+				isHandled = true;
+			}
+		}
+
+		return isHandled;
+	}
+
+	@Override
+	public boolean onEggLaid(IBee queen) {
+		for (IBeeListener eventHandler : eventHandlers) {
+			if (eventHandler.onEggLaid(queen)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public boolean isSealed() {
+		for (IBeeModifier modifier : modifiers) {
+			if (modifier.isSealed()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean isSelfLighted() {
+		for (IBeeModifier modifier : modifiers) {
+			if (modifier.isSelfLighted()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean isSunlightSimulated() {
+		for (IBeeModifier modifier : modifiers) {
+			if (modifier.isSunlightSimulated()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean isHellish() {
+		if (BiomeHelper.isBiomeHellish(biome)) {
+			return true;
+		}
+
+		for (IBeeModifier modifier : modifiers) {
+			if (modifier.isHellish()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/* IINVENTORY */
+	@Override
+	public IInventoryAdapter getInternalInventory() {
+		IInventoryAdapter inventory = super.getInternalInventory();
+		if (isMaster()) {
+			return inventory;
+		} else if (hasMaster()) {
+			ITileStructure central = getCentralTE();
+			if (central instanceof TileAlveary) {
+				return ((TileAlveary) central).getInternalInventory();
+			}
+		}
+		return inventory;
+	}
+
+	/* SMP GUI */
+	public void getGUINetworkData(int i, int j) {
+		switch (i) {
+			case 0:
+				displayHealth = j;
+				break;
+			case 1:
+				displayHealthMax = j;
+				break;
+			case 4:
+				this.tempChange = (float) j / 100;
+				break;
+			case 5:
+				this.humidChange = (float) j / 100;
+				break;
+			case 6: {
+				this.biome = BiomeGenBase.getBiome(j);
+				break;
+			}
+		}
+
+	}
+
+	public void sendGUINetworkData(ContainerAlveary container, ICrafting iCrafting) {
+		if (beekeepingLogic == null) {
+			return;
+		}
+
+		iCrafting.sendProgressBarUpdate(container, 0, beekeepingLogic.getBreedingTime());
+		iCrafting.sendProgressBarUpdate(container, 1, beekeepingLogic.getTotalBreedingTime());
+		iCrafting.sendProgressBarUpdate(container, 4, Math.round(tempChange * 100));
+		iCrafting.sendProgressBarUpdate(container, 5, Math.round(humidChange * 100));
+		iCrafting.sendProgressBarUpdate(container, 6, biome.biomeID);
+	}
+
+	/* IERRORSOURCE */
+	@Deprecated
+	@Override
+	public IErrorState getErrorState() {
+		Set<IErrorState> errorStates = null;
+		if (hasMaster()) {
+			ITileStructure tile = getCentralTE();
+			if (tile != null) {
+				errorStates = ((IErrorSource) tile).getErrorStates();
+			}
+		}
+
+		if (errorStates == null) {
+			errorStates = this.getErrorStates();
+		}
+
+		if (errorStates.size() == 0) {
+			return EnumErrorCode.OK;
+		} else {
+			return getErrorStates().iterator().next();
+		}
+	}
+
+	/* ICLIMATISED */
+	@Override
+	public boolean isClimatized() {
+		return true;
+	}
+
+	@Override
+	public float getExactTemperature() {
+		return biome.getFloatTemperature(xCoord, yCoord, zCoord) + this.tempChange;
+	}
+
+	@Override
+	public float getExactHumidity() {
+		return biome.rainfall + this.humidChange;
+	}
+
+	/* IHINTSOURCE */
+	@Override
+	public boolean hasHints() {
+		return Config.hints.get("alveary").length > 0;
+	}
+
+	@Override
+	public String[] getHints() {
+		return Config.hints.get("alveary");
+	}
+
+	/* IHousing */
+	@Override
+	public GameProfile getOwnerName() {
+		return this.getOwner();
+	}
+
+	private static class AlvearyInventoryAdapter extends TileInventoryAdapter<TileAlvearyPlain> {
+		public AlvearyInventoryAdapter(TileAlvearyPlain tileAlvearyPlain) {
+			super(tileAlvearyPlain, 9, "Items");
+		}
+
+		@Override
+		public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
+			if (slotIndex == SLOT_QUEEN) {
+				return BeeManager.beeRoot.isMember(itemStack) && !BeeManager.beeRoot.isDrone(itemStack);
+			} else if (slotIndex == SLOT_DRONE) {
+				return BeeManager.beeRoot.isDrone(itemStack);
+			}
+			return false;
+		}
+
+		@Override
+		public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) {
+			return slotIndex != SLOT_QUEEN && slotIndex != SLOT_DRONE;
+		}
+	}
+}

src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java

@@ -0,0 +1,196 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.gadgets;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+import forestry.api.apiculture.IAlvearyComponent;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeListener;
+import forestry.api.arboriculture.EnumGermlingType;
+import forestry.api.core.ForestryAPI;
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IIndividual;
+import forestry.core.config.ForestryItem;
+import forestry.core.interfaces.ICrafter;
+import forestry.core.inventory.IInventoryAdapter;
+import forestry.core.inventory.TileInventoryAdapter;
+import forestry.core.network.GuiId;
+import forestry.core.proxy.Proxies;
+import forestry.core.utils.StackUtils;
+
+public class TileAlvearySieve extends TileAlveary implements ICrafter, IBeeListener {
+
+	/* CONSTANTS */
+	public static final int BLOCK_META = 7;
+	
+	public static final int SLOT_POLLEN_1 = 0;
+	public static final int SLOTS_POLLEN_COUNT = 4;
+	public static final int SLOT_SIEVE = 4;
+
+	public TileAlvearySieve() {
+		super(BLOCK_META);
+		setInternalInventory(new AlvearySieveInventoryAdapter(this));
+	}
+
+	@Override
+	public void openGui(EntityPlayer player) {
+		player.openGui(ForestryAPI.instance, GuiId.AlvearySieveGUI.ordinal(), worldObj, xCoord, yCoord, zCoord);
+	}
+
+	@Override
+	public boolean hasFunction() {
+		return true;
+	}
+	
+	/* UPDATING */
+	@Override
+	public void initialize() {
+		super.initialize();
+		
+		if (!hasMaster() || !isIntegratedIntoStructure() || !Proxies.common.isSimulating(worldObj)) {
+			return;
+		}
+		
+		((IAlvearyComponent) getCentralTE()).registerBeeListener(this);
+	}
+	
+	@Override
+	protected void updateServerSide() {
+		super.updateServerSide();
+		if (!updateOnInterval(200)) {
+			return;
+		}
+		
+		if (!hasMaster() || !isIntegratedIntoStructure()) {
+			return;
+		}
+		
+		((IAlvearyComponent) getCentralTE()).registerBeeListener(this);
+	}
+	
+	/* TEXTURES & INTERNAL */
+	@Override
+	public int getIcon(int side, int metadata) {
+		if (side == 0 || side == 1) {
+			return BlockAlveary.BOTTOM;
+		}
+		return BlockAlveary.SIEVE;
+	}
+
+	private void destroySieve() {
+		IInventoryAdapter inventory = getInternalInventory();
+		inventory.setInventorySlotContents(SLOT_SIEVE, null);
+	}
+
+	private void destroyPollen() {
+		IInventoryAdapter inventory = getInternalInventory();
+		for (int i = SLOT_POLLEN_1; i < SLOT_POLLEN_1 + SLOTS_POLLEN_COUNT; i++) {
+			inventory.setInventorySlotContents(i, null);
+		}
+	}
+	
+	private boolean canStorePollen() {
+		IInventoryAdapter inventory = getInternalInventory();
+		if (inventory.getStackInSlot(SLOT_SIEVE) == null) {
+			return false;
+		}
+		
+		for (int i = SLOT_POLLEN_1; i < SLOT_POLLEN_1 + SLOTS_POLLEN_COUNT; i++) {
+			if (inventory.getStackInSlot(i) == null) {
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	private void storePollenStack(ItemStack itemstack) {
+		IInventoryAdapter inventory = getInternalInventory();
+		for (int i = SLOT_POLLEN_1; i < SLOT_POLLEN_1 + SLOTS_POLLEN_COUNT; i++) {
+			if (inventory.getStackInSlot(i) == null) {
+				inventory.setInventorySlotContents(i, itemstack);
+				return;
+			}
+		}
+	}
+
+	/* ICRAFTER */
+	@Override
+	public boolean canTakeStack(int slotIndex) {
+		return true;
+	}
+
+	@Override
+	public ItemStack takenFromSlot(int slotIndex, EntityPlayer player) {
+		IInventoryAdapter inventory = getInternalInventory();
+		if (slotIndex == SLOT_SIEVE) {
+			destroyPollen();
+			return inventory.getStackInSlot(SLOT_SIEVE);
+		} else {
+			destroySieve();
+			return inventory.getStackInSlot(slotIndex);
+		}
+	}
+
+	@Override
+	public ItemStack getResult() {
+		return null;
+	}
+
+	/* IBEELISTENER */
+	@Override
+	public void onQueenChange(ItemStack queen) {
+	}
+
+	@Override
+	public void wearOutEquipment(int amount) {
+	}
+
+	@Override
+	public void onQueenDeath(IBee queen) {
+	}
+
+	@Override
+	public void onPostQueenDeath(IBee queen) {
+	}
+
+	@Override
+	public boolean onPollenRetrieved(IBee queen, IIndividual pollen, boolean isHandled) {
+
+		if (isHandled) {
+			return true;
+		}
+		if (!canStorePollen()) {
+			return false;
+		}
+		
+		storePollenStack(AlleleManager.alleleRegistry.getSpeciesRoot(pollen.getClass()).getMemberStack(pollen, EnumGermlingType.POLLEN.ordinal()));
+		return true;
+	}
+
+	@Override
+	public boolean onEggLaid(IBee queen) {
+		return false;
+	}
+
+	private static class AlvearySieveInventoryAdapter extends TileInventoryAdapter<TileAlvearySieve> {
+		public AlvearySieveInventoryAdapter(TileAlvearySieve alvearySieve) {
+			super(alvearySieve, 5, "Items", 1);
+		}
+
+		@Override
+		public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
+			return StackUtils.isIdenticalItem(ForestryItem.craftingMaterial.getItemStack(1, 3), itemStack);
+		}
+	}
+}

src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java

@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.gadgets;
+
+import forestry.api.apiculture.IAlvearyComponent;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.core.proxy.Proxies;
+
+public class TileAlvearyStabiliser extends TileAlveary implements IBeeModifier {
+
+	public static final int BLOCK_META = 6;
+
+	public TileAlvearyStabiliser() {
+		super(BLOCK_META);
+	}
+
+	/* UPDATING */
+	@Override
+	public void initialize() {
+		super.initialize();
+		
+		if (!hasMaster() || !isIntegratedIntoStructure() || !Proxies.common.isSimulating(worldObj)) {
+			return;
+		}
+		
+		((IAlvearyComponent) getCentralTE()).registerBeeModifier(this);
+
+	}
+	
+	@Override
+	protected void updateServerSide() {
+		super.updateServerSide();
+		if (!updateOnInterval(200)) {
+			return;
+		}
+		
+		if (!hasMaster() || !isIntegratedIntoStructure()) {
+			return;
+		}
+		
+		((IAlvearyComponent) getCentralTE()).registerBeeModifier(this);
+	}
+	
+
+	@Override
+	public boolean hasFunction() {
+		return true;
+	}
+
+	/* TEXTURES */
+	@Override
+	public int getIcon(int side, int metadata) {
+		if (side == 0 || side == 1) {
+			return BlockAlveary.BOTTOM;
+		}
+
+		return BlockAlveary.STABILISER;
+	}
+
+	/* IBEEMODIFIER */
+	@Override
+	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return 0.0f;
+	}
+
+	@Override
+	public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getProductionModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public boolean isSealed() {
+		return false;
+	}
+
+	@Override
+	public boolean isSelfLighted() {
+		return false;
+	}
+
+	@Override
+	public boolean isSunlightSimulated() {
+		return false;
+	}
+
+	@Override
+	public boolean isHellish() {
+		return false;
+	}
+
+}

src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java

@@ -8,11 +8,13 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.multiblock;
+package forestry.apiculture.gadgets;
 
+import java.io.IOException;
 import java.util.Map.Entry;
 import java.util.Stack;
 
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -22,55 +24,55 @@ import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
 import forestry.api.apiculture.IAlvearyComponent;
 import forestry.api.apiculture.IBee;
-import forestry.apiculture.blocks.BlockAlveary;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.core.ForestryAPI;
 import forestry.apiculture.network.PacketActiveUpdate;
 import forestry.apiculture.worldgen.Hive;
 import forestry.apiculture.worldgen.HiveDecorator;
 import forestry.apiculture.worldgen.HiveDescriptionSwarmer;
-import forestry.core.access.EnumAccess;
-import forestry.core.inventory.IInventoryAdapter;
+import forestry.core.interfaces.IActivatable;
 import forestry.core.inventory.TileInventoryAdapter;
 import forestry.core.inventory.wrappers.IInvSlot;
 import forestry.core.inventory.wrappers.InventoryIterator;
+import forestry.core.network.DataInputStreamForestry;
+import forestry.core.network.DataOutputStreamForestry;
 import forestry.core.network.GuiId;
 import forestry.core.proxy.Proxies;
-import forestry.core.tiles.IActivatable;
-import forestry.core.utils.ItemStackUtil;
+import forestry.core.utils.StackUtils;
 
-public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInventory, IActivatable, IAlvearyComponent.Active {
+public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, IActivatable {
+
+	/* CONSTANTS */
+	public static final int BLOCK_META = 2;
 
-	private final SwarmerInventory inventory;
 	private final Stack<ItemStack> pendingSpawns = new Stack<ItemStack>();
 	private boolean active;
 
 	public TileAlvearySwarmer() {
-		super(TileAlveary.SWARMER_META, GuiId.AlvearySwarmerGUI);
-		this.inventory = new SwarmerInventory(this);
+		super(BLOCK_META);
+		setInternalInventory(new SwarmerInventoryAdapter(this));
 	}
 
 	@Override
-	public IInventoryAdapter getInternalInventory() {
-		return inventory;
-	}
-
-	@Override
-	public boolean allowsAutomation() {
-		return true;
+	public void openGui(EntityPlayer player) {
+		player.openGui(ForestryAPI.instance, GuiId.AlvearySwarmerGUI.ordinal(), worldObj, xCoord, yCoord, zCoord);
 	}
 
 	/* UPDATING */
 	@Override
-	public void updateServer(int tickCount) {
+	protected void updateServerSide() {
+		super.updateServerSide();
+
 		if (pendingSpawns.size() > 0) {
 			setActive(true);
-			if (tickCount % 1000 == 0) {
+			if (updateOnInterval(1000)) {
 				trySpawnSwarm();
 			}
 		} else {
 			setActive(false);
 		}
 
-		if (tickCount % 500 != 0) {
+		if (!updateOnInterval(500)) {
 			return;
 		}
 
@@ -95,19 +97,23 @@ public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInve
 		pendingSpawns.push(BeeManager.beeRoot.getMemberStack(princess, EnumBeeType.PRINCESS.ordinal()));
 	}
 
-	@Override
-	public void updateClient(int tickCount) {
-
-	}
-
 	private ItemStack getPrincessStack() {
-		ItemStack princessStack = getAlvearyController().getBeeInventory().getQueen();
-
-		if (BeeManager.beeRoot.isMated(princessStack)) {
-			return princessStack;
+		if (!this.hasMaster()) {
+			return null;
 		}
 
-		return null;
+		IAlvearyComponent master = (IAlvearyComponent) this.getCentralTE();
+		if (!(master instanceof IBeeHousing)) {
+			return null;
+		}
+
+		IBeeHousing housing = (IBeeHousing) master;
+		ItemStack princessStack = housing.getQueen();
+		if (princessStack == null || !BeeManager.beeRoot.isMated(princessStack)) {
+			return null;
+		}
+
+		return princessStack;
 	}
 
 	private int consumeInducerAndGetChance() {
@@ -118,7 +124,7 @@ public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInve
 		for (IInvSlot slot : InventoryIterator.getIterable(getInternalInventory())) {
 			ItemStack stack = slot.getStackInSlot();
 			for (Entry<ItemStack, Integer> entry : BeeManager.inducers.entrySet()) {
-				if (ItemStackUtil.isIdenticalItem(entry.getKey(), stack)) {
+				if (StackUtils.isIdenticalItem(entry.getKey(), stack)) {
 					slot.decreaseStackInSlot();
 					return entry.getValue();
 				}
@@ -137,7 +143,7 @@ public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInve
 		int chunkX = (xCoord + worldObj.rand.nextInt(40 * 2) - 40) / 16;
 		int chunkZ = (zCoord + worldObj.rand.nextInt(40 * 2) - 40) / 16;
 
-		if (HiveDecorator.genHive(worldObj, worldObj.rand, chunkX, chunkZ, hive)) {
+		if (HiveDecorator.instance().genHive(worldObj, worldObj.rand, chunkX, chunkZ, hive)) {
 			pendingSpawns.pop();
 		}
 	}
@@ -145,20 +151,29 @@ public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInve
 	/* NETWORK */
 
 	@Override
-	protected void encodeDescriptionPacket(NBTTagCompound packetData) {
-		super.encodeDescriptionPacket(packetData);
-		packetData.setBoolean("Active", active);
+	public void writeData(DataOutputStreamForestry data) throws IOException {
+		super.writeData(data);
+		data.writeBoolean(active);
 	}
 
 	@Override
-	protected void decodeDescriptionPacket(NBTTagCompound packetData) {
-		super.decodeDescriptionPacket(packetData);
-		setActive(packetData.getBoolean("Active"));
+	public void readData(DataInputStreamForestry data) throws IOException {
+		super.readData(data);
+		boolean active = data.readBoolean();
+		if (this.active != active) {
+			this.active = active;
+			worldObj.func_147479_m(xCoord, yCoord, zCoord);
+		}
+	}
+
+	@Override
+	public boolean hasFunction() {
+		return true;
 	}
 
 	/* TEXTURES */
 	@Override
-	public int getIcon(int side) {
+	public int getIcon(int side, int metadata) {
 		if (side == 0 || side == 1) {
 			return BlockAlveary.BOTTOM;
 		}
@@ -174,19 +189,18 @@ public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInve
 	@Override
 	public void readFromNBT(NBTTagCompound nbttagcompound) {
 		super.readFromNBT(nbttagcompound);
-		setActive(nbttagcompound.getBoolean("Active"));
 
 		NBTTagList nbttaglist = nbttagcompound.getTagList("PendingSpawns", 10);
 		for (int i = 0; i < nbttaglist.tagCount(); i++) {
 			NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i);
 			pendingSpawns.add(ItemStack.loadItemStackFromNBT(nbttagcompound1));
 		}
+
 	}
 
 	@Override
 	public void writeToNBT(NBTTagCompound nbttagcompound) {
 		super.writeToNBT(nbttagcompound);
-		nbttagcompound.setBoolean("Active", active);
 
 		NBTTagList nbttaglist = new NBTTagList();
 		ItemStack[] offspring = pendingSpawns.toArray(new ItemStack[pendingSpawns.size()]);
@@ -199,15 +213,7 @@ public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInve
 			}
 		}
 		nbttagcompound.setTag("PendingSpawns", nbttaglist);
-	}
 
-	@Override
-	public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) {
-		if (oldAccess == EnumAccess.SHARED || newAccess == EnumAccess.SHARED) {
-			// pipes connected to this need to update
-			worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType);
-			markDirty();
-		}
 	}
 
 	@Override
@@ -223,19 +229,19 @@ public class TileAlvearySwarmer extends TileAlvearyWithGui implements ISidedInve
 
 		this.active = active;
 
-		if (!worldObj.isRemote) {
-			Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this), worldObj);
+		if (worldObj != null && !worldObj.isRemote) {
+			Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this));
 		}
 	}
 
-	private static class SwarmerInventory extends TileInventoryAdapter<TileAlvearySwarmer> {
-		public SwarmerInventory(TileAlvearySwarmer alvearySwarmer) {
+	private static class SwarmerInventoryAdapter extends TileInventoryAdapter<TileAlvearySwarmer> {
+		public SwarmerInventoryAdapter(TileAlvearySwarmer alvearySwarmer) {
 			super(alvearySwarmer, 4, "SwarmInv");
 		}
 
 		@Override
 		public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
-			return ItemStackUtil.containsItemStack(BeeManager.inducers.keySet(), itemStack);
+			return StackUtils.containsItemStack(BeeManager.inducers.keySet(), itemStack);
 		}
 	}
 }

src/main/java/forestry/apiculture/gadgets/TileApiaristChest.java

@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.gadgets;
+
+import forestry.api.apiculture.BeeManager;
+import forestry.core.gadgets.TileNaturalistChest;
+import forestry.core.network.GuiId;
+
+public class TileApiaristChest extends TileNaturalistChest {
+
+	public TileApiaristChest() {
+		super(BeeManager.beeRoot, GuiId.ApiaristChestGUI.ordinal());
+	}
+
+}

src/main/java/forestry/apiculture/gadgets/TileApiary.java

@@ -0,0 +1,259 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.gadgets;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+import cpw.mods.fml.common.Optional;
+
+import forestry.api.apiculture.BeeManager;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IHiveFrame;
+import forestry.api.core.ForestryAPI;
+import forestry.apiculture.trigger.ApicultureTriggers;
+import forestry.core.gadgets.TileBase;
+import forestry.core.inventory.IInventoryAdapter;
+import forestry.core.network.GuiId;
+
+import buildcraft.api.statements.ITriggerExternal;
+
+public class TileApiary extends TileBeehouse {
+
+	public TileApiary() {
+		setInternalInventory(new BeehouseInventoryAdapter(this, 12, "Items"));
+	}
+
+	@Override
+	public void openGui(EntityPlayer player, TileBase tile) {
+		player.openGui(ForestryAPI.instance, GuiId.ApiaryGUI.ordinal(), worldObj, xCoord, yCoord, zCoord);
+	}
+
+	/* IBEEHOUSING */
+	@Override
+	public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
+		IInventoryAdapter inventory = getInternalInventory();
+		float mod = 1.0f;
+		for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) {
+			if (inventory.getStackInSlot(i) == null) {
+				continue;
+			}
+			if (inventory.getStackInSlot(i).getItem() instanceof IHiveFrame) {
+				mod *= ((IHiveFrame) inventory.getStackInSlot(i).getItem()).getTerritoryModifier(genome, mod);
+			}
+		}
+		return mod;
+	}
+
+	@Override
+	public float getProductionModifier(IBeeGenome genome, float currentModifier) {
+		IInventoryAdapter inventory = getInternalInventory();
+		float mod = 0.1f;
+		for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) {
+			if (inventory.getStackInSlot(i) == null) {
+				continue;
+			}
+			if (inventory.getStackInSlot(i).getItem() instanceof IHiveFrame) {
+				mod *= ((IHiveFrame) inventory.getStackInSlot(i).getItem()).getProductionModifier(genome, mod);
+			}
+		}
+		return mod;
+	}
+
+	@Override
+	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		IInventoryAdapter inventory = getInternalInventory();
+		float mod = 1.0f;
+		for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) {
+			if (inventory.getStackInSlot(i) == null) {
+				continue;
+			}
+			if (inventory.getStackInSlot(i).getItem() instanceof IHiveFrame) {
+				mod *= ((IHiveFrame) inventory.getStackInSlot(i).getItem()).getMutationModifier(genome, mate, mod);
+			}
+		}
+		return mod;
+	}
+
+	@Override
+	public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		IInventoryAdapter inventory = getInternalInventory();
+		float mod = 1.0f;
+		for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) {
+			if (inventory.getStackInSlot(i) == null) {
+				continue;
+			}
+			if (inventory.getStackInSlot(i).getItem() instanceof IHiveFrame) {
+				mod *= ((IHiveFrame) inventory.getStackInSlot(i).getItem()).getLifespanModifier(genome, mate, mod);
+			}
+		}
+		return mod;
+	}
+
+	@Override
+	public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
+		IInventoryAdapter inventory = getInternalInventory();
+		float mod = 1f;
+		for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) {
+			if (inventory.getStackInSlot(i) == null) {
+				continue;
+			}
+			if (inventory.getStackInSlot(i).getItem() instanceof IHiveFrame) {
+				mod *= ((IHiveFrame) inventory.getStackInSlot(i).getItem()).getFloweringModifier(genome, mod);
+			}
+		}
+		return mod;
+	}
+
+	@Override
+	public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
+		IInventoryAdapter inventory = getInternalInventory();
+		float mod = 1f;
+		for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) {
+			if (inventory.getStackInSlot(i) == null) {
+				continue;
+			}
+			if (inventory.getStackInSlot(i).getItem() instanceof IHiveFrame) {
+				mod *= ((IHiveFrame) inventory.getStackInSlot(i).getItem()).getGeneticDecay(genome, mod);
+			}
+		}
+		return mod;
+	}
+
+	@Override
+	public void wearOutEquipment(int amount) {
+		IInventoryAdapter inventory = getInternalInventory();
+		int wear = Math.round(amount * BeeManager.beeRoot.getBeekeepingMode(worldObj).getWearModifier());
+
+		for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) {
+			if (inventory.getStackInSlot(i) == null) {
+				continue;
+			}
+			if (!(inventory.getStackInSlot(i).getItem() instanceof IHiveFrame)) {
+				continue;
+			}
+
+			inventory.setInventorySlotContents(
+					i,
+					((IHiveFrame) inventory.getStackInSlot(i).getItem()).frameUsed(this, inventory.getStackInSlot(i),
+							BeeManager.beeRoot.getMember(inventory.getStackInSlot(SLOT_QUEEN)), wear));
+		}
+	}
+
+	/* ISPECIALINVENTORY */
+	//	@Override
+	//	public ItemStack[] extractItem(boolean doRemove, ForgeDirection from, int maxItemCount) {
+	//		ItemStack product = null;
+	//
+	//		for (int i = SLOT_PRODUCT_1; i < SLOT_PRODUCT_1 + SLOT_PRODUCT_COUNT; i++) {
+	//			if (inventory.getStackInSlot(i) == null)
+	//				continue;
+	//
+	//			// Princesses can only be extracted from top.
+	//			if (ForestryItem.beePrincessGE.isItemEqual(inventory.getStackInSlot(i))) {
+	//				if (PluginApiculture.apiarySideSensitive && from != ForgeDirection.UP)
+	//					continue;
+	//
+	//				product = inventory.getStackInSlot(i).copy();
+	//				if (doRemove) {
+	//					inventory.getStackInSlot(i).stackSize = 0;
+	//					inventory.setInventorySlotContents(i, null);
+	//				}
+	//				break;
+	//
+	//				// Drones can only be extracted from the bottom.
+	//			} else if (ForestryItem.beeDroneGE.isItemEqual(inventory.getStackInSlot(i))) {
+	//				if (PluginApiculture.apiarySideSensitive && from != ForgeDirection.DOWN)
+	//					continue;
+	//
+	//				product = StackUtils.createSplitStack(inventory.getStackInSlot(i), 1);
+	//				product.stackSize = 1;
+	//				if (doRemove) {
+	//					inventory.getStackInSlot(i).stackSize--;
+	//					if (inventory.getStackInSlot(i).stackSize <= 0)
+	//						inventory.setInventorySlotContents(i, null);
+	//				}
+	//				break;
+	//
+	//				// Everything else to be extracted from the sides
+	//			} else {
+	//				if (PluginApiculture.apiarySideSensitive && (from == ForgeDirection.UP || from == ForgeDirection.DOWN))
+	//					continue;
+	//
+	//				product = StackUtils.createSplitStack(inventory.getStackInSlot(i), 1);
+	//				if (doRemove) {
+	//					inventory.getStackInSlot(i).stackSize--;
+	//					if (inventory.getStackInSlot(i).stackSize <= 0)
+	//						inventory.setInventorySlotContents(i, null);
+	//				}
+	//				break;
+	//			}
+	//		}
+	//
+	//		return new ItemStack[] { product };
+	//	}
+	//
+	//	@Override
+	//	public int addItem(ItemStack stack, boolean doAdd, ForgeDirection from) {
+	//		// Princesses && Queens
+	//		if (ForestryItem.beePrincessGE.isItemEqual(stack) || ForestryItem.beeQueenGE.isItemEqual(stack))
+	//			if (inventory.getStackInSlot(SLOT_QUEEN) == null) {
+	//				if (doAdd) {
+	//					inventory.setInventorySlotContents(SLOT_QUEEN, stack.copy());
+	//					inventory.getStackInSlot(SLOT_QUEEN).stackSize = 1;
+	//				}
+	//
+	//				return 1;
+	//			}
+	//
+	//		// Drones
+	//		if (ForestryItem.beeDroneGE.isItemEqual(stack)) {
+	//
+	//			ItemStack droneStack = inventory.getStackInSlot(SLOT_DRONE);
+	//			if (droneStack == null) {
+	//				if (doAdd)
+	//					inventory.setInventorySlotContents(SLOT_DRONE, stack.copy());
+	//				return stack.stackSize;
+	//			} else {
+	//				if (!droneStack.isItemEqual(stack))
+	//					return 0;
+	//				if (!ItemStack.areItemStackTagsEqual(droneStack, stack))
+	//					return 0;
+	//				int space = droneStack.getMaxStackSize() - droneStack.stackSize;
+	//				if (space <= 0)
+	//					return 0;
+	//
+	//				int added = space > stack.stackSize ? stack.stackSize : space;
+	//				if (doAdd)
+	//					droneStack.stackSize += added;
+	//				return added;
+	//			}
+	//		}
+	//
+	//		return 0;
+	//	}
+
+	/* ITRIGGERPROVIDER */
+	@Optional.Method(modid = "BuildCraftAPI|statements")
+	@Override
+	public Collection<ITriggerExternal> getExternalTriggers(ForgeDirection side, TileEntity tile) {
+		LinkedList<ITriggerExternal> res = new LinkedList<ITriggerExternal>();
+		res.add(ApicultureTriggers.missingQueen);
+		res.add(ApicultureTriggers.missingDrone);
+		res.add(ApicultureTriggers.noFrames);
+		return res;
+	}
+}

src/main/java/forestry/apiculture/gadgets/TileBeehouse.java

@@ -0,0 +1,486 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.gadgets;
+
+import java.io.IOException;
+import java.util.Set;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+
+import com.mojang.authlib.GameProfile;
+
+import forestry.api.apiculture.BeeManager;
+import forestry.api.apiculture.IBee;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeekeepingLogic;
+import forestry.api.apiculture.IHiveFrame;
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.core.ForestryAPI;
+import forestry.api.core.IErrorState;
+import forestry.api.genetics.IIndividual;
+import forestry.apiculture.network.PacketActiveUpdate;
+import forestry.core.EnumErrorCode;
+import forestry.core.config.Config;
+import forestry.core.gadgets.TileBase;
+import forestry.core.interfaces.IActivatable;
+import forestry.core.interfaces.IClimatised;
+import forestry.core.inventory.InvTools;
+import forestry.core.inventory.TileInventoryAdapter;
+import forestry.core.network.DataInputStreamForestry;
+import forestry.core.network.DataOutputStreamForestry;
+import forestry.core.network.GuiId;
+import forestry.core.proxy.Proxies;
+import forestry.core.utils.GuiUtil;
+
+public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised, IActivatable {
+	// CONSTANTS
+	public static final int SLOT_QUEEN = 0;
+	public static final int SLOT_DRONE = 1;
+	public static final int SLOT_PRODUCT_1 = 2;
+	public static final int SLOT_PRODUCT_COUNT = 7;
+	public static final int SLOT_FRAMES_1 = 9;
+	public static final int SLOT_FRAMES_COUNT = 3;
+
+	private final IBeekeepingLogic logic;
+	private BiomeGenBase biome;
+
+	// CLIENT
+	private boolean active;
+	private int displayHealthMax = 0;
+	private int displayHealth = 0;
+	private IBee displayQueen;
+
+	public TileBeehouse() {
+		setHints(Config.hints.get("apiary"));
+		logic = BeeManager.beeRoot.createBeekeepingLogic(this);
+		setInternalInventory(new BeehouseInventoryAdapter(this, 12, "Items").disableAutomation());
+	}
+
+	@Override
+	public void openGui(EntityPlayer player, TileBase tile) {
+		player.openGui(ForestryAPI.instance, GuiId.BeehouseGUI.ordinal(), worldObj, xCoord, yCoord, zCoord);
+	}
+
+	/* LOADING & SAVING */
+	@Override
+	public void writeToNBT(NBTTagCompound nbttagcompound) {
+		super.writeToNBT(nbttagcompound);
+
+		nbttagcompound.setInteger("BiomeId", biome.biomeID);
+		if (logic != null) {
+			logic.writeToNBT(nbttagcompound);
+		}
+	}
+
+	@Override
+	public void readFromNBT(NBTTagCompound nbttagcompound) {
+		super.readFromNBT(nbttagcompound);
+
+		int biomeId = nbttagcompound.getInteger("BiomeId");
+		biome = BiomeGenBase.getBiome(biomeId);
+		logic.readFromNBT(nbttagcompound);
+	}
+
+	@Override
+	public void writeData(DataOutputStreamForestry data) throws IOException {
+		super.writeData(data);
+		data.writeBoolean(active);
+		if (active) {
+			ItemStack queen = getStackInSlot(SLOT_QUEEN);
+			data.writeItemStack(queen);
+		}
+	}
+
+	@Override
+	public void readData(DataInputStreamForestry data) throws IOException {
+		super.readData(data);
+		active = data.readBoolean();
+		if (active) {
+			ItemStack queen = data.readItemStack();
+			setInventorySlotContents(SLOT_QUEEN, queen);
+		}
+	}
+
+	@Override
+	public void initialize() {
+		super.initialize();
+		updateBiome();
+	}
+
+	@Override
+	public void validate() {
+		updateBiome();
+	}
+
+	/* ICLIMATISED */
+	@Override
+	public boolean isClimatized() {
+		return true;
+	}
+
+	@Override
+	public EnumTemperature getTemperature() {
+		return EnumTemperature.getFromBiome(biome, xCoord, yCoord, zCoord);
+	}
+
+	@Override
+	public EnumHumidity getHumidity() {
+		return EnumHumidity.getFromValue(getExactHumidity());
+	}
+
+	@Deprecated
+	@Override
+	public void setErrorState(IErrorState state) {
+		removeErrorStates();
+		if (state != EnumErrorCode.OK) {
+			addErrorState(state);
+		}
+	}
+
+	@Deprecated
+	@Override
+	public IErrorState getErrorState() {
+		Set<IErrorState> errorStates = getErrorStates();
+		if (errorStates.size() == 0) {
+			return EnumErrorCode.OK;
+		} else {
+			return getErrorStates().iterator().next();
+		}
+	}
+
+	@Override
+	public float getExactTemperature() {
+		return biome.getFloatTemperature(xCoord, yCoord, zCoord);
+	}
+
+	@Override
+	public float getExactHumidity() {
+		return biome.rainfall;
+	}
+
+	/* UPDATING */
+	@Override
+	public void updateClientSide() {
+		if (isActive() && (displayQueen != null) && updateOnInterval(4)) {
+			displayQueen.doFX(logic.getEffectData(), this);
+
+			if (updateOnInterval(50)) {
+				float fxX = xCoord + 0.5F;
+				float fxY = yCoord + 0.25F + (worldObj.rand.nextFloat() * 6F) / 16F;
+				float fxZ = zCoord + 0.5F;
+				float f3 = 0.6F;
+				float f4 = worldObj.rand.nextFloat() * f3 - 0.5F;
+
+				Proxies.common.addEntitySwarmFX(worldObj, (fxX - f3), fxY, (fxZ + f4), 0F, 0F, 0F);
+				Proxies.common.addEntitySwarmFX(worldObj, (fxX + f3), fxY, (fxZ + f4), 0F, 0F, 0F);
+				Proxies.common.addEntitySwarmFX(worldObj, (fxX + f4), fxY, (fxZ - f3), 0F, 0F, 0F);
+				Proxies.common.addEntitySwarmFX(worldObj, (fxX + f4), fxY, (fxZ + f3), 0F, 0F, 0F);
+			}
+		}
+	}
+
+	@Override
+	public void updateServerSide() {
+		boolean canWork = logic.canWork();
+		setActive(canWork);
+		if (canWork) {
+			logic.doWork();
+		}
+	}
+
+	// @Override
+	public boolean isWorking() {
+		return !hasErrorState();
+	}
+
+	@Override
+	public boolean addProduct(ItemStack product, boolean all) {
+		return InvTools.tryAddStack(getInternalInventory(), product, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, all, true);
+	}
+
+	/* NETWORK SYNCH */
+	@Override
+	public void onQueenChange(ItemStack queenStack) {
+	}
+
+	/* STATE INFORMATION */
+	private int getHealthDisplay() {
+		if (displayQueen == null) {
+			return 0;
+		}
+
+		if (displayQueen.getMate() != null) {
+			return displayQueen.getHealth();
+		} else {
+			return displayHealth;
+		}
+	}
+
+	private int getMaxHealthDisplay() {
+		if (displayQueen == null) {
+			return 0;
+		}
+
+		if (displayQueen.getMate() != null) {
+			return displayQueen.getMaxHealth();
+		} else {
+			return displayHealthMax;
+		}
+	}
+
+	/**
+	 * Returns scaled queen health or breeding progress
+	 */
+	public int getHealthScaled(int i) {
+		if (getMaxHealthDisplay() == 0) {
+			return 0;
+		}
+
+		return (getHealthDisplay() * i) / getMaxHealthDisplay();
+	}
+
+	public void updateBiome() {
+		if (worldObj != null) {
+			BiomeGenBase biome = worldObj.getBiomeGenForCoordsBody(xCoord, zCoord);
+			if (biome != null) {
+				this.biome = biome;
+			}
+		}
+	}
+
+	/* SMP */
+	// @Override
+	public void getGUINetworkData(int i, int j) {
+		if (logic == null) {
+			return;
+		}
+
+		switch (i) {
+			case 0:
+				displayHealth = j;
+				break;
+			case 1:
+				displayHealthMax = j;
+				break;
+		}
+	}
+
+	// @Override
+	public void sendGUINetworkData(Container container, ICrafting iCrafting) {
+		if (logic == null) {
+			return;
+		}
+
+		iCrafting.sendProgressBarUpdate(container, 0, logic.getBreedingTime());
+		iCrafting.sendProgressBarUpdate(container, 1, logic.getTotalBreedingTime());
+	}
+
+	// / IBEEHOUSING
+	@Override
+	public int getXCoord() {
+		return xCoord;
+	}
+
+	@Override
+	public int getYCoord() {
+		return yCoord;
+	}
+
+	@Override
+	public int getZCoord() {
+		return zCoord;
+	}
+
+	@Override
+	public BiomeGenBase getBiome() {
+		return biome;
+	}
+
+	@Override
+	public ItemStack getQueen() {
+		return getStackInSlot(SLOT_QUEEN);
+	}
+
+	@Override
+	public ItemStack getDrone() {
+		return getStackInSlot(SLOT_DRONE);
+	}
+
+	@Override
+	public void setQueen(ItemStack itemstack) {
+		setInventorySlotContents(SLOT_QUEEN, itemstack);
+	}
+
+	@Override
+	public ItemStack decrStackSize(int slotIndex, int amount) {
+		ItemStack itemStack = super.decrStackSize(slotIndex, amount);
+		if (slotIndex == SLOT_QUEEN) {
+			handleQueenChange();
+		}
+		return itemStack;
+	}
+
+	@Override
+	public void setInventorySlotContents(int slotIndex, ItemStack itemStack) {
+		super.setInventorySlotContents(slotIndex, itemStack);
+		if (slotIndex == SLOT_QUEEN) {
+			handleQueenChange();
+		}
+	}
+
+	private void handleQueenChange() {
+		if (!Proxies.common.isSimulating(worldObj)) {
+			ItemStack itemStack = getStackInSlot(SLOT_QUEEN);
+			displayQueen = BeeManager.beeRoot.getMember(itemStack);
+		}
+	}
+
+	@Override
+	public void setDrone(ItemStack itemstack) {
+		setInventorySlotContents(SLOT_DRONE, itemstack);
+	}
+
+	@Override
+	public World getWorld() {
+		return worldObj;
+	}
+
+	@Override
+	public boolean canBreed() {
+		return true;
+	}
+
+	@Override
+	public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getProductionModifier(IBeeGenome genome, float currentModifier) {
+		return 0.25f;
+	}
+
+	@Override
+	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return 0.0f;
+	}
+
+	@Override
+	public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return 3.0f;
+	}
+
+	@Override
+	public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
+		return 3.0f;
+	}
+
+	@Override
+	public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
+		return 0.0f;
+	}
+
+	@Override
+	public void wearOutEquipment(int amount) {
+	}
+
+	@Override
+	public boolean isSealed() {
+		return false;
+	}
+
+	@Override
+	public boolean isSelfLighted() {
+		return false;
+	}
+
+	@Override
+	public boolean isSunlightSimulated() {
+		return false;
+	}
+
+	@Override
+	public boolean isHellish() {
+		return false;
+	}
+
+	@Override
+	public void onQueenDeath(IBee queen) {
+	}
+
+	@Override
+	public void onPostQueenDeath(IBee queen) {
+	}
+
+	@Override
+	public boolean onPollenRetrieved(IBee queen, IIndividual pollen, boolean isHandled) {
+		return false;
+	}
+
+	@Override
+	public boolean onEggLaid(IBee queen) {
+		return false;
+	}
+
+	/* IHousing */
+	@Override
+	public GameProfile getOwnerName() {
+		return this.getOwner();
+	}
+
+	@Override
+	public boolean isActive() {
+		return active;
+	}
+
+	@Override
+	public void setActive(boolean active) {
+		if (this.active == active) {
+			return;
+		}
+		this.active = active;
+
+		if (worldObj != null && !worldObj.isRemote) {
+			Proxies.net.sendNetworkPacket(new PacketActiveUpdate(this));
+		}
+	}
+
+	protected static class BeehouseInventoryAdapter extends TileInventoryAdapter<TileBeehouse> {
+		public BeehouseInventoryAdapter(TileBeehouse tile, int size, String name) {
+			super(tile, size, name);
+		}
+
+		@Override
+		public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
+			if (slotIndex == SLOT_QUEEN) {
+				return BeeManager.beeRoot.isMember(itemStack) && !BeeManager.beeRoot.isDrone(itemStack);
+			} else if (GuiUtil.isIndexInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) {
+				return itemStack.getItem() instanceof IHiveFrame;
+			} else if (slotIndex == SLOT_DRONE) {
+				return BeeManager.beeRoot.isDrone(itemStack);
+			}
+			return false;
+		}
+
+		@Override
+		public boolean canExtractItem(int slotIndex, ItemStack itemstack, int side) {
+			return GuiUtil.isIndexInRange(slotIndex, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT);
+		}
+	}
+}

src/main/java/forestry/apiculture/gadgets/TileCandle.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.tiles;
+package forestry.apiculture.gadgets;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.Packet;

src/main/java/forestry/apiculture/gadgets/TileSwarm.java

@@ -8,15 +8,15 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.tiles;
+package forestry.apiculture.gadgets;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.EnumSkyBlock;
 
+import forestry.core.inventory.InvTools;
 import forestry.core.inventory.InventoryAdapter;
-import forestry.core.utils.InventoryUtil;
 
 public class TileSwarm extends TileEntity {
 
@@ -43,7 +43,7 @@ public class TileSwarm extends TileEntity {
 
 	public TileSwarm setContained(ItemStack[] bees) {
 		for (ItemStack itemstack : bees) {
-			InventoryUtil.addStack(contained, itemstack, true);
+			InvTools.addStack(contained, itemstack, true);
 		}
 
 		return this;

src/main/java/forestry/apiculture/genetics/AIAvoidPlayers.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.entities;
+package forestry.apiculture.genetics;
 
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.ai.EntityAIBase;

src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -36,23 +36,29 @@ import forestry.api.apiculture.IBeeIconProvider;
 import forestry.api.apiculture.IBeeRoot;
 import forestry.api.apiculture.IJubilanceProvider;
 import forestry.api.core.IIconProvider;
+import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IClassification;
 import forestry.api.genetics.IIndividual;
-import forestry.apiculture.genetics.JubilanceDefault;
+import forestry.api.genetics.IMutation;
 import forestry.core.genetics.alleles.AlleleSpecies;
 import forestry.core.render.TextureManager;
-import forestry.core.utils.GeneticsUtil;
-import forestry.core.utils.ItemStackUtil;
+import forestry.core.utils.StackUtils;
 
 public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpeciesCustom {
+
+	@Deprecated
+	private final Map<ItemStack, Integer> products = new HashMap<ItemStack, Integer>();
+	@Deprecated
+	private final Map<ItemStack, Integer> specialty = new HashMap<ItemStack, Integer>();
+
 	private final Map<ItemStack, Float> productChances = new HashMap<ItemStack, Float>();
 	private final Map<ItemStack, Float> specialtyChances = new HashMap<ItemStack, Float>();
 
 	private final int primaryColour;
 	private final int secondaryColour;
 
-	private IBeeIconProvider beeIconProvider = DefaultBeeIconProvider.instance;
-	private IJubilanceProvider jubilanceProvider = JubilanceDefault.instance;
+	private IBeeIconProvider beeIconProvider;
+	private IJubilanceProvider jubilanceProvider;
 	private boolean nocturnal = false;
 
 	public AlleleBeeSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, int primaryColor, int secondaryColor) {
@@ -60,6 +66,9 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
 
 		this.primaryColour = primaryColor;
 		this.secondaryColour = secondaryColor;
+
+		setCustomBeeIconProvider(DefaultBeeIconProvider.getInstance());
+		setJubilanceProvider(JubilanceDefault.getInstance());
 	}
 
 	@Override
@@ -76,6 +85,8 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
 			throw new IllegalArgumentException("chance must be in the range (0, 1]");
 		}
 		this.productChances.put(product, chance);
+		int intChance = Math.max(1, Math.round(chance * 100));
+		this.products.put(product, intChance);
 		return this;
 	}
 
@@ -88,6 +99,8 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
 			throw new IllegalArgumentException("chance must be in the range (0, 1]");
 		}
 		this.specialtyChances.put(specialty, chance);
+		int intChance = Math.max(1, Math.round(chance * 100));
+		this.specialty.put(specialty, intChance);
 		return this;
 	}
 
@@ -112,7 +125,31 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
 	/* RESEARCH */
 	@Override
 	public int getComplexity() {
-		return GeneticsUtil.getResearchComplexity(this, EnumBeeChromosome.SPECIES);
+		return 1 + getGeneticAdvancement(this, new ArrayList<IAllele>());
+	}
+
+	private int getGeneticAdvancement(IAllele species, ArrayList<IAllele> exclude) {
+
+		int own = 1;
+		int highest = 0;
+		exclude.add(species);
+
+		for (IMutation mutation : getRoot().getPaths(species, EnumBeeChromosome.SPECIES)) {
+			if (!exclude.contains(mutation.getAllele0())) {
+				int otherAdvance = getGeneticAdvancement(mutation.getAllele0(), exclude);
+				if (otherAdvance > highest) {
+					highest = otherAdvance;
+				}
+			}
+			if (!exclude.contains(mutation.getAllele1())) {
+				int otherAdvance = getGeneticAdvancement(mutation.getAllele1(), exclude);
+				if (otherAdvance > highest) {
+					highest = otherAdvance;
+				}
+			}
+		}
+
+		return own + (highest < 0 ? 0 : highest);
 	}
 
 	@Override
@@ -142,11 +179,11 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
 
 		if (bountyLevel > 10) {
 			for (ItemStack stack : specialtyChances.keySet()) {
-				bounty.add(ItemStackUtil.copyWithRandomSize(stack, (int) ((float) bountyLevel / 2), world.rand));
+				bounty.add(StackUtils.copyWithRandomSize(stack, (int) ((float) bountyLevel / 2), world.rand));
 			}
 		}
 		for (ItemStack stack : productChances.keySet()) {
-			bounty.add(ItemStackUtil.copyWithRandomSize(stack, (int) ((float) bountyLevel / 2), world.rand));
+			bounty.add(StackUtils.copyWithRandomSize(stack, (int) ((float) bountyLevel / 2), world.rand));
 		}
 		return bounty.toArray(new ItemStack[bounty.size()]);
 	}
@@ -157,11 +194,21 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
 		return nocturnal;
 	}
 
+	@Override
+	public Map<ItemStack, Integer> getProducts() {
+		return products;
+	}
+
 	@Override
 	public Map<ItemStack, Float> getProductChances() {
 		return productChances;
 	}
 
+	@Override
+	public Map<ItemStack, Integer> getSpecialty() {
+		return specialty;
+	}
+
 	@Override
 	public Map<ItemStack, Float> getSpecialtyChances() {
 		return specialtyChances;
@@ -201,7 +248,15 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
 
 	private static class DefaultBeeIconProvider implements IBeeIconProvider {
 
-		public static final DefaultBeeIconProvider instance = new DefaultBeeIconProvider();
+		private static final String iconType = "default";
+		private static DefaultBeeIconProvider instance;
+
+		public static DefaultBeeIconProvider getInstance() {
+			if (instance == null) {
+				instance = new DefaultBeeIconProvider();
+			}
+			return instance;
+		}
 
 		private DefaultBeeIconProvider() {
 
@@ -209,28 +264,20 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
 
 		private static final IIcon[][] icons = new IIcon[EnumBeeType.values().length][3];
 
-		@Override
 		@SideOnly(Side.CLIENT)
+		@Override
 		public void registerIcons(IIconRegister register) {
-			String beeIconDir = "bees/default/";
-			TextureManager textureManager = TextureManager.getInstance();
-			IIcon body1 = textureManager.registerTex(register, beeIconDir + "body1");
+			IIcon body1 = TextureManager.getInstance().registerTex(register, "bees/" + iconType + "/body1");
 
 			for (int i = 0; i < EnumBeeType.values().length; i++) {
-				EnumBeeType beeType = EnumBeeType.values()[i];
-				if (beeType == EnumBeeType.NONE) {
+				if (EnumBeeType.values()[i] == EnumBeeType.NONE) {
 					continue;
 				}
 
-				String beeTypeNameBase = beeIconDir + beeType.toString().toLowerCase(Locale.ENGLISH);
-
-				icons[i][0] = textureManager.registerTex(register, beeTypeNameBase + ".outline");
-				if (beeType == EnumBeeType.LARVAE) {
-					icons[i][1] = textureManager.registerTex(register, beeTypeNameBase + ".body");
-				} else {
-					icons[i][1] = body1;
-				}
-				icons[i][2] = textureManager.registerTex(register, beeTypeNameBase + ".body2");
+				icons[i][0] = TextureManager.getInstance().registerTex(register, "bees/" + iconType + '/' + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".outline");
+				icons[i][1] = (EnumBeeType.values()[i] != EnumBeeType.LARVAE) ? body1
+						: TextureManager.getInstance().registerTex(register, "bees/" + iconType + '/' + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body");
+				icons[i][2] = TextureManager.getInstance().registerTex(register, "bees/" + iconType + '/' + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body2");
 			}
 		}
 

src/main/java/forestry/apiculture/genetics/AlleleEffectAggressive.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import java.util.List;
 
@@ -17,23 +17,28 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
 
-import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
+import forestry.apiculture.items.ItemArmorApiarist;
 import forestry.core.utils.DamageSourceForestry;
 
 public class AlleleEffectAggressive extends AlleleEffectThrottled {
 
-	private static final DamageSource damageSourceBeeAggressive = new DamageSourceForestry("bee.aggressive");
+	public static final DamageSource damageSourceBeeAggressive = new DamageSourceForestry("bee.aggressive");
 
 	public AlleleEffectAggressive() {
 		super("aggressive", true, 40, false, false);
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
-		AxisAlignedBB hurtBox = getBounding(genome, housing);
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+
+		AxisAlignedBB hurtBox = getBounding(genome, housing, 1.0f);
 		@SuppressWarnings("rawtypes")
 		List list = housing.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, hurtBox);
 
@@ -45,7 +50,7 @@ public class AlleleEffectAggressive extends AlleleEffectThrottled {
 			// Players are not attacked if they wear a full set of apiarist's
 			// armor.
 			if (entity instanceof EntityPlayer) {
-				int count = BeeManager.armorApiaristHelper.wearsItems((EntityPlayer) entity, getUID(), true);
+				int count = ItemArmorApiarist.wearsItems((EntityPlayer) entity, getUID(), true);
 				// Full set, no damage/effect
 				if (count > 3) {
 					continue;

src/main/java/forestry/apiculture/genetics/AlleleEffectCreeper.java

@@ -8,27 +8,26 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 
-import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
+import forestry.apiculture.items.ItemArmorApiarist;
 import forestry.core.genetics.EffectData;
 
 public class AlleleEffectCreeper extends AlleleEffectThrottled {
 
 	private static final int explosionChance = 50;
 	private static final byte defaultForce = 12;
-	private static final byte indexExplosionTimer = 1;
-	private static final byte indexExplosionForce = 2;
+	private final byte indexExplosionTimer = 1;
+	private final byte indexExplosionForce = 2;
 
 	public AlleleEffectCreeper() {
 		super("creeper", true, 20, false, true);
@@ -48,18 +47,21 @@ public class AlleleEffectCreeper extends AlleleEffectThrottled {
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
 
 		World world = housing.getWorld();
-		ChunkCoordinates housingCoords = housing.getCoordinates();
 
-		// If we are already triggered, we continue the explosion sequence.
-		if (storedData.getInteger(indexExplosionTimer) > 0) {
-			progressExplosion(storedData, world, housingCoords.posX, housingCoords.posY, housingCoords.posZ);
+		if (isHalted(storedData, housing)) {
 			return storedData;
 		}
 
-		AxisAlignedBB infectionBox = getBounding(genome, housing);
+		// If we are already triggered, we continue the explosion sequence.
+		if (storedData.getInteger(indexExplosionTimer) > 0) {
+			progressExplosion(storedData, world, housing.getXCoord(), housing.getYCoord(), housing.getZCoord());
+			return storedData;
+		}
+
+		AxisAlignedBB infectionBox = getBounding(genome, housing, 1.0f);
 
 		@SuppressWarnings("rawtypes")
 		List list = world.getEntitiesWithinAABB(EntityPlayer.class, infectionBox);
@@ -73,7 +75,7 @@ public class AlleleEffectCreeper extends AlleleEffectThrottled {
 
 			// Players are not attacked if they wear a full set of apiarist's
 			// armor.
-			int count = BeeManager.armorApiaristHelper.wearsItems(player, getUID(), true);
+			int count = ItemArmorApiarist.wearsItems(player, getUID(), true);
 			// Full set, no damage/effect
 			if (count > 3) {
 				continue;
@@ -92,7 +94,7 @@ public class AlleleEffectCreeper extends AlleleEffectThrottled {
 				continue;
 			}
 
-			world.playSoundEffect(housingCoords.posX, housingCoords.posY, housingCoords.posZ, "mob.creeper", 4F,
+			world.playSoundEffect(housing.getXCoord(), housing.getYCoord(), housing.getZCoord(), "mob.creeper", 4F,
 					(1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F);
 			storedData.setInteger(indexExplosionTimer, 2); // Set explosion
 			// timer
@@ -101,7 +103,7 @@ public class AlleleEffectCreeper extends AlleleEffectThrottled {
 		return storedData;
 	}
 
-	private static void progressExplosion(IEffectData storedData, World world, int x, int y, int z) {
+	private void progressExplosion(IEffectData storedData, World world, int x, int y, int z) {
 
 		int explosionTimer = storedData.getInteger(indexExplosionTimer);
 		explosionTimer--;

src/main/java/forestry/apiculture/genetics/AlleleEffectExploration.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import java.util.List;
 
@@ -26,9 +26,13 @@ public class AlleleEffectExploration extends AlleleEffectThrottled {
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
 
-		AxisAlignedBB beatifyBox = getBounding(genome, housing);
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+
+		AxisAlignedBB beatifyBox = getBounding(genome, housing, 1.0f);
 		@SuppressWarnings("rawtypes")
 		List list = housing.getWorld().getEntitiesWithinAABB(EntityPlayer.class, beatifyBox);
 

src/main/java/forestry/apiculture/genetics/AlleleEffectFertile.java

@@ -0,0 +1,61 @@
+package forestry.apiculture.genetics;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.world.World;
+
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.genetics.IEffectData;
+
+public class AlleleEffectFertile extends AlleleEffectThrottled {
+	
+	public static final int MAX_BLOCK_FIND_TRIES = 5;
+
+	public AlleleEffectFertile() {
+		super("fertile", false, 6, true, false);
+	}
+
+	@Override
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+		
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+		
+		World world = housing.getWorld();
+		int territorySize[] = getModifiedArea(genome, housing);
+		
+		int blockX = getRandomOffset(world.rand, housing.getXCoord(), territorySize[0]);
+		int blockZ = getRandomOffset(world.rand, housing.getZCoord(), territorySize[2]);
+		int blockMaxY = housing.getYCoord() + territorySize[1] / 2 + 1;
+		int blockMinY = housing.getYCoord() - (territorySize[1] / 2) - 1;
+		
+		for (int attempt = 0; attempt < MAX_BLOCK_FIND_TRIES; ++attempt) {
+			if (tryTickColumn(world, blockX, blockZ, blockMaxY, blockMinY)) {
+				break;
+			}
+			blockX = getRandomOffset(world.rand, housing.getXCoord(), territorySize[0]);
+			blockZ = getRandomOffset(world.rand, housing.getZCoord(), territorySize[2]);
+		}
+		
+		return storedData;
+	}
+	
+	private int getRandomOffset(Random random, int centrePos, int offset) {
+		return centrePos + random.nextInt(offset) - (offset / 2);
+	}
+
+	private boolean tryTickColumn(World world, int x, int z, int maxY, int minY) {
+		for (int y = maxY; y >= minY; --y) {
+			if (!world.isAirBlock(x, y, z)) {
+				Block block = world.getBlock(x, y, z);
+				world.scheduleBlockUpdate(x, y, z, block, 5);
+				return true;
+			}
+		}
+		return false;
+	}
+
+}

src/main/java/forestry/apiculture/genetics/AlleleEffectFungification.java

@@ -1,4 +1,4 @@
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import java.util.List;
 import java.util.Random;
@@ -8,7 +8,6 @@ import net.minecraft.entity.passive.EntityCow;
 import net.minecraft.entity.passive.EntityMooshroom;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenBigMushroom;
 
@@ -16,12 +15,11 @@ import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
 import forestry.core.genetics.EffectData;
-import forestry.core.utils.vect.IVect;
 
 public class AlleleEffectFungification extends AlleleEffectThrottled {
 
-	private static final int MAX_BLOCK_FIND_TRIES = 10;
-	private static final int ENTITY_THROTTLE = 6;
+	public static final int MAX_BLOCK_FIND_TRIES = 10;
+	public static final int ENTITY_THROTTLE = 6;
 	
 	public AlleleEffectFungification() {
 		super("mycophilic", true, 10, false, false);
@@ -37,8 +35,11 @@ public class AlleleEffectFungification extends AlleleEffectThrottled {
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
-
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+		
 		doBlockEffect(genome, housing);
 		
 		int entityThrottle = storedData.getInteger(1);
@@ -55,12 +56,11 @@ public class AlleleEffectFungification extends AlleleEffectThrottled {
 
 	private void doBlockEffect(IBeeGenome genome, IBeeHousing housing) {
 		World world = housing.getWorld();
-		ChunkCoordinates housingCoordinates = housing.getCoordinates();
-		IVect area = getModifiedArea(genome, housing);
+		int territorySize[] = getModifiedArea(genome, housing);
 		
-		int blockX = getRandomOffset(world.rand, housingCoordinates.posX, area.getX());
-		int blockY = getRandomOffset(world.rand, housingCoordinates.posY, area.getY());
-		int blockZ = getRandomOffset(world.rand, housingCoordinates.posZ, area.getZ());
+		int blockX = getRandomOffset(world.rand, housing.getXCoord(), territorySize[0]);
+		int blockY = getRandomOffset(world.rand, housing.getYCoord(), territorySize[1]);
+		int blockZ = getRandomOffset(world.rand, housing.getZCoord(), territorySize[2]);
 		
 		for (int attempt = 0; attempt < MAX_BLOCK_FIND_TRIES; ++attempt) {
 			Block block = world.getBlock(blockX, blockY, blockZ);
@@ -71,15 +71,15 @@ public class AlleleEffectFungification extends AlleleEffectThrottled {
 				doMushroomGrowth(block, world, blockX, blockY, blockZ);
 				break;
 			}
-			blockX = getRandomOffset(world.rand, housingCoordinates.posX, area.getX());
-			blockY = getRandomOffset(world.rand, housingCoordinates.posY, area.getY());
-			blockZ = getRandomOffset(world.rand, housingCoordinates.posZ, area.getZ());
+			blockX = getRandomOffset(world.rand, housing.getXCoord(), territorySize[0]);
+			blockY = getRandomOffset(world.rand, housing.getYCoord(), territorySize[1]);
+			blockZ = getRandomOffset(world.rand, housing.getZCoord(), territorySize[2]);
 		}
 
 	}
 
 	private void doEntityEffect(IBeeGenome genome, IBeeHousing housing) {
-		AxisAlignedBB aabb = this.getBounding(genome, housing);
+		AxisAlignedBB aabb = this.getBounding(genome, housing, 1f);
 		World world = housing.getWorld();
 
 		List entities = world.getEntitiesWithinAABB(EntityCow.class, aabb);
@@ -91,15 +91,15 @@ public class AlleleEffectFungification extends AlleleEffectThrottled {
 		}
 	}
 	
-	private static int getRandomOffset(Random random, int centrePos, int offset) {
+	private int getRandomOffset(Random random, int centrePos, int offset) {
 		return centrePos + random.nextInt(offset) - (offset / 2);
 	}
 	
-	private static boolean isSuitableForMycelium(World world, Block block, int blockX, int blockY, int blockZ) {
+	private boolean isSuitableForMycelium(World world, Block block, int blockX, int blockY, int blockZ) {
 		return block == Blocks.grass || (block == Blocks.dirt && world.canBlockSeeTheSky(blockX, blockY, blockZ));
 	}
 
-	private static boolean isSuitableForGrowth(Block block) {
+	private boolean isSuitableForGrowth(Block block) {
 		return block == Blocks.red_mushroom || block == Blocks.brown_mushroom;
 	}
 	
@@ -114,7 +114,7 @@ public class AlleleEffectFungification extends AlleleEffectThrottled {
 		worldObj.spawnParticle("largeexplode", cow.posX, cow.posY + (double) (cow.height / 2.0F), cow.posZ, 0.0D, 0.0D, 0.0D);
 	}
 
-	private static void doMushroomGrowth(Block block, World world, int blockX, int blockY, int blockZ) {
+	private void doMushroomGrowth(Block block, World world, int blockX, int blockY, int blockZ) {
 		WorldGenBigMushroom giantMushroomGenerator;
 
 		if (block == Blocks.brown_mushroom) {

src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java

@@ -8,18 +8,19 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
 
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.core.EnumTemperature;
 import forestry.api.genetics.IEffectData;
 import forestry.core.proxy.Proxies;
-import forestry.core.utils.vect.Vect;
+import forestry.core.vect.Vect;
 
 public class AlleleEffectGlacial extends AlleleEffectThrottled {
 
@@ -28,9 +29,14 @@ public class AlleleEffectGlacial extends AlleleEffectThrottled {
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
 
 		World world = housing.getWorld();
+
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+
 		EnumTemperature temp = housing.getTemperature();
 
 		switch (temp) {
@@ -42,14 +48,15 @@ public class AlleleEffectGlacial extends AlleleEffectThrottled {
 		}
 
 		int[] areaAr = genome.getTerritory();
-		Vect area = new Vect(areaAr);
-		Vect offset = area.multiply(-1 / 2.0f);
-		Vect housingCoords = new Vect(housing.getCoordinates());
+		Vect area = new Vect(areaAr[0], areaAr[1], areaAr[2]);
+		Vect offset = new Vect(-Math.round(area.x / 2), -Math.round(area.y / 2), -Math.round(area.z / 2));
 
 		for (int i = 0; i < 10; i++) {
 
-			Vect randomPos = Vect.getRandomPositionInArea(world.rand, area);
-			Vect posBlock = Vect.add(randomPos, housingCoords, offset);
+			Vect randomPos = new Vect(world.rand.nextInt(area.x), world.rand.nextInt(area.y), world.rand.nextInt(area.z));
+
+			Vect posBlock = randomPos.add(new Vect(housing.getXCoord(), housing.getYCoord(), housing.getZCoord()));
+			posBlock = posBlock.add(offset);
 
 			// Freeze water
 			Block block = world.getBlock(posBlock.x, posBlock.y, posBlock.z);

src/main/java/forestry/apiculture/genetics/AlleleEffectHeroic.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import java.util.List;
 
@@ -27,8 +27,13 @@ public class AlleleEffectHeroic extends AlleleEffectThrottled {
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
-		AxisAlignedBB hurtBox = getBounding(genome, housing);
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+
+		AxisAlignedBB hurtBox = getBounding(genome, housing, 1.0f);
 		@SuppressWarnings("rawtypes")
 		List list = housing.getWorld().getEntitiesWithinAABB(EntityMob.class, hurtBox);
 

src/main/java/forestry/apiculture/genetics/AlleleEffectIgnition.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import java.util.List;
 
@@ -17,11 +17,11 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 
-import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
-import forestry.core.proxy.Proxies;
+import forestry.apiculture.items.ItemArmorApiarist;
+import forestry.plugins.PluginApiculture;
 
 public class AlleleEffectIgnition extends AlleleEffectThrottled {
 
@@ -33,11 +33,15 @@ public class AlleleEffectIgnition extends AlleleEffectThrottled {
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
 
 		World world = housing.getWorld();
 
-		AxisAlignedBB hurtBox = getBounding(genome, housing);
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+
+		AxisAlignedBB hurtBox = getBounding(genome, housing, 1.0f);
 		@SuppressWarnings("rawtypes")
 		List list = world.getEntitiesWithinAABB(EntityLivingBase.class, hurtBox);
 
@@ -47,9 +51,10 @@ public class AlleleEffectIgnition extends AlleleEffectThrottled {
 			int chance = ignitionChance;
 			int duration = fireDuration;
 
-			// Players are not attacked if they wear a full set of apiarist's armor.
+			// Players are not attacked if they wear a full set of apiarist's
+			// armor.
 			if (entity instanceof EntityPlayer) {
-				int count = BeeManager.armorApiaristHelper.wearsItems((EntityPlayer) entity, getUID(), true);
+				int count = ItemArmorApiarist.wearsItems((EntityPlayer) entity, getUID(), true);
 				// Full set, no damage/effect
 				if (count > 3) {
 					continue;
@@ -77,10 +82,15 @@ public class AlleleEffectIgnition extends AlleleEffectThrottled {
 
 	@Override
 	public IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
-		if (housing.getWorld().rand.nextInt(2) != 0) {
-			super.doFX(genome, storedData, housing);
+
+		int[] area = getModifiedArea(genome, housing);
+
+		if (housing.getWorld().rand.nextBoolean()) {
+			PluginApiculture.proxy.addBeeHiveFX("particles/swarm_bee", housing.getWorld(), housing.getXCoord(), housing.getYCoord(),
+					housing.getZCoord(), genome.getPrimary().getIconColour(0), area[0], area[1], area[2]);
 		} else {
-			Proxies.common.addEntityIgnitionFX(housing.getWorld(), housing.getCoordinates().posX + 0.5, housing.getCoordinates().posY + 1, housing.getCoordinates().posZ + 0.5);
+			PluginApiculture.proxy.addBeeHiveFX("particles/ember", housing.getWorld(), housing.getXCoord(), housing.getYCoord(),
+					housing.getZCoord(), 0xffffff, area[0], area[1], area[2]);
 		}
 		return storedData;
 	}

src/main/java/forestry/apiculture/genetics/AlleleEffectMiasmic.java

@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.genetics;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.genetics.IEffectData;
+import forestry.apiculture.items.ItemArmorApiarist;
+import forestry.plugins.PluginApiculture;
+
+public class AlleleEffectMiasmic extends AlleleEffectThrottled {
+
+	private static final int infectionChance = 50;
+
+	public AlleleEffectMiasmic() {
+		super("miasmic", false, 50, false, false);
+	}
+
+	@Override
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+
+		World world = housing.getWorld();
+
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+
+		AxisAlignedBB infectionBox = getBounding(genome, housing, 1.0f);
+		@SuppressWarnings("rawtypes")
+		List list = world.getEntitiesWithinAABB(EntityPlayer.class, infectionBox);
+
+		for (Object obj : list) {
+
+			if (world.rand.nextInt(1000) >= infectionChance) {
+				continue;
+			}
+
+			EntityPlayer player = (EntityPlayer) obj;
+
+			int duration = 800;
+
+			// Players are not attacked if they wear a full set of apiarist's
+			// armor.
+			int count = ItemArmorApiarist.wearsItems(player, getUID(), true);
+			// Full set, no damage/effect
+			if (count > 3) {
+				continue;
+			} else if (count > 2) {
+				duration = 200;
+			} else if (count > 1) {
+				duration = 400;
+			} else if (count > 0) {
+				duration = 600;
+			}
+
+			player.addPotionEffect(new PotionEffect(Potion.poison.id, duration, 0));
+		}
+
+		return storedData;
+	}
+
+	@Override
+	public IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+
+		int[] area = getModifiedArea(genome, housing);
+
+		if (housing.getWorld().rand.nextBoolean()) {
+			PluginApiculture.proxy.addBeeHiveFX("particles/swarm_bee", housing.getWorld(), housing.getXCoord(), housing.getYCoord(),
+					housing.getZCoord(), genome.getPrimary().getIconColour(0), area[0], area[1], area[2]);
+		} else {
+			PluginApiculture.proxy.addBeeHiveFX("particles/poison", housing.getWorld(), housing.getXCoord(), housing.getYCoord(),
+					housing.getZCoord(), 0xffffff, area[0], area[1], area[2]);
+		}
+		return storedData;
+	}
+
+}

src/main/java/forestry/apiculture/genetics/AlleleEffectMisanthrope.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import java.util.List;
 
@@ -16,24 +16,28 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
 
-import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
+import forestry.apiculture.items.ItemArmorApiarist;
 import forestry.core.utils.DamageSourceForestry;
 
 public class AlleleEffectMisanthrope extends AlleleEffectThrottled {
 
-	private static final DamageSource damageSourceBeeEnd = new DamageSourceForestry("bee.end");
+	public static final DamageSource damageSourceBeeEnd = new DamageSourceForestry("bee.end");
 
 	public AlleleEffectMisanthrope() {
 		super("misanthrope", true, 20, false, false);
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
 
-		AxisAlignedBB beatifyBox = getBounding(genome, housing);
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+
+		AxisAlignedBB beatifyBox = getBounding(genome, housing, 1.0f);
 		@SuppressWarnings("rawtypes")
 		List list = housing.getWorld().getEntitiesWithinAABB(EntityPlayer.class, beatifyBox);
 
@@ -44,7 +48,7 @@ public class AlleleEffectMisanthrope extends AlleleEffectThrottled {
 
 			// Players are not attacked if they wear a full set of apiarist's
 			// armor.
-			int count = BeeManager.armorApiaristHelper.wearsItems(player, getUID(), true);
+			int count = ItemArmorApiarist.wearsItems(player, getUID(), true);
 			// Full set, no damage/effect
 			if (count > 3) {
 				continue;

src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java

@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.genetics;
+
+import forestry.api.apiculture.IAlleleBeeEffect;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.genetics.IEffectData;
+import forestry.core.genetics.alleles.AlleleCategorized;
+import forestry.plugins.PluginApiculture;
+
+public class AlleleEffectNone extends AlleleCategorized implements IAlleleBeeEffect {
+
+	public AlleleEffectNone(String name) {
+		super("forestry", "effect", name, true);
+	}
+
+	@Override
+	public IEffectData validateStorage(IEffectData storedData) {
+		return null;
+	}
+
+	@Override
+	public boolean isCombinable() {
+		return false;
+	}
+
+	@Override
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+		return storedData;
+	}
+
+	@Override
+	public IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+
+		int[] area = genome.getTerritory();
+		area[0] *= housing.getTerritoryModifier(genome, 1f);
+		area[1] *= housing.getTerritoryModifier(genome, 1f);
+		area[2] *= housing.getTerritoryModifier(genome, 1f);
+
+		if (area[0] < 1) {
+			area[0] = 1;
+		}
+		if (area[1] < 1) {
+			area[1] = 1;
+		}
+		if (area[2] < 1) {
+			area[2] = 1;
+		}
+
+		PluginApiculture.proxy.addBeeHiveFX("particles/swarm_bee", housing.getWorld(), housing.getXCoord(), housing.getYCoord(),
+				housing.getZCoord(), genome.getPrimary().getIconColour(0), area[0], area[1], area[2]);
+		return storedData;
+	}
+
+}

src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java

@@ -8,74 +8,57 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
-import net.minecraft.potion.PotionHelper;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.ReflectionHelper;
 
-import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
+import forestry.apiculture.items.ItemArmorApiarist;
 import forestry.core.proxy.Proxies;
-import forestry.core.utils.Log;
 
 public class AlleleEffectPotion extends AlleleEffectThrottled {
 
 	private final Potion potion;
-	private final int potionFXColor;
 	private final boolean isBadEffect;
 	private final int duration;
-	private final float chance;
 
-	public AlleleEffectPotion(String name, boolean isDominant, Potion potion, int duration, int throttle, float chance) {
-		super(name, isDominant, throttle, true, false);
+	public AlleleEffectPotion(String name, boolean isDominant, Potion potion, int duration, boolean requiresWorking) {
+		super(name, isDominant, 200, requiresWorking, false);
 		this.potion = potion;
 		this.isBadEffect = isBadEffect(potion);
 		this.duration = duration;
-		this.chance = chance;
-
-		Collection<PotionEffect> potionEffects = Collections.singleton(new PotionEffect(potion.getId(), 1, 0));
-		this.potionFXColor = PotionHelper.calcPotionLiquidColor(potionEffects);
-	}
-
-	public AlleleEffectPotion(String name, boolean isDominant, Potion potion, int duration) {
-		this(name, isDominant, potion, duration, 200, 1.0f);
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
 
-		World world = housing.getWorld();
-		AxisAlignedBB effectArea = getBounding(genome, housing);
-		List list = housing.getWorld().getEntitiesWithinAABB(EntityPlayer.class, effectArea);
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+
+		AxisAlignedBB beatifyBox = getBounding(genome, housing, 1.0f);
+		List list = housing.getWorld().getEntitiesWithinAABB(EntityPlayer.class, beatifyBox);
 
 		for (Object entity : list) {
 			if (!(entity instanceof EntityPlayer)) {
 				continue;
 			}
 
-			if (world.rand.nextFloat() >= chance) {
-				continue;
-			}
-
 			EntityPlayer player = (EntityPlayer) entity;
 
 			int dur = this.duration;
 			if (isBadEffect) {
 				// Players are not attacked if they wear a full set of apiarist's armor.
-				int count = BeeManager.armorApiaristHelper.wearsItems((EntityPlayer) entity, getUID(), true);
+				int count = ItemArmorApiarist.wearsItems((EntityPlayer) entity, getUID(), true);
 				if (count >= 4) {
 					continue; // Full set, no damage/effect
 				} else if (count == 3) {
@@ -98,19 +81,9 @@ public class AlleleEffectPotion extends AlleleEffectThrottled {
 		try {
 			return (Boolean) ReflectionHelper.getPrivateValue(Potion.class, potion, "field_76418_K", "isBadEffect");
 		} catch (ReflectionHelper.UnableToFindFieldException e) {
-			Log.severe("Could not access potion field isBadEffect.");
+			Proxies.log.severe("Could not access potion field isBadEffect.");
 			return false;
 		}
 	}
 
-	@Override
-	public IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
-		if (housing.getWorld().rand.nextBoolean()) {
-			super.doFX(genome, storedData, housing);
-		} else {
-			ChunkCoordinates coords = housing.getCoordinates();
-			Proxies.common.addEntityPotionFX(housing.getWorld(), coords.posX + 0.5, coords.posY + 1, coords.posZ + 0.5, potionFXColor);
-		}
-		return storedData;
-	}
 }

src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import java.util.List;
 import java.util.Random;
@@ -21,35 +21,39 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 
-import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
-import forestry.apiculture.blocks.BlockAlveary;
-import forestry.apiculture.multiblock.TileAlveary;
+import forestry.apiculture.gadgets.BlockAlveary;
+import forestry.apiculture.gadgets.TileAlveary;
+import forestry.apiculture.items.ItemArmorApiarist;
 import forestry.core.utils.DamageSourceForestry;
-import forestry.core.utils.vect.Vect;
+import forestry.core.vect.Vect;
 
 public class AlleleEffectRadioactive extends AlleleEffectThrottled {
 
-	private static final DamageSource damageSourceBeeRadioactive = new DamageSourceForestry("bee.radioactive");
+	public static final DamageSource damageSourceBeeRadioactive = new DamageSourceForestry("bee.radioactive");
 
 	public AlleleEffectRadioactive() {
 		super("radioactive", true, 40, false, true);
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
 
 		World world = housing.getWorld();
 
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+
 		int[] areaAr = genome.getTerritory();
-		Vect area = new Vect(areaAr).multiply(2);
-		Vect offset = area.multiply(-1 / 2.0f);
+		Vect area = new Vect(areaAr[0] * 2, areaAr[1] * 2, areaAr[2] * 2);
+		Vect offset = new Vect(-Math.round(area.x / 2), -Math.round(area.y / 2), -Math.round(area.z / 2));
 
 		// Radioactivity hurts players and mobs
-		Vect min = new Vect(housing.getCoordinates()).add(offset);
-		Vect max = min.add(area);
+		Vect min = new Vect(housing.getXCoord() + offset.x, housing.getYCoord() + offset.y, housing.getZCoord() + offset.z);
+		Vect max = new Vect(housing.getXCoord() + offset.x + area.x, housing.getYCoord() + offset.y + area.y, housing.getZCoord() + offset.z + area.z);
 
 		AxisAlignedBB hurtBox = AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z);
 
@@ -64,7 +68,7 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
 			// Players are not attacked if they wear a full set of apiarist's
 			// armor.
 			if (entity instanceof EntityPlayer) {
-				int count = BeeManager.armorApiaristHelper.wearsItems((EntityPlayer) entity, getUID(), true);
+				int count = ItemArmorApiarist.wearsItems((EntityPlayer) entity, getUID(), true);
 				// Full set, no damage/effect
 				if (count > 3) {
 					continue;
@@ -85,18 +89,17 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
 		// Radioactivity destroys environment
 		for (int i = 0; i < 20; i++) {
 
-			Vect randomPos = Vect.getRandomPositionInArea(rand, area);
+			Vect randomPos = new Vect(rand.nextInt(area.x), rand.nextInt(area.y), rand.nextInt(area.z));
 
-			Vect posHousing = new Vect(housing.getCoordinates());
-			Vect posBlock = randomPos.add(posHousing);
+			Vect posBlock = randomPos.add(new Vect(housing.getXCoord(), housing.getYCoord(), housing.getZCoord()));
 			posBlock = posBlock.add(offset);
 
 			if (posBlock.y <= 1 || posBlock.y >= housing.getWorld().getActualHeight()) {
 				continue;
 			}
 
-			// Don't destroy ourselves or blocks below us.
-			if (posBlock.x == posHousing.x && posBlock.z == posHousing.z && posBlock.y <= posHousing.y) {
+			// Don't destroy ourself and blocks below us.
+			if (posBlock.x == housing.getXCoord() && posBlock.z == housing.getZCoord() && posBlock.y <= housing.getYCoord()) {
 				continue;
 			}
 

src/main/java/forestry/apiculture/genetics/AlleleEffectRepulsion.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import java.util.List;
 
@@ -19,7 +19,6 @@ import net.minecraft.util.AxisAlignedBB;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
-import forestry.apiculture.entities.AIAvoidPlayers;
 
 public class AlleleEffectRepulsion extends AlleleEffectThrottled {
 
@@ -28,13 +27,16 @@ public class AlleleEffectRepulsion extends AlleleEffectThrottled {
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
-
-		if (housing.getOwner() == null) {
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+		if (isHalted(storedData, housing)) {
 			return storedData;
 		}
 
-		AxisAlignedBB hurtBox = getBounding(genome, housing);
+		if (housing.getOwnerName() == null) {
+			return storedData;
+		}
+
+		AxisAlignedBB hurtBox = getBounding(genome, housing, 1.0f);
 		@SuppressWarnings("rawtypes")
 		List list = housing.getWorld().getEntitiesWithinAABB(EntityMob.class, hurtBox);
 

src/main/java/forestry/apiculture/genetics/AlleleEffectResurrection.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -33,8 +33,8 @@ import net.minecraft.util.AxisAlignedBB;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
-import forestry.core.utils.EntityUtil;
-import forestry.core.utils.ItemStackUtil;
+import forestry.core.utils.StackUtils;
+import forestry.core.utils.Utils;
 
 public class AlleleEffectResurrection extends AlleleEffectThrottled {
 
@@ -78,9 +78,12 @@ public class AlleleEffectResurrection extends AlleleEffectThrottled {
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
 
-		AxisAlignedBB bounding = getBounding(genome, housing);
+		AxisAlignedBB bounding = getBounding(genome, housing, 1.0f);
 		@SuppressWarnings("rawtypes")
 		List list = housing.getWorld().getEntitiesWithinAABB(EntityItem.class, bounding);
 
@@ -96,8 +99,8 @@ public class AlleleEffectResurrection extends AlleleEffectThrottled {
 
 			ItemStack contained = item.getEntityItem();
 			for (Resurrectable entry : resurrectables) {
-				if (ItemStackUtil.isIdenticalItem(entry.res, contained)) {
-					EntityUtil.spawnEntity(housing.getWorld(), entry.risen, item.posX, item.posY, item.posZ);
+				if (StackUtils.isIdenticalItem(entry.res, contained)) {
+					Utils.spawnEntity(housing.getWorld(), entry.risen, item.posX, item.posY, item.posZ);
 					contained.stackSize--;
 					if (contained.stackSize <= 0) {
 						item.setDead();

src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java

@@ -8,12 +8,11 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
-import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
-import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -21,9 +20,8 @@ import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.core.EnumTemperature;
 import forestry.api.genetics.IEffectData;
-import forestry.core.config.Constants;
 import forestry.core.proxy.Proxies;
-import forestry.core.utils.vect.Vect;
+import forestry.core.vect.Vect;
 
 public class AlleleEffectSnowing extends AlleleEffectThrottled {
 
@@ -32,10 +30,14 @@ public class AlleleEffectSnowing extends AlleleEffectThrottled {
 	}
 
 	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
 
 		World world = housing.getWorld();
 
+		if (isHalted(storedData, housing)) {
+			return storedData;
+		}
+
 		EnumTemperature temp = housing.getTemperature();
 
 		switch (temp) {
@@ -46,14 +48,15 @@ public class AlleleEffectSnowing extends AlleleEffectThrottled {
 			default:
 		}
 
-		Vect area = getModifiedArea(genome, housing);
-		Vect offset = area.multiply(-1 / 2.0f);
+		int[] areaAr = genome.getTerritory();
+		Vect area = new Vect(areaAr[0], areaAr[1], areaAr[2]);
+		Vect offset = new Vect(-Math.round(area.x / 2), -Math.round(area.y / 2), -Math.round(area.z / 2));
 
 		for (int i = 0; i < 1; i++) {
 
-			Vect randomPos = Vect.getRandomPositionInArea(world.rand, area);
+			Vect randomPos = new Vect(world.rand.nextInt(area.x), world.rand.nextInt(area.y), world.rand.nextInt(area.z));
 
-			Vect posBlock = randomPos.add(new Vect(housing.getCoordinates()));
+			Vect posBlock = randomPos.add(new Vect(housing.getXCoord(), housing.getYCoord(), housing.getZCoord()));
 			posBlock = posBlock.add(offset);
 
 			// Put snow on the ground
@@ -61,16 +64,11 @@ public class AlleleEffectSnowing extends AlleleEffectThrottled {
 				continue;
 			}
 
-			Block block = world.getBlock(posBlock.x, posBlock.y, posBlock.z);
-
-			if (block == Blocks.snow_layer) {
-				int meta = world.getBlockMetadata(posBlock.x, posBlock.y, posBlock.z);
-				if (meta < 7) {
-					world.setBlockMetadataWithNotify(posBlock.x, posBlock.y, posBlock.z, meta + 1, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE);
-				}
-			} else if (block.isReplaceable(world, posBlock.x, posBlock.y, posBlock.z)) {
-				Proxies.common.setBlockWithNotify(world, posBlock.x, posBlock.y, posBlock.z, Blocks.snow_layer);
+			if (!world.isAirBlock(posBlock.x, posBlock.y, posBlock.z)) {
+				continue;
 			}
+
+			Proxies.common.setBlockWithNotify(world, posBlock.x, posBlock.y, posBlock.z, Blocks.snow_layer);
 		}
 
 		return storedData;
@@ -79,18 +77,9 @@ public class AlleleEffectSnowing extends AlleleEffectThrottled {
 	@Override
 	public IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
 		if (housing.getWorld().rand.nextInt(3) == 0) {
-			Vect area = getModifiedArea(genome, housing);
-			Vect offset = area.multiply(-0.5F);
-
-			ChunkCoordinates coordinates = housing.getCoordinates();
-			World world = housing.getWorld();
-
-			Vect spawn = Vect.getRandomPositionInArea(world.rand, area).add(coordinates).add(offset);
-			Proxies.common.addEntitySnowFX(world, spawn.x, spawn.y, spawn.z);
-			return storedData;
-		} else {
-			return super.doFX(genome, storedData, housing);
+			int[] area = getModifiedArea(genome, housing);
+			Proxies.render.addSnowFX(housing.getWorld(), housing.getXCoord(), housing.getYCoord(), housing.getZCoord(), genome.getPrimary().getIconColour(0), area[0], area[1], area[2]);
 		}
+		return storedData;
 	}
-
 }

src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java

@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * 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 forestry.apiculture.genetics;
+
+import net.minecraft.util.AxisAlignedBB;
+
+import forestry.api.apiculture.IAlleleBeeEffect;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.genetics.IEffectData;
+import forestry.core.EnumErrorCode;
+import forestry.core.genetics.EffectData;
+import forestry.core.genetics.alleles.AlleleCategorized;
+import forestry.core.vect.Vect;
+import forestry.plugins.PluginApiculture;
+
+public abstract class AlleleEffectThrottled extends AlleleCategorized implements IAlleleBeeEffect {
+
+	private boolean isCombinable = false;
+	private final int throttle;
+	private boolean requiresWorkingQueen = false;
+
+	public AlleleEffectThrottled(String name, boolean isDominant, int throttle, boolean requiresWorking, boolean isCombinable) {
+		super("forestry", "effect", name, isDominant);
+		this.throttle = throttle;
+		this.isCombinable = isCombinable;
+		this.requiresWorkingQueen = requiresWorking;
+	}
+
+	public int getThrottle() {
+		return throttle;
+	}
+
+	@Override
+	public boolean isCombinable() {
+		return isCombinable;
+	}
+
+	@Override
+	public IEffectData validateStorage(IEffectData storedData) {
+		if (storedData instanceof EffectData) {
+			return storedData;
+		}
+
+		return new EffectData(1, 0);
+	}
+
+	public boolean isHalted(IEffectData storedData, IBeeHousing housing) {
+
+		if (requiresWorkingQueen && housing.getErrorState() != EnumErrorCode.OK) {
+			return true;
+		}
+
+		int throt = storedData.getInteger(0);
+		throt++;
+		storedData.setInteger(0, throt);
+
+		if (throt < getThrottle()) {
+			return true;
+		}
+
+		// Reset since we are done throttling.
+		storedData.setInteger(0, 0);
+		return false;
+	}
+
+	@Override
+	public IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+
+		int[] area = getModifiedArea(genome, housing);
+
+		PluginApiculture.proxy.addBeeHiveFX("particles/swarm_bee", housing.getWorld(), housing.getXCoord(), housing.getYCoord(),
+				housing.getZCoord(), genome.getPrimary().getIconColour(0), area[0], area[1], area[2]);
+		return storedData;
+	}
+
+	protected int[] getModifiedArea(IBeeGenome genome, IBeeHousing housing) {
+		int[] area = genome.getTerritory();
+		area[0] *= housing.getTerritoryModifier(genome, 1f) * 3;
+		area[1] *= housing.getTerritoryModifier(genome, 1f) * 3;
+		area[2] *= housing.getTerritoryModifier(genome, 1f) * 3;
+
+		if (area[0] < 1) {
+			area[0] = 1;
+		}
+		if (area[1] < 1) {
+			area[1] = 1;
+		}
+		if (area[2] < 1) {
+			area[2] = 1;
+		}
+
+		return area;
+	}
+
+	protected AxisAlignedBB getBounding(IBeeGenome genome, IBeeHousing housing, float modifier) {
+		int[] areaAr = genome.getTerritory();
+		Vect area = new Vect(areaAr[0], areaAr[1], areaAr[2]).multiply(modifier);
+		Vect offset = new Vect(-Math.round(area.x / 2), -Math.round(area.y / 2), -Math.round(area.z / 2));
+
+		// Radioactivity hurts players and mobs
+		Vect min = new Vect(housing.getXCoord() + offset.x, housing.getYCoord() + offset.y, housing.getZCoord() + offset.z);
+		Vect max = new Vect(housing.getXCoord() + offset.x + area.x, housing.getYCoord() + offset.y + area.y, housing.getZCoord() + offset.z + area.z);
+
+		return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z);
+	}
+}

src/main/java/forestry/apiculture/genetics/AlleleFlowers.java

@@ -8,7 +8,7 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.apiculture.genetics.alleles;
+package forestry.apiculture.genetics;
 
 import forestry.api.genetics.IAlleleFlowers;
 import forestry.api.genetics.IFlowerProvider;

src/main/java/forestry/apiculture/genetics/ApiaristTracker.java

@@ -20,7 +20,6 @@ import forestry.api.apiculture.EnumBeeChromosome;
 import forestry.api.apiculture.IApiaristTracker;
 import forestry.api.genetics.IBreedingTracker;
 import forestry.api.genetics.IIndividual;
-import forestry.api.genetics.ISpeciesRoot;
 import forestry.core.genetics.BreedingTracker;
 
 public class ApiaristTracker extends BreedingTracker implements IApiaristTracker {
@@ -62,16 +61,13 @@ public class ApiaristTracker extends BreedingTracker implements IApiaristTracker
 
 	@Override
 	public void registerPickup(IIndividual individual) {
-		ISpeciesRoot speciesRoot = individual.getGenome().getPrimary().getRoot();
-		if (!speciesRoot.getUID().equals(speciesRootUID())) {
+		if (!individual.getGenome().getPrimary().getRoot().getUID().equals(BeeHelper.UID)) {
 			return;
 		}
-
 		if (!individual.isPureBred(EnumBeeChromosome.SPECIES)) {
 			return;
 		}
-
-		if (speciesRoot.getCombinations(individual.getGenome().getPrimary()).size() > 0) {
+		if (BeeManager.beeRoot.getCombinations(individual.getGenome().getPrimary()).size() > 0) {
 			return;
 		}
 

src/main/java/forestry/apiculture/genetics/Bee.java

@@ -21,13 +21,10 @@ import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 
-import com.mojang.authlib.GameProfile;
-
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeChromosome;
 import forestry.api.apiculture.IAlleleBeeEffect;
@@ -36,7 +33,6 @@ import forestry.api.apiculture.IApiaristTracker;
 import forestry.api.apiculture.IBee;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
-import forestry.api.apiculture.IBeeModifier;
 import forestry.api.apiculture.IBeeMutation;
 import forestry.api.apiculture.IBeekeepingMode;
 import forestry.api.core.BiomeHelper;
@@ -50,28 +46,27 @@ import forestry.api.genetics.IChromosome;
 import forestry.api.genetics.IEffectData;
 import forestry.api.genetics.IFlowerProvider;
 import forestry.api.genetics.IIndividual;
-import forestry.api.genetics.IMutation;
 import forestry.api.genetics.IPollinatable;
-import forestry.arboriculture.genetics.pollination.FakePollinatable;
-import forestry.arboriculture.genetics.pollination.ICheckPollinatable;
-import forestry.core.config.Config;
-import forestry.core.config.Constants;
-import forestry.core.errors.EnumErrorCode;
+import forestry.arboriculture.genetics.FakePollinatable;
+import forestry.arboriculture.genetics.ICheckPollinatable;
+import forestry.core.EnumErrorCode;
+import forestry.core.config.Defaults;
 import forestry.core.genetics.Chromosome;
 import forestry.core.genetics.GenericRatings;
 import forestry.core.genetics.IndividualLiving;
+import forestry.core.proxy.Proxies;
 import forestry.core.utils.GeneticsUtil;
-import forestry.core.utils.Log;
 import forestry.core.utils.StringUtil;
-import forestry.core.utils.vect.Vect;
+import forestry.core.vect.MutableVect;
+import forestry.core.vect.Vect;
 
 public class Bee extends IndividualLiving implements IBee {
 
-	private int generation;
-	private boolean isNatural = true;
+	protected int generation;
+	protected boolean isNatural = true;
 
-	private IBeeGenome genome;
-	private IBeeGenome mate;
+	public IBeeGenome genome;
+	public IBeeGenome mate;
 
 	/* CONSTRUCTOR */
 	public Bee(NBTTagCompound nbttagcompound) {
@@ -87,7 +82,7 @@ public class Bee extends IndividualLiving implements IBee {
 		this(genome, true, 0);
 	}
 
-	private Bee(IBeeGenome genome, boolean isNatural, int generation) {
+	public Bee(IBeeGenome genome, boolean isNatural, int generation) {
 		super(genome.getLifespan());
 		this.genome = genome;
 		this.isNatural = isNatural;
@@ -114,13 +109,13 @@ public class Bee extends IndividualLiving implements IBee {
 		}
 
 		if (nbttagcompound.hasKey("Genome")) {
-			genome = BeeGenome.fromNBT(nbttagcompound.getCompoundTag("Genome"));
+			genome = new BeeGenome(nbttagcompound.getCompoundTag("Genome"));
 		} else {
 			genome = BeeDefinition.FOREST.getGenome();
 		}
 
 		if (nbttagcompound.hasKey("Mate")) {
-			mate = BeeGenome.fromNBT(nbttagcompound.getCompoundTag("Mate"));
+			mate = new BeeGenome(nbttagcompound.getCompoundTag("Mate"));
 		}
 
 	}
@@ -252,10 +247,8 @@ public class Bee extends IndividualLiving implements IBee {
 
 		Set<IErrorState> errorStates = new HashSet<IErrorState>();
 
-		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-
 		// / Rain needs tolerant flyers
-		if (world.isRaining() && !genome.getTolerantFlyer() && BiomeHelper.canRainOrSnow(biome) && !beeModifier.isSealed()) {
+		if (world.isRaining() && !genome.getTolerantFlyer() && BiomeHelper.canRainOrSnow(biome) && !housing.isSealed()) {
 			errorStates.add(EnumErrorCode.ISRAINING);
 		}
 
@@ -264,20 +257,21 @@ public class Bee extends IndividualLiving implements IBee {
 			if (!canWorkDuringDay()) {
 				errorStates.add(EnumErrorCode.NOTNIGHT);
 			}
-		} else if (!canWorkAtNight() && !beeModifier.isSelfLighted()) {
+		} else if (!canWorkAtNight() && !housing.isSelfLighted()) {
 			errorStates.add(EnumErrorCode.NOTDAY);
 		}
 
-		if (housing.getBlockLightValue() > Constants.APIARY_MIN_LEVEL_LIGHT) {
+		if (world.getBlockLightValue(housing.getXCoord(), housing.getYCoord() + 2, housing.getZCoord()) > Defaults.APIARY_MIN_LEVEL_LIGHT) {
 			if (!canWorkDuringDay()) {
 				errorStates.add(EnumErrorCode.NOTGLOOMY);
 			}
-		} else if (!canWorkAtNight() && !beeModifier.isSelfLighted()) {
+		} else if (!canWorkAtNight() && !housing.isSelfLighted()) {
 			errorStates.add(EnumErrorCode.NOTLUCID);
 		}
 
 		// / No sky, except if in hell
-		if (biome != null && !BiomeHelper.isBiomeHellish(biome) && !housing.canBlockSeeTheSky() && !genome.getCaveDwelling() && !beeModifier.isSunlightSimulated()) {
+		if (biome != null && !BiomeHelper.isBiomeHellish(biome) && !world.canBlockSeeTheSky(housing.getXCoord(), housing.getYCoord() + 3, housing.getZCoord())
+					&& !genome.getCaveDwelling() && !housing.isSunlightSimulated()) {
 			errorStates.add(EnumErrorCode.NOSKY);
 		}
 
@@ -289,6 +283,16 @@ public class Bee extends IndividualLiving implements IBee {
 		return errorStates;
 	}
 
+	@Override
+	public IErrorState canWork(IBeeHousing housing) {
+		Set<IErrorState> errorStates = getCanWork(housing);
+		if (errorStates.size() == 0) {
+			return EnumErrorCode.OK;
+		} else {
+			return errorStates.iterator().next();
+		}
+	}
+
 	private boolean canWorkAtNight() {
 		return genome.getPrimary().isNocturnal() || genome.getNocturnal();
 	}
@@ -297,7 +301,7 @@ public class Bee extends IndividualLiving implements IBee {
 		return !genome.getPrimary().isNocturnal() || genome.getNocturnal();
 	}
 
-	private boolean isSuitableBiome(BiomeGenBase biome) {
+	public boolean isSuitableBiome(BiomeGenBase biome) {
 		if (biome == null) {
 			return false;
 		}
@@ -313,6 +317,32 @@ public class Bee extends IndividualLiving implements IBee {
 				genome.getPrimary().getHumidity(), genome.getToleranceHumid());
 	}
 
+	@Override
+	public boolean hasFlower(IBeeHousing housing) {
+
+		IFlowerProvider provider = genome.getFlowerProvider();
+
+		Vect housingPos = new Vect(housing.getXCoord(), housing.getYCoord(), housing.getZCoord());
+		Vect area = getArea(genome, housing);
+		Vect offset = new Vect(-area.x / 2, -area.y / 2, -area.z / 2);
+
+		boolean hasFlower = false;
+
+		MutableVect posCurrent = new MutableVect(0, 0, 0);
+		while (posCurrent.advancePositionInArea(area)) {
+
+			Vect posBlock = Vect.add(housingPos, posCurrent, offset);
+
+			if (provider.isAcceptedFlower(housing.getWorld(), this, posBlock.x, posBlock.y, posBlock.z)) {
+				hasFlower = true;
+				break;
+			}
+
+		}
+
+		return hasFlower;
+	}
+
 	@Override
 	public ArrayList<BiomeGenBase> getSuitableBiomes() {
 		ArrayList<BiomeGenBase> suitableBiomes = new ArrayList<BiomeGenBase>();
@@ -392,8 +422,7 @@ public class Bee extends IndividualLiving implements IBee {
 	@Override
 	public void age(World world, float housingLifespanModifier) {
 		IBeekeepingMode mode = BeeManager.beeRoot.getBeekeepingMode(world);
-		IBeeModifier beeModifier = mode.getBeeModifier();
-		float finalModifier = housingLifespanModifier * beeModifier.getLifespanModifier(genome, mate, housingLifespanModifier);
+		float finalModifier = housingLifespanModifier * mode.getLifespanModifier(genome, mate, housingLifespanModifier);
 
 		super.age(world, finalModifier);
 	}
@@ -406,9 +435,9 @@ public class Bee extends IndividualLiving implements IBee {
 		IAlleleBeeSpecies primary = genome.getPrimary();
 		IAlleleBeeSpecies secondary = genome.getSecondary();
 
-		products.addAll(primary.getProductChances().keySet());
+		products.addAll(primary.getProducts().keySet());
 
-		Set<ItemStack> secondaryProducts = secondary.getProductChances().keySet();
+		Set<ItemStack> secondaryProducts = secondary.getProducts().keySet();
 		// Remove duplicates
 		for (ItemStack second : secondaryProducts) {
 			boolean skip = false;
@@ -431,19 +460,19 @@ public class Bee extends IndividualLiving implements IBee {
 
 	@Override
 	public ItemStack[] getSpecialtyList() {
-		Set<ItemStack> specialties = genome.getPrimary().getSpecialtyChances().keySet();
+		Set<ItemStack> specialties = genome.getPrimary().getSpecialty().keySet();
 		return specialties.toArray(new ItemStack[specialties.size()]);
 	}
 
 	@Override
 	public ItemStack[] produceStacks(IBeeHousing housing) {
 		if (housing == null) {
-			Log.warning("Failed to produce in an apiary because the beehousing was null.");
+			Proxies.log.warning("Failed to produce in an apiary because the beehousing was null.");
 			return null;
 		}
 		IBeekeepingMode mode = BeeManager.beeRoot.getBeekeepingMode(housing.getWorld());
 		if (mode == null) {
-			Log.warning("Failed to produce in an apiary because the beekeeping mode was null.");
+			Proxies.log.warning("Failed to produce in an apiary because the beekeeping mode was null.");
 			return null;
 		}
 
@@ -457,37 +486,33 @@ public class Bee extends IndividualLiving implements IBee {
 			setIsNatural(false);
 		}
 
-		IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-		IBeeModifier beeModeModifier = mode.getBeeModifier();
-
 		// Bee genetic speed * beehousing * beekeeping mode
-		float speed = genome.getSpeed() * beeHousingModifier.getProductionModifier(genome, 1f) * beeModeModifier.getProductionModifier(genome, 1f);
+		float speed = genome.getSpeed() * housing.getProductionModifier(genome, 1f) * mode.getProductionModifier(genome, 1f);
 
 		// / Primary Products
-		for (Map.Entry<ItemStack, Float> entry : primary.getProductChances().entrySet()) {
-			if (housing.getWorld().rand.nextFloat() < entry.getValue() * speed) {
+		for (Map.Entry<ItemStack, Integer> entry : primary.getProducts().entrySet()) {
+			if (housing.getWorld().rand.nextInt(100) < entry.getValue() * speed) {
 				products.add(entry.getKey().copy());
 			}
 		}
 		// / Secondary Products
-		for (Map.Entry<ItemStack, Float> entry : secondary.getProductChances().entrySet()) {
-			if (housing.getWorld().rand.nextFloat() < Math.round(entry.getValue() / 2) * speed) {
+		for (Map.Entry<ItemStack, Integer> entry : secondary.getProducts().entrySet()) {
+			if (housing.getWorld().rand.nextInt(100) < Math.round(entry.getValue() / 2) * speed) {
 				products.add(entry.getKey().copy());
 			}
 		}
 
 		// / Specialty products
 		if (primary.isJubilant(genome, housing) && secondary.isJubilant(genome, housing)) {
-			for (Map.Entry<ItemStack, Float> entry : primary.getSpecialtyChances().entrySet()) {
-				if (housing.getWorld().rand.nextFloat() < entry.getValue() * speed) {
+			for (Map.Entry<ItemStack, Integer> entry : primary.getSpecialty().entrySet()) {
+				if (housing.getWorld().rand.nextInt(100) < entry.getValue() * speed) {
 					products.add(entry.getKey().copy());
 				}
 			}
 		}
 
 		ItemStack[] productsArray = products.toArray(new ItemStack[products.size()]);
-		ChunkCoordinates housingCoordinates = housing.getCoordinates();
-		return genome.getFlowerProvider().affectProducts(housing.getWorld(), this, housingCoordinates.posX, housingCoordinates.posY, housingCoordinates.posZ, productsArray);
+		return genome.getFlowerProvider().affectProducts(housing.getWorld(), this, housing.getXCoord(), housing.getYCoord(), housing.getZCoord(), productsArray);
 	}
 
 	/* REPRODUCTION */
@@ -517,10 +542,10 @@ public class Bee extends IndividualLiving implements IBee {
 			return null;
 		}
 
-		List<IBee> bees = new ArrayList<IBee>();
+		ArrayList<IBee> bees = new ArrayList<IBee>();
 
-		ChunkCoordinates housingCoordinates = housing.getCoordinates();
-		int toCreate = BeeManager.beeRoot.getBeekeepingMode(world).getFinalFertility(this, world, housingCoordinates.posX, housingCoordinates.posY, housingCoordinates.posZ);
+		int toCreate = BeeManager.beeRoot.getBeekeepingMode(world).getFinalFertility(this, world, housing.getXCoord(), housing.getYCoord(),
+				housing.getZCoord());
 
 		if (toCreate <= 0) {
 			toCreate = 1;
@@ -579,44 +604,27 @@ public class Bee extends IndividualLiving implements IBee {
 
 		IBeeGenome genome0;
 		IBeeGenome genome1;
-
-		IAlleleBeeSpecies allele0;
-		IAlleleBeeSpecies allele1;
+		IAllele allele0;
+		IAllele allele1;
 
 		if (world.rand.nextBoolean()) {
-			allele0 = (IAlleleBeeSpecies) parent1[EnumBeeChromosome.SPECIES.ordinal()].getPrimaryAllele();
-			allele1 = (IAlleleBeeSpecies) parent2[EnumBeeChromosome.SPECIES.ordinal()].getSecondaryAllele();
+			allele0 = parent1[EnumBeeChromosome.SPECIES.ordinal()].getPrimaryAllele();
+			allele1 = parent2[EnumBeeChromosome.SPECIES.ordinal()].getSecondaryAllele();
 
 			genome0 = genomeOne;
 			genome1 = genomeTwo;
 		} else {
-			allele0 = (IAlleleBeeSpecies) parent2[EnumBeeChromosome.SPECIES.ordinal()].getPrimaryAllele();
-			allele1 = (IAlleleBeeSpecies) parent1[EnumBeeChromosome.SPECIES.ordinal()].getSecondaryAllele();
+			allele0 = parent2[EnumBeeChromosome.SPECIES.ordinal()].getPrimaryAllele();
+			allele1 = parent1[EnumBeeChromosome.SPECIES.ordinal()].getSecondaryAllele();
 
 			genome0 = genomeTwo;
 			genome1 = genomeOne;
 		}
 
-		GameProfile playerProfile = housing.getOwner();
-		IApiaristTracker breedingTracker = BeeManager.beeRoot.getBreedingTracker(world, playerProfile);
-
-		List<IMutation> combinations = BeeManager.beeRoot.getCombinations(allele0, allele1, true);
-		for (IMutation mutation : combinations) {
-			IBeeMutation beeMutation = (IBeeMutation) mutation;
-
-			float chance = beeMutation.getChance(housing, allele0, allele1, genome0, genome1);
-			if (chance <= 0) {
-				continue;
-			}
-
-			// boost chance for researched mutations
-			if (breedingTracker.isResearched(beeMutation)) {
-				float mutationBoost = chance * (Config.researchMutationBoostMultiplier - 1.0f);
-				mutationBoost = Math.min(Config.maxResearchMutationBoostPercent, mutationBoost);
-				chance += mutationBoost;
-			}
-
+		for (IBeeMutation mutation : BeeManager.beeRoot.getMutations(true)) {
+			float chance = mutation.getChance(housing, allele0, allele1, genome0, genome1);
 			if (chance > world.rand.nextFloat() * 100) {
+				IApiaristTracker breedingTracker = BeeManager.beeRoot.getBreedingTracker(world, housing.getOwnerName());
 				breedingTracker.registerMutation(mutation);
 				return BeeManager.beeRoot.templateAsChromosomes(mutation.getTemplate());
 			}
@@ -629,9 +637,7 @@ public class Bee extends IndividualLiving implements IBee {
 	@Override
 	public IIndividual retrievePollen(IBeeHousing housing) {
 
-		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-
-		int chance = Math.round(genome.getFlowering() * beeModifier.getFloweringModifier(getGenome(), 1f));
+		int chance = Math.round(genome.getFlowering() * housing.getFloweringModifier(getGenome(), 1f));
 
 		World world = housing.getWorld();
 		Random random = world.rand;
@@ -641,9 +647,9 @@ public class Bee extends IndividualLiving implements IBee {
 			return null;
 		}
 
-		Vect area = getArea(genome, beeModifier);
+		Vect area = getArea(genome, housing);
 		Vect offset = new Vect(-area.x / 2, -area.y / 4, -area.z / 2);
-		Vect housingPos = new Vect(housing.getCoordinates());
+		Vect housingPos = new Vect(housing.getXCoord(), housing.getYCoord(), housing.getZCoord());
 
 		IIndividual pollen = null;
 
@@ -672,9 +678,7 @@ public class Bee extends IndividualLiving implements IBee {
 	@Override
 	public boolean pollinateRandom(IBeeHousing housing, IIndividual pollen) {
 
-		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-
-		int chance = (int) (genome.getFlowering() * beeModifier.getFloweringModifier(getGenome(), 1f));
+		int chance = (int) (genome.getFlowering() * housing.getFloweringModifier(getGenome(), 1f));
 
 		World world = housing.getWorld();
 		Random random = world.rand;
@@ -684,9 +688,9 @@ public class Bee extends IndividualLiving implements IBee {
 			return false;
 		}
 
-		Vect area = getArea(genome, beeModifier);
+		Vect area = getArea(genome, housing);
 		Vect offset = new Vect(-area.x / 2, -area.y / 4, -area.z / 2);
-		Vect housingPos = new Vect(housing.getCoordinates());
+		Vect housingPos = new Vect(housing.getXCoord(), housing.getYCoord(), housing.getZCoord());
 
 		for (int i = 0; i < 30; i++) {
 
@@ -705,7 +709,7 @@ public class Bee extends IndividualLiving implements IBee {
 				continue;
 			}
 
-			IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(housing.getOwner(), world, posBlock.x, posBlock.y, posBlock.z);
+			IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(housing.getOwnerName(), world, posBlock.x, posBlock.y, posBlock.z);
 
 			if (realPollinatable != null) {
 				realPollinatable.mateWith(pollen);
@@ -719,9 +723,7 @@ public class Bee extends IndividualLiving implements IBee {
 	@Override
 	public void plantFlowerRandom(IBeeHousing housing) {
 
-		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-
-		int chance = Math.round(genome.getFlowering() * beeModifier.getFloweringModifier(getGenome(), 1f));
+		int chance = Math.round(genome.getFlowering() * housing.getFloweringModifier(getGenome(), 1f));
 
 		World world = housing.getWorld();
 		Random random = world.rand;
@@ -733,9 +735,9 @@ public class Bee extends IndividualLiving implements IBee {
 
 		// Gather required info
 		IFlowerProvider provider = genome.getFlowerProvider();
-		Vect area = getArea(genome, beeModifier);
+		Vect area = getArea(genome, housing);
 		Vect offset = new Vect(-area.x / 2, -area.y / 4, -area.z / 2);
-		Vect housingPos = new Vect(housing.getCoordinates());
+		Vect housingPos = new Vect(housing.getXCoord(), housing.getYCoord(), housing.getZCoord());
 
 		for (int i = 0; i < 10; i++) {
 			Vect randomPos = Vect.getRandomPositionInArea(random, area);
@@ -747,9 +749,9 @@ public class Bee extends IndividualLiving implements IBee {
 		}
 	}
 
-	private static Vect getArea(IBeeGenome genome, IBeeModifier beeModifier) {
+	private static Vect getArea(IBeeGenome genome, IBeeHousing housing) {
 		int[] genomeTerritory = genome.getTerritory();
-		float housingModifier = beeModifier.getTerritoryModifier(genome, 1f);
+		float housingModifier = housing.getTerritoryModifier(genome, 1f);
 		return new Vect(genomeTerritory).multiply(housingModifier * 3.0f);
 	}
 }

src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java

@@ -1,17 +1,15 @@
 package forestry.apiculture.genetics;
 
 import java.util.Arrays;
-import java.util.Locale;
 
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeChromosome;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IClassification;
-import forestry.core.genetics.IBranchDefinition;
 import forestry.core.genetics.alleles.Allele;
 import forestry.core.genetics.alleles.EnumAllele;
 
-public enum BeeBranchDefinition implements IBranchDefinition {
+public enum BeeBranchDefinition {
 	HONEY("Apis"),
 	NOBLE("Probapis"),
 	INDUSTRIOUS("Industrapis"),
@@ -110,26 +108,25 @@ public enum BeeBranchDefinition implements IBranchDefinition {
 			Allele.helper.set(alleles, EnumBeeChromosome.CAVE_DWELLING, true);
 			Allele.helper.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.WHEAT);
 		}
-	};
+	}
+	;
 
 	private final IClassification branch;
 
 	BeeBranchDefinition(String scientific) {
-		branch = BeeManager.beeFactory.createBranch(this.name().toLowerCase(Locale.ENGLISH), scientific);
+		branch = BeeManager.beeFactory.createBranch(this.name().toLowerCase(), scientific);
 	}
 
 	protected void setBranchProperties(IAllele[] template) {
 
 	}
 
-	@Override
 	public final IAllele[] getTemplate() {
 		IAllele[] template = getDefaultTemplate();
 		setBranchProperties(template);
 		return template;
 	}
 
-	@Override
 	public final IClassification getBranch() {
 		return branch;
 	}

src/main/java/forestry/apiculture/genetics/BeeDefinition.java

@@ -1,13 +1,3 @@
-/*******************************************************************************
- * 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 forestry.apiculture.genetics;
 
 import java.awt.Color;
@@ -86,7 +76,7 @@ public enum BeeDefinition implements IBeeDefinition {
 		protected void registerMutations() {
 			for (BeeDefinition hiveBee0 : overworldHiveBees) {
 				for (BeeDefinition hiveBee1 : overworldHiveBees) {
-					if (hiveBee0.ordinal() < hiveBee1.ordinal()) {
+					if (hiveBee0 != hiveBee1) {
 						registerMutation(hiveBee0, hiveBee1, 15);
 					}
 				}
@@ -515,6 +505,7 @@ public enum BeeDefinition implements IBeeDefinition {
 		}
 	},
 	SPECTRAL(BeeBranchDefinition.END, "idolum", true, new Color(0xa98bed), new Color(0xd9de9e)) {
+
 		@Override
 		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
 			beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 8), 0.50f)
@@ -532,6 +523,7 @@ public enum BeeDefinition implements IBeeDefinition {
 		}
 	},
 	PHANTASMAL(BeeBranchDefinition.END, "lemur", false, new Color(0xcc00fa), new Color(0xd9de9e)) {
+
 		@Override
 		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
 			beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 8), 0.40f)
@@ -951,7 +943,7 @@ public enum BeeDefinition implements IBeeDefinition {
 		}
 	};
 
-	private static final EnumSet<BeeDefinition> overworldHiveBees = EnumSet.of(FOREST, MARSHY, MEADOWS, MODEST, TROPICAL, WINTRY);
+	public static final EnumSet<BeeDefinition> overworldHiveBees = EnumSet.of(FOREST, MARSHY, MEADOWS, MODEST, TROPICAL, WINTRY);
 
 	private final BeeBranchDefinition branch;
 	private final IAlleleBeeSpeciesCustom species;

src/main/java/forestry/apiculture/genetics/BeeFactory.java

@@ -14,7 +14,6 @@ import forestry.api.apiculture.IAlleleBeeSpeciesCustom;
 import forestry.api.apiculture.IBeeFactory;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IClassification;
-import forestry.apiculture.genetics.alleles.AlleleBeeSpecies;
 
 public class BeeFactory implements IBeeFactory {
 	@Override

src/main/java/forestry/apiculture/genetics/BeeGenome.java

@@ -10,22 +10,18 @@
  ******************************************************************************/
 package forestry.apiculture.genetics;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-
-import javax.annotation.Nonnull;
-import java.util.concurrent.TimeUnit;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeChromosome;
 import forestry.api.apiculture.IAlleleBeeEffect;
 import forestry.api.apiculture.IAlleleBeeSpecies;
 import forestry.api.apiculture.IBeeGenome;
+import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.EnumTolerance;
+import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleFloat;
 import forestry.api.genetics.IAlleleFlowers;
 import forestry.api.genetics.IAlleleInteger;
@@ -33,50 +29,45 @@ import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IChromosome;
 import forestry.api.genetics.IFlowerProvider;
 import forestry.api.genetics.ISpeciesRoot;
+import forestry.core.genetics.Chromosome;
 import forestry.core.genetics.Genome;
 import forestry.core.genetics.alleles.AlleleArea;
 import forestry.core.genetics.alleles.AlleleBoolean;
 import forestry.core.genetics.alleles.AlleleTolerance;
-import forestry.core.utils.vect.Vect;
+import forestry.core.vect.Vect;
 
 public class BeeGenome extends Genome implements IBeeGenome {
 	/**
 	 * 0 - Species (determines product)
+	 *
 	 * 1 - Speed
+	 *
 	 * 2 - Lifespan
+	 *
 	 * 3 - Fertility (Maximum number of offspring)
+	 *
 	 * 4 - Preferred temperature Icy: Snow biomes Cold: Tundra/Steppe, Extreme Mountains/Hills? Normal: Plains, Forests, Mountains Hot: Desert Hellish: Nether
+	 *
 	 * 5 - Temperature tolerance (Range +/-)
+	 *
 	 * 6 - Nocturnal
+	 *
 	 * 7 - Preferred humidity (Arid - Normal - Damp)
+	 *
 	 * 8 - Humidity tolerance (Range +/-)
+	 *
 	 * 9 - Flight interference tolerance (stuff falling from the sky/other hindrances -> tolerates dampness + flight interference tolerance => rain resistance)
+	 *
 	 * 10 - Cave dwelling
+	 *
 	 * 11 - Required flowers
+	 *
 	 * 12 - Flower plant chance
+	 *
 	 * 13 - Territory
 	 */
-
-	private static final LoadingCache<NBTTagCompound, BeeGenome> beeGenomeCache = CacheBuilder.newBuilder()
-			.maximumSize(128)
-			.expireAfterAccess(1, TimeUnit.MINUTES)
-			.build(new CacheLoader<NBTTagCompound, BeeGenome>() {
-				@Override
-				public BeeGenome load(@Nonnull NBTTagCompound tagCompound) {
-					return new BeeGenome(tagCompound);
-				}
-			});
-
-	public static BeeGenome fromNBT(NBTTagCompound nbtTagCompound) {
-		if (nbtTagCompound == null) {
-			return null;
-		}
-
-		return beeGenomeCache.getUnchecked(nbtTagCompound);
-	}
-
 	/* CONSTRUCTOR */
-	private BeeGenome(NBTTagCompound nbttagcompound) {
+	public BeeGenome(NBTTagCompound nbttagcompound) {
 		super(nbttagcompound);
 	}
 

src/main/java/forestry/apiculture/genetics/BeeHelper.java

@@ -29,31 +29,30 @@ import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeChromosome;
 import forestry.api.apiculture.EnumBeeType;
 import forestry.api.apiculture.IAlleleBeeSpecies;
+import forestry.api.apiculture.IAlvearyComponent;
 import forestry.api.apiculture.IApiaristTracker;
 import forestry.api.apiculture.IBee;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
-import forestry.api.apiculture.IBeeListener;
-import forestry.api.apiculture.IBeeModifier;
 import forestry.api.apiculture.IBeeMutation;
 import forestry.api.apiculture.IBeeRoot;
 import forestry.api.apiculture.IBeekeepingLogic;
 import forestry.api.apiculture.IBeekeepingMode;
+import forestry.api.core.IStructureLogic;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IMutation;
-import forestry.apiculture.BeeHousingListener;
-import forestry.apiculture.BeeHousingModifier;
 import forestry.apiculture.BeekeepingLogic;
+import forestry.apiculture.gadgets.StructureLogicAlveary;
 import forestry.core.config.ForestryItem;
 import forestry.core.genetics.SpeciesRoot;
 import forestry.plugins.PluginApiculture;
 
 public class BeeHelper extends SpeciesRoot implements IBeeRoot {
 
-	private static int beeSpeciesCount = -1;
+	public static int beeSpeciesCount = -1;
 	public static final String UID = "rootBees";
 
 	@Override
@@ -208,7 +207,7 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot {
 	}
 
 	/* TEMPLATES */
-	private static final ArrayList<IBee> beeTemplates = new ArrayList<IBee>();
+	public static final ArrayList<IBee> beeTemplates = new ArrayList<IBee>();
 
 	@Override
 	public ArrayList<IBee> getIndividualTemplates() {
@@ -256,8 +255,8 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot {
 	}
 
 	/* BREEDING MODES */
-	private final ArrayList<IBeekeepingMode> beekeepingModes = new ArrayList<IBeekeepingMode>();
-	private static IBeekeepingMode activeBeekeepingMode;
+	final ArrayList<IBeekeepingMode> beekeepingModes = new ArrayList<IBeekeepingMode>();
+	public static IBeekeepingMode activeBeekeepingMode;
 
 	@Override
 	public void resetBeekeepingMode() {
@@ -331,13 +330,8 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot {
 	}
 
 	@Override
-	public IBeeModifier createBeeHousingModifier(IBeeHousing housing) {
-		return new BeeHousingModifier(housing);
-	}
-
-	@Override
-	public IBeeListener createBeeHousingListener(IBeeHousing housing) {
-		return new BeeHousingListener(housing);
+	public IStructureLogic createAlvearyStructureLogic(IAlvearyComponent structure) {
+		return new StructureLogicAlveary(structure);
 	}
 
 	@Override

src/main/java/forestry/apiculture/genetics/BeeMutation.java

@@ -10,18 +10,17 @@
  ******************************************************************************/
 package forestry.apiculture.genetics;
 
-import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IAlleleBeeSpecies;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
-import forestry.api.apiculture.IBeeModifier;
 import forestry.api.apiculture.IBeeMutationCustom;
 import forestry.api.apiculture.IBeeRoot;
 import forestry.api.genetics.IAllele;
-import forestry.core.genetics.mutations.Mutation;
+import forestry.api.genetics.IGenome;
+import forestry.core.genetics.Mutation;
 
 public class BeeMutation extends Mutation implements IBeeMutationCustom {
 
@@ -34,26 +33,39 @@ public class BeeMutation extends Mutation implements IBeeMutationCustom {
 		return BeeManager.beeRoot;
 	}
 
+	@Override
+	public float getChance(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+		return getChance(housing, (IAlleleBeeSpecies) allele0, (IAlleleBeeSpecies) allele1, (IBeeGenome) genome0, (IBeeGenome) genome1);
+	}
+
 	@Override
 	public float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0, IBeeGenome genome1) {
+
 		World world = housing.getWorld();
-		ChunkCoordinates housingCoordinates = housing.getCoordinates();
-		int x = housingCoordinates.posX;
-		int y = housingCoordinates.posY;
-		int z = housingCoordinates.posZ;
+		int x = housing.getXCoord();
+		int y = housing.getYCoord();
+		int z = housing.getZCoord();
 
 		float processedChance = super.getChance(world, x, y, z, allele0, allele1, genome0, genome1);
 		if (processedChance <= 0) {
 			return 0;
 		}
 
-		IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-		IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier();
+		processedChance *= housing.getMutationModifier(genome0, genome1, 1f);
+		processedChance *= BeeManager.beeRoot.getBeekeepingMode(world).getMutationModifier(genome0, genome1, 1f);
+		if (processedChance <= 0) {
+			return 0;
+		}
 
-		processedChance *= beeHousingModifier.getMutationModifier(genome0, genome1, processedChance);
-		processedChance *= beeModeModifier.getMutationModifier(genome0, genome1, processedChance);
+		if (this.species0.getUID().equals(allele0.getUID()) && this.species1.getUID().equals(allele1.getUID())) {
+			return processedChance;
+		}
+		if (this.species1.getUID().equals(allele0.getUID()) && this.species0.getUID().equals(allele1.getUID())) {
+			return processedChance;
+		}
+
+		return 0;
 
-		return processedChance;
 	}
 
 }

src/main/java/forestry/apiculture/genetics/BeeVariation.java

@@ -15,7 +15,7 @@ public abstract class BeeVariation implements IBeeDefinition {
 	private final IAllele[] template;
 	private final IBeeGenome genome;
 
-	protected BeeVariation(IBeeDefinition bee) {
+	public BeeVariation(IBeeDefinition bee) {
 		template = bee.getTemplate();
 		initializeTemplate(template);
 		genome = BeeManager.beeRoot.templateAsGenome(template);

src/main/java/forestry/apiculture/genetics/BeekeepingMode.java

@@ -16,12 +16,9 @@ import java.util.Random;
 
 import net.minecraft.world.World;
 
-import forestry.api.apiculture.BeeManager;
-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.IBeekeepingMode;
 
 public class BeekeepingMode implements IBeekeepingMode {
@@ -32,18 +29,22 @@ public class BeekeepingMode implements IBeekeepingMode {
 	public static final IBeekeepingMode hardcore = new BeekeepingMode("HARDCORE", 0.5f, 5.0f, 0.8f, true, true);
 	public static final IBeekeepingMode insane = new BeekeepingMode("INSANE", 0.2f, 10.0f, 0.6f, true, true);
 
-	private final Random rand;
-	private final String name;
-	private final boolean reducesFertility;
-	private final boolean canFatigue;
-	private final IBeeModifier beeModifier;
+	final Random rand;
+	final String name;
+	final float mutationModifier;
+	final float lifespanModifier;
+	final float speedModifier;
+	final boolean reducesFertility;
+	final boolean canFatigue;
 
 	public BeekeepingMode(String name, float mutationModifier, float lifespanModifier, float speedModifier, boolean reducesFertility, boolean canFatigue) {
 		this.rand = new Random();
 		this.name = name;
+		this.mutationModifier = mutationModifier;
+		this.lifespanModifier = lifespanModifier;
+		this.speedModifier = speedModifier;
 		this.reducesFertility = reducesFertility;
 		this.canFatigue = canFatigue;
-		this.beeModifier = new BeekeepingModeBeeModifier(mutationModifier, lifespanModifier, speedModifier);
 	}
 
 	@Override
@@ -63,6 +64,36 @@ public class BeekeepingMode implements IBeekeepingMode {
 		return 1.0f;
 	}
 
+	@Override
+	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return this.mutationModifier;
+	}
+
+	@Override
+	public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return this.lifespanModifier;
+	}
+
+	@Override
+	public float getProductionModifier(IBeeGenome genome, float currentModifier) {
+		return this.speedModifier;
+	}
+
+	@Override
+	public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
+	@Override
+	public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
+
 	@Override
 	public int getFinalFertility(IBee queen, World world, int x, int y, int z) {
 		int toCreate = queen.getGenome().getFertility();
@@ -84,17 +115,17 @@ public class BeekeepingMode implements IBeekeepingMode {
 			return false;
 		}
 
-		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
+		if (queen.getGeneration() > 96 + rand.nextInt(6) + rand.nextInt(6) &&
+				rand.nextFloat() < 0.02f * housing.getGeneticDecay(queen.getGenome(), 1f)) {
+			return true;
+		}
 
-		return queen.getGeneration() > 96 + rand.nextInt(6) + rand.nextInt(6) &&
-				rand.nextFloat() < 0.02f * beeModifier.getGeneticDecay(queen.getGenome(), 1f);
+		return false;
 	}
 
 	@Override
 	public boolean isOverworked(IBee queen, IBeeHousing housing) {
-		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-
-		float productionModifier = beeModifier.getProductionModifier(queen.getGenome(), 1f);
+		float productionModifier = housing.getProductionModifier(queen.getGenome(), 1f);
 		if (productionModifier > 16) {
 			if (housing.getWorld().rand.nextFloat() * 100 < 0.01 * ((productionModifier * productionModifier) - 100)) {
 				return true;
@@ -106,9 +137,7 @@ public class BeekeepingMode implements IBeekeepingMode {
 	
 	@Override
 	public boolean isDegenerating(IBee queen, IBee offspring, IBeeHousing housing) {
-		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-
-		float mutationModifier = beeModifier.getMutationModifier(queen.getGenome(), queen.getMate(), 1.0f);
+		float mutationModifier = housing.getMutationModifier(queen.getGenome(), queen.getMate(), 1.0f);
 		if (mutationModifier > 10) {
 			if (housing.getWorld().rand.nextFloat() * 100 < 0.4 * ((mutationModifier * mutationModifier) - 100)) {
 				return true;
@@ -129,34 +158,23 @@ public class BeekeepingMode implements IBeekeepingMode {
 	}
 
 	@Override
-	public IBeeModifier getBeeModifier() {
-		return beeModifier;
+	public boolean isSealed() {
+		return false;
 	}
 
-	private static class BeekeepingModeBeeModifier extends DefaultBeeModifier {
-		private final float mutationModifier;
-		private final float lifespanModifier;
-		private final float speedModifier;
-
-		public BeekeepingModeBeeModifier(float mutationModifier, float lifespanModifier, float speedModifier) {
-			this.mutationModifier = mutationModifier;
-			this.lifespanModifier = lifespanModifier;
-			this.speedModifier = speedModifier;
-		}
-
-		@Override
-		public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
-			return this.mutationModifier;
-		}
-
-		@Override
-		public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
-			return this.lifespanModifier;
-		}
-
-		@Override
-		public float getProductionModifier(IBeeGenome genome, float currentModifier) {
-			return this.speedModifier;
-		}
+	@Override
+	public boolean isSelfLighted() {
+		return false;
 	}
+
+	@Override
+	public boolean isSunlightSimulated() {
+		return false;
+	}
+
+	@Override
+	public boolean isHellish() {
+		return false;
+	}
+
 }

src/main/java/forestry/apiculture/genetics/IBeeDefinition.java

@@ -1,13 +1,3 @@
-/*******************************************************************************
- * 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 forestry.apiculture.genetics;
 
 import net.minecraft.item.ItemStack;

src/main/java/forestry/apiculture/genetics/JubilanceDefault.java

@@ -19,7 +19,14 @@ import forestry.api.core.EnumTemperature;
 
 public class JubilanceDefault implements IJubilanceProvider {
 
-	public static final JubilanceDefault instance = new JubilanceDefault();
+	private static JubilanceDefault instance;
+
+	public static JubilanceDefault getInstance() {
+		if (instance == null) {
+			instance = new JubilanceDefault();
+		}
+		return instance;
+	}
 
 	protected JubilanceDefault() {
 

src/main/java/forestry/apiculture/genetics/JubilanceFactory.java

@@ -18,7 +18,7 @@ import forestry.api.apiculture.IJubilanceProvider;
 public class JubilanceFactory implements IJubilanceFactory {
 	@Override
 	public IJubilanceProvider getDefault() {
-		return JubilanceDefault.instance;
+		return JubilanceDefault.getInstance();
 	}
 
 	@Override

src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java

@@ -14,12 +14,11 @@ import java.util.List;
 
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.ChunkCoordinates;
 
 import forestry.api.apiculture.IAlleleBeeSpecies;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
-import forestry.core.utils.vect.Vect;
+import forestry.core.vect.Vect;
 
 /**
  * Hermits will not produce if there are any other living creatures nearby.
@@ -37,13 +36,11 @@ public class JubilanceProviderHermit extends JubilanceDefault {
 
 	private static AxisAlignedBB getBounding(IBeeGenome genome, IBeeHousing housing, float modifier) {
 		int[] areaAr = genome.getTerritory();
-		Vect area = new Vect(areaAr).multiply(modifier);
-		Vect offset = area.multiply(-1 / 2.0f);
-		
-		ChunkCoordinates housingCoordinates = housing.getCoordinates();
-		
-		Vect min = new Vect(housingCoordinates).add(offset);
-		Vect max = min.add(area);
+		Vect area = new Vect(areaAr[0], areaAr[1], areaAr[2]).multiply(modifier);
+		Vect offset = new Vect(-Math.round(area.x / 2), -Math.round(area.y / 2), -Math.round(area.z / 2));
+
+		Vect min = new Vect(housing.getXCoord() + offset.x, housing.getYCoord() + offset.y, housing.getZCoord() + offset.z);
+		Vect max = new Vect(housing.getXCoord() + offset.x + area.x, housing.getYCoord() + offset.y + area.y, housing.getZCoord() + offset.z + area.z);
 
 		return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z);
 	}

src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java

@@ -12,14 +12,13 @@ package forestry.apiculture.genetics;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 
 import forestry.api.apiculture.IAlleleBeeSpecies;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IJubilanceProvider;
-import forestry.core.utils.ItemStackUtil;
+import forestry.core.utils.StackUtils;
 
 public class JubilanceRequiresResource implements IJubilanceProvider {
 
@@ -32,11 +31,10 @@ public class JubilanceRequiresResource implements IJubilanceProvider {
 	@Override
 	public boolean isJubilant(IAlleleBeeSpecies species, IBeeGenome genome, IBeeHousing housing) {
 		World world = housing.getWorld();
-		ChunkCoordinates housingCoords = housing.getCoordinates();
 
-		Block block = world.getBlock(housingCoords.posX, housingCoords.posY - 1, housingCoords.posZ);
-		int meta = world.getBlockMetadata(housingCoords.posX, housingCoords.posY - 1, housingCoords.posZ);
-		return ItemStackUtil.equals(block, meta, blockRequired);
+		Block block = world.getBlock(housing.getXCoord(), housing.getYCoord() - 1, housing.getZCoord());
+		int meta = world.getBlockMetadata(housing.getXCoord(), housing.getYCoord() - 1, housing.getZCoord());
+		return StackUtils.equals(block, meta, blockRequired);
 	}
 
 }

src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectFertile.java

@@ -1,70 +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 forestry.apiculture.genetics.alleles;
-
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
-
-import forestry.api.apiculture.IBeeGenome;
-import forestry.api.apiculture.IBeeHousing;
-import forestry.api.genetics.IEffectData;
-import forestry.core.utils.vect.IVect;
-
-public class AlleleEffectFertile extends AlleleEffectThrottled {
-	
-	private static final int MAX_BLOCK_FIND_TRIES = 5;
-
-	public AlleleEffectFertile() {
-		super("fertile", false, 6, true, false);
-	}
-
-	@Override
-	public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
-		
-		World world = housing.getWorld();
-		ChunkCoordinates housingCoordinates = housing.getCoordinates();
-		IVect area = getModifiedArea(genome, housing);
-		
-		int blockX = getRandomOffset(world.rand, housingCoordinates.posX, area.getX());
-		int blockZ = getRandomOffset(world.rand, housingCoordinates.posZ, area.getZ());
-		int blockMaxY = housingCoordinates.posY + (area.getY() / 2) + 1;
-		int blockMinY = housingCoordinates.posY - (area.getY() / 2) - 1;
-		
-		for (int attempt = 0; attempt < MAX_BLOCK_FIND_TRIES; ++attempt) {
-			if (tryTickColumn(world, blockX, blockZ, blockMaxY, blockMinY)) {
-				break;
-			}
-			blockX = getRandomOffset(world.rand, housingCoordinates.posX, area.getX());
-			blockZ = getRandomOffset(world.rand, housingCoordinates.posZ, area.getZ());
-		}
-		
-		return storedData;
-	}
-	
-	private static int getRandomOffset(Random random, int centrePos, int offset) {
-		return centrePos + random.nextInt(offset) - (offset / 2);
-	}
-
-	private static boolean tryTickColumn(World world, int x, int z, int maxY, int minY) {
-		for (int y = maxY; y >= minY; --y) {
-			if (!world.isAirBlock(x, y, z)) {
-				Block block = world.getBlock(x, y, z);
-				world.scheduleBlockUpdate(x, y, z, block, 5);
-				return true;
-			}
-		}
-		return false;
-	}
-
-}

src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectNone.java

@@ -1,87 +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 forestry.apiculture.genetics.alleles;
-
-import net.minecraft.util.AxisAlignedBB;
-
-import forestry.api.apiculture.BeeManager;
-import forestry.api.apiculture.IAlleleBeeEffect;
-import forestry.api.apiculture.IBeeGenome;
-import forestry.api.apiculture.IBeeHousing;
-import forestry.api.apiculture.IBeeModifier;
-import forestry.api.genetics.IEffectData;
-import forestry.core.genetics.alleles.AlleleCategorized;
-import forestry.core.utils.vect.MutableVect;
-import forestry.core.utils.vect.Vect;
-import forestry.plugins.PluginApiculture;
-
-public class AlleleEffectNone extends AlleleCategorized implements IAlleleBeeEffect {
-
-	public AlleleEffectNone(String valueName, boolean isDominant) {
-		super("forestry", "effect", valueName, isDominant);
-	}
-
-	@Override
-	public IEffectData validateStorage(IEffectData storedData) {
-		return null;
-	}
-
-	@Override
-	public boolean isCombinable() {
-		return false;
-	}
-
-	@Override
-	public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
-		return storedData;
-	}
-
-	@Override
-	public IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
-		PluginApiculture.proxy.addBeeHiveFX("particles/swarm_bee", housing.getWorld(), housing.getCoordinates(), genome.getPrimary().getIconColour(0));
-		return storedData;
-	}
-
-	protected Vect getModifiedArea(IBeeGenome genome, IBeeHousing housing) {
-		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-		float territoryModifier = beeModifier.getTerritoryModifier(genome, 1f);
-
-		MutableVect area = new MutableVect(genome.getTerritory());
-		area.multiply(territoryModifier);
-
-		if (area.x < 1) {
-			area.x = 1;
-		}
-		if (area.y < 1) {
-			area.y = 1;
-		}
-		if (area.z < 1) {
-			area.z = 1;
-		}
-
-		return new Vect(area);
-	}
-
-	protected AxisAlignedBB getBounding(IBeeGenome genome, IBeeHousing housing) {
-		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
-		float territoryModifier = beeModifier.getTerritoryModifier(genome, 1.0f);
-
-		MutableVect area = new MutableVect(genome.getTerritory());
-		area.multiply(territoryModifier);
-		Vect offset = new Vect(area).multiply(-1 / 2.0f);
-
-		Vect min = new Vect(housing.getCoordinates()).add(offset);
-		Vect max = min.add(area);
-
-		return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z);
-	}
-
-}

src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectThrottled.java

@@ -1,74 +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 forestry.apiculture.genetics.alleles;
-
-import forestry.api.apiculture.IBeeGenome;
-import forestry.api.apiculture.IBeeHousing;
-import forestry.api.genetics.IEffectData;
-import forestry.core.genetics.EffectData;
-
-public abstract class AlleleEffectThrottled extends AlleleEffectNone {
-
-	private boolean isCombinable = false;
-	private final int throttle;
-	private boolean requiresWorkingQueen = false;
-
-	protected AlleleEffectThrottled(String name, boolean isDominant, int throttle, boolean requiresWorking, boolean isCombinable) {
-		super(name, isDominant);
-		this.throttle = throttle;
-		this.isCombinable = isCombinable;
-		this.requiresWorkingQueen = requiresWorking;
-	}
-
-	@Override
-	public boolean isCombinable() {
-		return isCombinable;
-	}
-
-	@Override
-	public IEffectData validateStorage(IEffectData storedData) {
-		if (storedData instanceof EffectData) {
-			return storedData;
-		}
-
-		return new EffectData(1, 0);
-	}
-
-	@Override
-	public final IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
-		if (isThrottled(storedData, housing)) {
-			return storedData;
-		}
-		return doEffectThrottled(genome, storedData, housing);
-	}
-
-	private boolean isThrottled(IEffectData storedData, IBeeHousing housing) {
-
-		if (requiresWorkingQueen && housing.getErrorLogic().hasErrors()) {
-			return true;
-		}
-
-		int time = storedData.getInteger(0);
-		time++;
-		storedData.setInteger(0, time);
-
-		if (time < throttle) {
-			return true;
-		}
-
-		// Reset since we are done throttling.
-		storedData.setInteger(0, 0);
-		return false;
-	}
-
-	abstract IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
-
-}

src/main/java/forestry/apiculture/gui/ContainerAlveary.java

@@ -11,13 +11,12 @@
 package forestry.apiculture.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
 
-import forestry.apiculture.BeeHousingInventory;
-import forestry.apiculture.multiblock.TileAlvearyPlain;
+import forestry.apiculture.gadgets.TileAlvearyPlain;
 import forestry.core.gui.ContainerTile;
 import forestry.core.gui.slots.SlotFiltered;
 import forestry.core.gui.slots.SlotOutput;
-import forestry.core.network.PacketGuiUpdate;
 
 public class ContainerAlveary extends ContainerTile<TileAlvearyPlain> {
 
@@ -25,10 +24,10 @@ public class ContainerAlveary extends ContainerTile<TileAlvearyPlain> {
 		super(tile, player, 8, 108);
 
 		// Queen/Princess
-		this.addSlotToContainer(new SlotFiltered(tile, BeeHousingInventory.SLOT_QUEEN, 29, 39));
+		this.addSlotToContainer(new SlotFiltered(tile, TileAlvearyPlain.SLOT_QUEEN, 29, 39));
 
 		// Drone
-		this.addSlotToContainer(new SlotFiltered(tile, BeeHousingInventory.SLOT_DRONE, 29, 65));
+		this.addSlotToContainer(new SlotFiltered(tile, TileAlvearyPlain.SLOT_DRONE, 29, 65));
 
 		// Product Inventory
 		this.addSlotToContainer(new SlotOutput(tile, 2, 116, 52));
@@ -40,10 +39,16 @@ public class ContainerAlveary extends ContainerTile<TileAlvearyPlain> {
 		this.addSlotToContainer(new SlotOutput(tile, 8, 116, 26));
 	}
 
+	@Override
+	public void updateProgressBar(int i, int j) {
+		tile.getGUINetworkData(i, j);
+	}
+
 	@Override
 	public void detectAndSendChanges() {
 		super.detectAndSendChanges();
-		PacketGuiUpdate packet = new PacketGuiUpdate(tile);
-		sendPacketToCrafters(packet);
+		for (Object crafter : crafters) {
+			tile.sendGUINetworkData(this, (ICrafting) crafter);
+		}
 	}
 }

src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java

@@ -12,7 +12,7 @@ package forestry.apiculture.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
 
-import forestry.apiculture.multiblock.TileAlvearyHygroregulator;
+import forestry.apiculture.gadgets.TileAlvearyHygroregulator;
 import forestry.core.gui.ContainerLiquidTanks;
 import forestry.core.gui.slots.SlotFiltered;
 
@@ -21,7 +21,7 @@ public class ContainerAlvearyHygroregulator extends ContainerLiquidTanks<TileAlv
 	public ContainerAlvearyHygroregulator(InventoryPlayer playerInventory, TileAlvearyHygroregulator tile) {
 		super(tile, playerInventory, 8, 84);
 
-		this.addSlotToContainer(new SlotFiltered(tile, TileAlvearyHygroregulator.HygroInventory.SLOT_INPUT, 56, 38));
+		this.addSlotToContainer(new SlotFiltered(tile, TileAlvearyHygroregulator.SLOT_INPUT, 56, 38));
 	}
 
 }

src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java

@@ -12,7 +12,7 @@ package forestry.apiculture.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
 
-import forestry.apiculture.multiblock.TileAlvearySieve;
+import forestry.apiculture.gadgets.TileAlvearySieve;
 import forestry.core.gui.ContainerTile;
 import forestry.core.gui.slots.SlotFiltered;
 import forestry.core.gui.slots.SlotOutput;
@@ -27,6 +27,6 @@ public class ContainerAlvearySieve extends ContainerTile<TileAlvearySieve> {
 		addSlotToContainer(new SlotOutput(tile, 2, 73, 39).setCrafter(tile));
 		addSlotToContainer(new SlotOutput(tile, 3, 94, 26).setCrafter(tile));
 
-		addSlotToContainer(new SlotFiltered(tile, TileAlvearySieve.AlvearySieveInventory.SLOT_SIEVE, 43, 39).setCrafter(tile));
+		addSlotToContainer(new SlotFiltered(tile, TileAlvearySieve.SLOT_SIEVE, 43, 39).setCrafter(tile));
 	}
 }

src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java

@@ -12,7 +12,7 @@ package forestry.apiculture.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
 
-import forestry.apiculture.multiblock.TileAlvearySwarmer;
+import forestry.apiculture.gadgets.TileAlvearySwarmer;
 import forestry.core.gui.ContainerTile;
 import forestry.core.gui.slots.SlotFiltered;
 

src/main/java/forestry/apiculture/gui/ContainerApiary.java

@@ -13,30 +13,27 @@ package forestry.apiculture.gui;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
 
-import forestry.apiculture.BeeHousingInventory;
-import forestry.apiculture.tiles.TileAbstractBeeHousing;
-import forestry.apiculture.tiles.TileApiary;
+import forestry.apiculture.gadgets.TileBeehouse;
 import forestry.core.gui.ContainerTile;
 import forestry.core.gui.slots.SlotFiltered;
 import forestry.core.gui.slots.SlotOutput;
 
-public class ContainerBeeHousing extends ContainerTile<TileAbstractBeeHousing> {
+public class ContainerApiary extends ContainerTile<TileBeehouse> {
 
-	public ContainerBeeHousing(InventoryPlayer player, TileAbstractBeeHousing tile, boolean hasFrames) {
+	public ContainerApiary(InventoryPlayer player, TileBeehouse tile, boolean hasFrames) {
 		super(tile, player, 8, 108);
 
 		// Queen/Princess
-		this.addSlotToContainer(new SlotFiltered(tile, BeeHousingInventory.SLOT_QUEEN, 29, 39));
+		this.addSlotToContainer(new SlotFiltered(tile, TileBeehouse.SLOT_QUEEN, 29, 39));
 
 		// Drone
-		this.addSlotToContainer(new SlotFiltered(tile, BeeHousingInventory.SLOT_DRONE, 29, 65));
+		this.addSlotToContainer(new SlotFiltered(tile, TileBeehouse.SLOT_DRONE, 29, 65));
 
 		// Frames
 		if (hasFrames) {
-			final int slotFrames1 = TileApiary.ApiaryInventory.SLOT_FRAMES_1;
-			this.addSlotToContainer(new SlotFiltered(tile, slotFrames1, 66, 23));
-			this.addSlotToContainer(new SlotFiltered(tile, slotFrames1 + 1, 66, 52));
-			this.addSlotToContainer(new SlotFiltered(tile, slotFrames1 + 2, 66, 81));
+			this.addSlotToContainer(new SlotFiltered(tile, TileBeehouse.SLOT_FRAMES_1, 66, 23));
+			this.addSlotToContainer(new SlotFiltered(tile, TileBeehouse.SLOT_FRAMES_1 + 1, 66, 52));
+			this.addSlotToContainer(new SlotFiltered(tile, TileBeehouse.SLOT_FRAMES_1 + 2, 66, 81));
 		}
 
 		// Product Inventory

src/main/java/forestry/apiculture/gui/ContainerImprinter.java

@@ -41,7 +41,7 @@ public class ContainerImprinter extends ContainerItemInventory<ImprinterInventor
 	@Override
 	public void onContainerClosed(EntityPlayer entityplayer) {
 
-		if (entityplayer.worldObj.isRemote) {
+		if (!Proxies.common.isSimulating(entityplayer.worldObj)) {
 			return;
 		}
 
@@ -66,7 +66,7 @@ public class ContainerImprinter extends ContainerItemInventory<ImprinterInventor
 	}
 
 	public void updateContainer(World world) {
-		if (!isNetSynced && world.isRemote) {
+		if (!isNetSynced && !Proxies.common.isSimulating(world)) {
 			isNetSynced = true;
 			Proxies.net.sendToServer(new ForestryPacket(PacketId.IMPRINT_SELECTION_GET));
 		}

src/main/java/forestry/apiculture/gui/GuiAlveary.java

@@ -12,17 +12,16 @@ package forestry.apiculture.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
 
-import forestry.apiculture.multiblock.IAlvearyController;
-import forestry.apiculture.multiblock.TileAlvearyPlain;
-import forestry.core.config.Constants;
+import forestry.apiculture.gadgets.TileAlvearyPlain;
+import forestry.core.config.Defaults;
 import forestry.core.gui.GuiForestryTitled;
-import forestry.core.gui.ledgers.OwnerLedger;
-import forestry.core.render.EnumTankLevel;
+import forestry.core.utils.EnumTankLevel;
+import forestry.core.utils.Utils;
 
 public class GuiAlveary extends GuiForestryTitled<ContainerAlveary, TileAlvearyPlain> {
 
 	public GuiAlveary(InventoryPlayer inventory, TileAlvearyPlain tile) {
-		super(Constants.TEXTURE_PATH_GUI + "/alveary.png", new ContainerAlveary(inventory, tile), tile);
+		super(Defaults.TEXTURE_PATH_GUI + "/alveary.png", new ContainerAlveary(inventory, tile), tile);
 
 		ySize = 190;
 	}
@@ -31,8 +30,8 @@ public class GuiAlveary extends GuiForestryTitled<ContainerAlveary, TileAlvearyP
 	protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
 		super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
 
-		IAlvearyController alvearyController = inventory.getAlvearyController();
-		drawHealthMeter(guiLeft + 20, guiTop + 37, alvearyController.getHealthScaled(46), EnumTankLevel.rateTankLevel(alvearyController.getHealthScaled(100)));
+		TileAlvearyPlain machine = inventory;
+		drawHealthMeter(guiLeft + 20, guiTop + 37, machine.getHealthScaled(46), Utils.rateTankLevel(machine.getHealthScaled(100)));
 	}
 
 	private void drawHealthMeter(int x, int y, int height, EnumTankLevel rated) {
@@ -58,12 +57,4 @@ public class GuiAlveary extends GuiForestryTitled<ContainerAlveary, TileAlvearyP
 		this.drawTexturedModalRect(x, y + 46 - height, i, k + 46 - height, 4, height);
 	}
 
-	/* LEDGERS */
-	protected void initLedgers() {
-		super.initLedgers();
-
-		IAlvearyController alvearyController = inventory.getAlvearyController();
-		ledgerManager.add(new OwnerLedger(ledgerManager, alvearyController));
-	}
-
 }

src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java

@@ -12,15 +12,15 @@ package forestry.apiculture.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
 
-import forestry.apiculture.multiblock.TileAlvearyHygroregulator;
-import forestry.core.config.Constants;
+import forestry.apiculture.gadgets.TileAlvearyHygroregulator;
+import forestry.core.config.Defaults;
 import forestry.core.gui.GuiForestryTitled;
 import forestry.core.gui.widgets.TankWidget;
 
 public class GuiAlvearyHygroregulator extends GuiForestryTitled<ContainerAlvearyHygroregulator, TileAlvearyHygroregulator> {
 
 	public GuiAlvearyHygroregulator(InventoryPlayer inventory, TileAlvearyHygroregulator tile) {
-		super(Constants.TEXTURE_PATH_GUI + "/hygroregulator.png", new ContainerAlvearyHygroregulator(inventory, tile), tile);
+		super(Defaults.TEXTURE_PATH_GUI + "/hygroregulator.png", new ContainerAlvearyHygroregulator(inventory, tile), tile);
 
 		widgetManager.add(new TankWidget(this.widgetManager, 104, 17, 0));
 	}

src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java

@@ -12,14 +12,14 @@ package forestry.apiculture.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
 
-import forestry.apiculture.multiblock.TileAlvearySieve;
-import forestry.core.config.Constants;
-import forestry.core.gui.GuiForestryTitled;
+import forestry.apiculture.gadgets.TileAlvearySieve;
+import forestry.core.config.Defaults;
+import forestry.core.gui.GuiForestry;
 
-public class GuiAlvearySieve extends GuiForestryTitled<ContainerAlvearySieve, TileAlvearySieve> {
+public class GuiAlvearySieve extends GuiForestry<ContainerAlvearySieve, TileAlvearySieve> {
 
 	public GuiAlvearySieve(InventoryPlayer inventory, TileAlvearySieve tile) {
-		super(Constants.TEXTURE_PATH_GUI + "/sieve.png", new ContainerAlvearySieve(inventory, tile), tile);
+		super(Defaults.TEXTURE_PATH_GUI + "/sieve.png", new ContainerAlvearySieve(inventory, tile), tile);
 	}
 
 }

src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java

@@ -12,14 +12,14 @@ package forestry.apiculture.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
 
-import forestry.apiculture.multiblock.TileAlvearySwarmer;
-import forestry.core.config.Constants;
-import forestry.core.gui.GuiForestryTitled;
+import forestry.apiculture.gadgets.TileAlvearySwarmer;
+import forestry.core.config.Defaults;
+import forestry.core.gui.GuiForestry;
 
-public class GuiAlvearySwarmer extends GuiForestryTitled<ContainerAlvearySwarmer, TileAlvearySwarmer> {
+public class GuiAlvearySwarmer extends GuiForestry<ContainerAlvearySwarmer, TileAlvearySwarmer> {
 
 	public GuiAlvearySwarmer(InventoryPlayer inventory, TileAlvearySwarmer tile) {
-		super(Constants.TEXTURE_PATH_GUI + "/swarmer.png", new ContainerAlvearySwarmer(inventory, tile), tile);
+		super(Defaults.TEXTURE_PATH_GUI + "/swarmer.png", new ContainerAlvearySwarmer(inventory, tile), tile);
 	}
 
 }

src/main/java/forestry/apiculture/gui/GuiApiary.java

@@ -12,23 +12,23 @@ package forestry.apiculture.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
 
-import forestry.apiculture.tiles.TileAbstractBeeHousing;
-import forestry.apiculture.tiles.TileApiary;
-import forestry.apiculture.tiles.TileBeehouse;
-import forestry.core.config.Constants;
+import forestry.apiculture.gadgets.TileApiary;
+import forestry.apiculture.gadgets.TileBeehouse;
+import forestry.core.config.Defaults;
 import forestry.core.gui.GuiForestryTitled;
-import forestry.core.render.EnumTankLevel;
+import forestry.core.utils.EnumTankLevel;
+import forestry.core.utils.Utils;
 
-public class GuiBeeHousing extends GuiForestryTitled<ContainerBeeHousing, TileAbstractBeeHousing> {
+public class GuiApiary extends GuiForestryTitled<ContainerApiary, TileBeehouse> {
 
-	public GuiBeeHousing(InventoryPlayer inventory, TileApiary tile) {
-		super(Constants.TEXTURE_PATH_GUI + "/apiary.png", new ContainerBeeHousing(inventory, tile, true), tile);
+	public GuiApiary(InventoryPlayer inventory, TileApiary tile) {
+		super(Defaults.TEXTURE_PATH_GUI + "/apiary.png", new ContainerApiary(inventory, tile, true), tile);
 
 		ySize = 190;
 	}
 
-	public GuiBeeHousing(InventoryPlayer inventory, TileBeehouse tile) {
-		super(Constants.TEXTURE_PATH_GUI + "/alveary.png", new ContainerBeeHousing(inventory, tile, false), tile);
+	public GuiApiary(InventoryPlayer inventory, TileBeehouse tile) {
+		super(Defaults.TEXTURE_PATH_GUI + "/alveary.png", new ContainerApiary(inventory, tile, false), tile);
 
 		ySize = 190;
 	}
@@ -37,7 +37,8 @@ public class GuiBeeHousing extends GuiForestryTitled<ContainerBeeHousing, TileAb
 	protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
 		super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
 
-		drawHealthMeter(guiLeft + 20, guiTop + 37, inventory.getHealthScaled(46), EnumTankLevel.rateTankLevel(inventory.getHealthScaled(100)));
+		TileBeehouse machine = inventory;
+		drawHealthMeter(guiLeft + 20, guiTop + 37, machine.getHealthScaled(46), Utils.rateTankLevel(machine.getHealthScaled(100)));
 	}
 
 	private void drawHealthMeter(int x, int y, int height, EnumTankLevel rated) {

src/main/java/forestry/apiculture/gui/GuiBeealyzer.java

@@ -32,7 +32,7 @@ import forestry.core.genetics.alleles.AlleleBoolean;
 import forestry.core.gui.ContainerAlyzer;
 import forestry.core.gui.GuiAlyzer;
 import forestry.core.utils.StringUtil;
-import forestry.core.utils.vect.Vect;
+import forestry.core.vect.Vect;
 
 public class GuiBeealyzer extends GuiAlyzer {
 
@@ -83,10 +83,10 @@ public class GuiBeealyzer extends GuiAlyzer {
 				drawAnalyticsPage2(bee, beeType);
 				break;
 			case 3:
-				drawAnalyticsPage3(bee);
+				drawAnalyticsPage3(bee, beeType);
 				break;
 			case 4:
-				drawAnalyticsPageMutations(bee);
+				drawAnalyticsPage4(bee);
 				break;
 			case 6:
 				drawAnalyticsPageClassification(bee);
@@ -112,17 +112,14 @@ public class GuiBeealyzer extends GuiAlyzer {
 			String customSecondaryBeeKey = "bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getSecondary().getUnlocalizedName().replace("bees.species.", "");
 
 			drawSpeciesRow(StringUtil.localize("gui.species"), bee, EnumBeeChromosome.SPECIES, checkCustomName(customPrimaryBeeKey), checkCustomName(customSecondaryBeeKey));
-			newLine();
 		}
-
 		drawChromosomeRow(StringUtil.localize("gui.lifespan"), bee, EnumBeeChromosome.LIFESPAN);
-		newLine();
+
 		drawChromosomeRow(StringUtil.localize("gui.speed"), bee, EnumBeeChromosome.SPEED);
-		newLine();
+
 		drawChromosomeRow(StringUtil.localize("gui.pollination"), bee, EnumBeeChromosome.FLOWERING);
-		newLine();
+
 		drawChromosomeRow(StringUtil.localize("gui.flowers"), bee, EnumBeeChromosome.FLOWER_PROVIDER);
-		newLine();
 
 		drawLine(StringUtil.localize("gui.fertility"), COLUMN_0);
 		IAlleleInteger primaryFertility = (IAlleleInteger) bee.getGenome().getActiveAllele(EnumBeeChromosome.FERTILITY);
@@ -139,8 +136,6 @@ public class GuiBeealyzer extends GuiAlyzer {
 				new Vect(inactiveTerritory.getValue()).toString(),
 				bee, EnumBeeChromosome.TERRITORY);
 
-		newLine();
-
 		drawChromosomeRow(StringUtil.localize("gui.effect"), bee, EnumBeeChromosome.EFFECT);
 
 		newLine();
@@ -155,33 +150,31 @@ public class GuiBeealyzer extends GuiAlyzer {
 		drawLine(StringUtil.localize("gui.active"), COLUMN_1);
 		drawLine(StringUtil.localize("gui.inactive"), COLUMN_2);
 
+		newLine();
 		newLine();
 
 		drawRow(StringUtil.localize("gui.climate"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getTemperature()),
 				AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getTemperature()), bee, EnumBeeChromosome.SPECIES);
 
-		newLine();
-
 		IAlleleTolerance tempToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE);
 		IAlleleTolerance tempToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE);
-		drawLine("  " + StringUtil.localize("gui.tolerance"), COLUMN_0);
+		drawLine(StringUtil.localize("gui.temptol"), COLUMN_0);
 		drawToleranceInfo(tempToleranceActive, COLUMN_1);
 		drawToleranceInfo(tempToleranceInactive, COLUMN_2);
 
-		newLine(16);
+		newLine();
 
 		drawRow(StringUtil.localize("gui.humidity"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getHumidity()),
 				AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getHumidity()), bee, EnumBeeChromosome.SPECIES);
 
-		newLine();
-
 		IAlleleTolerance humidToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE);
 		IAlleleTolerance humidToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE);
-		drawLine("  " + StringUtil.localize("gui.tolerance"), COLUMN_0);
+		drawLine(StringUtil.localize("gui.humidtol"), COLUMN_0);
 		drawToleranceInfo(humidToleranceActive, COLUMN_1);
 		drawToleranceInfo(humidToleranceInactive, COLUMN_2);
 
-		newLine(16);
+		newLine();
+		newLine();
 
 		String yes = StringUtil.localize("yes");
 		String no = StringUtil.localize("no");
@@ -203,22 +196,22 @@ public class GuiBeealyzer extends GuiAlyzer {
 		drawLine(StringUtil.localize("gui.diurnal"), COLUMN_0);
 		drawLine(diurnal0, COLUMN_1, getColorCoding(false));
 		drawLine(diurnal1, COLUMN_2, getColorCoding(false));
-		newLineCompressed();
+		newLine();
 
 		drawLine(StringUtil.localize("gui.nocturnal"), COLUMN_0);
 		drawLine(nocturnal0, COLUMN_1, getColorCoding(false));
 		drawLine(nocturnal1, COLUMN_2, getColorCoding(false));
-		newLineCompressed();
+		newLine();
 
 		String primary = StringUtil.readableBoolean(bee.getGenome().getTolerantFlyer(), yes, no);
-		String secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TOLERANT_FLYER)).getValue(), yes, no);
+		String secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TOLERANT_FLYER)).getValue(), yes,
+				no);
 
 		drawRow(StringUtil.localize("gui.flyer"), primary, secondary, bee, EnumBeeChromosome.TOLERANT_FLYER);
 
-		newLineCompressed();
-
 		primary = StringUtil.readableBoolean(bee.getGenome().getCaveDwelling(), yes, no);
-		secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.CAVE_DWELLING)).getValue(), yes, no);
+		secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.CAVE_DWELLING)).getValue(), yes,
+				no);
 
 		drawRow(StringUtil.localize("gui.cave"), primary, secondary, bee, EnumBeeChromosome.CAVE_DWELLING);
 
@@ -235,7 +228,8 @@ public class GuiBeealyzer extends GuiAlyzer {
 		}
 
 		if (bee.getGeneration() >= 0) {
-			newLineCompressed();
+			newLine();
+
 			displayText = StringUtil.localizeAndFormat("gui.beealyzer.generations", bee.getGeneration());
 			drawCenteredLine(displayText, 8, 208, fontColor.get("gui.beealyzer.binomial"));
 		}
@@ -243,7 +237,10 @@ public class GuiBeealyzer extends GuiAlyzer {
 		endPage();
 	}
 
-	private void drawAnalyticsPage3(IBee bee) {
+	private void drawAnalyticsPage3(IBee bee, EnumBeeType type) {
+
+		float factor = this.factor;
+		this.setFactor(1.0f);
 
 		startPage(COLUMN_0, COLUMN_1, COLUMN_2);
 
@@ -253,10 +250,10 @@ public class GuiBeealyzer extends GuiAlyzer {
 
 		int x = COLUMN_0;
 		for (ItemStack stack : bee.getProduceList()) {
-			widgetManager.add(new ItemStackWidget(x, getLineY(), stack));
+			widgetManager.add(new ItemStackWidget(adjustToFactor(x), adjustToFactor(getLineY()), stack));
 
 			x += 18;
-			if (x > 148) {
+			if (x > adjustToFactor(148)) {
 				x = COLUMN_0;
 				newLine();
 			}
@@ -265,23 +262,24 @@ public class GuiBeealyzer extends GuiAlyzer {
 		newLine();
 		newLine();
 		newLine();
-		newLine();
 
 		drawLine(StringUtil.localize("gui.beealyzer.specialty") + ":", COLUMN_0);
 		newLine();
 
 		x = COLUMN_0;
 		for (ItemStack stack : bee.getSpecialtyList()) {
-			widgetManager.add(new ItemStackWidget(x, getLineY(), stack));
+			widgetManager.add(new ItemStackWidget(adjustToFactor(x), adjustToFactor(getLineY()), stack));
 
 			x += 18;
-			if (x > 148) {
+			if (x > adjustToFactor(148)) {
 				x = COLUMN_0;
 				newLine();
 			}
 		}
 
 		endPage();
+
+		this.setFactor(factor);
 	}
 
 }

src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java

@@ -27,7 +27,7 @@ import net.minecraftforge.common.BiomeDictionary;
 import org.lwjgl.opengl.GL11;
 
 import forestry.apiculture.items.ItemHabitatLocator.HabitatLocatorInventory;
-import forestry.core.config.Constants;
+import forestry.core.config.Defaults;
 import forestry.core.gui.GuiForestry;
 import forestry.core.gui.widgets.Widget;
 import forestry.core.proxy.Proxies;
@@ -55,7 +55,7 @@ public class GuiHabitatLocator extends GuiForestry<ContainerHabitatLocator, Habi
 	private int startY;
 
 	public GuiHabitatLocator(EntityPlayer player, HabitatLocatorInventory item) {
-		super(Constants.TEXTURE_PATH_GUI + "/biomefinder.png", new ContainerHabitatLocator(player, item), item);
+		super(Defaults.TEXTURE_PATH_GUI + "/biomefinder.png", new ContainerHabitatLocator(player, item), item);
 
 		xSize = 176;
 		ySize = 184;

src/main/java/forestry/apiculture/gui/GuiImprinter.java

@@ -23,7 +23,7 @@ import forestry.api.apiculture.IAlleleBeeSpecies;
 import forestry.apiculture.genetics.BeeGenome;
 import forestry.apiculture.items.ItemBeeGE;
 import forestry.apiculture.items.ItemImprinter.ImprinterInventory;
-import forestry.core.config.Constants;
+import forestry.core.config.Defaults;
 import forestry.core.config.ForestryItem;
 import forestry.core.gui.GuiForestry;
 import forestry.core.proxy.Proxies;
@@ -37,7 +37,7 @@ public class GuiImprinter extends GuiForestry<ContainerImprinter, ImprinterInven
 	private final Map<String, ItemStack> iconStacks = new HashMap<String, ItemStack>();
 
 	public GuiImprinter(InventoryPlayer inventoryplayer, ImprinterInventory inventory) {
-		super(Constants.TEXTURE_PATH_GUI + "/imprinter.png", new ContainerImprinter(inventoryplayer, inventory), inventory);
+		super(Defaults.TEXTURE_PATH_GUI + "/imprinter.png", new ContainerImprinter(inventoryplayer, inventory), inventory);
 
 		xSize = 176;
 		ySize = 185;
@@ -80,7 +80,7 @@ public class GuiImprinter extends GuiForestry<ContainerImprinter, ImprinterInven
 		RenderHelper.disableStandardItemLighting();
 	}
 
-	private static int getHabitatSlotAtPosition(int i, int j) {
+	private int getHabitatSlotAtPosition(int i, int j) {
 		int[] xPos = new int[]{12, 12};
 		int[] yPos = new int[]{32, 52};
 

src/main/java/forestry/apiculture/items/ItemAlvearyBlock.java

@@ -12,15 +12,15 @@ package forestry.apiculture.items;
 
 import net.minecraft.block.Block;
 
-import forestry.core.items.IStructureBlockItem;
-import forestry.core.items.ItemBlockForestry;
+import forestry.core.gadgets.IStructureBlockItem;
+import forestry.core.items.ItemForestryBlock;
 
 /**
  * @author CovertJaguar <http://www.railcraft.info/>
  */
-public class ItemBlockAlveary extends ItemBlockForestry implements IStructureBlockItem {
+public class ItemAlvearyBlock extends ItemForestryBlock implements IStructureBlockItem {
 
-	public ItemBlockAlveary(Block block) {
+	public ItemAlvearyBlock(Block block) {
 		super(block);
 	}
 }