Fix #1366 Alveary in the Nether does not have Hellish temperature

(no fix for vanilla leaves, the harvest event is fired server-side only)

README.md

@@ -9,7 +9,7 @@ Forestry is a modification for the game Minecraft and known primarily for its fa
 
 [Wiki](http://forestry.sengir.net/)
 
-[Latest Builds for 1.9](http://jenkins.ic2.player.to/job/Forestry_5/)
+[Latest Builds for 1.10 / 1.10.2](http://jenkins.ic2.player.to/job/Forestry_5/)
 
 [IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryGithub...&channels=forestry&prompt=1)
 

build.gradle

@@ -40,7 +40,6 @@ targetCompatibility = 1.8
 minecraft {
 	version = mcversion + "-" + forgeversion
 	runDir = "run"
-	useDepAts = true
 	mappings = mcp_mappings
 
 	replace '@VERSION@', project.version
@@ -56,6 +55,9 @@ sourceSets {
 }
 
 repositories {
+	maven {
+		url 'http://maven.epoxide.xyz'
+	}
 	maven {
 		url "http://dvs1.progwml6.com/files/maven"
 	}
@@ -66,9 +68,10 @@ repositories {
 }
 
 dependencies {
-	deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}"
-//	deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
-//	runtime "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
+	deobfCompile "net.darkhax.tesla:Tesla:${tesla_version}"
+	deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}:api"
+	runtime "mezz.jei:jei_${mcversion}:${jei_version}"
+	deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
 }
 
 configurations {

gradle.properties

@@ -1,9 +1,11 @@
-mcversion=1.9.4
-forgeversion=12.17.0.1950
+mcversion=1.10.2
+forgeversion=12.18.0.2005-1.10.0
 mcp_mappings=snapshot_20160525
 
-jei_version=3.4.0.+
+tesla_version=1.9.4-1.1.0.24
+jei_version=3.7.3.221
+ic2_version=2.6.5-ex110
 
 version_major=5
-version_minor=0
-version_patch=8
+version_minor=2
+version_patch=4

src/main/java/forestry/Forestry.java

@@ -12,6 +12,7 @@ package forestry;
 
 import java.io.File;
 
+import forestry.plugins.compat.PluginIC2;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fml.common.Mod;
@@ -49,15 +50,10 @@ import forestry.plugins.PluginManager;
 		name = "Forestry",
 		version = Constants.VERSION,
 		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
-		dependencies = "required-after:Forge@[12.17.0.1949,);"
-				+ "after:Buildcraft|Core@[7.2,);"
-				+ "after:BuildCraft|Energy@[7.2,);"
-				+ "after:ExtrabiomesXL;"
-				+ "after:BiomesOPlenty;"
-				+ "after:IC2@[2.3.235,);"
-				+ "after:Natura@[2.2.0,);"
-				+ "after:HardcoreEnderExpansion;"
-				+ "after:basemetals;")
+		acceptedMinecraftVersions = "[1.10]",
+		dependencies = "required-after:Forge@[12.18.0.1989,);"
+				+ "after:JEI@[3.7.0,);"
+				+ "after:" + PluginIC2.modId + ";")
 public class Forestry {
 
 	@Mod.Instance(Constants.MOD_ID)

src/main/java/forestry/api/apiculture/IAlleleBeeSpecies.java

@@ -50,12 +50,4 @@ public interface IAlleleBeeSpecies extends IAlleleSpecies {
 	
 	@SideOnly(Side.CLIENT)
 	void registerModels(Item item, IModelManager manager);
-
-	/**
-	 * @deprecated since Forestry 3.6.
-	 * @return Path of the texture to use for entity rendering.
-	 */
-	@Deprecated
-	String getEntityTexture();
-
 }

src/main/java/forestry/api/apiculture/IBeeHousing.java

@@ -5,6 +5,8 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
@@ -32,6 +34,7 @@ public interface IBeeHousing extends IHousing, IErrorLogicSource {
 	 */
 	Iterable<IBeeListener> getBeeListeners();
 
+	@Nonnull
 	IBeeHousingInventory getBeeInventory();
 
 	IBeekeepingLogic getBeekeepingLogic();

src/main/java/forestry/api/apiculture/IBeeMutationBuilder.java

@@ -5,8 +5,9 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import forestry.api.genetics.IMutationCustom;
-
-public interface IBeeMutationCustom extends IBeeMutation, IMutationCustom {
+import forestry.api.genetics.IMutationBuilder;
 
+public interface IBeeMutationBuilder extends IMutationBuilder {
+	@Override
+	IBeeMutation build();
 }

src/main/java/forestry/api/apiculture/IBeeMutationFactory.java

@@ -11,7 +11,7 @@ public interface IBeeMutationFactory {
 	/**
 	 * Creates a new bee mutation.
 	 * Automatically registered with BeeManager.beeRoot.registerMutation()
-	 * See IBeeMutationCustom and IMutationCustom for adding additional properties to the returned mutation.
+	 * See IBeeMutationBuilder and IMutationBuilder for adding additional properties to the returned mutation.
 	 *
 	 * @param parentBee0 A parent bee for this mutation
 	 * @param parentBee1 A parent bee for this mutation
@@ -19,5 +19,5 @@ public interface IBeeMutationFactory {
 	 * @param chance The chance that breeding the two parent bees will result in this mutation
 	 * @return a new bee mutation.
 	 */
-	IBeeMutationCustom createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance);
+	IBeeMutationBuilder createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance);
 }

src/main/java/forestry/api/apiculture/IBeeRoot.java

@@ -7,17 +7,15 @@ package forestry.api.apiculture;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
 
+import com.mojang.authlib.GameProfile;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.ISpeciesRoot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-import com.mojang.authlib.GameProfile;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.ISpeciesRoot;
-
 public interface IBeeRoot extends ISpeciesRoot {
 
 	/**
@@ -100,7 +98,7 @@ public interface IBeeRoot extends ISpeciesRoot {
 
 	/* MUTATIONS */
 	@Override
-	Collection<IBeeMutation> getMutations(boolean shuffle);
+	List<IBeeMutation> getMutations(boolean shuffle);
 
 	/* GAME MODE */
 	void resetBeekeepingMode();

src/main/java/forestry/api/apiculture/IBeekeepingLogic.java

@@ -36,6 +36,12 @@ public interface IBeekeepingLogic extends INbtWritable, INbtReadable {
 	 */
 	void doWork();
 
+	/**
+	 * Force the logic to refresh any cached values and error states.
+	 * Call this when a player opens the gui so that all errors are up to date.
+	 */
+	void clearCachedValues();
+
 
 	/* CLIENT */
 

src/main/java/forestry/api/apiculture/IJubilanceFactory.java

@@ -5,12 +5,12 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
 
 public interface IJubilanceFactory {
 	/** The default Jubilance Provider is satisfied when the humidity and temperature are ideal for the bee. */
 	IJubilanceProvider getDefault();
 
 	/** The Requires Resource Jubilance Provider is satisfied when a specific block is under the hive. */
-	IJubilanceProvider getRequiresResource(Block block, int meta);
+	IJubilanceProvider getRequiresResource(IBlockState... acceptedBlockStates);
 }

src/main/java/forestry/api/apiculture/hives/IHiveDescription.java

@@ -5,6 +5,8 @@
  ******************************************************************************/
 package forestry.api.apiculture.hives;
 
+import java.util.Random;
+
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -46,5 +48,5 @@ public interface IHiveDescription {
 	 * Called after successful hive generation.
 	 * world, x, y, z give the location of the new hive.
 	 **/
-	void postGen(World world, BlockPos pos);
+	void postGen(World world, Random rand, BlockPos pos);
 }

src/main/java/forestry/api/arboriculture/EnumForestryWoodType.java

@@ -10,28 +10,53 @@ import java.util.Locale;
 import java.util.Random;
 
 public enum EnumForestryWoodType implements IWoodType {
-	LARCH, TEAK, ACACIA, LIME,
-	CHESTNUT, WENGE, BAOBAB, SEQUOIA(4.0f),
+	LARCH(4, 20),
+	TEAK(4, 20),
+	ACACIA(4, 20),
+	LIME(4, 19),
+	CHESTNUT(4, 21),
+	WENGE(4, 20),
+	BAOBAB(4, 20),
+	SEQUOIA(3, 18, 4.0f),
 
-	KAPOK, EBONY, MAHOGANY, BALSA(1.0f),
-	WILLOW, WALNUT, GREENHEART(7.5f), CHERRY,
+	KAPOK(4, 20),
+	EBONY(4, 20),
+	MAHOGANY(4, 20),
+	BALSA(4, 20, 1.0f),
+	WILLOW(4, 20),
+	WALNUT(4, 21),
+	GREENHEART(4, 20, 7.5f),
+	CHERRY(4, 20),
 
-	MAHOE, POPLAR, PALM, PAPAYA,
-	PINE(3.0f), PLUM, MAPLE, CITRUS,
+	MAHOE(4, 20),
+	POPLAR(4, 20),
+	PALM(4, 20),
+	PAPAYA(4, 20),
+	PINE(4, 20, 3.0f),
+	PLUM(4, 20),
+	MAPLE(4, 20),
+	CITRUS(4, 20),
 
-	GIGANTEUM, IPE, PADAUK, COCOBOLO,
-	ZEBRAWOOD;
+	GIGANTEUM(3, 18, 4.0f),
+	IPE(4, 20),
+	PADAUK(4, 20),
+	COCOBOLO(4, 20),
+	ZEBRAWOOD(4, 20);
 
 	public static final float DEFAULT_HARDNESS = 2.0f;
 	public static final EnumForestryWoodType[] VALUES = values();
 
+	private final int carbonization;
+	private final int combustability;
 	private final float hardness;
 
-	EnumForestryWoodType() {
-		this(DEFAULT_HARDNESS);
+	EnumForestryWoodType(int carbonization, int combustability) {
+		this(carbonization, combustability, DEFAULT_HARDNESS);
 	}
 
-	EnumForestryWoodType(float hardness) {
+	EnumForestryWoodType(int carbonization, int combustability, float hardness) {
+		this.carbonization = carbonization;
+		this.combustability = combustability;
 		this.hardness = hardness;
 	}
 
@@ -66,4 +91,12 @@ public enum EnumForestryWoodType implements IWoodType {
 		}
 		return VALUES[meta];
 	}
+
+	public int getCarbonization() {
+		return carbonization;
+	}
+
+	public int getCombustability() {
+		return combustability;
+	}
 }

src/main/java/forestry/api/arboriculture/EnumTreeChromosome.java

@@ -7,8 +7,6 @@ package forestry.api.arboriculture;
 
 import java.util.Locale;
 
-import net.minecraftforge.common.EnumPlantType;
-
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleArea;
 import forestry.api.genetics.IAlleleBoolean;
@@ -18,6 +16,7 @@ import forestry.api.genetics.IAllelePlantType;
 import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.IFruitFamily;
 import forestry.api.genetics.ISpeciesRoot;
+import net.minecraftforge.common.EnumPlantType;
 
 public enum EnumTreeChromosome implements IChromosomeType {
 
@@ -28,7 +27,9 @@ public enum EnumTreeChromosome implements IChromosomeType {
 	SPECIES(IAlleleTreeSpecies.class),
 	/**
 	 * {@link IGrowthProvider}, determines conditions required by the tree to grow.
+	 * @deprecated unused
 	 */
+	@Deprecated
 	GROWTH(IAlleleGrowth.class),
 	/**
 	 * A float modifying the height of the tree. Taken into account at worldgen.
@@ -48,15 +49,19 @@ public enum EnumTreeChromosome implements IChromosomeType {
 	YIELD(IAlleleFloat.class),
 	/**
 	 * May add additional tolerances for {@link EnumPlantType}.
+	 * @deprecated this is tied to species directly
 	 */
+	@Deprecated
 	PLANT(IAllelePlantType.class),
 	/**
 	 * Determines the speed at which fruit will ripen on this tree.
 	 */
 	SAPPINESS(IAlleleFloat.class),
 	/**
-	 * Territory for leaf effects. Unused.
+	 * Territory for leaf effects.
+	 * @deprecated unused
 	 */
+	@Deprecated
 	TERRITORY(IAlleleArea.class),
 	/**
 	 * Leaf effect. Unused.
@@ -70,11 +75,15 @@ public enum EnumTreeChromosome implements IChromosomeType {
 	GIRTH(IAlleleInteger.class),
 	/**
 	 * The combustibility of the wood, when it burn to charcoal and the combustibility of the charcoal.
+	 * @deprecated this is tied to species directly
 	 */
+	@Deprecated
 	COMBUSTIBILITY(IAlleleInteger.class),
 	/**
 	 * The amount of charcoal that a wood pile ash drop;
+	 * @deprecated this is tied to species directly
 	 */
+	@Deprecated
 	CARBONIZATION(IAlleleInteger.class),
 	/**
 	 * Determines if the tree can burn.

src/main/java/forestry/api/arboriculture/EnumVanillaWoodType.java

@@ -7,12 +7,12 @@ import java.util.Random;
 import net.minecraft.block.BlockPlanks;
 
 public enum EnumVanillaWoodType implements IWoodType {
-	OAK(BlockPlanks.EnumType.OAK),
-	SPRUCE(BlockPlanks.EnumType.SPRUCE),
-	BIRCH(BlockPlanks.EnumType.BIRCH),
-	JUNGLE(BlockPlanks.EnumType.JUNGLE),
-	ACACIA(BlockPlanks.EnumType.ACACIA),
-	DARK_OAK(BlockPlanks.EnumType.DARK_OAK);
+	OAK(BlockPlanks.EnumType.OAK, 5, 20),
+	SPRUCE(BlockPlanks.EnumType.SPRUCE, 4, 19),
+	BIRCH(BlockPlanks.EnumType.BIRCH, 4, 19),
+	JUNGLE(BlockPlanks.EnumType.JUNGLE, 5, 20),
+	ACACIA(BlockPlanks.EnumType.ACACIA, 4, 20),
+	DARK_OAK(BlockPlanks.EnumType.DARK_OAK, 5, 20);
 
 	public static final EnumVanillaWoodType[] VALUES = values();
 
@@ -21,9 +21,13 @@ public enum EnumVanillaWoodType implements IWoodType {
 	}
 
 	private final BlockPlanks.EnumType vanillaType;
+	private final int carbonization;
+	private final int combustability;
 
-	EnumVanillaWoodType(BlockPlanks.EnumType vanillaType) {
+	EnumVanillaWoodType(BlockPlanks.EnumType vanillaType, int carbonization, int combustability) {
 		this.vanillaType = vanillaType;
+		this.carbonization = carbonization;
+		this.combustability = combustability;
 	}
 
 	public BlockPlanks.EnumType getVanillaType() {
@@ -57,4 +61,14 @@ public enum EnumVanillaWoodType implements IWoodType {
 	public float getHardness() {
 		return 2.0F;
 	}
+
+	@Override
+	public int getCarbonization() {
+		return carbonization;
+	}
+
+	@Override
+	public int getCombustability() {
+		return combustability;
+	}
 }

src/main/java/forestry/api/arboriculture/IGermlingModelProvider.java

@@ -10,6 +10,9 @@ import javax.annotation.Nonnull;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.Item;
 
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
 import forestry.api.core.IModelManager;
 
 /**
@@ -18,6 +21,7 @@ import forestry.api.core.IModelManager;
  * There is no default implementation because every sapling has a unique icon.
  */
 public interface IGermlingModelProvider {
+	@SideOnly(Side.CLIENT)
 	void registerModels(Item item, IModelManager manager, EnumGermlingType type);
 
 	@Nonnull

src/main/java/forestry/api/arboriculture/IGrowthProvider.java

@@ -10,6 +10,10 @@ import javax.annotation.Nullable;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+/**
+ * @deprecated this is being removed to simplify trees
+ */
+@Deprecated
 public interface IGrowthProvider {
 
 	/**
@@ -25,8 +29,6 @@ public interface IGrowthProvider {
 	@Nullable
 	BlockPos canGrow(ITreeGenome genome, World world, BlockPos pos, int expectedGirth, int expectedHeight);
 
-	EnumGrowthConditions getGrowthConditions(ITreeGenome genome, World world, BlockPos pos);
-
 	/**
 	 * @return Short, human-readable identifier used in the treealyzer.
 	 */

src/main/java/forestry/api/arboriculture/ITree.java

@@ -7,24 +7,19 @@ package forestry.api.arboriculture;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 
+import com.mojang.authlib.GameProfile;
+import forestry.api.genetics.IEffectData;
+import forestry.api.genetics.IIndividual;
+import forestry.api.world.ITreeGenData;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
 
-import com.mojang.authlib.GameProfile;
-
-import net.minecraftforge.common.EnumPlantType;
-
-import forestry.api.genetics.IEffectData;
-import forestry.api.genetics.IIndividual;
-import forestry.api.world.ITreeGenData;
-
 public interface ITree extends IIndividual, ITreeGenData {
 
 	void mate(ITree other);
@@ -39,8 +34,6 @@ public interface ITree extends IIndividual, ITreeGenData {
 
 	ITreeGenome getMate();
 
-	EnumSet<EnumPlantType> getPlantTypes();
-
 	/**
 	 * @since Forestry 4.0
 	 */
@@ -84,12 +77,7 @@ public interface ITree extends IIndividual, ITreeGenData {
 	 * @return Integer denoting the size of the tree trunk.
 	 */
 	@Override
-	int getGirth(World world, BlockPos pos);
-
-	/**
-	 * @return Growth conditions at the given position.
-	 */
-	EnumGrowthConditions getGrowthCondition(World world, BlockPos pos);
+	int getGirth();
 
 	WorldGenerator getTreeGenerator(World world, BlockPos pos, boolean wasBonemealed);
 

src/main/java/forestry/api/arboriculture/ITreeGenome.java

@@ -6,9 +6,6 @@
 package forestry.api.arboriculture;
 
 import javax.annotation.Nonnull;
-import java.util.EnumSet;
-
-import net.minecraftforge.common.EnumPlantType;
 
 import forestry.api.genetics.IGenome;
 
@@ -23,8 +20,6 @@ public interface ITreeGenome extends IGenome {
 	@Nonnull
 	IFruitProvider getFruitProvider();
 
-	IGrowthProvider getGrowthProvider();
-
 	float getHeight();
 
 	float getFertility();
@@ -37,18 +32,12 @@ public interface ITreeGenome extends IGenome {
 
 	float getSappiness();
 
-	EnumSet<EnumPlantType> getPlantTypes();
-
 	/**
 	 * @return Amount of random block ticks required for a sapling to mature into a fully grown tree.
 	 */
 	int getMaturationTime();
 
 	int getGirth();
-	
-	int getCombustibility();
-	
-	int getCarbonization();
 
 	IAlleleLeafEffect getEffect();
 }

src/main/java/forestry/api/arboriculture/ITreeMutationBuilder.java

@@ -5,8 +5,9 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import forestry.api.genetics.IMutationCustom;
-
-public interface ITreeMutationCustom extends ITreeMutation, IMutationCustom {
+import forestry.api.genetics.IMutationBuilder;
 
+public interface ITreeMutationBuilder extends IMutationBuilder {
+	@Override
+	ITreeMutation build();
 }

src/main/java/forestry/api/arboriculture/ITreeMutationFactory.java

@@ -11,7 +11,7 @@ public interface ITreeMutationFactory {
 	/**
 	 * Creates a new tree mutation.
 	 * Automatically registered with TreeManager.treeRoot.registerMutation()
-	 * See ITreeMutationCustom and IMutationCustom for adding additional properties to the returned mutation.
+	 * See ITreeMutationBuilder and IMutationBuilder for adding additional properties to the returned mutation.
 	 *
 	 * @param parentTree0 A parent tree for this mutation
 	 * @param parentTree1 A parent tree for this mutation
@@ -19,5 +19,5 @@ public interface ITreeMutationFactory {
 	 * @param chance The chance that breeding the two parent trees will result in this mutation
 	 * @return a new tree mutation.
 	 */
-	ITreeMutationCustom createMutation(IAlleleTreeSpecies parentTree0, IAlleleTreeSpecies parentTree1, IAllele[] result, int chance);
+	ITreeMutationBuilder createMutation(IAlleleTreeSpecies parentTree0, IAlleleTreeSpecies parentTree1, IAllele[] result, int chance);
 }

src/main/java/forestry/api/arboriculture/ITreeRoot.java

@@ -8,18 +8,17 @@ package forestry.api.arboriculture;
 import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
+import com.mojang.authlib.GameProfile;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IChromosome;
+import forestry.api.genetics.ISpeciesRoot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import com.mojang.authlib.GameProfile;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IChromosome;
-import forestry.api.genetics.ISpeciesRoot;
-
 public interface ITreeRoot extends ISpeciesRoot {
 
 	@Override
@@ -82,7 +81,7 @@ public interface ITreeRoot extends ISpeciesRoot {
 	boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, BlockPos pos);
 
 	/* GAME MODE */
-	ArrayList<ITreekeepingMode> getTreekeepingModes();
+	List<ITreekeepingMode> getTreekeepingModes();
 
 	ITreekeepingMode getTreekeepingMode(World world);
 
@@ -98,6 +97,5 @@ public interface ITreeRoot extends ISpeciesRoot {
 
 	/* MUTATIONS */
 	@Override
-	Collection<ITreeMutation> getMutations(boolean shuffle);
-
+	List<ITreeMutation> getMutations(boolean shuffle);
 }

src/main/java/forestry/api/arboriculture/IWoodProvider.java

@@ -7,12 +7,12 @@ package forestry.api.arboriculture;
 
 import javax.annotation.Nonnull;
 
+import forestry.api.core.ITextureManager;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import forestry.api.core.ITextureManager;
 
 public interface IWoodProvider {
 	@SideOnly(Side.CLIENT)
@@ -30,4 +30,14 @@ public interface IWoodProvider {
 	 * @return A stack of wood from the tree to craft wood pile's or other things.
 	 */
 	ItemStack getWoodStack();
+
+	/**
+	 * @return how long this wood's charcoal burns / 1000
+	 */
+	int getCombustibility();
+
+	/**
+	 * The amount of charcoal dropped from a charcoal pile of this wood.
+	 */
+	int getCarbonization();
 }

src/main/java/forestry/api/arboriculture/IWoodType.java

@@ -10,4 +10,8 @@ public interface IWoodType extends IStringSerializable {
 	int getMetadata();
 
 	float getHardness();
+
+	int getCarbonization();
+
+	int getCombustability();
 }

src/main/java/forestry/api/circuits/ICircuit.java

@@ -10,10 +10,6 @@ import java.util.List;
 public interface ICircuit {
 	String getUID();
 
-	boolean requiresDiscovery();
-
-	int getLimit();
-
 	String getUnlocalizedName();
 
 	boolean isCircuitable(Object tile);

src/main/java/forestry/api/core/IModelBaker.java

@@ -9,6 +9,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.EnumFacing;
@@ -38,7 +39,7 @@ public interface IModelBaker {
 	
 	void addModel(@Nonnull AxisAlignedBB renderBounds, @Nonnull TextureAtlasSprite texture, int colorIndex);
 	
-	void addBakedModel(@Nonnull IBakedModel model);
+	void addBakedModel(@Nullable IBlockState state, @Nonnull IBakedModel model);
 	
 	void addFace(@Nonnull EnumFacing facing, @Nonnull TextureAtlasSprite sprite);
 	

src/main/java/forestry/api/core/IModelManager.java

@@ -30,6 +30,4 @@ public interface IModelManager {
 	
 	void registerItemModel(Item item, ItemMeshDefinition definition);
 	
-	void registerVariant(Item item, ResourceLocation... resources);
-	
 }

src/main/java/forestry/api/farming/IFarmLogic.java

@@ -38,6 +38,8 @@ public interface IFarmLogic {
 	
 	String getName();
 	
-	@SideOnly(Side.CLIENT)
-	ItemStack getStack();
+	/**
+	 * @return the itemStack that represents this farm logic. Used as an icon for the farm logic.
+	 */
+	ItemStack getIconItemStack();
 }

src/main/java/forestry/api/genetics/ICheckPollinatable.java

@@ -10,11 +10,8 @@
  ******************************************************************************/
 package forestry.api.genetics;
 
-import java.util.EnumSet;
-
-import net.minecraftforge.common.EnumPlantType;
-
 import forestry.api.arboriculture.ITree;
+import net.minecraftforge.common.EnumPlantType;
 
 /**
  * Used to check for pollination traits without altering the world by changing vanilla leaves to forestry ones.
@@ -23,10 +20,10 @@ import forestry.api.arboriculture.ITree;
 public interface ICheckPollinatable {
 
 	/**
-	 * @return plant types this pollinatable is classified as.
+	 * @return plant type this pollinatable is classified as.
 	 * (Can be used by bees to determine whether to interact or not.)
 	 */
-	EnumSet<EnumPlantType> getPlantType();
+	EnumPlantType getPlantType();
 
 	/**
 	 * @return IIndividual containing the genetic information of this IPollinatable

src/main/java/forestry/api/genetics/IMutationBuilder.java

@@ -5,48 +5,48 @@
  ******************************************************************************/
 package forestry.api.genetics;
 
-import net.minecraft.block.Block;
-
-import net.minecraftforge.common.BiomeDictionary;
-
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
+import net.minecraft.block.state.IBlockState;
+import net.minecraftforge.common.BiomeDictionary;
 
 /** Set custom mutation requirements */
-public interface IMutationCustom extends IMutation {
+public interface IMutationBuilder {
 
+	IMutation build();
+	
 	/** Prevent this mutation from being shown in the analyzers */
-	IMutationCustom setIsSecret();
+	IMutationBuilder setIsSecret();
 
 	/** Require a specific temperature for this mutation to occur */
-	IMutationCustom restrictTemperature(EnumTemperature temperature);
+	IMutationBuilder restrictTemperature(EnumTemperature temperature);
 
-	IMutationCustom restrictTemperature(EnumTemperature minTemperature, EnumTemperature maxTemperature);
+	IMutationBuilder restrictTemperature(EnumTemperature minTemperature, EnumTemperature maxTemperature);
 
 	/** Require a specific humidity for this mutation to occur */
-	IMutationCustom restrictHumidity(EnumHumidity humidity);
+	IMutationBuilder restrictHumidity(EnumHumidity humidity);
 
-	IMutationCustom restrictHumidity(EnumHumidity minHumidity, EnumHumidity maxHumidity);
+	IMutationBuilder restrictHumidity(EnumHumidity minHumidity, EnumHumidity maxHumidity);
 
 	/**
 	 * Restrict this mutation to certain types of biomes.
 	 * @param types The types of biomes this mutation can occur.
 	 */
-	IMutationCustom restrictBiomeType(BiomeDictionary.Type... types);
+	IMutationBuilder restrictBiomeType(BiomeDictionary.Type... types);
 
 	/** Restrict the days of the year that this mutation can occur */
-	IMutationCustom restrictDateRange(int startMonth, int startDay, int endMonth, int endDay);
+	IMutationBuilder restrictDateRange(int startMonth, int startDay, int endMonth, int endDay);
 
 	/** Restrict the time of day that this mutation can occur */
-	IMutationCustom requireDay();
+	IMutationBuilder requireDay();
 
-	IMutationCustom requireNight();
+	IMutationBuilder requireNight();
 
 	/** Require a specific resource to be under the location of the mutation */
-	IMutationCustom requireResource(Block block, int meta);
+	IMutationBuilder requireResource(IBlockState... acceptedBlockStates);
 
-	IMutationCustom requireResource(String oreDictName);
+	IMutationBuilder requireResource(String oreDictName);
 
 	/** Require some other custom mutation condition */
-	IMutationCustom addMutationCondition(IMutationCondition mutationCondition);
+	IMutationBuilder addMutationCondition(IMutationCondition mutationCondition);
 }

src/main/java/forestry/api/genetics/ISpeciesRoot.java

@@ -12,12 +12,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import com.mojang.authlib.GameProfile;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-import com.mojang.authlib.GameProfile;
-
 /**
  * Describes a class of species (i.e. bees, trees, butterflies), provides helper functions and access to common functionality.
  */
@@ -105,9 +104,9 @@ public interface ISpeciesRoot {
 	void registerTemplate(String identifier, IAllele[] template);
 
 	/**
-	 * Retrieves a registered template using the passed identifier.
+	 * Retrieves a registered template using the passed species unique identifier.
 	 *
-	 * @param identifier
+	 * @param identifier species UID
 	 * @return Array of {@link IAllele} representing a genome.
 	 */
 	IAllele[] getTemplate(String identifier);
@@ -139,13 +138,13 @@ public interface ISpeciesRoot {
 	/**
 	 * @return All registered mutations.
 	 */
-	Collection<? extends IMutation> getMutations(boolean shuffle);
+	List<? extends IMutation> getMutations(boolean shuffle);
 
 	/**
 	 * @param other Allele to match mutations against.
 	 * @return All registered mutations the given allele is part of.
 	 */
-	Collection<? extends IMutation> getCombinations(IAllele other);
+	List<? extends IMutation> getCombinations(IAllele other);
 
 	/**
 	 * @since Forestry 3.7
@@ -170,14 +169,14 @@ public interface ISpeciesRoot {
 	void setResearchSuitability(ItemStack itemstack, float suitability);
 
 	/**
-	 * @return Array of {@link IChromosomeType} which are in this species genome
+	 * @return Array of all {@link IChromosomeType} which are in this species genome
 	 */
 	IChromosomeType[] getKaryotype();
 
 	/**
-	 * @return {@link IChromosomeType} which is the "key" for this species class, usually the species chromosome.
+	 * @return {@link IChromosomeType} which is the "key" for this species class, the species chromosome.
 	 */
-	IChromosomeType getKaryotypeKey();
+	IChromosomeType getSpeciesChromosomeType();
 
 	/**
 	 * Plugin to add information for the handheld genetic analyzer.

src/main/java/forestry/api/lepidopterology/IButterflyMutationBuilder.java

@@ -5,8 +5,9 @@
  ******************************************************************************/
 package forestry.api.lepidopterology;
 
-import forestry.api.genetics.IMutationCustom;
-
-public interface IButterflyMutationCustom extends IButterflyMutation, IMutationCustom {
+import forestry.api.genetics.IMutationBuilder;
 
+public interface IButterflyMutationBuilder extends IMutationBuilder {
+	@Override
+	IButterflyMutation build();
 }

src/main/java/forestry/api/lepidopterology/IButterflyMutationFactory.java

@@ -11,7 +11,7 @@ public interface IButterflyMutationFactory {
 	/**
 	 * Creates a new butterfly mutation.
 	 * Automatically registered with ButterflyManager.butterflyRoot.registerMutation()
-	 * See IButterflyMutationCustom and IMutationCustom for adding additional properties to the returned mutation.
+	 * See IButterflyMutationBuilder and IMutationBuilder for adding additional properties to the returned mutation.
 	 *
 	 * @param parentButterfly0 A parent butterfly for this mutation
 	 * @param parentButterfly1 A parent butterfly for this mutation
@@ -19,5 +19,5 @@ public interface IButterflyMutationFactory {
 	 * @param chance The chance that breeding the two parent butterfly's will result in this mutation
 	 * @return a new butterfly mutation.
 	 */
-	IButterflyMutationCustom createMutation(IAlleleButterflySpecies parentButterfly0, IAlleleButterflySpecies parentButterfly1, IAllele[] result, int chance);
+	IButterflyMutationBuilder createMutation(IAlleleButterflySpecies parentButterfly0, IAlleleButterflySpecies parentButterfly1, IAllele[] result, int chance);
 }

src/main/java/forestry/api/lepidopterology/IButterflyRoot.java

@@ -7,18 +7,16 @@ package forestry.api.lepidopterology;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
 
+import com.mojang.authlib.GameProfile;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.ISpeciesRoot;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-import com.mojang.authlib.GameProfile;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.ISpeciesRoot;
-
 public interface IButterflyRoot extends ISpeciesRoot {
 
 	@Override
@@ -67,7 +65,7 @@ public interface IButterflyRoot extends ISpeciesRoot {
 
 	/* MUTATIONS */
 	@Override
-	Collection<IButterflyMutation> getMutations(boolean shuffle);
+	List<IButterflyMutation> getMutations(boolean shuffle);
 
 	@Nullable
 	@Override

src/main/java/forestry/api/mail/IMailAddress.java

@@ -17,9 +17,5 @@ public interface IMailAddress extends INbtWritable {
 
 	boolean isValid();
 
-	boolean isPlayer();
-
-	boolean isTrader();
-
 	GameProfile getPlayerProfile();
 }

src/main/java/forestry/api/mail/IPostRegistry.java

@@ -5,6 +5,7 @@
  ******************************************************************************/
 package forestry.api.mail;
 
+import javax.annotation.Nonnull;
 import java.util.Map;
 
 import net.minecraft.item.ItemStack;
@@ -18,9 +19,10 @@ public interface IPostRegistry {
 	IPostOffice getPostOffice(World world);
 
 	/* MAIL ADDRESSES */
-	IMailAddress getMailAddress(GameProfile gameProfile);
-
-	IMailAddress getMailAddress(String traderName);
+	@Nonnull
+	IMailAddress getMailAddress(@Nonnull GameProfile gameProfile);
+	
+	IMailAddress getMailAddress(@Nonnull String traderName);
 
 	/* LETTERS */
 	boolean isLetter(ItemStack itemstack);

src/main/java/forestry/api/multiblock/ICharcoalPileComponent.java

@@ -8,9 +8,8 @@ package forestry.api.multiblock;
 import javax.annotation.Nonnull;
 
 import com.mojang.authlib.GameProfile;
-
 import forestry.api.arboriculture.EnumPileType;
-import forestry.api.arboriculture.ITree;
+import forestry.api.arboriculture.IAlleleTreeSpecies;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -23,11 +22,10 @@ public interface ICharcoalPileComponent<T extends IMultiblockLogicCharcoalPile>
 	
 	@Override
 	T getMultiblockLogic();
-	
-	@Nonnull
-	ITree getTree();
-	
-	void setTree(@Nonnull ITree tree);
+
+	IAlleleTreeSpecies getTreeSpecies();
+
+	void setTreeSpecies(@Nonnull IAlleleTreeSpecies treeSpecies);
 	
 	@Override
 	@Nonnull
@@ -38,6 +36,6 @@ public interface ICharcoalPileComponent<T extends IMultiblockLogicCharcoalPile>
 	EnumPileType getPileType();
 	
 	@SideOnly(Side.CLIENT)
-	ITree getNextWoodPile();
+	IAlleleTreeSpecies getNextWoodPile();
 
 }

src/main/java/forestry/api/recipes/ISqueezerRecipe.java

@@ -5,6 +5,8 @@
  ******************************************************************************/
 package forestry.api.recipes;
 
+import javax.annotation.Nullable;
+
 import net.minecraft.item.ItemStack;
 
 import net.minecraftforge.fluids.FluidStack;
@@ -24,6 +26,7 @@ public interface ISqueezerRecipe extends IForestryRecipe {
 	/**
 	 * @return Item stack representing the possible remnants from this recipe. (i.e. tin left over from tin cans)
 	 */
+	@Nullable
 	ItemStack getRemnants();
 
 	/**

src/main/java/forestry/api/storage/IBackpackDefinition.java

@@ -5,43 +5,42 @@
  ******************************************************************************/
 package forestry.api.storage;
 
-import java.util.List;
+import javax.annotation.Nonnull;
 import java.util.function.Predicate;
 
 import net.minecraft.item.ItemStack;
 
-public interface IBackpackDefinition extends Predicate<ItemStack> {
-
+/**
+ * To make your own backpack, create a backpack definition and register it with
+ * {@link IBackpackInterface#registerBackpackDefinition(String, IBackpackDefinition)}.
+ */
+public interface IBackpackDefinition {
 	/**
 	 * @return Human-readable name of the backpack.
 	 */
+	@Nonnull
 	String getName(ItemStack backpack);
 
 	/**
-	 * @return Primary colour for the backpack icon.
+	 * @return Primary color for the backpack icon.
 	 */
 	int getPrimaryColour();
 
 	/**
-	 * @return Secondary colour for backpack icon.
+	 * @return Secondary color for backpack icon, normally white.
 	 */
 	int getSecondaryColour();
 
 	/**
-	 * Adds an item as valid for this backpack.
+	 * Filters items that can be put into a backpack.
 	 *
-	 * @param validItem
+	 * For Backpack Implementers: you can create a new filter with
+	 * {@link IBackpackInterface#createBackpackFilter()} or
+	 * {@link IBackpackInterface#createNaturalistBackpackFilter(String)}
+	 * or implement your own.
+	 *
+	 * @return the backpack's item filter.
 	 */
-	void addValidItem(ItemStack validItem);
-
-	void addValidItems(List<ItemStack> validItems);
-
-	void addValidOreDictName(String oreDictName);
-
-	/**
-	 * Returns true if the ItemStack is a valid item for this backpack type.
-	 */
-	@Override
-	boolean test(ItemStack itemstack);
-
+	@Nonnull
+	Predicate<ItemStack> getFilter();
 }

src/main/java/forestry/api/storage/IBackpackFilterConfigurable.java

@@ -0,0 +1,45 @@
+package forestry.api.storage;
+
+import java.util.function.Predicate;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+/**
+ * A configurable backpack filter. Useful for implementers of {@link IBackpackDefinition}.
+ * Get a new instance from {@link IBackpackInterface#createBackpackFilter()}.
+ */
+public interface IBackpackFilterConfigurable extends Predicate<ItemStack> {
+	/**
+	 * Adds an item as valid for this backpack to pick up.
+	 */
+	void acceptItem(ItemStack validItem);
+
+	/**
+	 * Adds an item as invalid for this backpack, used to make exceptions to oreDictionary matches.
+	 *
+	 * @see #acceptOreDictName(String)
+	 */
+	void rejectItem(ItemStack invalidItem);
+
+	/**
+	 * Adds an ore dictionary name as valid for this backpack.
+	 * The backpack will pick up any item that has this oreDictName.
+	 *
+	 * @see OreDictionary
+	 */
+	void acceptOreDictName(String oreDictName);
+
+	/**
+	 * Removes an ore dictionary name as valid for this backpack.
+	 * The backpack will not pick up any item that has this oreDictName.
+	 *
+	 * @see OreDictionary
+	 */
+	void rejectOreDictName(String oreDictName);
+
+	/**
+	 * Clear all the rules from this filter.
+	 */
+	void clear();
+}

src/main/java/forestry/api/storage/IBackpackInterface.java

@@ -7,32 +7,83 @@ package forestry.api.storage;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.function.Predicate;
 
+import forestry.api.genetics.ISpeciesRoot;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
+import net.minecraftforge.oredict.OreDictionary;
 
+/**
+ * The Backpack Interface allows you to add items to Forestry backpacks or create your own backpacks.
+ * <p>
+ * To create your own backpack, create an {@link IBackpackDefinition}.
+ * Backpack definitions have a filter, which you can create here with
+ * {@link #createBackpackFilter()}
+ * or {@link #createNaturalistBackpackFilter(String)}
+ * or create your own.
+ * <p>
+ * After you've registered your backpack definition, create the item with
+ * {@link #createBackpack(String, EnumBackpackType)}
+ * or {@link #createNaturalistBackpack(String, ISpeciesRoot)}
+ * and then register the returned item with {@link GameRegistry#register(IForgeRegistryEntry)} like any other item.
+ */
 public interface IBackpackInterface {
 	/**
-	 * Get a backpack with a given uid so you can add items to it or get information about it.
-	 * returns null if there is no backpack for the given uid.
+	 * Add an accepted item to a Forestry backpack.
+	 *
+	 * @param backpackUid The unique ID of the Forestry backpack. See {@link BackpackManager} for valid UIDs.
+	 * @param itemStack   The itemStack that the backpack should accept.
+	 *                    {@link OreDictionary#WILDCARD_VALUE} can be used for meta value.
+	 */
+	void addItemToForestryBackpack(@Nonnull String backpackUid, @Nonnull ItemStack itemStack);
+
+	/**
+	 * Register a backpack definition with a given uid.
+	 */
+	void registerBackpackDefinition(@Nonnull String backpackUid, @Nonnull IBackpackDefinition definition);
+
+	/**
+	 * Get a backpack definition with a given uid.
 	 */
 	@Nullable
-	IBackpackDefinition getBackpack(@Nonnull String uid);
+	IBackpackDefinition getBackpackDefinition(@Nonnull String backpackUid);
 
 	/**
-	 * Register a backpack with a given uid
-	 */
-	void registerBackpack(@Nonnull String uid, @Nonnull IBackpackDefinition definition);
-
-	/**
-	 * Adds a backpack with the given definition and type, returning the item.
+	 * Creates a backpack with the given UID and type, returning the item.
+	 * The backpack's definition must first be registered with {@link #registerBackpackDefinition(String, IBackpackDefinition)}.
 	 *
-	 * @param definition
-	 *            Definition of backpack behaviour.
-	 * @param type
-	 *            Type of backpack.
+	 * @param backpackUid The unique ID of the backpack.
+	 * @param type        Type of backpack.
 	 * @return Created backpack item.
 	 */
 	@Nonnull
-	Item createBackpack(@Nonnull IBackpackDefinition definition, @Nonnull EnumBackpackType type);
+	Item createBackpack(@Nonnull String backpackUid, @Nonnull EnumBackpackType type);
 
+	/**
+	 * Create a backpack that can hold items from a specific {@link ISpeciesRoot}.
+	 * The backpack's definition must first be registered with {@link #registerBackpackDefinition(String, IBackpackDefinition)}.
+	 *
+	 * @param backpackUid The unique ID of the backpack.
+	 * @param speciesRoot The species root.
+	 * @return Created backpack item.
+	 */
+	Item createNaturalistBackpack(@Nonnull String backpackUid, @Nonnull ISpeciesRoot speciesRoot);
+
+	/**
+	 * Makes a new configurable backpack filter. Useful for implementing {@link IBackpackDefinition}.
+	 */
+	IBackpackFilterConfigurable createBackpackFilter();
+
+	/**
+	 * Makes a new naturalist backpack filter. Only accepts items from a specific {@link ISpeciesRoot}.
+	 * Useful for implementing {@link IBackpackDefinition} for naturalist's backpacks.
+	 *
+	 * @param speciesRootUid The species root's unique ID. See {@link ISpeciesRoot#getUID()}.
+	 * @return a new backpack filter for the specified species root
+	 * @see #createNaturalistBackpack(String, ISpeciesRoot)
+	 */
+	Predicate<ItemStack> createNaturalistBackpackFilter(String speciesRootUid);
 }

src/main/java/forestry/api/storage/package-info.java

@@ -3,7 +3,7 @@
  *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
-@API(apiVersion = "3.0.0", owner = "ForestryAPI|core", provides = "ForestryAPI|storage")
+@API(apiVersion = "5.0.0", owner = "ForestryAPI|core", provides = "ForestryAPI|storage")
 package forestry.api.storage;
 
 import net.minecraftforge.fml.common.API;

src/main/java/forestry/api/world/ITreeGenData.java

@@ -18,7 +18,7 @@ import forestry.api.arboriculture.ITreeGenome;
 
 public interface ITreeGenData {
 
-	int getGirth(World world, BlockPos pos);
+	int getGirth();
 
 	float getHeightModifier();
 

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

@@ -11,6 +11,7 @@
 package forestry.apiculture;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -197,6 +198,8 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 		if (!ItemStack.areItemStacksEqual(this.queenStack, queenStack)) {
 			this.queen = BeeManager.beeRoot.getMember(queenStack);
 			this.queenStack = queenStack;
+			hasFlowersCache.clear();
+			queenCanWorkCache.clear();
 		}
 
 		if (errorLogic.setCondition(queen == null, EnumErrorCode.NO_QUEEN)) {
@@ -231,11 +234,20 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 		if (beeType == EnumBeeType.PRINCESS) {
 			tickBreed();
 		} else if (beeType == EnumBeeType.QUEEN) {
-			queenWorkTick(queen);
+			queenWorkTick(queen, queenStack);
 		}
 	}
 
-	private void queenWorkTick(IBee queen) {
+	@Override
+	public void clearCachedValues() {
+		if (!housing.getWorldObj().isRemote) {
+			hasFlowersCache.clear();
+			queenCanWorkCache.clear();
+			canWork();
+		}
+	}
+
+	private void queenWorkTick(@Nullable IBee queen, @Nonnull ItemStack queenStack) {
 		if (queen == null) {
 			beeProgress = 0;
 			beeProgressMax = 0;
@@ -261,7 +273,8 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 			// Write the changed queen back into the item stack.
 			NBTTagCompound nbttagcompound = new NBTTagCompound();
 			queen.writeToNBT(nbttagcompound);
-			housing.getBeeInventory().getQueen().setTagCompound(nbttagcompound);
+			queenStack.setTagCompound(nbttagcompound);
+			housing.getBeeInventory().setQueen(queenStack);
 		}
 
 		beeProgress = queen.getHealth();
@@ -505,6 +518,11 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 
 			return queenCanWorkCached;
 		}
+
+		public void clear() {
+			queenCanWorkCached.clear();
+			queenCanWorkCooldown = 0;
+		}
 	}
 
 	private static class PollenHandler {

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

@@ -37,6 +37,11 @@ public class FakeBeekeepingLogic implements IBeekeepingLogic {
 
 	}
 
+	@Override
+	public void clearCachedValues() {
+
+	}
+
 	@Override
 	public void syncToClient() {
 

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

@@ -97,6 +97,11 @@ public class HasFlowersCache implements INbtWritable, INbtReadable, IStreamable
 		return returnVal;
 	}
 
+	public void clear() {
+		flowerCoords.clear();
+		cooldown = 0;
+	}
+
 	@Nonnull
 	public List<BlockPos> getFlowerCoords() {
 		return Collections.unmodifiableList(flowerCoords);

src/main/java/forestry/apiculture/InventoryBeeHousing.java

@@ -16,7 +16,6 @@ import net.minecraft.util.EnumFacing;
 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;
@@ -27,8 +26,8 @@ public class InventoryBeeHousing extends InventoryAdapterRestricted implements I
 	public static final int SLOT_PRODUCT_1 = 2;
 	public static final int SLOT_PRODUCT_COUNT = 7;
 
-	public InventoryBeeHousing(int size, IAccessHandler accessHandler) {
-		super(size, "Items", accessHandler);
+	public InventoryBeeHousing(int size) {
+		super(size, "Items");
 	}
 
 	@Override

src/main/java/forestry/apiculture/PluginApiculture.java

@@ -10,44 +10,14 @@
  ******************************************************************************/
 package forestry.apiculture;
 
-import com.google.common.collect.ImmutableMap;
-
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 
-import net.minecraft.block.BlockFlower;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.entity.passive.EntityVillager;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.chunk.IChunkGenerator;
-import net.minecraft.world.storage.loot.LootTableList;
-
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.BiomeDictionary;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fml.common.FMLCommonHandler;
-import net.minecraftforge.fml.common.SidedProxy;
-import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.fml.common.registry.VillagerRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
+import com.google.common.collect.ImmutableMap;
 import forestry.Forestry;
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
@@ -120,6 +90,32 @@ import forestry.food.items.ItemRegistryFood;
 import forestry.plugins.BlankForestryPlugin;
 import forestry.plugins.ForestryPlugin;
 import forestry.plugins.ForestryPluginUids;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.chunk.IChunkGenerator;
+import net.minecraft.world.storage.loot.LootTableList;
+import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.common.BiomeDictionary;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.fml.common.registry.VillagerRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 @ForestryPlugin(pluginID = ForestryPluginUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.apiculture.description")
 public class PluginApiculture extends BlankForestryPlugin {
@@ -130,16 +126,12 @@ public class PluginApiculture extends BlankForestryPlugin {
 	public static String beekeepingMode = "NORMAL";
 	private static float secondPrincessChance = 0;
 	public static final int ticksPerBeeWorkCycle = 550;
-	public static boolean fancyRenderedBees = false;
 
 	public static ItemRegistryApiculture items;
 	public static BlockRegistryApiculture blocks;
 
 	public static HiveRegistry hiveRegistry;
 
-	private final Map<String, String[]> defaultAcceptedFlowers = new HashMap<>();
-	private final Map<String, String[]> defaultPlantableFlowers = new HashMap<>();
-
 	public static VillagerRegistry.VillagerProfession villagerApiarist;
 
 	@Override
@@ -271,13 +263,16 @@ public class PluginApiculture extends BlankForestryPlugin {
 			VillagerRegistry villagerRegistry = VillagerRegistry.instance();
 			villagerRegistry.registerVillageCreationHandler(villageHandler);
 
-			villagerApiarist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_APIARIST, Constants.TEXTURE_SKIN_BEEKPEEPER);
+			villagerApiarist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_APIARIST, Constants.TEXTURE_SKIN_BEEKPEEPER, Constants.TEXTURE_SKIN_ZOMBIE_BEEKPEEPER);
 			villagerRegistry.register(villagerApiarist);
 
 			ItemStack wildcardPrincess = new ItemStack(items.beePrincessGE, 1);
+			ItemStack wildcardDrone = new ItemStack(items.beeDroneGE, 1);
 			ItemStack apiary = new ItemStack(blocks.apiary);
 			ItemStack provenFrames = items.frameProven.getItemStack();
 			ItemStack monasticDrone = BeeDefinition.MONASTIC.getMemberStack(EnumBeeType.DRONE);
+			ItemStack endDrone = BeeDefinition.ENDED.getMemberStack(EnumBeeType.DRONE);
+			ItemStack propolis = new ItemStack(PluginApiculture.items.propolis,1);
 
 			VillagerRegistry.VillagerCareer apiaristCareer = new VillagerRegistry.VillagerCareer(villagerApiarist, "apiarist");
 			apiaristCareer.addTrade(1,
@@ -287,19 +282,19 @@ public class PluginApiculture extends BlankForestryPlugin {
 			);
 			apiaristCareer.addTrade(2,
 					new VillagerTradeLists.GiveItemForEmeralds(new EntityVillager.PriceInfo(1, 4), new ItemStack(items.smoker), null),
-					new VillagerTradeLists.GiveItemForLogsAndEmeralds(apiary, new EntityVillager.PriceInfo(1, 1), new EntityVillager.PriceInfo(16, 32), new EntityVillager.PriceInfo(1, 2))
+					new VillagerTradeLists.GiveItemForLogsAndEmeralds(apiary, new EntityVillager.PriceInfo(1, 1), new EntityVillager.PriceInfo(16, 32), new EntityVillager.PriceInfo(1, 2)),
+					new VillagerApiaristTrades.GiveRandomHiveDroneForItems(propolis, null, wildcardDrone, new EntityVillager.PriceInfo(2, 4))
 			);
 			apiaristCareer.addTrade(3,
 					new VillagerTradeLists.GiveEmeraldForItems(wildcardPrincess, null),
 					new VillagerTradeLists.GiveItemForEmeralds(new EntityVillager.PriceInfo(1, 2), provenFrames, new EntityVillager.PriceInfo(1, 6))
 			);
 			apiaristCareer.addTrade(4,
-					new VillagerTradeLists.GiveItemForItemAndEmerald(wildcardPrincess, null, new EntityVillager.PriceInfo(10, 64), monasticDrone, null)
+					new VillagerTradeLists.GiveItemForItemAndEmerald(wildcardPrincess, null, new EntityVillager.PriceInfo(10, 64), monasticDrone, null),
+					new VillagerTradeLists.GiveItemForTwoItems(wildcardPrincess, null,new ItemStack(Items.ENDER_EYE),new EntityVillager.PriceInfo(12, 16),endDrone, null)
 			);
 		}
 
-		proxy.initializeRendering();
-
 		blocks.apiary.init();
 		blocks.beeHouse.init();
 		blocks.beeChest.init();
@@ -561,9 +556,9 @@ public class PluginApiculture extends BlankForestryPlugin {
 			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{items.honeydew.getItemStack()}, honeyDropFluid);
 
 			ItemStack phosphor = PluginCore.items.phosphor.getItemStack(2);
-			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.SAND)}, Fluids.LAVA.getFluid(2000));
-			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.SAND, 1, 1)}, Fluids.LAVA.getFluid(2000));
-			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.DIRT)}, Fluids.LAVA.getFluid(1600));
+			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.SAND)}, new FluidStack(FluidRegistry.WATER, 2000));
+			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.SAND, 1, 1)}, new FluidStack(FluidRegistry.LAVA, 2000));
+			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.DIRT)}, new FluidStack(FluidRegistry.LAVA, 1600));
 
 			// / CARPENTER
 			RecipeManagers.carpenterManager.addRecipe(50, Fluids.FOR_HONEY.getFluid(500), null, PluginCore.items.craftingMaterial.getScentedPaneling(),
@@ -572,14 +567,14 @@ public class PluginApiculture extends BlankForestryPlugin {
 					'J', items.royalJelly,
 					'W', PluginCore.items.beeswax,
 					'P', items.pollenCluster.get(EnumPollenCluster.NORMAL, 1));
-
-			RecipeManagers.carpenterManager.addRecipe(30, Fluids.WATER.getFluid(600), null, blocks.candle.getUnlitCandle(24),
+			
+			RecipeManagers.carpenterManager.addRecipe(30, new FluidStack(FluidRegistry.WATER, 600), null, blocks.candle.getUnlitCandle(24),
 					" X ",
 					"###",
 					"###",
 					'#', PluginCore.items.beeswax,
 					'X', Items.STRING);
-			RecipeManagers.carpenterManager.addRecipe(10, Fluids.WATER.getFluid(200), null, blocks.candle.getUnlitCandle(6),
+			RecipeManagers.carpenterManager.addRecipe(10, new FluidStack(FluidRegistry.WATER, 200), null, blocks.candle.getUnlitCandle(6),
 					"#X#",
 					'#', PluginCore.items.beeswax,
 					'X', PluginCore.items.craftingMaterial.getSilkWisp());

src/main/java/forestry/apiculture/VillagerApiaristTrades.java

@@ -1,5 +1,6 @@
 package forestry.apiculture;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Random;
 
@@ -8,6 +9,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.village.MerchantRecipe;
 import net.minecraft.village.MerchantRecipeList;
 
+import forestry.api.apiculture.EnumBeeType;
+import forestry.apiculture.genetics.BeeDefinition;
+
 public class VillagerApiaristTrades {
 
 	public static class GiveRandomCombsForItems implements EntityVillager.ITradeList {
@@ -24,7 +28,7 @@ public class VillagerApiaristTrades {
 		}
 
 		@Override
-		public void modifyMerchantRecipeList(MerchantRecipeList recipeList, Random random) {
+		public void modifyMerchantRecipeList(@Nonnull MerchantRecipeList recipeList, @Nonnull Random random) {
 			int sellAmount = 1;
 			if (this.priceInfo != null) {
 				sellAmount = this.priceInfo.getPrice(random);
@@ -41,5 +45,46 @@ public class VillagerApiaristTrades {
 			recipeList.add(new MerchantRecipe(itemToBuy, randomComb));
 		}
 	}
+	public static class GiveRandomHiveDroneForItems implements EntityVillager.ITradeList {
+		@Nonnull
+		public ItemStack buyingItemStack;
+		@Nullable
+		public EntityVillager.PriceInfo buyingPriceInfo;
+		@Nonnull
+		public ItemStack buyingItemStackTwo;
+		@Nullable
+		public EntityVillager.PriceInfo buyingPriceItemTwoInfo;
 
+		public GiveRandomHiveDroneForItems(
+				@Nonnull ItemStack buyingItemStack,
+				@Nullable EntityVillager.PriceInfo buyingPriceInfo,
+				@Nonnull ItemStack buyingItemStackTwo,
+				@Nullable EntityVillager.PriceInfo buyingPriceItemTwoInfo) {
+			this.buyingItemStack = buyingItemStack;
+			this.buyingPriceInfo = buyingPriceInfo;
+			this.buyingItemStackTwo = buyingItemStackTwo;
+			this.buyingPriceItemTwoInfo = buyingPriceItemTwoInfo;
+		}
+
+		@Override
+		public void modifyMerchantRecipeList(@Nonnull MerchantRecipeList recipeList, @Nonnull Random random) {
+
+			int buyAmount = 1;
+			if (this.buyingPriceInfo != null) {
+				buyAmount = this.buyingPriceInfo.getPrice(random);
+			}
+
+			int buyTwoAmount = 1;
+			if (this.buyingPriceItemTwoInfo != null) {
+				buyTwoAmount = this.buyingPriceItemTwoInfo.getPrice(random);
+			}
+			BeeDefinition [] forestryMundane = new BeeDefinition[] { BeeDefinition.FOREST, BeeDefinition.MEADOWS, BeeDefinition.MODEST, BeeDefinition.WINTRY, BeeDefinition.TROPICAL, BeeDefinition.MARSHY };
+			ItemStack randomHiveDrone = forestryMundane[random.nextInt(forestryMundane.length)].getMemberStack(EnumBeeType.DRONE);
+			ItemStack buyItemStack = this.buyingItemStack.copy();
+			buyItemStack.stackSize = buyAmount;
+			ItemStack buyItemStackTwo = this.buyingItemStackTwo.copy();
+			buyItemStackTwo.stackSize = buyTwoAmount;
+			recipeList.add(new MerchantRecipe(buyItemStack, buyItemStackTwo, randomHiveDrone));
+		}
+	}
 }

src/main/java/forestry/apiculture/blocks/BlockApiculture.java

@@ -12,10 +12,11 @@ package forestry.apiculture.blocks;
 
 import forestry.api.core.Tabs;
 import forestry.core.blocks.BlockBase;
+import net.minecraft.block.material.Material;
 
 public class BlockApiculture extends BlockBase<BlockTypeApiculture> {
 	public BlockApiculture(BlockTypeApiculture type) {
-		super(type);
+		super(type, Material.WOOD);
 		setCreativeTab(Tabs.tabApiculture);
 		setHarvestLevel("axe", 0);
 	}

src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java

@@ -12,6 +12,7 @@ package forestry.apiculture.blocks;
 
 import java.util.Map;
 
+import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
 
 import forestry.api.core.Tabs;
@@ -36,7 +37,7 @@ public class BlockRegistryApiculture extends BlockRegistry {
 		beeHouse = new BlockApiculture(BlockTypeApiculture.BEE_HOUSE);
 		registerBlock(beeHouse, new ItemBlockForestry(beeHouse), "bee_house");
 
-		beeChest = new BlockBase<>(BlockTypeApicultureTesr.APIARIST_CHEST);
+		beeChest = new BlockBase<>(BlockTypeApicultureTesr.APIARIST_CHEST, Material.WOOD);
 		registerBlock(beeChest, new ItemBlockForestry(beeChest), "bee_chest");
 		beeChest.setCreativeTab(Tabs.tabApiculture);
 		beeChest.setHarvestLevel("axe", 0);

src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java

@@ -1,16 +1,19 @@
 package forestry.apiculture.compat;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
 
-import net.minecraft.item.ItemStack;
-
+import forestry.api.apiculture.BeeManager;
+import forestry.api.genetics.IAlleleSpecies;
 import forestry.apiculture.PluginApiculture;
-
+import forestry.core.genetics.Genome;
 import mezz.jei.api.BlankModPlugin;
 import mezz.jei.api.IModRegistry;
+import mezz.jei.api.ISubtypeRegistry;
 import mezz.jei.api.JEIPlugin;
+import net.minecraft.item.ItemStack;
 
 @JEIPlugin
 public class ApicultureJeiPlugin extends BlankModPlugin {
@@ -34,5 +37,21 @@ public class ApicultureJeiPlugin extends BlankModPlugin {
 		registry.addDescription(new ItemStack(PluginApiculture.items.habitatLocator), "for.jei.description.habitat.locator");
 
 		registry.addDescription(new ItemStack(PluginApiculture.items.scoop), "for.jei.description.scoop");
+
+		ISubtypeRegistry subtypeRegistry = registry.getJeiHelpers().getSubtypeRegistry();
+		subtypeRegistry.registerNbtInterpreter(PluginApiculture.items.beeDroneGE, BeeSubtypeInterpreter.INSTANCE);
+		subtypeRegistry.registerNbtInterpreter(PluginApiculture.items.beePrincessGE, BeeSubtypeInterpreter.INSTANCE);
+		subtypeRegistry.registerNbtInterpreter(PluginApiculture.items.beeQueenGE, BeeSubtypeInterpreter.INSTANCE);
+	}
+
+	private static class BeeSubtypeInterpreter implements ISubtypeRegistry.ISubtypeInterpreter {
+		public static BeeSubtypeInterpreter INSTANCE = new BeeSubtypeInterpreter();
+
+		@Nullable
+		@Override
+		public String getSubtypeInfo(@Nonnull ItemStack itemStack) {
+			IAlleleSpecies species = Genome.getSpeciesDirectly(BeeManager.beeRoot, itemStack);
+			return species == null ? null : species.getUID();
+		}
 	}
 }

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

@@ -66,7 +66,7 @@ public class AIAvoidPlayers extends EntityAIBase {
 		}
 
 		path = pathNavigator.getPathToXYZ(randomTarget.xCoord, randomTarget.yCoord, randomTarget.zCoord);
-		return path != null && path.isDestinationSame(randomTarget);
+		return path != null;
 	}
 
 	@Override

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

@@ -1,94 +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.entities;
-
-import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.passive.IAnimals;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-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;
-
-public class EntityBee extends EntityCreature implements IAnimals {
-
-	private static final String DEFAULT_TEXTURE = Constants.TEXTURE_PATH_ENTITIES + "/bees/honeyBee.png";
-
-	private IBee contained;
-	private IAlleleBeeSpecies species;
-	private EnumBeeType type = EnumBeeType.DRONE;
-
-	private String beeTexture = DEFAULT_TEXTURE;
-	private long lastUpdate;
-
-	public EntityBee(World world) {
-		super(world);
-	}
-
-	private void resetAppearance() {
-		beeTexture = species.getEntityTexture();
-	}
-
-	public EntityBee setIndividual(IBee bee) {
-		if (bee != null) {
-			contained = bee;
-		} else {
-			contained = BeeManager.beeRoot.templateAsIndividual(BeeManager.beeRoot.getDefaultTemplate());
-		}
-
-		//isImmuneToFire = contained.getGenome().getFireResist();
-		setSpecies(contained.getGenome().getPrimary());
-		//dataWatcher.updateObject(DATAWATCHER_ID_SPECIES, species.getUID());
-		//dataWatcher.updateObject(DATAWATCHER_ID_SCALE, (int)(contained.getSize() * 100));
-		return this;
-	}
-
-	public IBee getBee() {
-		return contained;
-	}
-
-	public EntityBee setType(EnumBeeType type) {
-		this.type = type;
-		return this;
-	}
-
-	public EnumBeeType getType() {
-		return type;
-	}
-
-	public EntityBee setSpecies(IAlleleBeeSpecies species) {
-		this.species = species;
-		resetAppearance();
-		lastUpdate = worldObj.getTotalWorldTime();
-		return this;
-	}
-
-	@SideOnly(Side.CLIENT)
-	private ResourceLocation textureResource;
-	private long lastTextureUpdate;
-
-	@SideOnly(Side.CLIENT)
-	public ResourceLocation getTexture() {
-		if (textureResource == null || lastTextureUpdate != lastUpdate) {
-			textureResource = new ForestryResource(beeTexture);
-		}
-
-		return textureResource;
-	}
-
-}

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

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package forestry.apiculture.entities;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -36,9 +37,12 @@ import forestry.core.config.Config;
 import forestry.core.inventory.IInventoryAdapter;
 
 public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implements IApiary {
+	@Nonnull
 	private static final IBeeModifier beeModifier = new ApiaryBeeModifier();
+	@Nonnull
 	private final IBeeListener beeListener = new ApiaryBeeListener(this);
-	private final InventoryApiary inventory = new InventoryApiary(getAccessHandler());
+	@Nonnull
+	private final InventoryApiary inventory = new InventoryApiary();
 
 	@SuppressWarnings("unused")
 	public EntityMinecartApiary(World world) {
@@ -64,6 +68,7 @@ public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implement
 		return inventory;
 	}
 
+	@Nonnull
 	@Override
 	public IBeeHousingInventory getBeeInventory() {
 		return inventory;

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

@@ -10,17 +10,12 @@
  ******************************************************************************/
 package forestry.apiculture.entities;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.Random;
 
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-
+import com.google.common.base.Optional;
 import com.mojang.authlib.GameProfile;
-
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeekeepingLogic;
@@ -36,10 +31,24 @@ import forestry.core.network.DataInputStreamForestry;
 import forestry.core.network.DataOutputStreamForestry;
 import forestry.core.network.IForestryPacketServer;
 import forestry.core.network.IStreamableGui;
+import forestry.core.owner.GameProfileDataSerializer;
+import forestry.core.owner.IOwnedTile;
+import forestry.core.owner.IOwnerHandler;
+import forestry.core.owner.OwnerHandler;
 import forestry.core.proxy.Proxies;
 import forestry.core.tiles.IClimatised;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.datasync.DataParameter;
+import net.minecraft.network.datasync.EntityDataManager;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+
+public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContainerForestry implements IBeeHousing, IOwnedTile, IGuiBeeHousingInventory, IClimatised, IStreamableGui {
+	private static final DataParameter<Optional<GameProfile>> OWNER = EntityDataManager.createKey(EntityMinecart.class, GameProfileDataSerializer.INSTANCE);
 
-public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContainerForestry implements IBeeHousing, IGuiBeeHousingInventory, IClimatised, IStreamableGui {
 	private static final Random random = new Random();
 	private static final int beeFXInterval = 4;
 	private static final int pollenFXInterval = 50;
@@ -49,6 +58,23 @@ public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain
 
 	private final IBeekeepingLogic beeLogic = BeeManager.beeRoot.createBeekeepingLogic(this);
 	private final IErrorLogic errorLogic = ForestryAPI.errorStateRegistry.createErrorLogic();
+	private final OwnerHandler ownerHandler = new OwnerHandler() {
+		@Override
+		public void setOwner(@Nonnull GameProfile owner) {
+			super.setOwner(owner);
+			dataManager.set(OWNER, Optional.of(owner));
+		}
+
+		@Override
+		public GameProfile getOwner() {
+			Optional<GameProfile> gameProfileOptional = dataManager.get(OWNER);
+			if (gameProfileOptional.isPresent()) {
+				return gameProfileOptional.get();
+			} else {
+				return null;
+			}
+		}
+	};
 
 	// CLIENT
 	private int breedingProgressPercent = 0;
@@ -63,6 +89,18 @@ public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain
 		super(world, posX, posY, posZ);
 	}
 
+	@Override
+	protected void entityInit() {
+		super.entityInit();
+		this.dataManager.register(OWNER, Optional.absent());
+	}
+
+	/* IOwnedTile */
+	@Override
+	public IOwnerHandler getOwnerHandler() {
+		return ownerHandler;
+	}
+
 	/* IBeeHousing */
 	@Override
 	public IBeekeepingLogic getBeekeepingLogic() {
@@ -111,7 +149,7 @@ public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain
 
 	@Override
 	public GameProfile getOwner() {
-		return getAccessHandler().getOwner();
+		return getOwnerHandler().getOwner();
 	}
 
 	@Override
@@ -174,11 +212,13 @@ public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain
 	protected void readEntityFromNBT(NBTTagCompound nbtTagCompound) {
 		super.readEntityFromNBT(nbtTagCompound);
 		beeLogic.readFromNBT(nbtTagCompound);
+		ownerHandler.readFromNBT(nbtTagCompound);
 	}
 
 	@Override
 	protected void writeEntityToNBT(NBTTagCompound nbtTagCompound) {
 		super.writeEntityToNBT(nbtTagCompound);
 		beeLogic.writeToNBT(nbtTagCompound);
+		ownerHandler.writeToNBT(nbtTagCompound);
 	}
 }

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

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package forestry.apiculture.entities;
 
+import javax.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 
@@ -33,7 +34,7 @@ import forestry.core.inventory.IInventoryAdapter;
 public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase {
 	private static final IBeeModifier beeModifier = new BeehouseBeeModifier();
 	private static final IBeeListener beeListener = new DefaultBeeListener();
-	private final InventoryBeeHousing beeInventory = new InventoryBeeHousing(9, getAccessHandler());
+	private final InventoryBeeHousing beeInventory = new InventoryBeeHousing(9);
 
 	@SuppressWarnings("unused")
 	public EntityMinecartBeehouse(World world) {
@@ -72,6 +73,7 @@ public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase {
 		return Collections.singleton(beeListener);
 	}
 
+	@Nonnull
 	@Override
 	public IBeeHousingInventory getBeeInventory() {
 		return beeInventory;

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

@@ -10,19 +10,15 @@
  ******************************************************************************/
 package forestry.apiculture.flowers;
 
-import java.util.EnumSet;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-import net.minecraftforge.common.EnumPlantType;
-
 import forestry.api.apiculture.FlowerManager;
 import forestry.api.genetics.ICheckPollinatable;
 import forestry.api.genetics.IFlowerProvider;
 import forestry.api.genetics.IIndividual;
 import forestry.core.utils.Translator;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.common.EnumPlantType;
 
 public class FlowerProvider implements IFlowerProvider {
 
@@ -42,15 +38,15 @@ public class FlowerProvider implements IFlowerProvider {
 	@Override
 	public boolean isAcceptedPollinatable(World world, ICheckPollinatable pollinatable) {
 
-		EnumSet<EnumPlantType> plantTypes = pollinatable.getPlantType();
+		EnumPlantType plantType = pollinatable.getPlantType();
 
 		switch (flowerType) {
 			case FlowerManager.FlowerTypeNether:
-				return plantTypes.contains(EnumPlantType.Nether);
+				return plantType == EnumPlantType.Nether;
 			case FlowerManager.FlowerTypeCacti:
-				return plantTypes.contains(EnumPlantType.Desert);
+				return plantType == EnumPlantType.Desert;
 			default:
-				return plantTypes.size() > 1 || !plantTypes.contains(EnumPlantType.Nether);
+				return plantType != EnumPlantType.Nether;
 		}
 	}
 

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

@@ -29,7 +29,7 @@ import forestry.api.apiculture.IAlleleBeeSpecies;
 import forestry.api.apiculture.IAlleleBeeSpeciesBuilder;
 import forestry.api.apiculture.IBee;
 import forestry.api.apiculture.IBeeGenome;
-import forestry.api.apiculture.IBeeMutationCustom;
+import forestry.api.apiculture.IBeeMutationBuilder;
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
 import forestry.api.genetics.IAllele;
@@ -1035,7 +1035,7 @@ public enum BeeDefinition implements IBeeDefinition {
 		BeeManager.beeRoot.registerTemplate(template);
 	}
 
-	protected final IBeeMutationCustom registerMutation(BeeDefinition parent1, BeeDefinition parent2, int chance) {
+	protected final IBeeMutationBuilder registerMutation(BeeDefinition parent1, BeeDefinition parent2, int chance) {
 		return BeeManager.beeMutationFactory.createMutation(parent1.species, parent2.species, getTemplate(), chance);
 	}
 

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

@@ -10,17 +10,12 @@
  ******************************************************************************/
 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.util.math.Vec3i;
-
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeChromosome;
 import forestry.api.apiculture.IAlleleBeeEffect;
@@ -38,6 +33,9 @@ import forestry.core.genetics.Genome;
 import forestry.core.genetics.alleles.AlleleArea;
 import forestry.core.genetics.alleles.AlleleBoolean;
 import forestry.core.genetics.alleles.AlleleTolerance;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.math.Vec3i;
 
 public class BeeGenome extends Genome implements IBeeGenome {
 	/**
@@ -90,7 +88,7 @@ public class BeeGenome extends Genome implements IBeeGenome {
 			return null;
 		}
 
-		IAlleleSpecies species = getSpeciesDirectly(itemStack);
+		IAlleleSpecies species = getSpeciesDirectly(BeeManager.beeRoot, itemStack);
 		if (species instanceof IAlleleBeeSpecies) {
 			return (IAlleleBeeSpecies) species;
 		}

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

@@ -18,17 +18,23 @@ 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.IBeeMutation;
+import forestry.api.apiculture.IBeeMutationBuilder;
 import forestry.api.apiculture.IBeeRoot;
 import forestry.api.genetics.IAllele;
 import forestry.core.genetics.mutations.Mutation;
 
-public class BeeMutation extends Mutation implements IBeeMutationCustom {
+public class BeeMutation extends Mutation implements IBeeMutation, IBeeMutationBuilder {
 
 	public BeeMutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance) {
 		super(bee0, bee1, result, chance);
 	}
-
+	
+	@Override
+	public IBeeMutation build() {
+		return this;
+	}
+	
 	@Override
 	public IBeeRoot getRoot() {
 		return BeeManager.beeRoot;

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

@@ -12,16 +12,16 @@ package forestry.apiculture.genetics;
 
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IAlleleBeeSpecies;
-import forestry.api.apiculture.IBeeMutationCustom;
+import forestry.api.apiculture.IBeeMutationBuilder;
 import forestry.api.apiculture.IBeeMutationFactory;
 import forestry.api.genetics.IAllele;
 
 public class BeeMutationFactory implements IBeeMutationFactory {
 
 	@Override
-	public IBeeMutationCustom createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance) {
-		IBeeMutationCustom mutation = new BeeMutation(parentBee0, parentBee1, result, chance);
-		BeeManager.beeRoot.registerMutation(mutation);
-		return mutation;
+	public IBeeMutationBuilder createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance) {
+		BeeMutation beeMutation = new BeeMutation(parentBee0, parentBee1, result, chance);
+		BeeManager.beeRoot.registerMutation(beeMutation);
+		return beeMutation;
 	}
 }

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

@@ -12,20 +12,12 @@ package forestry.apiculture.genetics;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-
 import com.mojang.authlib.GameProfile;
-
-import net.minecraftforge.fml.common.FMLCommonHandler;
-
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeChromosome;
 import forestry.api.apiculture.EnumBeeType;
@@ -53,6 +45,11 @@ import forestry.apiculture.BeeHousingModifier;
 import forestry.apiculture.BeekeepingLogic;
 import forestry.apiculture.PluginApiculture;
 import forestry.core.genetics.SpeciesRoot;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.FMLCommonHandler;
 
 public class BeeRoot extends SpeciesRoot implements IBeeRoot {
 
@@ -252,10 +249,10 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot {
 	/**
 	 * List of possible mutations on species alleles.
 	 */
-	private static final ArrayList<IBeeMutation> beeMutations = new ArrayList<>();
+	private static final List<IBeeMutation> beeMutations = new ArrayList<>();
 
 	@Override
-	public Collection<IBeeMutation> getMutations(boolean shuffle) {
+	public List<IBeeMutation> getMutations(boolean shuffle) {
 		if (shuffle) {
 			Collections.shuffle(beeMutations);
 		}
@@ -371,7 +368,7 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot {
 	}
 
 	@Override
-	public IChromosomeType getKaryotypeKey() {
+	public IChromosomeType getSpeciesChromosomeType() {
 		return EnumBeeChromosome.SPECIES;
 	}
 

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

@@ -12,6 +12,7 @@ package forestry.apiculture.genetics;
 
 import java.util.Locale;
 
+import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
@@ -47,7 +48,7 @@ public class DefaultBeeModelProvider implements IBeeModelProvider {
 		}
 
 		models[beeType.ordinal()] = manager.getModelLocation(beeTypeNameBase);
-		manager.registerVariant(item, new ResourceLocation("forestry:" + beeTypeNameBase));
+		ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:" + beeTypeNameBase));
 	}
 
 	@Override

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

@@ -10,10 +10,9 @@
  ******************************************************************************/
 package forestry.apiculture.genetics;
 
-import net.minecraft.block.Block;
-
 import forestry.api.apiculture.IJubilanceFactory;
 import forestry.api.apiculture.IJubilanceProvider;
+import net.minecraft.block.state.IBlockState;
 
 public class JubilanceFactory implements IJubilanceFactory {
 	@Override
@@ -22,7 +21,7 @@ public class JubilanceFactory implements IJubilanceFactory {
 	}
 
 	@Override
-	public IJubilanceProvider getRequiresResource(Block block, int meta) {
-		return new JubilanceRequiresResource(block, meta);
+	public IJubilanceProvider getRequiresResource(IBlockState... acceptedBlockStates) {
+		return new JubilanceRequiresResource(acceptedBlockStates);
 	}
 }

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

@@ -10,33 +10,40 @@
  ******************************************************************************/
 package forestry.apiculture.genetics;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 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 net.minecraft.block.state.IBlockState;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 
 public class JubilanceRequiresResource implements IJubilanceProvider {
 
-	private final ItemStack blockRequired;
+	private final Set<IBlockState> acceptedBlockStates = new HashSet<>();
 
-	public JubilanceRequiresResource(Block block, int meta) {
-		this.blockRequired = new ItemStack(block, meta);
+	public JubilanceRequiresResource(IBlockState... acceptedBlockStates) {
+		Collections.addAll(this.acceptedBlockStates, acceptedBlockStates);
 	}
 
 	@Override
 	public boolean isJubilant(IAlleleBeeSpecies species, IBeeGenome genome, IBeeHousing housing) {
 		World world = housing.getWorldObj();
-		BlockPos housingCoords = housing.getCoordinates();
+		BlockPos pos = housing.getCoordinates();
 
-		IBlockState state = world.getBlockState(housingCoords.down());
-		return ItemStackUtil.equals(state, blockRequired);
+		TileEntity tile;
+		do {
+			pos = pos.down();
+			tile = world.getTileEntity(pos);
+		} while (tile instanceof IBeeHousing && pos.getY() > 0);
+
+		IBlockState blockState = world.getBlockState(pos);
+		return this.acceptedBlockStates.contains(blockState);
 	}
 
 }

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

@@ -195,9 +195,4 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
 	public int getSpriteColour(int renderPass) {
 		return beeSpriteColourProvider.getSpriteColour(renderPass);
 	}
-
-	@Override
-	public String getEntityTexture() {
-		return null;
-	}
 }

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

@@ -85,7 +85,7 @@ public class AlleleEffectCreeper extends AlleleEffectThrottled {
 			}
 
 			float pitch = (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F;
-			world.playSound((EntityPlayer)null, housingCoords.getX(), housingCoords.getY(), housingCoords.getZ(), SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, pitch);
+			world.playSound(null, housingCoords.getX(), housingCoords.getY(), housingCoords.getZ(), SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, pitch);
 			storedData.setInteger(indexExplosionTimer, 2); // Set explosion timer
 		}
 

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

@@ -1,9 +1,15 @@
 package forestry.apiculture.genetics.alleles;
 
 import java.util.List;
-import java.util.Random;
 
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.genetics.IEffectData;
+import forestry.core.genetics.EffectData;
+import forestry.core.utils.VectUtil;
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockMushroom;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.passive.EntityCow;
 import net.minecraft.entity.passive.EntityMooshroom;
 import net.minecraft.init.Blocks;
@@ -11,12 +17,6 @@ import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenBigMushroom;
-
-import forestry.api.apiculture.IBeeGenome;
-import forestry.api.apiculture.IBeeHousing;
-import forestry.api.genetics.IEffectData;
-import forestry.core.genetics.EffectData;
 
 public class AlleleEffectFungification extends AlleleEffectThrottled {
 
@@ -24,7 +24,7 @@ public class AlleleEffectFungification extends AlleleEffectThrottled {
 	private static final int ENTITY_THROTTLE = 6;
 	
 	public AlleleEffectFungification() {
-		super("mycophilic", true, 10, false, false);
+		super("mycophilic", true, 20, false, false);
 	}
 
 	@Override
@@ -57,50 +57,51 @@ public class AlleleEffectFungification extends AlleleEffectThrottled {
 		World world = housing.getWorldObj();
 		BlockPos housingCoordinates = housing.getCoordinates();
 		Vec3i area = getModifiedArea(genome, housing);
-		
-		int blockX = getRandomOffset(world.rand, housingCoordinates.getX(), area.getX());
-		int blockY = getRandomOffset(world.rand, housingCoordinates.getY(), area.getY());
-		int blockZ = getRandomOffset(world.rand, housingCoordinates.getZ(), area.getZ());
-		
-		for (int attempt = 0; attempt < MAX_BLOCK_FIND_TRIES; ++attempt) {
-			BlockPos pos = new BlockPos(blockX, blockY, blockZ);
-			Block block = world.getBlockState(pos).getBlock();
-			if (isSuitableForMycelium(world, block, pos)) {
-				world.setBlockState(pos, Blocks.MYCELIUM.getDefaultState());
-				break;
-			} else if (isSuitableForGrowth(block)) {
-				doMushroomGrowth(block, world, pos);
-				break;
-			}
-			blockX = getRandomOffset(world.rand, housingCoordinates.getX(), area.getX());
-			blockY = getRandomOffset(world.rand, housingCoordinates.getY(), area.getY());
-			blockZ = getRandomOffset(world.rand, housingCoordinates.getZ(), area.getZ());
-		}
+		Vec3i halfArea = new Vec3i(area.getX() / 2, area.getY() / 2, area.getZ() / 2);
 
+		for (int attempt = 0; attempt < MAX_BLOCK_FIND_TRIES; ++attempt) {
+			BlockPos pos = VectUtil.getRandomPositionInArea(world.rand, area).subtract(halfArea).add(housingCoordinates);
+			IBlockState blockState = world.getBlockState(pos);
+
+			if (convertToMycelium(world, blockState, pos)) {
+				return;
+			} else if (growGiantMushroom(world, blockState, pos)) {
+				return;
+			}
+		}
 	}
 
 	private static void doEntityEffect(IBeeGenome genome, IBeeHousing housing) {
 		List<EntityCow> cows = getEntitiesInRange(genome, housing, EntityCow.class);
 		for (EntityCow cow : cows) {
-			convertCowToMooshroom(cow);
+			if (convertCowToMooshroom(cow)) {
+				return;
+			}
 		}
 	}
-	
-	private static int getRandomOffset(Random random, int centrePos, int offset) {
-		return centrePos + random.nextInt(offset) - offset / 2;
-	}
-	
-	private static boolean isSuitableForMycelium(World world, Block block, BlockPos pos) {
-		return block == Blocks.GRASS || block == Blocks.DIRT && world.canBlockSeeSky(pos);
+
+	private static boolean convertToMycelium(World world, IBlockState blockState, BlockPos pos) {
+		Block block = blockState.getBlock();
+		if (block == Blocks.GRASS || block == Blocks.DIRT && world.canBlockSeeSky(pos)) {
+			world.setBlockState(pos, Blocks.MYCELIUM.getDefaultState());
+			return true;
+		}
+		return false;
 	}
 
-	private static boolean isSuitableForGrowth(Block block) {
-		return block == Blocks.RED_MUSHROOM || block == Blocks.BROWN_MUSHROOM;
+	private static boolean growGiantMushroom(World world, IBlockState blockState, BlockPos pos) {
+		Block block = blockState.getBlock();
+		if (block instanceof BlockMushroom) {
+			BlockMushroom mushroom = (BlockMushroom) block;
+			mushroom.generateBigMushroom(world, pos, blockState, world.rand);
+			return true;
+		}
+		return false;
 	}
-	
-	private static void convertCowToMooshroom(EntityCow cow) {
+
+	private static boolean convertCowToMooshroom(EntityCow cow) {
 		if (cow instanceof EntityMooshroom) {
-			return;
+			return false;
 		}
 		World worldObj = cow.worldObj;
 		cow.setDead();
@@ -110,14 +111,6 @@ public class AlleleEffectFungification extends AlleleEffectThrottled {
 		mooshroom.renderYawOffset = cow.renderYawOffset;
 		worldObj.spawnEntityInWorld(mooshroom);
 		worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, cow.posX, cow.posY + cow.height / 2.0F, cow.posZ, 0.0D, 0.0D, 0.0D);
-	}
-
-	private static void doMushroomGrowth(Block block, World world, BlockPos pos) {
-		WorldGenBigMushroom giantMushroomGenerator;
-
-		giantMushroomGenerator = new WorldGenBigMushroom(block);
-
-		world.setBlockToAir(pos);
-		giantMushroomGenerator.generate(world, world.rand, pos);
+		return true;
 	}
 }

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

@@ -22,6 +22,8 @@ public class ContainerAlveary extends ContainerTile<TileAlveary> {
 	public ContainerAlveary(InventoryPlayer player, TileAlveary tile) {
 		super(tile, player, 8, 108);
 		ContainerBeeHelper.addSlots(this, tile, false);
+
+		tile.getBeekeepingLogic().clearCachedValues();
 	}
 
 	private int beeProgress = -1;

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

@@ -22,6 +22,8 @@ public class ContainerBeeHousing extends ContainerTile<TileBeeHousingBase> imple
 	public ContainerBeeHousing(InventoryPlayer player, TileBeeHousingBase tile, boolean hasFrames) {
 		super(tile, player, 8, 108);
 		ContainerBeeHelper.addSlots(this, tile, hasFrames);
+
+		tile.getBeekeepingLogic().clearCachedValues();
 	}
 
 	private int beeProgress = -1;

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

@@ -21,6 +21,8 @@ public class ContainerMinecartBeehouse extends ContainerEntity<EntityMinecartBee
 	public ContainerMinecartBeehouse(InventoryPlayer player, EntityMinecartBeeHousingBase entity, boolean hasFrames) {
 		super(entity, player, 8, 108);
 		ContainerBeeHelper.addSlots(this, entity, hasFrames);
+
+		entity.getBeekeepingLogic().clearCachedValues();
 	}
 
 	private int beeProgress = -1;

src/main/java/forestry/apiculture/inventory/InventoryApiary.java

@@ -22,15 +22,14 @@ import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeekeepingMode;
 import forestry.api.apiculture.IHiveFrame;
 import forestry.apiculture.InventoryBeeHousing;
-import forestry.core.access.IAccessHandler;
 import forestry.core.utils.SlotUtil;
 
 public class InventoryApiary extends InventoryBeeHousing implements IApiaryInventory {
 	public static final int SLOT_FRAMES_1 = 9;
 	public static final int SLOT_FRAMES_COUNT = 3;
 
-	public InventoryApiary(IAccessHandler accessHandler) {
-		super(12, accessHandler);
+	public InventoryApiary() {
+		super(12);
 	}
 
 	@Override

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

@@ -57,7 +57,7 @@ public class ItemHiveFrame extends ItemForestry implements IHiveFrame {
 		super.addInformation(stack, playerIn, tooltip, advanced);
 		beeModifier.addInformation(stack, playerIn, tooltip, advanced);
 		if (!stack.isItemDamaged()) {
-			tooltip.add(Translator.translateToLocalFormatted("item.for.frame.durability", stack.getMaxDamage()));
+			tooltip.add(Translator.translateToLocalFormatted("item.for.durability", stack.getMaxDamage()));
 		}
 	}
 

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

@@ -66,7 +66,8 @@ public class ItemMinecartBeehouse extends ItemMinecart implements IItemModelRegi
 			} else {
 				entityMinecart = new EntityMinecartApiary(worldIn, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F);
 			}
-			entityMinecart.setOwner(playerIn.getGameProfile());
+
+			entityMinecart.getOwnerHandler().setOwner(playerIn.getGameProfile());
 
 			if (stack.hasDisplayName()) {
 				entityMinecart.setCustomNameTag(stack.getDisplayName());

src/main/java/forestry/apiculture/multiblock/AlvearyController.java

@@ -15,22 +15,13 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-
 import com.mojang.authlib.GameProfile;
-
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeHousingInventory;
 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;
@@ -39,7 +30,6 @@ import forestry.api.multiblock.IAlvearyComponent;
 import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.AlvearyBeeModifier;
 import forestry.apiculture.InventoryBeeHousing;
-import forestry.core.access.EnumAccess;
 import forestry.core.inventory.FakeInventoryAdapter;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.multiblock.IMultiblockControllerInternal;
@@ -50,9 +40,17 @@ import forestry.core.network.DataOutputStreamForestry;
 import forestry.core.proxy.Proxies;
 import forestry.core.utils.BlockUtil;
 import forestry.core.utils.Translator;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
 
 public class AlvearyController extends RectangularMultiblockControllerBase implements IAlvearyControllerInternal, IClimateControlled {
 
+	@Nonnull
 	private final InventoryBeeHousing inventory;
 	private final IBeekeepingLogic beekeepingLogic;
 
@@ -71,12 +69,13 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple
 
 	public AlvearyController(World world) {
 		super(world, AlvearyMultiblockSizeLimits.instance);
-		this.inventory = new InventoryBeeHousing(9, getAccessHandler());
+		this.inventory = new InventoryBeeHousing(9);
 		this.beekeepingLogic = BeeManager.beeRoot.createBeekeepingLogic(this);
 
 		this.beeModifiers.add(new AlvearyBeeModifier());
 	}
 
+	@Nonnull
 	@Override
 	public IBeeHousingInventory getBeeInventory() {
 		return inventory;
@@ -340,20 +339,6 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple
 		return new Vec3d(coord.getX() + 0.5, coord.getY() + 1.5, coord.getZ() + 0.5);
 	}
 
-	@Override
-	public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) {
-		if (oldAccess == EnumAccess.SHARED || newAccess == EnumAccess.SHARED) {
-			// pipes connected to this need to update
-			for (IMultiblockComponent part : connectedParts) {
-				if (part instanceof TileEntity) {
-					TileEntity tile = (TileEntity) part;
-					worldObj.notifyBlockOfStateChange(tile.getPos(), tile.getBlockType());
-				}
-			}
-			markDirty();
-		}
-	}
-
 	@Override
 	public float getExactTemperature() {
 		BlockPos coords = getReferenceCoord();
@@ -369,8 +354,11 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple
 	@Override
 	public EnumTemperature getTemperature() {
 		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(this);
-		if (beeModifier.isHellish() && tempChange >= 0) {
-			return EnumTemperature.HELLISH;
+		Biome biome = getBiome();
+		if (beeModifier.isHellish() || BiomeHelper.isBiomeHellish(biome)) {
+			if (tempChange >= 0) {
+				return EnumTemperature.HELLISH;
+			}
 		}
 
 		return EnumTemperature.getFromValue(getExactTemperature());
@@ -383,7 +371,7 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple
 
 	@Override
 	public GameProfile getOwner() {
-		return getAccessHandler().getOwner();
+		return getOwnerHandler().getOwner();
 	}
 
 	@Override

src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package forestry.apiculture.multiblock;
 
+import javax.annotation.Nonnull;
 import java.util.Collections;
 
 import net.minecraft.util.math.BlockPos;
@@ -45,6 +46,7 @@ public class FakeAlvearyController extends FakeMultiblockController implements I
 		return Collections.emptyList();
 	}
 
+	@Nonnull
 	@Override
 	public IBeeHousingInventory getBeeInventory() {
 		return FakeBeeHousingInventory.instance;

src/main/java/forestry/apiculture/multiblock/IAlvearyControllerInternal.java

@@ -11,13 +11,13 @@
 package forestry.apiculture.multiblock;
 
 import forestry.api.multiblock.IAlvearyController;
-import forestry.core.access.IRestrictedAccess;
+import forestry.core.owner.IOwnedTile;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.multiblock.IMultiblockControllerInternal;
 import forestry.core.network.IStreamableGui;
 import forestry.core.tiles.IClimatised;
 
-public interface IAlvearyControllerInternal extends IAlvearyController, IMultiblockControllerInternal, IClimatised, IRestrictedAccess, IStreamableGui {
+public interface IAlvearyControllerInternal extends IAlvearyController, IMultiblockControllerInternal, IClimatised, IOwnedTile, IStreamableGui {
 	IInventoryAdapter getInternalInventory();
 
 	int getHealthScaled(int i);

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

@@ -10,9 +10,12 @@
  ******************************************************************************/
 package forestry.apiculture.multiblock;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.List;
 
+import forestry.core.owner.IOwnedTile;
+import forestry.core.owner.IOwnerHandler;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
@@ -33,9 +36,6 @@ import forestry.api.multiblock.IMultiblockController;
 import forestry.apiculture.blocks.BlockAlvearyType;
 import forestry.apiculture.gui.ContainerAlveary;
 import forestry.apiculture.gui.GuiAlveary;
-import forestry.core.access.EnumAccess;
-import forestry.core.access.IAccessHandler;
-import forestry.core.access.IRestrictedAccess;
 import forestry.core.config.Config;
 import forestry.core.gui.IHintSource;
 import forestry.core.inventory.IInventoryAdapter;
@@ -46,7 +46,7 @@ import forestry.core.network.IStreamableGui;
 import forestry.core.tiles.IClimatised;
 import forestry.core.tiles.ITitled;
 
-public abstract class TileAlveary extends MultiblockTileEntityForestry<MultiblockLogicAlveary> implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, ITitled, IClimatised, IHintSource {
+public abstract class TileAlveary extends MultiblockTileEntityForestry<MultiblockLogicAlveary> implements IBeeHousing, IAlvearyComponent, IOwnedTile, IStreamableGui, ITitled, IClimatised, IHintSource {
 	private final String unlocalizedTitle;
 
 	protected TileAlveary() {
@@ -99,6 +99,7 @@ public abstract class TileAlveary extends MultiblockTileEntityForestry<Multibloc
 		return getMultiblockLogic().getController().getBeeListeners();
 	}
 
+	@Nonnull
 	@Override
 	public IBeeHousingInventory getBeeInventory() {
 		return getMultiblockLogic().getController().getBeeInventory();
@@ -141,13 +142,8 @@ public abstract class TileAlveary extends MultiblockTileEntityForestry<Multibloc
 	}
 
 	@Override
-	public IAccessHandler getAccessHandler() {
-		return getMultiblockLogic().getController().getAccessHandler();
-	}
-
-	@Override
-	public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) {
-		getMultiblockLogic().getController().onSwitchAccess(oldAccess, newAccess);
+	public IOwnerHandler getOwnerHandler() {
+		return getMultiblockLogic().getController().getOwnerHandler();
 	}
 
 	@Override

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

@@ -11,6 +11,7 @@
 package forestry.apiculture.multiblock;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
@@ -23,6 +24,7 @@ import forestry.core.tiles.IActivatable;
 import forestry.energy.EnergyManager;
 
 import cofh.api.energy.IEnergyReceiver;
+import net.minecraftforge.common.capabilities.Capability;
 
 public abstract class TileAlvearyClimatiser extends TileAlveary implements IEnergyReceiver, IActivatable, IAlvearyComponent.Climatiser {
 
@@ -143,4 +145,18 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner
 		return energyManager.canConnectEnergy(from);
 	}
 
+	@Override
+	public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+		return energyManager.hasCapability(capability) || super.hasCapability(capability, facing);
+	}
+
+	@Nonnull
+	@Override
+	public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+		T energyCapability = energyManager.getCapability(capability);
+		if (energyCapability != null) {
+			return energyCapability;
+		}
+		return super.getCapability(capability, facing);
+	}
 }

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

@@ -19,6 +19,7 @@ import net.minecraft.util.EnumFacing;
 
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 
@@ -50,9 +51,9 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory
 		super(BlockAlvearyType.HYGRO);
 
 		this.inventory = new InventoryHygroregulator(this);
-
-		Fluid water = Fluids.WATER.getFluid();
-		Fluid lava = Fluids.LAVA.getFluid();
+		
+		Fluid water = FluidRegistry.WATER;
+		Fluid lava = FluidRegistry.LAVA;
 		Fluid liquidIce = Fluids.ICE.getFluid();
 
 		this.liquidTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY).setFilters(water, lava, liquidIce);

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

@@ -137,7 +137,7 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory,
 		int x = getPos().getX() + worldObj.rand.nextInt(40 * 2) - 40;
 		int z = getPos().getZ() + worldObj.rand.nextInt(40 * 2) - 40;
 
-		if (HiveDecorator.tryGenHive(worldObj, x, z, hive)) {
+		if (HiveDecorator.tryGenHive(worldObj, worldObj.rand, x, z, hive)) {
 			pendingSpawns.pop();
 		}
 	}

src/main/java/forestry/apiculture/proxy/ProxyApiculture.java

@@ -12,7 +12,4 @@ package forestry.apiculture.proxy;
 
 public class ProxyApiculture {
 
-	public void initializeRendering() {
-	}
-
 }

src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java

@@ -16,8 +16,4 @@ public class ProxyApicultureClient extends ProxyApiculture {
 
 	public static TextureAtlasSprite beeSprite;
 
-	@Override
-	public void initializeRendering() {
-		// TODO: remove unused bee entity model completely
-	}
 }

src/main/java/forestry/apiculture/render/ModelBee.java

@@ -160,9 +160,4 @@ public class ModelBee extends ModelBase {
 		model.rotateAngleZ = z;
 	}
 
-	@Override
-	public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
-		super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-	}
-
 }

src/main/java/forestry/apiculture/render/RenderBeeEntity.java

@@ -1,44 +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.render;
-
-import net.minecraft.client.renderer.entity.RenderLiving;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.util.ResourceLocation;
-
-import forestry.apiculture.entities.EntityBee;
-import forestry.core.proxy.Proxies;
-
-public class RenderBeeEntity extends RenderLiving {
-
-	private final ModelBee beeModel;
-
-	public RenderBeeEntity() {
-		super(Proxies.common.getClientInstance().getRenderManager(), new ModelBee(), 0.15f);
-		beeModel = (ModelBee) mainModel;
-	}
-
-	private void renderBee(EntityBee entity, double posX, double posY, double posZ, float par8, float par9) {
-		beeModel.setType(entity.getType());
-		this.doRender(entity, posX, posY, posZ, par8, par9);
-	}
-	
-	@Override
-	public void doRender(EntityLiving entity, double x, double y, double z, float entityYaw, float partialTicks) {
-		renderBee((EntityBee) entity, x, y, z, entityYaw, partialTicks);
-	}
-
-	@Override
-	protected ResourceLocation getEntityTexture(Entity entity) {
-		return ((EntityBee) entity).getTexture();
-	}
-}

src/main/java/forestry/apiculture/tiles/FakeBeeHousingInventory.java

@@ -1,10 +1,13 @@
 package forestry.apiculture.tiles;
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.item.ItemStack;
 
 import forestry.api.apiculture.IBeeHousingInventory;
 
 public class FakeBeeHousingInventory implements IBeeHousingInventory {
+	@Nonnull
 	public static final FakeBeeHousingInventory instance = new FakeBeeHousingInventory();
 
 	private FakeBeeHousingInventory() {

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

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package forestry.apiculture.tiles;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -30,15 +31,19 @@ import forestry.apiculture.inventory.IApiaryInventory;
 import forestry.apiculture.inventory.InventoryApiary;
 
 public class TileApiary extends TileBeeHousingBase implements IApiary {
+	@Nonnull
 	private final IBeeModifier beeModifier = new ApiaryBeeModifier();
+	@Nonnull
 	private final IBeeListener beeListener = new ApiaryBeeListener(this);
-	private final InventoryApiary inventory = new InventoryApiary(getAccessHandler());
+	@Nonnull
+	private final InventoryApiary inventory = new InventoryApiary();
 
 	public TileApiary() {
 		super("apiary");
 		setInternalInventory(inventory);
 	}
 
+	@Nonnull
 	@Override
 	public IBeeHousingInventory getBeeInventory() {
 		return inventory;

src/main/java/forestry/apiculture/tiles/TileBeeHouse.java

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package forestry.apiculture.tiles;
 
+import javax.annotation.Nonnull;
 import java.util.Collections;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -24,20 +25,24 @@ import forestry.apiculture.gui.ContainerBeeHousing;
 import forestry.apiculture.gui.GuiBeeHousing;
 
 public class TileBeeHouse extends TileBeeHousingBase {
+	@Nonnull
 	private static final IBeeModifier beeModifier = new BeehouseBeeModifier();
 
+	@Nonnull
 	private final IBeeListener beeListener;
+	@Nonnull
 	private final InventoryBeeHousing beeInventory;
 
 	public TileBeeHouse() {
 		super("bee.house");
 		this.beeListener = new DefaultBeeListener();
 
-		beeInventory = new InventoryBeeHousing(12, getAccessHandler());
+		beeInventory = new InventoryBeeHousing(12);
 		beeInventory.disableAutomation();
 		setInternalInventory(beeInventory);
 	}
 
+	@Nonnull
 	@Override
 	public IBeeHousingInventory getBeeInventory() {
 		return beeInventory;

src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java

@@ -13,13 +13,7 @@ package forestry.apiculture.tiles;
 import javax.annotation.Nonnull;
 import java.io.IOException;
 
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-
 import com.mojang.authlib.GameProfile;
-
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeekeepingLogic;
@@ -30,11 +24,19 @@ import forestry.apiculture.gui.IGuiBeeHousingInventory;
 import forestry.core.network.DataInputStreamForestry;
 import forestry.core.network.DataOutputStreamForestry;
 import forestry.core.network.IStreamableGui;
+import forestry.core.owner.IOwnedTile;
+import forestry.core.owner.IOwnerHandler;
+import forestry.core.owner.OwnerHandler;
 import forestry.core.proxy.Proxies;
 import forestry.core.tiles.IClimatised;
 import forestry.core.tiles.TileBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
 
-public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing, IClimatised, IGuiBeeHousingInventory, IStreamableGui {
+public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing, IOwnedTile, IClimatised, IGuiBeeHousingInventory, IStreamableGui {
+	private final OwnerHandler ownerHandler = new OwnerHandler();
 	private final IBeekeepingLogic beeLogic;
 	private Biome cachedBiome;
 
@@ -57,6 +59,7 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing
 	public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) {
 		nbttagcompound = super.writeToNBT(nbttagcompound);
 		beeLogic.writeToNBT(nbttagcompound);
+		ownerHandler.writeToNBT(nbttagcompound);
 		return nbttagcompound;
 	}
 
@@ -64,6 +67,7 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing
 	public void readFromNBT(NBTTagCompound nbttagcompound) {
 		super.readFromNBT(nbttagcompound);
 		beeLogic.readFromNBT(nbttagcompound);
+		ownerHandler.readFromNBT(nbttagcompound);
 	}
 
 	@Nonnull
@@ -71,6 +75,7 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing
 	public NBTTagCompound getUpdateTag() {
 		NBTTagCompound updateTag = super.getUpdateTag();
 		beeLogic.writeToNBT(updateTag);
+		ownerHandler.writeToNBT(updateTag);
 		return updateTag;
 	}
 
@@ -78,6 +83,12 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing
 	public void handleUpdateTag(@Nonnull NBTTagCompound tag) {
 		super.handleUpdateTag(tag);
 		beeLogic.readFromNBT(tag);
+		ownerHandler.readFromNBT(tag);
+	}
+
+	@Override
+	public IOwnerHandler getOwnerHandler() {
+		return ownerHandler;
 	}
 
 	/* ICLIMATISED */
@@ -171,7 +182,7 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing
 
 	@Override
 	public GameProfile getOwner() {
-		return getAccessHandler().getOwner();
+		return getOwnerHandler().getOwner();
 	}
 
 	@Override

src/main/java/forestry/apiculture/tiles/TileHive.java

@@ -15,26 +15,8 @@ import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.server.SPacketUpdateTileEntity;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.ITickable;
-import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.EnumSkyBlock;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-
+import com.google.common.base.Predicate;
 import com.mojang.authlib.GameProfile;
-
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBee;
 import forestry.api.apiculture.IBeeGenome;
@@ -62,9 +44,41 @@ import forestry.core.tiles.IActivatable;
 import forestry.core.utils.DamageSourceForestry;
 import forestry.core.utils.InventoryUtil;
 import forestry.core.utils.ItemStackUtil;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.IMob;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.play.server.SPacketUpdateTileEntity;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.ITickable;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.EnumSkyBlock;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
 
 public class TileHive extends TileEntity implements ITickable, IHiveTile, IActivatable, IBeeHousing {
 	private static final DamageSource damageSourceBeeHive = new DamageSourceForestry("bee.hive");
+	private static final Predicate<EntityLivingBase> BEE_TARGET_PREDICATE = new Predicate<EntityLivingBase>() {
+		@Override
+		public boolean apply(@Nullable EntityLivingBase input) {
+			if (input != null && input.isEntityAlive() && !input.isInvisible()) {
+				if (input instanceof EntityPlayer) {
+					EntityPlayer player = (EntityPlayer) input;
+					return !player.isSpectator() && !player.isCreative();
+				} else if (input instanceof IMob) {
+					return true;
+				}
+			}
+			return false;
+		}
+	};
 
 	@Nonnull
 	private final InventoryAdapter contained = new InventoryAdapter(2, "Contained");
@@ -113,7 +127,7 @@ public class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv
 				if (calmTime == 0) {
 					if (canWork) {
 						AxisAlignedBB boundingBox = AlleleEffect.getBounding(getContainedBee().getGenome(), this);
-						List<EntityLivingBase> entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, boundingBox);
+						List<EntityLivingBase> entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, boundingBox, BEE_TARGET_PREDICATE);
 						if (!entities.isEmpty()) {
 							Collections.shuffle(entities);
 							EntityLivingBase entity = entities.get(0);
@@ -293,6 +307,7 @@ public class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv
 		return Collections.emptyList();
 	}
 
+	@Nonnull
 	@Override
 	public IBeeHousingInventory getBeeInventory() {
 		return inventory;

src/main/java/forestry/apiculture/worldgen/Hive.java

@@ -13,6 +13,7 @@ package forestry.apiculture.worldgen;
 import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
@@ -52,8 +53,8 @@ public final class Hive {
 		return hiveDescription.getGenChance();
 	}
 
-	public void postGen(World world, BlockPos pos) {
-		hiveDescription.postGen(world, pos);
+	public void postGen(World world, Random rand, BlockPos pos) {
+		hiveDescription.postGen(world, rand, pos);
 	}
 
 	public boolean isGoodBiome(Biome biome) {

src/main/java/forestry/apiculture/worldgen/HiveDecorator.java

@@ -34,7 +34,7 @@ import forestry.core.utils.Log;
 
 public abstract class HiveDecorator {
 
-	private static final EventType EVENT_TYPE = EnumHelper.addEnum(EventType.class, "FORESTRY_HIVES", new Class[0], new Object[0]);
+	private static final EventType EVENT_TYPE = EnumHelper.addEnum(EventType.class, "FORESTRY_HIVES", new Class[0]);
 
 	public static void decorateHives(IChunkGenerator chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated) {
 		if (!TerrainGen.populate(chunkProvider, world, rand, chunkX, chunkZ, hasVillageGenerated, EVENT_TYPE)) {
@@ -48,7 +48,7 @@ public abstract class HiveDecorator {
 		List<Hive> hives = PluginApiculture.hiveRegistry.getHives();
 
 		if (Config.generateBeehivesDebug) {
-			decorateHivesDebug(world, chunkX, chunkZ, hives);
+			decorateHivesDebug(world, rand, chunkX, chunkZ, hives);
 			return;
 		}
 
@@ -72,7 +72,7 @@ public abstract class HiveDecorator {
 			for (Hive hive : hives) {
 				if (hive.genChance() * Config.getBeehivesAmount() >= rand.nextFloat() * 100.0f) {
 					if (hive.isGoodBiome(biome) && hive.isGoodHumidity(humidity)) {
-						if (tryGenHive(world, x, z, hive)) {
+						if (tryGenHive(world, rand, x, z, hive)) {
 							return;
 						}
 					}
@@ -81,7 +81,7 @@ public abstract class HiveDecorator {
 		}
 	}
 
-	private static void decorateHivesDebug(World world, int chunkX, int chunkZ, List<Hive> hives) {
+	private static void decorateHivesDebug(World world, Random rand, int chunkX, int chunkZ, List<Hive> hives) {
 		int worldX = (chunkX << 4) + 8;
 		int worldZ = (chunkZ << 4) + 8;
 		Biome biome = world.getBiome(new BlockPos(chunkX, 0, chunkZ));
@@ -95,13 +95,13 @@ public abstract class HiveDecorator {
 						continue;
 					}
 
-					tryGenHive(world, worldX + x, worldZ + z, hive);
+					tryGenHive(world, rand, worldX + x, worldZ + z, hive);
 				}
 			}
 		}
 	}
 
-	public static boolean tryGenHive(World world, int x, int z, Hive hive) {
+	public static boolean tryGenHive(World world, Random rand, int x, int z, Hive hive) {
 
 		final BlockPos hivePos = hive.getPosForHive(world, x, z);
 
@@ -123,10 +123,10 @@ public abstract class HiveDecorator {
 			return false;
 		}
 
-		return setHive(world, hivePos, hive);
+		return setHive(world, rand, hivePos, hive);
 	}
 
-	private static boolean setHive(World world, BlockPos pos, Hive hive) {
+	private static boolean setHive(World world, Random rand, BlockPos pos, Hive hive) {
 		IBlockState hiveState = hive.getHiveBlockState();
 		Block hiveBlock = hiveState.getBlock();
 		boolean placed = world.setBlockState(pos, hiveState, Constants.FLAG_BLOCK_SYNC);
@@ -143,7 +143,7 @@ public abstract class HiveDecorator {
 		hiveBlock.onBlockAdded(world, pos, state);
 
 		if (!Config.generateBeehivesDebug) {
-			hive.postGen(world, pos);
+			hive.postGen(world, rand, pos);
 		}
 
 		if (Config.logHivePlacement) {

src/main/java/forestry/apiculture/worldgen/HiveDescription.java

@@ -13,6 +13,7 @@ package forestry.apiculture.worldgen;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
@@ -41,23 +42,23 @@ public enum HiveDescription implements IHiveDescription {
 
 	FOREST(IHiveRegistry.HiveType.FOREST, 3.0f, BeeDefinition.FOREST, HiveManager.genHelper.tree()) {
 		@Override
-		public void postGen(World world, BlockPos pos) {
-			super.postGen(world, pos);
-			postGenFlowers(world, pos, flowerStates);
+		public void postGen(World world, Random rand, BlockPos pos) {
+			super.postGen(world, rand, pos);
+			postGenFlowers(world, rand, pos, flowerStates);
 		}
 	},
 	MEADOWS(IHiveRegistry.HiveType.MEADOWS, 1.0f, BeeDefinition.MEADOWS, HiveManager.genHelper.ground(Blocks.DIRT, Blocks.GRASS)) {
 		@Override
-		public void postGen(World world, BlockPos pos) {
-			super.postGen(world, pos);
-			postGenFlowers(world, pos, flowerStates);
+		public void postGen(World world, Random rand, BlockPos pos) {
+			super.postGen(world, rand, pos);
+			postGenFlowers(world, rand, pos, flowerStates);
 		}
 	},
 	DESERT(IHiveRegistry.HiveType.DESERT, 1.0f, BeeDefinition.MODEST, HiveManager.genHelper.ground(Blocks.DIRT, Blocks.GRASS, Blocks.SAND, Blocks.SANDSTONE)) {
 		@Override
-		public void postGen(World world, BlockPos pos) {
-			super.postGen(world, pos);
-			postGenFlowers(world, pos, cactusStates);
+		public void postGen(World world, Random rand, BlockPos pos) {
+			super.postGen(world, rand, pos);
+			postGenFlowers(world, rand, pos, cactusStates);
 		}
 	},
 	JUNGLE(IHiveRegistry.HiveType.JUNGLE, 6.0f, BeeDefinition.TROPICAL, HiveManager.genHelper.tree()),
@@ -69,21 +70,21 @@ public enum HiveDescription implements IHiveDescription {
 	},
 	SNOW(IHiveRegistry.HiveType.SNOW, 2.0f, BeeDefinition.WINTRY, HiveManager.genHelper.ground(Blocks.DIRT, Blocks.GRASS, Blocks.SNOW)) {
 		@Override
-		public void postGen(World world, BlockPos pos) {
+		public void postGen(World world, Random rand, BlockPos pos) {
 			BlockPos posAbove = pos.up();
 			if (world.isAirBlock(posAbove)) {
 				world.setBlockState(posAbove, Blocks.SNOW_LAYER.getDefaultState(), Constants.FLAG_BLOCK_SYNC);
 			}
 
-			postGenFlowers(world, pos, flowerStates);
+			postGenFlowers(world, rand, pos, flowerStates);
 		}
 	},
 	SWAMP(IHiveRegistry.HiveType.SWAMP, 2.0f, BeeDefinition.MARSHY, HiveManager.genHelper.ground(Blocks.DIRT, Blocks.GRASS)) {
 		@Override
-		public void postGen(World world, BlockPos pos) {
-			super.postGen(world, pos);
+		public void postGen(World world, Random rand, BlockPos pos) {
+			super.postGen(world, rand, pos);
 
-			postGenFlowers(world, pos, mushroomStates);
+			postGenFlowers(world, rand, pos, mushroomStates);
 		}
 	};
 
@@ -146,15 +147,15 @@ public enum HiveDescription implements IHiveDescription {
 	}
 
 	@Override
-	public void postGen(World world, BlockPos pos) {
+	public void postGen(World world, Random rand, BlockPos pos) {
 
 	}
 
-	protected static void postGenFlowers(World world, BlockPos hivePos, List<IBlockState> flowerStates) {
+	protected static void postGenFlowers(World world, Random rand, BlockPos hivePos, List<IBlockState> flowerStates) {
 		int plantedCount = 0;
 		for (int i = 0; i < 10; i++) {
-			int xOffset = world.rand.nextInt(8) - 4;
-			int zOffset = world.rand.nextInt(8) - 4;
+			int xOffset = rand.nextInt(8) - 4;
+			int zOffset = rand.nextInt(8) - 4;
 			BlockPos blockPos = hivePos.add(xOffset, 0, zOffset);
 			if ((xOffset == 0 && zOffset == 0) || !world.isBlockLoaded(blockPos)) {
 				continue;
@@ -165,7 +166,7 @@ public enum HiveDescription implements IHiveDescription {
 				continue;
 			}
 
-			IBlockState state = flowerStates.get(world.rand.nextInt(flowerStates.size()));
+			IBlockState state = flowerStates.get(rand.nextInt(flowerStates.size()));
 			Block block = state.getBlock();
 			if (!block.canPlaceBlockAt(world, blockPos)) {
 				continue;

src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java

@@ -12,6 +12,7 @@ package forestry.apiculture.worldgen;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
@@ -68,7 +69,7 @@ public class HiveDescriptionSwarmer implements IHiveDescription {
 	}
 
 	@Override
-	public void postGen(World world, BlockPos pos) {
+	public void postGen(World world, Random rand, BlockPos pos) {
 		TileEntity tile = world.getTileEntity(pos);
 		if (tile instanceof TileHive) {
 			((TileHive) tile).setContained(bees);

src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java

@@ -69,7 +69,6 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
 	private static final Random random = new Random();
 
 	private int averageGroundLevel = -1;
-	private boolean isInDesert = false;
 	private IBlockState planks;
 	private IBlockState slabs;
 	private IBlockState logs;
@@ -86,8 +85,6 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
 	public VillageApiaristHouse(StructureVillagePieces.Start startPiece, int componentType, Random random, StructureBoundingBox boundingBox, EnumFacing facing) {
 		super(startPiece, componentType, random, boundingBox, facing);
 
-		isInDesert = startPiece.inDesert;
-
 		createBuildingBlocks(random);
 	}
 
@@ -280,7 +277,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
 	private void buildGarden(World world, StructureBoundingBox box) {
 
 		Block ground = Blocks.DIRT;
-		if (isInDesert) {
+		if (field_189928_h == 1) { // desert
 			ground = Blocks.SAND;
 		}
 
@@ -293,7 +290,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
 
 	private void plantFlowerGarden(World world, StructureBoundingBox box, int minX, int minY, int minZ, int maxX, int maxY, int maxZ) {
 
-		if (isInDesert) {
+		if (field_189928_h == 1) { // desert
 			setBlockState(world, Blocks.CACTUS.getDefaultState(), 4, 1, 7, box);
 			return;
 		}

src/main/java/forestry/arboriculture/PluginArboriculture.java

@@ -17,34 +17,12 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockLeaves;
-import net.minecraft.block.BlockNewLeaf;
-import net.minecraft.block.BlockOldLeaf;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.passive.EntityVillager;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.IFuelHandler;
-import net.minecraftforge.fml.common.SidedProxy;
-import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.fml.common.registry.VillagerRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import net.minecraftforge.oredict.OreDictionary;
-
 import forestry.api.arboriculture.EnumForestryWoodType;
 import forestry.api.arboriculture.EnumGermlingType;
 import forestry.api.arboriculture.EnumPileType;
 import forestry.api.arboriculture.EnumVanillaWoodType;
 import forestry.api.arboriculture.IAlleleFruit;
+import forestry.api.arboriculture.IAlleleTreeSpecies;
 import forestry.api.arboriculture.ITree;
 import forestry.api.arboriculture.IWoodType;
 import forestry.api.arboriculture.TreeManager;
@@ -56,6 +34,7 @@ import forestry.api.genetics.ISaplingTranslator;
 import forestry.api.recipes.RecipeManagers;
 import forestry.api.storage.ICrateRegistry;
 import forestry.api.storage.StorageManager;
+import forestry.arboriculture.blocks.BlockForestryLeaves;
 import forestry.arboriculture.blocks.BlockPile;
 import forestry.arboriculture.blocks.BlockRegistryArboriculture;
 import forestry.arboriculture.blocks.log.BlockArbLog;
@@ -71,7 +50,7 @@ import forestry.arboriculture.genetics.alleles.AlleleFruit;
 import forestry.arboriculture.genetics.alleles.AlleleGrowth;
 import forestry.arboriculture.genetics.alleles.AlleleLeafEffect;
 import forestry.arboriculture.items.ItemCharcoal;
-import forestry.arboriculture.items.ItemGermlingGE;
+import forestry.arboriculture.items.ItemGrafter;
 import forestry.arboriculture.items.ItemRegistryArboriculture;
 import forestry.arboriculture.models.TextureLeaves;
 import forestry.arboriculture.network.PacketRegistryArboriculture;
@@ -96,6 +75,31 @@ import forestry.factory.recipes.FabricatorRecipe;
 import forestry.plugins.BlankForestryPlugin;
 import forestry.plugins.ForestryPlugin;
 import forestry.plugins.ForestryPluginUids;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLeaves;
+import net.minecraft.block.BlockNewLeaf;
+import net.minecraft.block.BlockOldLeaf;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumHand;
+import net.minecraft.world.World;
+import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.fml.common.IFuelHandler;
+import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.fml.common.registry.VillagerRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.oredict.OreDictionary;
 
 @ForestryPlugin(pluginID = ForestryPluginUids.ARBORICULTURE, name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.arboriculture.description")
 public class PluginArboriculture extends BlankForestryPlugin {
@@ -194,7 +198,7 @@ public class PluginArboriculture extends BlankForestryPlugin {
 		blocks.treeChest.init();
 
 		if (Config.enableVillagers) {
-			villagerArborist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_ARBORIST, Constants.TEXTURE_SKIN_LUMBERJACK);
+			villagerArborist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_ARBORIST, Constants.TEXTURE_SKIN_LUMBERJACK, Constants.TEXTURE_SKIN_ZOMBIE_LUMBERJACK);
 			VillagerRegistry.instance().register(villagerArborist);
 
 			VillagerRegistry.VillagerCareer arboristCareer = new VillagerRegistry.VillagerCareer(villagerArborist, "arborist");
@@ -396,10 +400,11 @@ public class PluginArboriculture extends BlankForestryPlugin {
 				'Y', "chestWood");
 		
 		//Wood Piles
-		for(ITree tree : TreeManager.treeRoot.getIndividualTemplates()){
-			ItemStack log = tree.getGenome().getPrimary().getWoodProvider().getWoodStack().copy();
+		for (ITree tree : TreeManager.treeRoot.getIndividualTemplates()) {
+			IAlleleTreeSpecies treeSpecies = tree.getGenome().getPrimary();
+			ItemStack log = treeSpecies.getWoodProvider().getWoodStack().copy();
 			log.stackSize = 1;
-			ItemStack woodPile = BlockPile.createWoodPile(tree);
+			ItemStack woodPile = BlockPile.createWoodPile(treeSpecies);
 			RecipeUtil.addShapelessRecipe(woodPile, log, log, log, log);
 		}
 		
@@ -547,4 +552,31 @@ public class PluginArboriculture extends BlankForestryPlugin {
 			alleleFruit.getProvider().registerSprites();
 		}
 	}
+
+	@SubscribeEvent
+	public void onHarvestDropsEvent(BlockEvent.HarvestDropsEvent event) {
+		IBlockState state = event.getState();
+		Block block = state.getBlock();
+		if (block instanceof BlockLeaves && !(block instanceof BlockForestryLeaves)) {
+			EntityPlayer player = event.getHarvester();
+			if (player != null) {
+				ItemStack harvestingTool = player.getHeldItemMainhand();
+				if (harvestingTool != null && harvestingTool.getItem() instanceof ItemGrafter) {
+					if (event.getDrops().isEmpty()) {
+						World world = event.getWorld();
+						Item itemDropped = block.getItemDropped(state, world.rand, 3);
+						if (itemDropped != null) {
+							event.getDrops().add(new ItemStack(itemDropped, 1, block.damageDropped(state)));
+						}
+					}
+
+					harvestingTool.damageItem(1, player);
+					if (harvestingTool.stackSize <= 0) {
+						net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(player, harvestingTool, EnumHand.MAIN_HAND);
+						player.setHeldItem(EnumHand.MAIN_HAND, null);
+					}
+				}
+			}
+		}
+	}
 }

src/main/java/forestry/arboriculture/VillagerArboristTrades.java

@@ -7,12 +7,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Random;
 
-import net.minecraft.entity.passive.EntityVillager;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.village.MerchantRecipe;
-import net.minecraft.village.MerchantRecipeList;
-
 import forestry.api.arboriculture.EnumForestryWoodType;
 import forestry.api.arboriculture.EnumGermlingType;
 import forestry.api.arboriculture.TreeManager;
@@ -22,6 +16,11 @@ import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.IIndividual;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.village.MerchantRecipe;
+import net.minecraft.village.MerchantRecipeList;
 
 public class VillagerArboristTrades {
 
@@ -120,7 +119,7 @@ public class VillagerArboristTrades {
 				j = this.emeraldPriceInfo.getPrice(random);
 			}
 
-			IChromosomeType treeSpeciesType = TreeManager.treeRoot.getKaryotypeKey();
+			IChromosomeType treeSpeciesType = TreeManager.treeRoot.getSpeciesChromosomeType();
 			Collection<IAllele> registeredSpecies = AlleleManager.alleleRegistry.getRegisteredAlleles(treeSpeciesType);
 			List<IAlleleSpecies> potentialSpecies = new ArrayList<>();
 			for (IAllele allele : registeredSpecies) {

src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java

@@ -18,6 +18,7 @@ import java.util.Random;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
@@ -51,7 +52,7 @@ public class BlockArbDoor extends BlockDoor implements IWoodTyped, IItemModelReg
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerModel(Item item, IModelManager manager) {
-		manager.registerVariant(item, WoodHelper.getResourceLocations(this));
+		ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this));
 		manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this));
 	}
 
@@ -100,7 +101,6 @@ public class BlockArbDoor extends BlockDoor implements IWoodTyped, IItemModelReg
 	}
 
 	@Override
-	@SideOnly(Side.CLIENT)
 	public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) {
 		return new ItemStack(getItem());
 	}