Bump version

* Allow overriding climate when checking for mutations

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

@@ -55,6 +55,9 @@ sourceSets {
 }
 
 repositories {
+	maven {
+		url 'http://maven.epoxide.xyz'
+	}
 	maven {
 		url "http://dvs1.progwml6.com/files/maven"
 	}
@@ -65,6 +68,7 @@ repositories {
 }
 
 dependencies {
+	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"

gradle.properties

@@ -1,10 +1,11 @@
-mcversion=1.10
-forgeversion=12.18.0.1984-1.10.0
+mcversion=1.10.2
+forgeversion=12.18.1.2050
 mcp_mappings=snapshot_20160525
 
-jei_version=3.7.0.+
-ic2_version=2.5.5-ex19
+tesla_version=1.10.2-1.2.1.41
+jei_version=3.8.0.240
+ic2_version=2.6.15-ex110
 
 version_major=5
-version_minor=1
-version_patch=3
+version_minor=2
+version_patch=8

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Jun 21 15:23:47 PDT 2016
+#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip

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;
@@ -50,8 +51,9 @@ import forestry.plugins.PluginManager;
 		version = Constants.VERSION,
 		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
 		acceptedMinecraftVersions = "[1.10]",
-		dependencies = "required-after:Forge@[12.18.0.1984,);"
-				+ "after:JEI@[3.7.0,);")
+		dependencies = "required-after:Forge@[12.18.0.1989,);"
+				+ "after:JEI@[3.8.0,);"
+				+ "after:" + PluginIC2.modId + ";")
 public class Forestry {
 
 	@Mod.Instance(Constants.MOD_ID)

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

@@ -5,6 +5,9 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import javax.annotation.Nonnull;
+
+import forestry.api.core.IClimateProvider;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
@@ -16,7 +19,7 @@ import forestry.api.core.EnumTemperature;
 import forestry.api.core.IErrorLogicSource;
 import forestry.api.genetics.IHousing;
 
-public interface IBeeHousing extends IHousing, IErrorLogicSource {
+public interface IBeeHousing extends IHousing, IErrorLogicSource, IClimateProvider {
 
 	/**
 	 * Used by BeeManager.beeRoot.createBeeHousingModifier(IBeeHousing housing)
@@ -32,14 +35,11 @@ public interface IBeeHousing extends IHousing, IErrorLogicSource {
 	 */
 	Iterable<IBeeListener> getBeeListeners();
 
+	@Nonnull
 	IBeeHousingInventory getBeeInventory();
 
 	IBeekeepingLogic getBeekeepingLogic();
 
-	EnumTemperature getTemperature();
-
-	EnumHumidity getHumidity();
-
 	int getBlockLightValue();
 
 	boolean canBlockSeeTheSky();
@@ -47,8 +47,6 @@ public interface IBeeHousing extends IHousing, IErrorLogicSource {
 	/** Must not be named "getWorld" to avoid SpecialSource issue https://github.com/md-5/SpecialSource/issues/12 */
 	World getWorldObj();
 
-	Biome getBiome();
-
 	GameProfile getOwner();
 
 	/**

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/package-info.java

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

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/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/IClimateManager.java

@@ -13,5 +13,7 @@ public interface IClimateManager {
 	float getTemperature(World world, BlockPos pos);
 	
 	float getHumidity(World world, BlockPos pos);
-	
+
+	IClimateProvider getDefaultClimate(World world, BlockPos pos);
+
 }

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

@@ -0,0 +1,11 @@
+package forestry.api.core;
+
+import net.minecraft.world.biome.Biome;
+
+public interface IClimateProvider {
+    Biome getBiome();
+
+    EnumTemperature getTemperature();
+
+    EnumHumidity getHumidity();
+}

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/fuels/EngineBronzeFuel.java

@@ -8,22 +8,10 @@ package forestry.api.fuels;
 import net.minecraftforge.fluids.Fluid;
 
 public class EngineBronzeFuel {
-	/**
-	 * Item that is valid fuel for a biogas engine.
-	 */
-	public final Fluid liquid;
-	/**
-	 * Power produced by this fuel per work cycle of the engine.
-	 */
-	public final int powerPerCycle;
-	/**
-	 * How many work cycles a single "stack" of this type lasts.
-	 */
-	public final int burnDuration;
-	/**
-	 * By how much the normal heat dissipation rate of 1 is multiplied when using this fuel type.
-	 */
-	public final int dissipationMultiplier;
+	private final Fluid liquid;
+	private final int powerPerCycle;
+	private final int burnDuration;
+	private final int dissipationMultiplier;
 
 	public EngineBronzeFuel(Fluid liquid, int powerPerCycle, int burnDuration, int dissipationMultiplier) {
 		this.liquid = liquid;
@@ -31,4 +19,32 @@ public class EngineBronzeFuel {
 		this.burnDuration = burnDuration;
 		this.dissipationMultiplier = dissipationMultiplier;
 	}
+
+	/**
+	 * Item that is valid fuel for a biogas engine.
+	 */
+	public Fluid getLiquid() {
+		return liquid;
+	}
+
+	/**
+	 * Power produced by this fuel per work cycle of the engine.
+	 */
+	public int getPowerPerCycle() {
+		return powerPerCycle;
+	}
+
+	/**
+	 * How many work cycles a single "stack" of this type lasts.
+	 */
+	public int getBurnDuration() {
+		return burnDuration;
+	}
+
+	/**
+	 * By how much the normal heat dissipation rate of 1 is multiplied when using this fuel type.
+	 */
+	public int getDissipationMultiplier() {
+		return dissipationMultiplier;
+	}
 }

src/main/java/forestry/api/fuels/EngineCopperFuel.java

@@ -9,18 +9,9 @@ import net.minecraft.item.ItemStack;
 
 public class EngineCopperFuel {
 
-	/**
-	 * Item that is valid fuel for a peat-fired engine.
-	 */
-	public final ItemStack fuel;
-	/**
-	 * Power produced by this fuel per work cycle.
-	 */
-	public final int powerPerCycle;
-	/**
-	 * Amount of work cycles this item lasts before being consumed.
-	 */
-	public final int burnDuration;
+	private final ItemStack fuel;
+	private final int powerPerCycle;
+	private final int burnDuration;
 
 	public EngineCopperFuel(ItemStack fuel, int powerPerCycle, int burnDuration) {
 		this.fuel = fuel;
@@ -28,4 +19,24 @@ public class EngineCopperFuel {
 		this.burnDuration = burnDuration;
 	}
 
+	/**
+	 * Item that is valid fuel for a peat-fired engine.
+	 */
+	public ItemStack getFuel() {
+		return fuel;
+	}
+
+	/**
+	 * Power produced by this fuel per work cycle.
+	 */
+	public int getPowerPerCycle() {
+		return powerPerCycle;
+	}
+
+	/**
+	 * Amount of work cycles this item lasts before being consumed.
+	 */
+	public int getBurnDuration() {
+		return burnDuration;
+	}
 }

src/main/java/forestry/api/fuels/FermenterFuel.java

@@ -8,22 +8,34 @@ package forestry.api.fuels;
 import net.minecraft.item.ItemStack;
 
 public class FermenterFuel {
-	/**
-	 * Item that is a valid fuel for the fermenter (i.e. fertilizer).
-	 */
-	public final ItemStack item;
-	/**
-	 * How much is fermeted per work cycle, i.e. how much biomass is produced per cycle.
-	 */
-	public final int fermentPerCycle;
-	/**
-	 * Amount of work cycles a single item of this fuel lasts before expiring.
-	 */
-	public final int burnDuration;
+	private final ItemStack item;
+	private final int fermentPerCycle;
+	private final int burnDuration;
 
 	public FermenterFuel(ItemStack item, int fermentPerCycle, int burnDuration) {
 		this.item = item;
 		this.fermentPerCycle = fermentPerCycle;
 		this.burnDuration = burnDuration;
 	}
+
+	/**
+	 * Item that is a valid fuel for the fermenter (i.e. fertilizer).
+	 */
+	public ItemStack getItem() {
+		return item;
+	}
+
+	/**
+	 * How much is fermeted per work cycle, i.e. how much biomass is produced per cycle.
+	 */
+	public int getFermentPerCycle() {
+		return fermentPerCycle;
+	}
+
+	/**
+	 * Amount of work cycles a single item of this fuel lasts before expiring.
+	 */
+	public int getBurnDuration() {
+		return burnDuration;
+	}
 }

src/main/java/forestry/api/fuels/GeneratorFuel.java

@@ -9,18 +9,9 @@ import net.minecraftforge.fluids.FluidStack;
 
 public class GeneratorFuel {
 
-	/**
-	 * LiquidStack representing the fuel type and amount consumed per triggered cycle.
-	 */
-	public final FluidStack fuelConsumed;
-	/**
-	 * EU emitted per tick while this fuel is being consumed in the generator (i.e. biofuel = 32, biomass = 8).
-	 */
-	public final int eu;
-	/**
-	 * Rate at which the fuel is consumed. 1 - Every tick 2 - Every second tick 3 - Every third tick etc.
-	 */
-	public final int rate;
+	private final FluidStack fuelConsumed;
+	private final int eu;
+	private final int rate;
 
 	public GeneratorFuel(FluidStack fuelConsumed, int eu, int rate) {
 		this.fuelConsumed = fuelConsumed;
@@ -28,4 +19,24 @@ public class GeneratorFuel {
 		this.rate = rate;
 	}
 
+	/**
+	 * LiquidStack representing the fuel type and amount consumed per triggered cycle.
+	 */
+	public FluidStack getFuelConsumed() {
+		return fuelConsumed;
+	}
+
+	/**
+	 * EU emitted per tick while this fuel is being consumed in the generator (i.e. biofuel = 32, biomass = 8).
+	 */
+	public int getEu() {
+		return eu;
+	}
+
+	/**
+	 * Rate at which the fuel is consumed. 1 - Every tick 2 - Every second tick 3 - Every third tick etc.
+	 */
+	public int getRate() {
+		return rate;
+	}
 }

src/main/java/forestry/api/fuels/MoistenerFuel.java

@@ -8,22 +8,10 @@ package forestry.api.fuels;
 import net.minecraft.item.ItemStack;
 
 public class MoistenerFuel {
-	/**
-	 * The item to use
-	 */
-	public final ItemStack item;
-	/**
-	 * The item that leaves the moistener's working slot (i.e. mouldy wheat, decayed wheat, mulch)
-	 */
-	public final ItemStack product;
-	/**
-	 * How much this item contributes to the final product of the moistener (i.e. mycelium)
-	 */
-	public final int moistenerValue;
-	/**
-	 * What stage this product represents. Resources with lower stage value will be consumed first.
-	 */
-	public final int stage;
+	private final ItemStack item;
+	private final ItemStack product;
+	private final int moistenerValue;
+	private final int stage;
 
 	public MoistenerFuel(ItemStack item, ItemStack product, int stage, int moistenerValue) {
 		this.item = item;
@@ -31,4 +19,32 @@ public class MoistenerFuel {
 		this.stage = stage;
 		this.moistenerValue = moistenerValue;
 	}
+
+	/**
+	 * The item to use
+	 */
+	public ItemStack getItem() {
+		return item;
+	}
+
+	/**
+	 * The item that leaves the moistener's working slot (i.e. mouldy wheat, decayed wheat, mulch)
+	 */
+	public ItemStack getProduct() {
+		return product;
+	}
+
+	/**
+	 * How much this item contributes to the final product of the moistener (i.e. mycelium)
+	 */
+	public int getMoistenerValue() {
+		return moistenerValue;
+	}
+
+	/**
+	 * What stage this product represents. Resources with lower stage value will be consumed first.
+	 */
+	public int getStage() {
+		return stage;
+	}
 }

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

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

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

@@ -5,6 +5,7 @@
  ******************************************************************************/
 package forestry.api.genetics;
 
+import forestry.api.core.IClimateProvider;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -15,7 +16,7 @@ public interface IMutationCondition {
 	 * Most will return 1 if the condition is met and 0 otherwise,
 	 * but the float offers flexibility for more advanced conditions.
 	 */
-	float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
+	float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate);
 
 	/**
 	 * A localized description of the mutation condition. (i.e. "A temperature of HOT is required.")

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

@@ -138,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

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

@@ -5,10 +5,11 @@
  ******************************************************************************/
 package forestry.api.lepidopterology;
 
+import forestry.api.core.IClimateProvider;
 import forestry.api.genetics.IHousing;
 import forestry.api.genetics.IIndividual;
 
-public interface IButterflyNursery extends IHousing {
+public interface IButterflyNursery extends IHousing, IClimateProvider {
 	
 	IButterfly getCaterpillar();
 	

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/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/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;
@@ -233,18 +234,20 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 		if (beeType == EnumBeeType.PRINCESS) {
 			tickBreed();
 		} else if (beeType == EnumBeeType.QUEEN) {
-			queenWorkTick(queen);
+			queenWorkTick(queen, queenStack);
 		}
 	}
 
 	@Override
 	public void clearCachedValues() {
-		hasFlowersCache.clear();
-		queenCanWorkCache.clear();
-		canWork();
+		if (!housing.getWorldObj().isRemote) {
+			hasFlowersCache.clear();
+			queenCanWorkCache.clear();
+			canWork();
+		}
 	}
 
-	private void queenWorkTick(IBee queen) {
+	private void queenWorkTick(@Nullable IBee queen, @Nonnull ItemStack queenStack) {
 		if (queen == null) {
 			beeProgress = 0;
 			beeProgressMax = 0;
@@ -270,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();

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,8 +10,6 @@
  ******************************************************************************/
 package forestry.apiculture;
 
-import com.google.common.collect.ImmutableMap;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -19,34 +17,7 @@ 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.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;
-
+import com.google.common.collect.ImmutableMap;
 import forestry.Forestry;
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
@@ -119,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 {
@@ -266,7 +263,7 @@ 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);

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/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/genetics/BeeMutation.java

@@ -45,7 +45,7 @@ public class BeeMutation extends Mutation implements IBeeMutation, IBeeMutationB
 		World world = housing.getWorldObj();
 		BlockPos housingPos = housing.getCoordinates();
 
-		float processedChance = super.getChance(world, housingPos, allele0, allele1, genome0, genome1);
+		float processedChance = super.getChance(world, housingPos, allele0, allele1, genome0, genome1, housing);
 		if (processedChance <= 0) {
 			return 0;
 		}

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

@@ -12,8 +12,8 @@ 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;
 
@@ -249,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);
 		}

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/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/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/arboriculture/PluginArboriculture.java

@@ -34,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;
@@ -49,6 +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.ItemGrafter;
 import forestry.arboriculture.items.ItemRegistryArboriculture;
 import forestry.arboriculture.models.TextureLeaves;
 import forestry.arboriculture.network.PacketRegistryArboriculture;
@@ -79,12 +81,16 @@ 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;
@@ -192,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");
@@ -546,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/blocks/BlockArbDoor.java

@@ -101,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());
 	}

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

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

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

@@ -16,6 +16,29 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
+import com.mojang.authlib.GameProfile;
+import forestry.api.arboriculture.EnumGermlingType;
+import forestry.api.arboriculture.IToolGrafter;
+import forestry.api.arboriculture.ITree;
+import forestry.api.arboriculture.TreeManager;
+import forestry.api.core.IItemModelRegister;
+import forestry.api.core.IModelManager;
+import forestry.api.core.IToolScoop;
+import forestry.api.core.Tabs;
+import forestry.api.lepidopterology.ButterflyManager;
+import forestry.api.lepidopterology.EnumFlutterType;
+import forestry.api.lepidopterology.IButterfly;
+import forestry.arboriculture.LeafDecayHelper;
+import forestry.arboriculture.PluginArboriculture;
+import forestry.arboriculture.genetics.TreeDefinition;
+import forestry.arboriculture.tiles.TileLeaves;
+import forestry.core.blocks.IColoredBlock;
+import forestry.core.blocks.propertys.UnlistedBlockAccess;
+import forestry.core.blocks.propertys.UnlistedBlockPos;
+import forestry.core.proxy.Proxies;
+import forestry.core.tiles.TileUtil;
+import forestry.core.utils.BlockUtil;
+import forestry.core.utils.ItemStackUtil;
 import net.minecraft.block.BlockLeaves;
 import net.minecraft.block.BlockPlanks;
 import net.minecraft.block.IGrowable;
@@ -40,9 +63,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-
-import com.mojang.authlib.GameProfile;
-
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
@@ -50,29 +70,6 @@ import net.minecraftforge.common.property.IUnlistedProperty;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import forestry.api.arboriculture.EnumGermlingType;
-import forestry.api.arboriculture.IToolGrafter;
-import forestry.api.arboriculture.ITree;
-import forestry.api.arboriculture.TreeManager;
-import forestry.api.core.IItemModelRegister;
-import forestry.api.core.IModelManager;
-import forestry.api.core.IToolScoop;
-import forestry.api.core.Tabs;
-import forestry.api.lepidopterology.ButterflyManager;
-import forestry.api.lepidopterology.EnumFlutterType;
-import forestry.api.lepidopterology.IButterfly;
-import forestry.arboriculture.LeafDecayHelper;
-import forestry.arboriculture.PluginArboriculture;
-import forestry.arboriculture.genetics.TreeDefinition;
-import forestry.arboriculture.tiles.TileLeaves;
-import forestry.core.blocks.IColoredBlock;
-import forestry.core.blocks.propertys.UnlistedBlockAccess;
-import forestry.core.blocks.propertys.UnlistedBlockPos;
-import forestry.core.proxy.Proxies;
-import forestry.core.tiles.TileUtil;
-import forestry.core.utils.BlockUtil;
-import forestry.core.utils.ItemStackUtil;
-
 public class BlockForestryLeaves extends BlockLeaves implements ITileEntityProvider, IGrowable, IItemModelRegister, IColoredBlock {
 
 	public BlockForestryLeaves() {
@@ -137,17 +134,16 @@ public class BlockForestryLeaves extends BlockLeaves implements ITileEntityProvi
 		int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, player.getActiveItemStack());
 		float saplingModifier = 1.0f;
 
-		if (!world.isRemote) {
-			ItemStack held = player.inventory.getCurrentItem();
-			if (held != null && held.getItem() instanceof IToolGrafter) {
-				saplingModifier = ((IToolGrafter) held.getItem()).getSaplingModifier(held, world, player, pos);
-				held.damageItem(1, player);
-				if (held.stackSize <= 0) {
-					net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(player, held, EnumHand.MAIN_HAND);
-					player.setHeldItem(EnumHand.MAIN_HAND, null);
-				}
+		ItemStack held = player.inventory.getCurrentItem();
+		if (held != null && held.getItem() instanceof IToolGrafter) {
+			saplingModifier = ((IToolGrafter) held.getItem()).getSaplingModifier(held, world, player, pos);
+			held.damageItem(1, player);
+			if (held.stackSize <= 0) {
+				net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(player, held, EnumHand.MAIN_HAND);
+				player.setHeldItem(EnumHand.MAIN_HAND, null);
 			}
 		}
+
 		GameProfile playerProfile = player.getGameProfile();
 		List<ItemStack> leafDrops = getLeafDrop(world, playerProfile, pos, saplingModifier, fortune);
 		drops.set(leafDrops);

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

@@ -531,7 +531,7 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro
 	}
 
 	public static IAlleleTreeSpecies getTreeSpecies(ItemStack stack) {
-		if (stack != null) {
+		if (stack != null && stack.hasTagCompound()) {
 			NBTTagCompound tagCompound = stack.getTagCompound();
 
 			// legacy

src/main/java/forestry/arboriculture/commands/TreeModeHelper.java

@@ -13,17 +13,16 @@ package forestry.arboriculture.commands;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.world.World;
-
 import forestry.api.arboriculture.ITreekeepingMode;
 import forestry.api.arboriculture.TreeManager;
 import forestry.core.commands.ICommandModeHelper;
+import net.minecraft.world.World;
 
 public class TreeModeHelper implements ICommandModeHelper {
 
 	@Override
 	public String[] getModeNames() {
-		ArrayList<ITreekeepingMode> treekeepingModes = TreeManager.treeRoot.getTreekeepingModes();
+		List<ITreekeepingMode> treekeepingModes = TreeManager.treeRoot.getTreekeepingModes();
 		int modeStringCount = treekeepingModes.size();
 		List<String> modeStrings = new ArrayList<>(modeStringCount);
 		for (ITreekeepingMode mode : treekeepingModes) {

src/main/java/forestry/arboriculture/genetics/TreeDefinition.java

@@ -1010,7 +1010,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe
 			return false;
 		}
 
-		tileLeaves.setOwner(owner);
+		tileLeaves.getOwnerHandler().setOwner(owner);
 		tileLeaves.setTree(new Tree(genome));
 
 		world.markBlockRangeForRenderUpdate(pos, pos);

src/main/java/forestry/arboriculture/genetics/TreeMutation.java

@@ -10,6 +10,8 @@
  ******************************************************************************/
 package forestry.arboriculture.genetics;
 
+import forestry.api.core.ForestryAPI;
+import forestry.core.DefaultClimateProvider;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -40,7 +42,7 @@ public class TreeMutation extends Mutation implements ITreeMutation, ITreeMutati
 
 	@Override
 	public float getChance(World world, BlockPos pos, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, ITreeGenome genome0, ITreeGenome genome1) {
-		float processedChance = super.getChance(world, pos, allele0, allele1, genome0, genome1);
+		float processedChance = super.getChance(world, pos, allele0, allele1, genome0, genome1, ForestryAPI.climateManager.getDefaultClimate(world, pos));
 		if (processedChance <= 0) {
 			return 0;
 		}

src/main/java/forestry/arboriculture/genetics/TreeRoot.java

@@ -219,15 +219,14 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot {
 			return false;
 		}
 
-		TileEntity tile = world.getTileEntity(pos);
-		if (!(tile instanceof TileSapling)) {
+		TileSapling sapling = TileUtil.getTile(world, pos, TileSapling.class);
+		if (sapling == null) {
 			world.setBlockToAir(pos);
 			return false;
 		}
 
-		TileSapling sapling = (TileSapling) tile;
 		sapling.setTree(tree.copy());
-		sapling.setOwner(owner);
+		sapling.getOwnerHandler().setOwner(owner);
 
 		PacketFXSignal packet = new PacketFXSignal(PacketFXSignal.SoundFXType.BLOCK_PLACE, pos, blockState);
 		Proxies.net.sendNetworkPacket(packet, world);

src/main/java/forestry/arboriculture/items/ItemGrafter.java

@@ -10,6 +10,9 @@
  ******************************************************************************/
 package forestry.arboriculture.items;
 
+import java.util.List;
+
+import forestry.core.utils.Translator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLeaves;
 import net.minecraft.block.material.Material;
@@ -34,6 +37,14 @@ public class ItemGrafter extends ItemForestryTool implements IToolGrafter {
 		setEfficiencyOnProperMaterial(4.0f);
 	}
 
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
+		super.addInformation(stack, playerIn, tooltip, advanced);
+		if (!stack.isItemDamaged()) {
+			tooltip.add(Translator.translateToLocalFormatted("item.for.uses", stack.getMaxDamage() + 1));
+		}
+	}
+
 	@Override
 	public boolean canHarvestBlock(IBlockState state, ItemStack stack) {
 		Block block = state.getBlock();

src/main/java/forestry/arboriculture/items/ItemRegistryArboriculture.java

@@ -10,6 +10,8 @@
  ******************************************************************************/
 package forestry.arboriculture.items;
 
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import forestry.api.arboriculture.EnumGermlingType;
@@ -28,8 +30,12 @@ public class ItemRegistryArboriculture extends ItemRegistry {
 		OreDictionary.registerOre(OreDictUtil.TREE_SAPLING, sapling.getWildcard());
 		
 		pollenFertile = registerItem(new ItemGermlingGE(EnumGermlingType.POLLEN), "pollenFertile");
+
 		charcoal = registerItem(new ItemCharcoal(), "charcoal");
-		grafter = registerItem(new ItemGrafter(4), "grafter");
+		registerOreDict(OreDictUtil.CHARCOAL, new ItemStack(charcoal, 1, OreDictionary.WILDCARD_VALUE));
+		registerOreDict(OreDictUtil.CHARCOAL, new ItemStack(Items.COAL, 1, 1));
+
+		grafter = registerItem(new ItemGrafter(9), "grafter");
 		grafterProven = registerItem(new ItemGrafter(149), "grafterProven");
 	}
 }

src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java

@@ -13,7 +13,6 @@ import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.network.packets.PacketActiveUpdate;
 import forestry.arboriculture.PluginArboriculture;
 import forestry.arboriculture.blocks.BlockPile;
-import forestry.core.access.EnumAccess;
 import forestry.core.multiblock.IMultiblockControllerInternal;
 import forestry.core.multiblock.MultiblockRegistry;
 import forestry.core.multiblock.MultiblockValidationException;
@@ -307,10 +306,6 @@ public class CharcoalPileController extends RectangularMultiblockControllerBase
 		active = data.readBoolean();
 	}
 
-	@Override
-	public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) {
-	}
-
 	@Override
 	public EnumTemperature getTemperature() {
 		return null;

src/main/java/forestry/arboriculture/tiles/TileLeaves.java

@@ -27,6 +27,9 @@ import forestry.api.arboriculture.ITree;
 import forestry.api.arboriculture.ITreeGenome;
 import forestry.api.arboriculture.ITreekeepingMode;
 import forestry.api.arboriculture.TreeManager;
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.core.ForestryAPI;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IEffectData;
@@ -55,6 +58,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
 import net.minecraftforge.common.EnumPlantType;
 
 public class TileLeaves extends TileTreeContainer implements IPollinatable, IFruitBearer, IButterflyNursery, IRipeningPacketReceiver {
@@ -461,7 +465,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru
 		int caterpillarMatureTime = Math.round((float) caterpillarGenome.getLifespan() / (caterpillarGenome.getFertility() * 2));
 
 		if (maturationTime >= caterpillarMatureTime) {
-			ButterflyManager.butterflyRoot.plantCocoon(worldObj, this, getOwner(), 0);
+			ButterflyManager.butterflyRoot.plantCocoon(worldObj, this, getOwnerHandler().getOwner(), 0);
 			setCaterpillar(null);
 		} else if (!wasDestroyed && isDestroyed(tree, damage)) {
 			sendNetworkUpdate();
@@ -495,4 +499,19 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru
 		ITree tree = getTree();
 		return !isDestroyed(tree, damage) && caterpillar == null;
 	}
+
+	@Override
+	public Biome getBiome() {
+		return worldObj.getBiome(pos);
+	}
+
+	@Override
+	public EnumTemperature getTemperature() {
+		return EnumTemperature.getFromBiome(worldObj.getBiome(pos), worldObj, pos);
+	}
+
+	@Override
+	public EnumHumidity getHumidity() {
+		return EnumHumidity.getFromValue(ForestryAPI.climateManager.getHumidity(worldObj, pos));
+	}
 }

src/main/java/forestry/arboriculture/tiles/TileSapling.java

@@ -106,7 +106,7 @@ public class TileSapling extends TileTreeContainer {
 		}
 
 		if (generated) {
-			IBreedingTracker breedingTracker = TreeManager.treeRoot.getBreedingTracker(worldObj, getOwner());
+			IBreedingTracker breedingTracker = TreeManager.treeRoot.getBreedingTracker(worldObj, getOwnerHandler().getOwner());
 			breedingTracker.registerBirth(tree);
 		}
 	}

src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java

@@ -15,9 +15,19 @@ import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Random;
 
+import forestry.api.arboriculture.ITree;
+import forestry.api.arboriculture.TreeManager;
+import forestry.api.genetics.IAllele;
+import forestry.arboriculture.genetics.Tree;
+import forestry.core.network.DataInputStreamForestry;
+import forestry.core.network.DataOutputStreamForestry;
+import forestry.core.network.IStreamable;
+import forestry.core.owner.IOwnerHandler;
+import forestry.core.owner.IOwnedTile;
+import forestry.core.owner.OwnerHandler;
+import forestry.core.utils.NBTUtilForestry;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.play.server.SPacketUpdateTileEntity;
@@ -25,30 +35,16 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import com.mojang.authlib.GameProfile;
-
-import forestry.api.arboriculture.ITree;
-import forestry.api.arboriculture.TreeManager;
-import forestry.api.genetics.IAllele;
-import forestry.arboriculture.genetics.Tree;
-import forestry.core.access.IOwnable;
-import forestry.core.network.DataInputStreamForestry;
-import forestry.core.network.DataOutputStreamForestry;
-import forestry.core.network.IStreamable;
-import forestry.core.utils.NBTUtilForestry;
-import forestry.core.utils.PlayerUtil;
-
 /**
  * This is the base TE class for any block that needs to contain tree genome information.
  *
  * @author SirSengir
  */
-public abstract class TileTreeContainer extends TileEntity implements IStreamable, IOwnable {
+public abstract class TileTreeContainer extends TileEntity implements IStreamable, IOwnedTile {
 
 	@Nullable
 	private ITree containedTree;
-	@Nullable
-	private GameProfile owner;
+	private final OwnerHandler ownerHandler = new OwnerHandler();
 
 	/* SAVING & LOADING */
 	@Override
@@ -58,9 +54,7 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl
 		if (nbttagcompound.hasKey("ContainedTree")) {
 			containedTree = new Tree(nbttagcompound.getCompoundTag("ContainedTree"));
 		}
-		if (nbttagcompound.hasKey("owner")) {
-			owner = PlayerUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner"));
-		}
+		ownerHandler.readFromNBT(nbttagcompound);
 	}
 
 	@Nonnull
@@ -73,11 +67,7 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl
 			containedTree.writeToNBT(subcompound);
 			nbttagcompound.setTag("ContainedTree", subcompound);
 		}
-		if (this.owner != null) {
-			NBTTagCompound nbt = new NBTTagCompound();
-			PlayerUtil.writeGameProfile(nbt, owner);
-			nbttagcompound.setTag("owner", nbt);
-		}
+		ownerHandler.writeToNBT(nbttagcompound);
 
 		return nbttagcompound;
 	}
@@ -122,26 +112,9 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl
 		return this.containedTree;
 	}
 
-	/* IOwnable */
-	@Nullable
 	@Override
-	public GameProfile getOwner() {
-		return owner;
-	}
-
-	@Override
-	public void setOwner(@Nonnull GameProfile owner) {
-		this.owner = owner;
-	}
-
-	@Override
-	public boolean isOwned() {
-		return owner != null;
-	}
-
-	@Override
-	public boolean isOwner(EntityPlayer player) {
-		return player != null && PlayerUtil.isSameGameProfile(player.getGameProfile(), owner);
+	public IOwnerHandler getOwnerHandler() {
+		return ownerHandler;
 	}
 
 	/* UPDATING */

src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java

@@ -78,7 +78,7 @@ public abstract class WorldGenArboriculture extends WorldGenBase {
 		if (tile == null) {
 			return null;
 		}
-		return tile.getOwner();
+		return tile.getOwnerHandler().getOwner();
 	}
 
 	public void preGenerate(World world, Random rand, BlockPos startPos) {

src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java

@@ -10,18 +10,14 @@
  ******************************************************************************/
 package forestry.arboriculture.worldgen;
 
-import javax.annotation.Nonnull;
-import java.util.Collections;
 import java.util.List;
 import java.util.Random;
-import java.util.Set;
-
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
 
 import forestry.api.world.ITreeGenData;
 import forestry.core.worldgen.WorldGenHelper;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 
 public class WorldGenBalsa extends WorldGenTree {
 
@@ -31,7 +27,8 @@ public class WorldGenBalsa extends WorldGenTree {
 
 	@Override
 	protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
-		BlockPos.MutableBlockPos leafCenter = new BlockPos.MutableBlockPos(startPos.add(0, height, 0));
+		BlockPos topPos = startPos.add(0, height + 1, 0);
+		BlockPos.MutableBlockPos leafCenter = new BlockPos.MutableBlockPos(topPos);
 		float leafRadius = (girth - 1.0f) / 2.0f;
 
 		WorldGenHelper.addBlock(world, leafCenter, leaf, WorldGenHelper.EnumReplaceMode.AIR);
@@ -44,7 +41,7 @@ public class WorldGenBalsa extends WorldGenTree {
 			leafCenter.move(EnumFacing.DOWN);
 		}
 
-		while (leafCenter.getY() > 6) {
+		while (leafCenter.getY() > topPos.getY() - 6) {
 			WorldGenHelper.generateCylinderFromPos(world, leaf, leafCenter, leafRadius + girth, 1, WorldGenHelper.EnumReplaceMode.SOFT);
 			leafCenter.move(EnumFacing.DOWN);
 		}

src/main/java/forestry/core/ClimateManager.java

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package forestry.core;
 
+import forestry.api.core.IClimateProvider;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
@@ -42,4 +43,8 @@ public class ClimateManager implements IClimateManager{
 		return biome.getRainfall();
 	}
 
+	@Override
+	public IClimateProvider getDefaultClimate(World world, BlockPos pos) {
+		return new DefaultClimateProvider(world, pos);
+	}
 }

src/main/java/forestry/core/DefaultClimateProvider.java

@@ -0,0 +1,34 @@
+package forestry.core;
+
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.core.ForestryAPI;
+import forestry.api.core.IClimateProvider;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+
+public class DefaultClimateProvider implements IClimateProvider {
+    private World world;
+    private BlockPos pos;
+
+    public DefaultClimateProvider(World world, BlockPos pos) {
+        this.world = world;
+        this.pos = pos;
+    }
+
+    @Override
+    public Biome getBiome() {
+        return world.getBiome(pos);
+    }
+
+    @Override
+    public EnumTemperature getTemperature() {
+        return EnumTemperature.getFromBiome(world.getBiome(pos), world, pos);
+    }
+
+    @Override
+    public EnumHumidity getHumidity() {
+        return EnumHumidity.getFromValue(ForestryAPI.climateManager.getHumidity(world, pos));
+    }
+}

src/main/java/forestry/core/PluginCore.java

@@ -17,6 +17,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import forestry.core.owner.GameProfileDataSerializer;
 import net.minecraft.command.ICommand;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -119,6 +120,8 @@ public class PluginCore extends BlankForestryPlugin {
 	public void preInit() {
 		super.preInit();
 		
+		GameProfileDataSerializer.register();
+
 		MinecraftForge.EVENT_BUS.register(this);
 
 		rootCommand.addChildCommand(new CommandPlugins());

src/main/java/forestry/core/access/AccessHandler.java

@@ -1,190 +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.core.access;
-
-import javax.annotation.Nonnull;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-
-import com.mojang.authlib.GameProfile;
-
-import forestry.core.config.Config;
-import forestry.core.network.DataInputStreamForestry;
-import forestry.core.network.DataOutputStreamForestry;
-import forestry.core.network.packets.PacketAccessSwitch;
-import forestry.core.network.packets.PacketAccessSwitchEntity;
-import forestry.core.proxy.Proxies;
-import forestry.core.tiles.ILocatable;
-import forestry.core.utils.PlayerUtil;
-
-public final class AccessHandler implements IAccessHandler {
-	private final IRestrictedAccess accessListener;
-	private final List<IAccessOwnerListener> accessOwnerListeners = new ArrayList<>();
-	private final Object target;
-
-	private GameProfile owner = null;
-	private EnumAccess access = EnumAccess.SHARED;
-
-	public <T extends IRestrictedAccess & ILocatable> AccessHandler(T tile) {
-		this.accessListener = tile;
-		this.target = tile;
-	}
-
-	public <T extends Entity & IRestrictedAccess> AccessHandler(T entity) {
-		this.accessListener = entity;
-		this.target = entity;
-	}
-
-	@Override
-	public void addOwnerListener(IAccessOwnerListener accessListener) {
-		accessOwnerListeners.add(accessListener);
-	}
-
-	@Override
-	public void removeOwnerListener(IAccessOwnerListener accessListener) {
-		accessOwnerListeners.remove(accessListener);
-	}
-
-	@Override
-	public final boolean allowsRemoval(EntityPlayer player) {
-		return !Config.enablePermissions || getAccess() == EnumAccess.SHARED || !isOwned() || isOwner(player) || Proxies.common.isOp(player);
-	}
-
-	@Override
-	public final boolean allowsAlteration(EntityPlayer player) {
-		return allowsRemoval(player);
-	}
-
-	@Override
-	public final boolean allowsViewing(EntityPlayer player) {
-		return allowsAlteration(player) || getAccess() == EnumAccess.VIEWABLE;
-	}
-	
-	@Override
-	public boolean allowsInteracting(EntityPlayer player) {
-		return allowsAlteration(player);
-	}
-
-	@Override
-	public final boolean allowsPipeConnections() {
-		return access == EnumAccess.SHARED;
-	}
-
-	@Override
-	public EnumAccess getAccess() {
-		return access;
-	}
-
-	@Override
-	public boolean isOwned() {
-		return owner != null;
-	}
-
-	@Override
-	public GameProfile getOwner() {
-		return owner;
-	}
-
-	@Override
-	public void setOwner(@Nonnull GameProfile owner) {
-		this.owner = owner;
-		for (IAccessOwnerListener listener : accessOwnerListeners) {
-			listener.onOwnerSet(owner);
-		}
-	}
-
-	@Override
-	public boolean isOwner(EntityPlayer player) {
-		return PlayerUtil.isSameGameProfile(owner, player.getGameProfile());
-	}
-
-	@Override
-	public boolean switchAccess(EntityPlayer player) {
-		if (!isOwner(player)) {
-			return false;
-		}
-
-		int ordinal = (access.ordinal() + 1) % EnumAccess.values().length;
-		EnumAccess newAccess = EnumAccess.values()[ordinal];
-		setAccess(player.worldObj, newAccess);
-
-		return true;
-	}
-
-	private void setAccess(World world, EnumAccess access) {
-		EnumAccess oldAccess = this.access;
-		if (oldAccess == access) {
-			return;
-		}
-
-		this.access = access;
-
-		if (world.isRemote) {
-			if (target instanceof ILocatable) {
-				Proxies.net.sendToServer(new PacketAccessSwitch((ILocatable) target));
-			} else if (target instanceof Entity) {
-				Proxies.net.sendToServer(new PacketAccessSwitchEntity((Entity) target));
-			}
-		} else {
-			accessListener.onSwitchAccess(oldAccess, access);
-		}
-	}
-
-	@Override
-	public void writeData(DataOutputStreamForestry data) throws IOException {
-		if (owner == null) {
-			data.writeByte(-1);
-		} else {
-			data.writeByte(access.ordinal());
-			data.writeLong(owner.getId().getMostSignificantBits());
-			data.writeLong(owner.getId().getLeastSignificantBits());
-			data.writeUTF(owner.getName());
-		}
-	}
-
-	@Override
-	public void readData(DataInputStreamForestry data) throws IOException {
-		byte accessOrdinal = data.readByte();
-		if (accessOrdinal >= 0) {
-			access = EnumAccess.values()[accessOrdinal];
-			GameProfile owner = new GameProfile(new UUID(data.readLong(), data.readLong()), data.readUTF());
-			setOwner(owner);
-		}
-	}
-
-	@Override
-	public void readFromNBT(NBTTagCompound data) {
-		access = EnumAccess.values()[data.getInteger("Access")];
-
-		if (data.hasKey("owner")) {
-			owner = PlayerUtil.readGameProfileFromNBT(data.getCompoundTag("owner"));
-		}
-	}
-
-	@Override
-	public NBTTagCompound writeToNBT(NBTTagCompound data) {
-		data.setInteger("Access", access.ordinal());
-
-		if (this.owner != null) {
-			NBTTagCompound nbt = new NBTTagCompound();
-			PlayerUtil.writeGameProfile(nbt, owner);
-			data.setTag("owner", nbt);
-		}
-		return data;
-	}
-}

src/main/java/forestry/core/access/EnumAccess.java

@@ -1,34 +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.core.access;
-
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-public enum EnumAccess {
-	SHARED("for.gui.rule.shared"), VIEWABLE("for.gui.rule.restricted"), PRIVATE("for.gui.rule.private");
-
-	private final String unlocalizedName;
-	
-	@SideOnly(Side.CLIENT)
-	private TextureAtlasSprite icon;
-
-	EnumAccess(String unlocalizedName) {
-		this.unlocalizedName = unlocalizedName;
-	}
-
-	public String getUnlocalizedName() {
-		return this.unlocalizedName;
-	}
-
-}

src/main/java/forestry/core/access/FakeAccessHandler.java

@@ -1,122 +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.core.access;
-
-import javax.annotation.Nonnull;
-import java.io.IOException;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
-
-import com.mojang.authlib.GameProfile;
-
-import forestry.core.network.DataInputStreamForestry;
-import forestry.core.network.DataOutputStreamForestry;
-
-public class FakeAccessHandler implements IAccessHandler {
-	private static FakeAccessHandler instance;
-
-	public static FakeAccessHandler getInstance() {
-		if (instance == null) {
-			instance = new FakeAccessHandler();
-		}
-		return instance;
-	}
-
-	private FakeAccessHandler() {
-
-	}
-
-	@Override
-	public boolean switchAccess(EntityPlayer player) {
-		return false;
-	}
-
-	@Override
-	public EnumAccess getAccess() {
-		return EnumAccess.SHARED;
-	}
-
-	@Override
-	public boolean allowsRemoval(EntityPlayer player) {
-		return true;
-	}
-
-	@Override
-	public boolean allowsAlteration(EntityPlayer player) {
-		return true;
-	}
-
-	@Override
-	public boolean allowsViewing(EntityPlayer player) {
-		return true;
-	}
-	
-	@Override
-	public boolean allowsInteracting(EntityPlayer player) {
-		return true;
-	}
-	
-	@Override
-	public boolean allowsPipeConnections() {
-		return true;
-	}
-
-	@Override
-	public void addOwnerListener(IAccessOwnerListener accessListener) {
-
-	}
-
-	@Override
-	public void removeOwnerListener(IAccessOwnerListener accessListener) {
-
-	}
-
-	@Override
-	public boolean isOwned() {
-		return false;
-	}
-
-	@Override
-	public GameProfile getOwner() {
-		return null;
-	}
-
-	@Override
-	public void setOwner(@Nonnull GameProfile owner) {
-
-	}
-
-	@Override
-	public boolean isOwner(EntityPlayer player) {
-		return true;
-	}
-
-	@Override
-	public void readFromNBT(NBTTagCompound nbttagcompound) {
-
-	}
-
-	@Override
-	public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) {
-		return nbttagcompound;
-	}
-
-	@Override
-	public void writeData(DataOutputStreamForestry data) throws IOException {
-
-	}
-
-	@Override
-	public void readData(DataInputStreamForestry data) throws IOException {
-
-	}
-}

src/main/java/forestry/core/access/IAccessHandler.java

@@ -1,39 +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.core.access;
-
-import net.minecraft.entity.player.EntityPlayer;
-
-import forestry.api.core.INbtReadable;
-import forestry.api.core.INbtWritable;
-import forestry.core.network.IStreamable;
-
-public interface IAccessHandler extends IOwnable, IStreamable, INbtWritable, INbtReadable {
-
-	boolean switchAccess(EntityPlayer player);
-
-	EnumAccess getAccess();
-
-	boolean allowsRemoval(EntityPlayer player);
-
-	boolean allowsAlteration(EntityPlayer player);
-
-	boolean allowsViewing(EntityPlayer player);
-	
-	boolean allowsInteracting(EntityPlayer player);
-
-	boolean allowsPipeConnections();
-
-	void addOwnerListener(IAccessOwnerListener accessListener);
-
-	void removeOwnerListener(IAccessOwnerListener accessListener);
-
-}

src/main/java/forestry/core/access/IRestrictedAccess.java

@@ -1,17 +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.core.access;
-
-public interface IRestrictedAccess {
-	IAccessHandler getAccessHandler();
-
-	void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess);
-}

src/main/java/forestry/core/blocks/BlockBase.java

@@ -36,7 +36,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 
 import net.minecraftforge.fluids.FluidUtil;
@@ -50,7 +49,6 @@ import forestry.api.core.IModelManager;
 import forestry.api.core.ISpriteRegister;
 import forestry.api.core.IStateMapperRegister;
 import forestry.api.core.ITextureManager;
-import forestry.core.access.IAccessHandler;
 import forestry.core.circuits.ISocketable;
 import forestry.core.proxy.Proxies;
 import forestry.core.render.MachineParticleCallback;
@@ -60,7 +58,6 @@ import forestry.core.tiles.TileBase;
 import forestry.core.tiles.TileForestry;
 import forestry.core.tiles.TileUtil;
 import forestry.core.utils.InventoryUtil;
-import forestry.core.utils.PlayerUtil;
 
 public class BlockBase<P extends Enum<P> & IBlockType & IStringSerializable> extends BlockForestry implements IItemModelRegister, ISpriteRegister, IStateMapperRegister {
 	/** use this instead of {@link BlockHorizontal#FACING} so the blocks rotate in a circle instead of NSWE order. */
@@ -77,8 +74,8 @@ public class BlockBase<P extends Enum<P> & IBlockType & IStringSerializable> ext
 	
 	protected final BlockStateContainer blockState;
 
-	public BlockBase(@Nonnull P blockType) {
-		super(Material.IRON);
+	public BlockBase(@Nonnull P blockType, Material material) {
+		super(material);
 
 		this.blockType = blockType;
 		blockType.getMachineProperties().setBlock(this);
@@ -93,6 +90,10 @@ public class BlockBase<P extends Enum<P> & IBlockType & IStringSerializable> ext
 		
 		particleCallback = new MachineParticleCallback<>(this, blockType);
 	}
+	
+	public BlockBase(@Nonnull P blockType) {
+		this(blockType, Material.IRON);
+	}
 
 	@Override
 	public boolean isOpaqueCube(IBlockState state) {
@@ -148,35 +149,25 @@ public class BlockBase<P extends Enum<P> & IBlockType & IStringSerializable> ext
 	@Override
 	public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
 		TileBase tile = TileUtil.getTile(worldIn, pos, TileBase.class);
-		if (tile == null) {
-			return false;
-		}
+		if (tile != null) {
+			if (TileUtil.isUsableByPlayer(playerIn, tile)) {
 
-		if (!TileUtil.isUsableByPlayer(playerIn, tile)) {
-			return false;
-		}
-
-		IAccessHandler access = tile.getAccessHandler();
-
-		if (!playerIn.isSneaking()) {
-			if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) {
-				IFluidHandler tileFluidHandler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side);
-				if (FluidUtil.interactWithFluidHandler(heldItem, tileFluidHandler, playerIn)) {
-					return true;
+				if (!playerIn.isSneaking()) {
+					if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side)) {
+						IFluidHandler tileFluidHandler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side);
+						if (FluidUtil.interactWithFluidHandler(heldItem, tileFluidHandler, playerIn)) {
+							return true;
+						}
+					}
 				}
+
+				if (!worldIn.isRemote) {
+					tile.openGui(playerIn, heldItem);
+				}
+				return true;
 			}
 		}
-
-		if (worldIn.isRemote) {
-			return true;
-		}
-
-		if (access.allowsViewing(playerIn)) {
-			tile.openGui(playerIn, heldItem);
-		} else {
-			playerIn.addChatMessage(new TextComponentTranslation("for.chat.accesslocked", PlayerUtil.getOwnerName(access)));
-		}
-		return true;
+		return false;
 	}
 
 	public void rotateAfterPlacement(EntityPlayer player, World world, BlockPos pos, EnumFacing side) {

src/main/java/forestry/core/blocks/BlockBogEarth.java

@@ -113,7 +113,7 @@ public class BlockBogEarth extends Block implements IItemModelRegister, IBlockWi
 		SoilType type = SoilType.fromMaturity(maturity);
 
 		if (type == SoilType.PEAT) {
-			ret.add(PluginCore.items.peat.getItemStack());
+			ret.add(PluginCore.items.peat.getItemStack(2));
 			ret.add(new ItemStack(Blocks.DIRT));
 		} else {
 			ret.add(new ItemStack(this, 1, SoilType.BOG_EARTH.ordinal()));

src/main/java/forestry/core/blocks/BlockCore.java

@@ -13,5 +13,6 @@ package forestry.core.blocks;
 public class BlockCore extends BlockBase<BlockTypeCoreTesr> {
 	public BlockCore(BlockTypeCoreTesr blockType) {
 		super(blockType);
+		setHarvestLevel("pickaxe", 0);
 	}
 }

src/main/java/forestry/core/blocks/BlockForestry.java

@@ -10,6 +10,8 @@
  ******************************************************************************/
 package forestry.core.blocks;
 
+import forestry.core.owner.IOwnedTile;
+import forestry.core.owner.IOwnerHandler;
 import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
@@ -25,8 +27,6 @@ import com.mojang.authlib.GameProfile;
 
 import forestry.api.core.IItemModelRegister;
 import forestry.core.CreativeTabForestry;
-import forestry.core.access.IOwnable;
-import forestry.core.access.IRestrictedAccess;
 import forestry.core.tiles.TileForestry;
 import forestry.core.utils.Log;
 
@@ -38,20 +38,6 @@ public abstract class BlockForestry extends Block implements IItemModelRegister,
 		setCreativeTab(CreativeTabForestry.tabForestry);
 	}
 
-	@Override
-	public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) {
-		TileEntity tile = world.getTileEntity(pos);
-
-		if (tile instanceof IRestrictedAccess) {
-			IRestrictedAccess restrictedAccessTile = (IRestrictedAccess) tile;
-			if (!restrictedAccessTile.getAccessHandler().allowsRemoval(player)) {
-				return false;
-			}
-		}
-		
-		return super.removedByPlayer(state, world, pos, player, willHarvest);
-	}
-
 	@Override
 	public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
 		if (world.isRemote) {
@@ -61,19 +47,12 @@ public abstract class BlockForestry extends Block implements IItemModelRegister,
 		if (placer instanceof EntityPlayer) {
 			TileEntity tile = world.getTileEntity(pos);
 
-			IOwnable ownable;
-
-			if (tile instanceof IRestrictedAccess) {
-				ownable = ((IRestrictedAccess) tile).getAccessHandler();
-			} else if (tile instanceof IOwnable) {
-				ownable = (IOwnable) tile;
-			} else {
-				return;
+			if (tile instanceof IOwnedTile) {
+				IOwnerHandler ownerHandler = ((IOwnedTile) tile).getOwnerHandler();
+				EntityPlayer player = (EntityPlayer) placer;
+				GameProfile gameProfile = player.getGameProfile();
+				ownerHandler.setOwner(gameProfile);
 			}
-
-			EntityPlayer player = (EntityPlayer) placer;
-			GameProfile gameProfile = player.getGameProfile();
-			ownable.setOwner(gameProfile);
 		}
 	}
 

src/main/java/forestry/core/circuits/Circuit.java

@@ -19,35 +19,18 @@ import forestry.core.utils.Translator;
 public abstract class Circuit implements ICircuit {
 
 	private final String uid;
-	private final boolean requiresDiscovery;
-	private int limit = 1;
 
-	protected Circuit(String uid, boolean requiresDiscovery) {
+	protected Circuit(String uid) {
 		this.uid = uid;
-		this.requiresDiscovery = requiresDiscovery;
 
 		ChipsetManager.circuitRegistry.registerCircuit(this);
 	}
 
-	protected void setLimit(int limit) {
-		this.limit = limit;
-	}
-
 	@Override
 	public String getUID() {
 		return "forestry." + this.uid;
 	}
 
-	@Override
-	public int getLimit() {
-		return this.limit;
-	}
-
-	@Override
-	public boolean requiresDiscovery() {
-		return this.requiresDiscovery;
-	}
-
 	@Override
 	public String getUnlocalizedName() {
 		return "for.circuit." + this.uid;

src/main/java/forestry/core/circuits/CircuitBoard.java

@@ -11,6 +11,7 @@
 package forestry.core.circuits;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,7 +30,7 @@ public class CircuitBoard<T> implements ICircuitBoard {
 
 	@Nonnull
 	private final EnumCircuitBoardType type;
-	@Nonnull
+	@Nullable
 	private final ICircuitLayout layout;
 	@Nonnull
 	private final ICircuit[] circuits;
@@ -80,19 +81,23 @@ public class CircuitBoard<T> implements ICircuitBoard {
 	public void addTooltip(List<String> list) {
 		if (layout != null) {
 			list.add(TextFormatting.GOLD + layout.getUsage() + ":");
-		}
-
-		List<String> extendedTooltip = new ArrayList<>();
-		for (ICircuit circuit : circuits) {
-			if (circuit != null) {
-				circuit.addTooltip(extendedTooltip);
+			List<String> extendedTooltip = new ArrayList<>();
+			for (ICircuit circuit : circuits) {
+				if (circuit != null) {
+					circuit.addTooltip(extendedTooltip);
+				}
 			}
-		}
 
-		if (Proxies.common.isShiftDown() || extendedTooltip.size() <= 4) {
-			list.addAll(extendedTooltip);
+			if (Proxies.common.isShiftDown() || extendedTooltip.size() <= 4) {
+				list.addAll(extendedTooltip);
+			} else {
+				list.add(TextFormatting.ITALIC + "<" + Translator.translateToLocal("for.gui.tooltip.tmi") + ">");
+			}
 		} else {
-			list.add(TextFormatting.ITALIC + "<" + Translator.translateToLocal("for.gui.tooltip.tmi") + ">");
+			int socketCount = type.getSockets();
+			String localizationKey = "item.for.circuitboard.tooltip." + (socketCount == 1 ? "singular" : "plural");
+			String tooltip = Translator.translateToLocalFormatted(localizationKey, type.getSockets());
+			list.add(tooltip);
 		}
 	}
 

src/main/java/forestry/core/circuits/EnumCircuitBoardType.java

@@ -11,20 +11,22 @@
 package forestry.core.circuits;
 
 public enum EnumCircuitBoardType {
-	BASIC((short) 1, 0x191919, 0x6dcff6), ENHANCED((short) 2, 0x191919, 0xcb7c32), REFINED((short) 3, 0x191919, 0xc9c9c9), INTRICATE((short) 4, 0x191919,
-			0xe2cb6b);
+	BASIC(1, 0x191919, 0x6dcff6),
+	ENHANCED(2, 0x191919, 0xcb7c32),
+	REFINED(3, 0x191919, 0xc9c9c9),
+	INTRICATE(4, 0x191919, 0xe2cb6b);
 
-	private final short sockets;
+	private final int sockets;
 	private final int primaryColor;
 	private final int secondaryColor;
 
-	EnumCircuitBoardType(short sockets, int primaryColor, int secondaryColor) {
+	EnumCircuitBoardType(int sockets, int primaryColor, int secondaryColor) {
 		this.sockets = sockets;
 		this.primaryColor = primaryColor;
 		this.secondaryColor = secondaryColor;
 	}
 
-	public short getSockets() {
+	public int getSockets() {
 		return sockets;
 	}
 

src/main/java/forestry/core/circuits/GuiSolderingIron.java

@@ -50,7 +50,7 @@ public class GuiSolderingIron extends GuiForestry<ContainerSolderingIron, ItemIn
 			if (recipe == null) {
 				description = "(" + Translator.translateToLocal("for.gui.noeffect") + ")";
 			} else {
-				description = Translator.translateToLocal(recipe.getCircuit().getUnlocalizedName()) + " (" + recipe.getCircuit().getLimit() + ")";
+				description = Translator.translateToLocal(recipe.getCircuit().getUnlocalizedName());
 			}
 
 			int row = i * 20;

src/main/java/forestry/core/config/Constants.java

@@ -23,6 +23,8 @@ public class Constants implements IForestryConstants {
 	public static final String VERSION = "@VERSION@";
 	public static final String BUILD_NUMBER = "@BUILD_NUMBER@";
 
+	public static final String TESLA_MOD_ID = "tesla";
+
 	public static final int FLAG_BLOCK_UPDATE = 1;
 	public static final int FLAG_BLOCK_SYNC = 2;
 
@@ -41,7 +43,9 @@ public class Constants implements IForestryConstants {
 	public static final String TEXTURE_APIARIST_ARMOR_SECONDARY = TEXTURE_PATH_ITEMS + "/apiarist_armor_2.png";
 	public static final String TEXTURE_NATURALIST_ARMOR_PRIMARY = TEXTURE_PATH_ITEMS + "/naturalist_armor_1.png";
 	public static final String TEXTURE_SKIN_BEEKPEEPER = Constants.MOD_ID + ":" + TEXTURE_PATH_ENTITIES + "/beekeeper.png";
+	public static final String TEXTURE_SKIN_ZOMBIE_BEEKPEEPER = Constants.MOD_ID + ":" + TEXTURE_PATH_ENTITIES + "/zombie_beekeeper.png";
 	public static final String TEXTURE_SKIN_LUMBERJACK = Constants.MOD_ID + ":" + TEXTURE_PATH_ENTITIES + "/lumberjack.png";
+	public static final String TEXTURE_SKIN_ZOMBIE_LUMBERJACK = Constants.MOD_ID + ":" + TEXTURE_PATH_ENTITIES + "/zombie_lumberjack.png";
 
 	// Villagers
 	public static final String ID_VILLAGER_APIARIST = Constants.MOD_ID + ":apiarist";
@@ -87,10 +91,10 @@ public class Constants implements IForestryConstants {
 	public static final int ENGINE_BRONZE_HEAT_LOSS_OVERHEATING = 5;
 	public static final int ENGINE_BRONZE_HEAT_GENERATION_ENERGY = 1;
 
-	public static final int ENGINE_COPPER_CYCLE_DURATION_PEAT = 5000;
-	public static final int ENGINE_COPPER_FUEL_VALUE_PEAT = 10;
-	public static final int ENGINE_COPPER_CYCLE_DURATION_BITUMINOUS_PEAT = 6000;
-	public static final int ENGINE_COPPER_FUEL_VALUE_BITUMINOUS_PEAT = 20;
+	public static final int ENGINE_COPPER_CYCLE_DURATION_PEAT = 2500;
+	public static final int ENGINE_COPPER_FUEL_VALUE_PEAT = 20;
+	public static final int ENGINE_COPPER_CYCLE_DURATION_BITUMINOUS_PEAT = 3000;
+	public static final int ENGINE_COPPER_FUEL_VALUE_BITUMINOUS_PEAT = 40;
 	public static final int ENGINE_COPPER_HEAT_MAX = 10000;
 	public static final int ENGINE_COPPER_ASH_FOR_ITEM = 7500;
 

src/main/java/forestry/core/entities/EntityMinecartForestry.java

@@ -10,33 +10,23 @@
  ******************************************************************************/
 package forestry.core.entities;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.item.EntityMinecart;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumHand;
-import net.minecraft.world.World;
-
-import com.mojang.authlib.GameProfile;
-
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.minecart.MinecartInteractEvent;
-
-import forestry.core.access.AccessHandler;
-import forestry.core.access.EnumAccess;
-import forestry.core.access.IAccessHandler;
-import forestry.core.access.IRestrictedAccess;
 import forestry.core.gui.GuiHandler;
 import forestry.core.gui.IGuiHandlerEntity;
 import forestry.core.gui.IHintSource;
 import forestry.core.tiles.ITitled;
 import forestry.core.utils.Translator;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumHand;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.minecart.MinecartInteractEvent;
 
-public abstract class EntityMinecartForestry extends EntityMinecart implements ITitled, IRestrictedAccess, IHintSource, IGuiHandlerEntity {
-	private final AccessHandler accessHandler = new AccessHandler(this);
+public abstract class EntityMinecartForestry extends EntityMinecart implements ITitled, IHintSource, IGuiHandlerEntity {
 
 	@SuppressWarnings("unused")
 	public EntityMinecartForestry(World world) {
@@ -61,27 +51,11 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I
 		return true;
 	}
 
-	public void setOwner(GameProfile owner) {
-		accessHandler.setOwner(owner);
-	}
-
 	@Override
 	public Type getType() {
 		return null;
 	}
 
-	@Override
-	protected void readEntityFromNBT(NBTTagCompound nbtTagCompound) {
-		super.readEntityFromNBT(nbtTagCompound);
-		accessHandler.readFromNBT(nbtTagCompound);
-	}
-
-	@Override
-	protected void writeEntityToNBT(NBTTagCompound nbtTagCompound) {
-		super.writeEntityToNBT(nbtTagCompound);
-		accessHandler.writeToNBT(nbtTagCompound);
-	}
-
 	/* EntityMinecart */
 	@Override
 	public boolean canBeRidden() {
@@ -104,8 +78,10 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I
 	@Override
 	public void killMinecart(DamageSource damageSource) {
 		super.killMinecart(damageSource);
-		Block block = getDisplayTile().getBlock();
-		entityDropItem(new ItemStack(block, 1, block.getMetaFromState(getDisplayTile())), 0.0F);
+		if (this.worldObj.getGameRules().getBoolean("doEntityDrops")) {
+			Block block = getDisplayTile().getBlock();
+			entityDropItem(new ItemStack(block), 0.0F);
+		}
 	}
 
 	// fix cart contents rendering as black in the End dimension
@@ -125,17 +101,6 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I
 		ItemStack cartItem = getCartItem();
 		return cartItem.getUnlocalizedName() + ".name";
 	}
-
-	/* IRestrictedAccess */
-	@Override
-	public IAccessHandler getAccessHandler() {
-		return accessHandler;
-	}
-
-	@Override
-	public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) {
-
-	}
 	
 	@Override
 	public int getIdOfEntity() {

src/main/java/forestry/core/genetics/SpeciesRoot.java

@@ -20,14 +20,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import net.minecraft.item.ItemStack;
-
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IChromosome;
 import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.IMutation;
 import forestry.api.genetics.ISpeciesRoot;
+import net.minecraft.item.ItemStack;
 
 public abstract class SpeciesRoot implements ISpeciesRoot {
 	
@@ -82,8 +81,8 @@ public abstract class SpeciesRoot implements ISpeciesRoot {
 
 	/* MUTATIONS */
 	@Override
-	public Collection<? extends IMutation> getCombinations(IAllele other) {
-		ArrayList<IMutation> combinations = new ArrayList<>();
+	public List<IMutation> getCombinations(IAllele other) {
+		List<IMutation> combinations = new ArrayList<>();
 		for (IMutation mutation : getMutations(false)) {
 			if (mutation.isPartner(other)) {
 				combinations.add(mutation);

src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java

@@ -11,7 +11,8 @@
 package forestry.core.genetics.alleles;
 
 import javax.annotation.Nonnull;
-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import com.mojang.authlib.GameProfile;
@@ -20,6 +21,7 @@ import forestry.api.core.EnumTemperature;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IAlleleSpeciesBuilder;
+import forestry.api.genetics.IBreedingTracker;
 import forestry.api.genetics.IClassification;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IMutation;
@@ -111,20 +113,30 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuil
 
 	@Override
 	public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) {
-		ItemStack research = null;
-		if (world.rand.nextFloat() < (float) 10 / bountyLevel) {
-			Collection<? extends IMutation> combinations = getRoot().getCombinations(this);
-			if (!combinations.isEmpty()) {
-				IMutation[] candidates = combinations.toArray(new IMutation[combinations.size()]);
-				research = AlleleManager.alleleRegistry.getMutationNoteStack(researcher, candidates[world.rand.nextInt(candidates.length)]);
+		if (world.rand.nextFloat() < bountyLevel / 16.0f) {
+			List<? extends IMutation> allMutations = getRoot().getCombinations(this);
+			if (!allMutations.isEmpty()) {
+				List<IMutation> unresearchedMutations = new ArrayList<>();
+				IBreedingTracker tracker = individual.getGenome().getSpeciesRoot().getBreedingTracker(world, researcher);
+				for (IMutation mutation : allMutations) {
+					if (!tracker.isResearched(mutation)) {
+						unresearchedMutations.add(mutation);
+					}
+				}
+
+				IMutation chosenMutation;
+				if (!unresearchedMutations.isEmpty()) {
+					chosenMutation = unresearchedMutations.get(world.rand.nextInt(unresearchedMutations.size()));
+				} else {
+					chosenMutation = allMutations.get(world.rand.nextInt(allMutations.size()));
+				}
+
+				ItemStack researchNote = AlleleManager.alleleRegistry.getMutationNoteStack(researcher, chosenMutation);
+				return new ItemStack[]{researchNote};
 			}
 		}
 
-		if (research != null) {
-			return new ItemStack[]{research};
-		} else {
-			return ItemStackUtil.EMPTY_STACK_ARRAY;
-		}
+		return ItemStackUtil.EMPTY_STACK_ARRAY;
 	}
 
 	@Override

src/main/java/forestry/core/genetics/mutations/Mutation.java

@@ -16,6 +16,7 @@ import java.util.List;
 
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
+import forestry.api.core.IClimateProvider;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IGenome;
@@ -124,10 +125,10 @@ public abstract class Mutation implements IMutation, IMutationBuilder {
 		return this;
 	}
 
-	protected float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+	protected float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
 		float mutationChance = chance;
 		for (IMutationCondition mutationCondition : mutationConditions) {
-			mutationChance *= mutationCondition.getChance(world, pos, allele0, allele1, genome0, genome1);
+			mutationChance *= mutationCondition.getChance(world, pos, allele0, allele1, genome0, genome1, climate);
 			if (mutationChance == 0) {
 				return 0;
 			}

src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java

@@ -14,6 +14,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
+import forestry.api.core.IClimateProvider;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
@@ -34,8 +35,8 @@ public class MutationConditionBiome implements IMutationCondition {
 	}
 
 	@Override
-	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
-		Biome biome = world.getBiome(pos);
+	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
+		Biome biome = climate.getBiome();
 		for (BiomeDictionary.Type type : validBiomeTypes) {
 			if (BiomeDictionary.isBiomeOfType(biome, type)) {
 				return 1;

src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package forestry.core.genetics.mutations;
 
+import forestry.api.core.IClimateProvider;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -27,7 +28,7 @@ public class MutationConditionDaytime implements IMutationCondition {
 	}
 
 	@Override
-	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
 		if (world.isDaytime() == daytime) {
 			return 1;
 		}

src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package forestry.core.genetics.mutations;
 
+import forestry.api.core.IClimateProvider;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -31,8 +32,8 @@ public class MutationConditionHumidity implements IMutationCondition {
 	}
 
 	@Override
-	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
-		EnumHumidity biomeHumidity = EnumHumidity.getFromValue(ForestryAPI.climateManager.getHumidity(world, pos));
+	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
+		EnumHumidity biomeHumidity = climate.getHumidity();
 
 		if (biomeHumidity.ordinal() < minHumidity.ordinal() || biomeHumidity.ordinal() > maxHumidity.ordinal()) {
 			return 0;

src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java

@@ -15,6 +15,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import forestry.api.apiculture.IBeeHousing;
+import forestry.api.core.IClimateProvider;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IGenome;
 import forestry.api.genetics.IMutationCondition;
@@ -54,7 +55,7 @@ public class MutationConditionRequiresResource implements IMutationCondition {
 	}
 
 	@Override
-	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
 		TileEntity tile;
 		do {
 			pos = pos.down();

src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package forestry.core.genetics.mutations;
 
+import forestry.api.core.IClimateProvider;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
@@ -32,9 +33,9 @@ public class MutationConditionTemperature implements IMutationCondition {
 	}
 
 	@Override
-	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
 		Biome biome = world.getBiomeProvider().getBiome(pos);
-		EnumTemperature biomeTemperature = EnumTemperature.getFromBiome(biome, world, pos);
+		EnumTemperature biomeTemperature = climate.getTemperature();
 
 		if (biomeTemperature.ordinal() < minTemperature.ordinal() || biomeTemperature.ordinal() > maxTemperature.ordinal()) {
 			return 0;

src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java

@@ -12,6 +12,7 @@ package forestry.core.genetics.mutations;
 
 import java.util.Calendar;
 
+import forestry.api.core.IClimateProvider;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -32,7 +33,7 @@ public class MutationConditionTimeLimited implements IMutationCondition {
 	}
 
 	@Override
-	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+	public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
 		DayMonth now = new DayMonth();
 
 		// If we are equal to start day, return 1.

src/main/java/forestry/core/gui/ContainerEntity.java

@@ -11,34 +11,20 @@
 package forestry.core.gui;
 
 import com.google.common.collect.ImmutableSet;
-
+import forestry.api.core.IErrorLogicSource;
+import forestry.api.core.IErrorState;
+import forestry.core.network.packets.PacketErrorUpdateEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 
-import forestry.api.core.IErrorLogicSource;
-import forestry.api.core.IErrorState;
-import forestry.core.access.EnumAccess;
-import forestry.core.access.FakeAccessHandler;
-import forestry.core.access.IAccessHandler;
-import forestry.core.access.IRestrictedAccess;
-import forestry.core.network.IForestryPacketClient;
-import forestry.core.network.packets.PacketAccessUpdateEntity;
-import forestry.core.network.packets.PacketErrorUpdateEntity;
-
 public class ContainerEntity<T extends Entity & IInventory> extends ContainerForestry {
 	protected final T entity;
-	private final IAccessHandler accessHandler;
+	private ImmutableSet<IErrorState> previousErrorStates;
 
 	protected ContainerEntity(T entity) {
 		this.entity = entity;
-
-		if (entity instanceof IRestrictedAccess) {
-			accessHandler = ((IRestrictedAccess) entity).getAccessHandler();
-		} else {
-			accessHandler = FakeAccessHandler.getInstance();
-		}
 	}
 
 	protected ContainerEntity(T entity, InventoryPlayer playerInventory, int xInv, int yInv) {
@@ -48,17 +34,14 @@ public class ContainerEntity<T extends Entity & IInventory> extends ContainerFor
 
 	@Override
 	protected final boolean canAccess(EntityPlayer player) {
-		return player != null && accessHandler.allowsAlteration(player);
+		return player != null;
 	}
 
 	@Override
 	public final boolean canInteractWith(EntityPlayer entityplayer) {
-		return entity.isUseableByPlayer(entityplayer) && accessHandler.allowsViewing(entityplayer);
+		return entity.isUseableByPlayer(entityplayer);
 	}
 
-	private ImmutableSet<IErrorState> previousErrorStates;
-	private EnumAccess previousAccess;
-
 	@Override
 	public void detectAndSendChanges() {
 		super.detectAndSendChanges();
@@ -74,17 +57,5 @@ public class ContainerEntity<T extends Entity & IInventory> extends ContainerFor
 
 			previousErrorStates = errorStates;
 		}
-
-		if (entity instanceof IRestrictedAccess) {
-			IRestrictedAccess restrictedAccess = (IRestrictedAccess) entity;
-			IAccessHandler accessHandler = restrictedAccess.getAccessHandler();
-			EnumAccess access = accessHandler.getAccess();
-			if (access != previousAccess) {
-				IForestryPacketClient packet = new PacketAccessUpdateEntity(restrictedAccess, entity);
-				sendPacketToListeners(packet);
-
-				previousAccess = access;
-			}
-		}
 	}
 }

src/main/java/forestry/core/gui/ContainerEscritoire.java

@@ -23,16 +23,11 @@ import forestry.core.tiles.EscritoireGame;
 import forestry.core.tiles.TileEscritoire;
 
 public class ContainerEscritoire extends ContainerTile<TileEscritoire> implements IGuiSelectable {
-
-	private final EntityPlayer player;
-
 	private long lastUpdate;
 
 	public ContainerEscritoire(EntityPlayer player, TileEscritoire tile) {
 		super(tile, player.inventory, 34, 153);
 
-		this.player = player;
-
 		// Analyze slot
 		addSlotToContainer(new SlotFiltered(this.tile, InventoryEscritoire.SLOT_ANALYZE, 97, 67).setPickupWatcher(this.tile).setStackLimit(1));
 
@@ -54,7 +49,7 @@ public class ContainerEscritoire extends ContainerTile<TileEscritoire> implement
 		long gameLastUpdate = tile.getGame().getLastUpdate();
 		if (lastUpdate != gameLastUpdate) {
 			lastUpdate = gameLastUpdate;
-			Proxies.net.sendToPlayer(new PacketGuiUpdate(tile), player);
+			sendPacketToListeners(new PacketGuiUpdate(tile));
 		}
 	}
 

src/main/java/forestry/core/gui/ContainerTile.java

@@ -11,19 +11,8 @@
 package forestry.core.gui;
 
 import com.google.common.collect.ImmutableSet;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.tileentity.TileEntity;
-
 import forestry.api.core.IErrorLogicSource;
 import forestry.api.core.IErrorState;
-import forestry.core.access.EnumAccess;
-import forestry.core.access.FakeAccessHandler;
-import forestry.core.access.IAccessHandler;
-import forestry.core.access.IRestrictedAccess;
-import forestry.core.network.IForestryPacketClient;
-import forestry.core.network.packets.PacketAccessUpdate;
 import forestry.core.network.packets.PacketErrorUpdate;
 import forestry.core.network.packets.PacketGuiEnergy;
 import forestry.core.network.packets.PacketGuiUpdate;
@@ -31,20 +20,19 @@ import forestry.core.tiles.IPowerHandler;
 import forestry.core.tiles.TilePowered;
 import forestry.core.tiles.TileUtil;
 import forestry.energy.EnergyManager;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.tileentity.TileEntity;
 
 public abstract class ContainerTile<T extends TileEntity> extends ContainerForestry {
-
 	protected final T tile;
-	private final IAccessHandler accessHandler;
+	private ImmutableSet<IErrorState> previousErrorStates;
+	private int previousEnergyManagerData = 0;
+	private int previousWorkCounter = 0;
+	private int previousTicksPerWorkCycle = 0;
 
 	protected ContainerTile(T tile) {
 		this.tile = tile;
-
-		if (tile instanceof IRestrictedAccess) {
-			accessHandler = ((IRestrictedAccess) tile).getAccessHandler();
-		} else {
-			accessHandler = FakeAccessHandler.getInstance();
-		}
 	}
 
 	protected ContainerTile(T tileForestry, InventoryPlayer playerInventory, int xInv, int yInv) {
@@ -55,20 +43,14 @@ public abstract class ContainerTile<T extends TileEntity> extends ContainerFores
 
 	@Override
 	protected final boolean canAccess(EntityPlayer player) {
-		return player != null && accessHandler.allowsAlteration(player);
+		return player != null;
 	}
 
 	@Override
 	public final boolean canInteractWith(EntityPlayer entityplayer) {
-		return TileUtil.isUsableByPlayer(entityplayer, tile) && accessHandler.allowsViewing(entityplayer);
+		return TileUtil.isUsableByPlayer(entityplayer, tile);
 	}
 
-	private ImmutableSet<IErrorState> previousErrorStates;
-	private int previousEnergyManagerData = 0;
-	private EnumAccess previousAccess;
-	private int previousWorkCounter = 0;
-	private int previousTicksPerWorkCycle = 0;
-
 	@Override
 	public void detectAndSendChanges() {
 		super.detectAndSendChanges();
@@ -96,18 +78,6 @@ public abstract class ContainerTile<T extends TileEntity> extends ContainerFores
 			}
 		}
 
-		if (tile instanceof IRestrictedAccess) {
-			IRestrictedAccess restrictedAccess = (IRestrictedAccess) tile;
-			IAccessHandler accessHandler = restrictedAccess.getAccessHandler();
-			EnumAccess access = accessHandler.getAccess();
-			if (access != previousAccess) {
-				IForestryPacketClient packet = new PacketAccessUpdate(restrictedAccess, tile);
-				sendPacketToListeners(packet);
-
-				previousAccess = access;
-			}
-		}
-
 		if (tile instanceof TilePowered) {
 			boolean guiNeedsUpdate = false;
 

src/main/java/forestry/core/gui/GuiAlyzer.java

@@ -15,6 +15,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Stack;
 
+import forestry.api.genetics.IGenome;
 import org.apache.commons.lang3.StringUtils;
 
 import net.minecraft.client.renderer.GlStateManager;
@@ -292,17 +293,9 @@ public class GuiAlyzer extends GuiForestry<ContainerAlyzer, IInventory> {
 
 		RenderHelper.enableGUIStandardItemLighting();
 
-		HashMap<IMutation, IAllele> combinations = new HashMap<>();
-
-		ISpeciesRoot speciesRoot = individual.getGenome().getSpeciesRoot();
-
-		for (IMutation mutation : speciesRoot.getCombinations(individual.getGenome().getPrimary())) {
-			combinations.put(mutation, individual.getGenome().getPrimary());
-		}
-
-		for (IMutation mutation : speciesRoot.getCombinations(individual.getGenome().getSecondary())) {
-			combinations.put(mutation, individual.getGenome().getSecondary());
-		}
+		IGenome genome = individual.getGenome();
+		ISpeciesRoot speciesRoot = genome.getSpeciesRoot();
+		IAlleleSpecies species = genome.getPrimary();
 
 		int columnWidth = 50;
 		int x = 0;
@@ -310,17 +303,16 @@ public class GuiAlyzer extends GuiForestry<ContainerAlyzer, IInventory> {
 		EntityPlayer player = Proxies.common.getPlayer();
 		IBreedingTracker breedingTracker = speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile());
 
-		for (Map.Entry<IMutation, IAllele> mutation : combinations.entrySet()) {
-
-			if (breedingTracker.isDiscovered(mutation.getKey())) {
-				drawMutationInfo(mutation.getKey(), mutation.getValue(), COLUMN_0 + x, breedingTracker);
+		for (IMutation mutation : speciesRoot.getCombinations(species)) {
+			if (breedingTracker.isDiscovered(mutation)) {
+				drawMutationInfo(mutation, species, COLUMN_0 + x, breedingTracker);
 			} else {
 				// Do not display secret undiscovered mutations.
-				if (mutation.getKey().isSecret()) {
+				if (mutation.isSecret()) {
 					continue;
 				}
 
-				drawUnknownMutation(mutation.getKey(), COLUMN_0 + x, breedingTracker);
+				drawUnknownMutation(mutation, COLUMN_0 + x, breedingTracker);
 			}
 
 			x += columnWidth;