Backport some fixes for BTM

Conflicts:
	gradle.properties

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.10 / 1.10.2](http://jenkins.ic2.player.to/job/Forestry_5/)
+[Latest Builds for 1.9](http://jenkins.ic2.player.to/job/Forestry_5/)
 
 [IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryGithub...&channels=forestry&prompt=1)
 

build.gradle

@@ -40,6 +40,7 @@ targetCompatibility = 1.8
 minecraft {
 	version = mcversion + "-" + forgeversion
 	runDir = "run"
+	useDepAts = true
 	mappings = mcp_mappings
 
 	replace '@VERSION@', project.version
@@ -55,9 +56,6 @@ sourceSets {
 }
 
 repositories {
-	maven {
-		url 'http://maven.epoxide.xyz'
-	}
 	maven {
 		url "http://dvs1.progwml6.com/files/maven"
 	}
@@ -68,9 +66,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 "mezz.jei:jei_${mcversion}:${jei_version}"
 	deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
 }
 
@@ -108,7 +104,13 @@ allprojects {
 }
 
 jar {
-
+	// Copy redstone api into the jar, should shade this as a maven dep...
+	from (sourceSets.api.allSource) {
+		include 'cofh/**/*.txt'
+	}
+	from (sourceSets.api.output.classesDir) {
+		include 'cofh/**/*.*'
+	}
 }
 
 task sourcesJar(type: Jar) {

gradle.properties

@@ -1,11 +1,10 @@
-mcversion=1.10.2
-forgeversion=12.18.1.2094
+mcversion=1.9.4
+forgeversion=12.17.0.1968
 mcp_mappings=snapshot_20160525
 
-tesla_version=1.10.2-1.2.1.49
-jei_version=3.12.2.290
-ic2_version=2.6.76-ex110
+jei_version=3.6.4.+
+ic2_version=2.5.5-ex19
 
 version_major=5
-version_minor=2
-version_patch=13
+version_minor=0
+version_patch=24

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/forestry/Forestry.java

@@ -12,21 +12,6 @@ package forestry;
 
 import java.io.File;
 
-import forestry.api.core.ForestryAPI;
-import forestry.core.EventHandlerCore;
-import forestry.core.climate.ClimateEventHandler;
-import forestry.core.config.Config;
-import forestry.core.config.Constants;
-import forestry.core.config.GameMode;
-import forestry.core.errors.EnumErrorCode;
-import forestry.core.errors.ErrorStateRegistry;
-import forestry.core.gui.GuiHandler;
-import forestry.core.multiblock.MultiblockEventHandler;
-import forestry.core.network.PacketHandler;
-import forestry.core.proxy.Proxies;
-import forestry.core.worldgen.WorldGenerator;
-import forestry.plugins.PluginManager;
-import forestry.plugins.compat.PluginIC2;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fml.common.Mod;
@@ -40,6 +25,20 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
+import forestry.api.core.ForestryAPI;
+import forestry.core.EventHandlerCore;
+import forestry.core.config.Config;
+import forestry.core.config.Constants;
+import forestry.core.config.GameMode;
+import forestry.core.errors.EnumErrorCode;
+import forestry.core.errors.ErrorStateRegistry;
+import forestry.core.gui.GuiHandler;
+import forestry.core.multiblock.MultiblockEventHandler;
+import forestry.core.network.PacketHandler;
+import forestry.core.proxy.Proxies;
+import forestry.core.worldgen.WorldGenerator;
+import forestry.plugins.PluginManager;
+
 /**
  * Forestry Minecraft Mod
  *
@@ -50,10 +49,16 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
 		name = "Forestry",
 		version = Constants.VERSION,
 		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
-		acceptedMinecraftVersions = "[1.10]",
-		dependencies = "required-after:Forge@[12.18.1.2080,);"
-				+ "after:JEI@[3.11.2.278,);"
-				+ "after:" + PluginIC2.modId + ";")
+		dependencies = "required-after:Forge@[12.17.0.1963,);"
+				+ "after:Buildcraft|Core@[7.2,);"
+				+ "after:BuildCraft|Energy@[7.2,);"
+				+ "after:ExtrabiomesXL;"
+				+ "after:BiomesOPlenty;"
+				+ "after:IC2@[2.3.235,);"
+				+ "after:Natura@[2.2.0,);"
+				+ "after:HardcoreEnderExpansion;"
+				+ "after:JEI@[3.6.4,);"
+				+ "after:basemetals;")
 public class Forestry {
 
 	@Mod.Instance(Constants.MOD_ID)
@@ -78,7 +83,6 @@ public class Forestry {
 		EventHandlerCore eventHandlerCore = new EventHandlerCore();
 		MinecraftForge.EVENT_BUS.register(eventHandlerCore);
 		MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
-		MinecraftForge.EVENT_BUS.register(new ClimateEventHandler());
 
 		configFolder = new File(event.getModConfigurationDirectory(), Constants.MOD_ID);
 		Config.load();

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

@@ -1,13 +0,0 @@
-package forestry.api.apiculture;
-
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityInject;
-
-public class ApicultureCapabilities {
-	/**
-	 * Capability for {@link IArmorApiarist}.
-	 * The {@link Capability#getDefaultInstance()} will always protect the wearer with no side effects.
-	 */
-	@CapabilityInject(IArmorApiarist.class)
-	public static Capability<IArmorApiarist> ARMOR_APIARIST;
-}

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

@@ -5,24 +5,21 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import javax.annotation.Nullable;
-
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 
 /**
- * When implemented as a capability by armor items, protects the wearer from negative bee effects.
- * @see ApicultureCapabilities#ARMOR_APIARIST
+ * When implemented by armor piece items, allows them to act as apiarist's armor.
  */
 public interface IArmorApiarist {
 	/**
 	 * Called when the apiarist's armor acts as protection against an attack.
 	 *
-	 * @param entity    Entity being attacked
-	 * @param armor     Armor item
-	 * @param cause     Optional cause of attack, such as a bee effect identifier
+	 * @param entity Entity being attacked
+	 * @param armor Armor item
+	 * @param cause  Optional cause of attack, such as a bee effect identifier
 	 * @param doProtect Whether or not to actually do the side effects of protection
 	 * @return Whether or not the armor should protect the player from that attack
 	 */
-	boolean protectEntity(EntityLivingBase entity, ItemStack armor, @Nullable String cause, boolean doProtect);
+	boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect);
 }

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

@@ -5,42 +5,58 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import com.mojang.authlib.GameProfile;
-import forestry.api.climate.IClimateProvider;
-import forestry.api.core.IErrorLogicSource;
-import forestry.api.core.ILocatable;
-import forestry.api.genetics.IHousing;
-import net.minecraft.util.math.Vec3d;
+import javax.annotation.Nonnull;
 
-public interface IBeeHousing extends IHousing, IErrorLogicSource, IClimateProvider, ILocatable {
+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.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.core.IErrorLogicSource;
+import forestry.api.genetics.IHousing;
+
+public interface IBeeHousing extends IHousing, IErrorLogicSource {
 
 	/**
-	 * Used by {@link IBeeRoot#createBeeHousingModifier(IBeeHousing)}
+	 * Used by BeeManager.beeRoot.createBeeHousingModifier(IBeeHousing housing)
 	 * to combine bee modifiers from several sources that can change over time.
 	 * @return IBeeModifiers from the housing, frames, etc.
 	 */
 	Iterable<IBeeModifier> getBeeModifiers();
 
 	/**
-	 * Used by {@link IBeeRoot#createBeeHousingListener(IBeeHousing)}
+	 * Used by BeeManager.beeRoot.createBeeHousingListener(IBeeHousing housing)
 	 * to combine bee listeners from several sources that can change over time.
 	 * @return IBeeListeners from the housing, multiblock parts, etc.
 	 */
 	Iterable<IBeeListener> getBeeListeners();
 
+	@Nonnull
 	IBeeHousingInventory getBeeInventory();
 
 	IBeekeepingLogic getBeekeepingLogic();
 
+	EnumTemperature getTemperature();
+
+	EnumHumidity getHumidity();
+
 	int getBlockLightValue();
 
 	boolean canBlockSeeTheSky();
 
+	/** Must not be named "getWorld" to avoid SpecialSource issue https://github.com/md-5/SpecialSource/issues/12 */
+	World getWorldObj();
+
+	Biome getBiome();
+
 	GameProfile getOwner();
 
 	/**
 	 * @since Forestry 4.2
-	 * @return exact coordinates where bee particle FX should spawn from
+	 * @return exact coordinates where bee FX should spawn from
 	 */
 	Vec3d getBeeFXCoordinates();
 }

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

@@ -7,15 +7,17 @@ package forestry.api.apiculture;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;
 
-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 {
 
 	/**
@@ -98,7 +100,7 @@ public interface IBeeRoot extends ISpeciesRoot {
 
 	/* MUTATIONS */
 	@Override
-	List<IBeeMutation> getMutations(boolean shuffle);
+	Collection<IBeeMutation> getMutations(boolean shuffle);
 
 	/* GAME MODE */
 	void resetBeekeepingMode();

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

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

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 = "5.0.0", owner = "ForestryAPI|core", provides = "ForestryAPI|apiculture")
+@API(apiVersion = "4.8.0", owner = "ForestryAPI|core", provides = "ForestryAPI|apiculture")
 package forestry.api.apiculture;
 
 import net.minecraftforge.fml.common.API;

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

@@ -1,14 +0,0 @@
-package forestry.api.arboriculture;
-
-import forestry.api.core.IArmorNaturalist;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityInject;
-
-public class ArboricultureCapabilities {
-	/**
-	 * Capability for {@link IArmorNaturalist}.
-	 * The {@link Capability#getDefaultInstance()} will always show pollination with no side effects.
-	 */
-	@CapabilityInject(IArmorNaturalist.class)
-	public static Capability<IArmorNaturalist> ARMOR_NATURALIST;
-}

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

@@ -10,53 +10,28 @@ import java.util.Locale;
 import java.util.Random;
 
 public enum EnumForestryWoodType implements IWoodType {
-	LARCH(4, 20),
-	TEAK(4, 20),
-	ACACIA(4, 20),
-	LIME(4, 19),
-	CHESTNUT(4, 21),
-	WENGE(4, 20),
-	BAOBAB(4, 20),
-	SEQUOIA(3, 18, 4.0f),
+	LARCH, TEAK, ACACIA, LIME,
+	CHESTNUT, WENGE, BAOBAB, SEQUOIA(4.0f),
 
-	KAPOK(4, 20),
-	EBONY(4, 20),
-	MAHOGANY(4, 20),
-	BALSA(4, 20, 1.0f),
-	WILLOW(4, 20),
-	WALNUT(4, 21),
-	GREENHEART(4, 20, 7.5f),
-	CHERRY(4, 20),
+	KAPOK, EBONY, MAHOGANY, BALSA(1.0f),
+	WILLOW, WALNUT, GREENHEART(7.5f), CHERRY,
 
-	MAHOE(4, 20),
-	POPLAR(4, 20),
-	PALM(4, 20),
-	PAPAYA(4, 20),
-	PINE(4, 20, 3.0f),
-	PLUM(4, 20),
-	MAPLE(4, 20),
-	CITRUS(4, 20),
+	MAHOE, POPLAR, PALM, PAPAYA,
+	PINE(3.0f), PLUM, MAPLE, CITRUS,
 
-	GIGANTEUM(3, 18, 4.0f),
-	IPE(4, 20),
-	PADAUK(4, 20),
-	COCOBOLO(4, 20),
-	ZEBRAWOOD(4, 20);
+	GIGANTEUM, IPE, PADAUK, COCOBOLO,
+	ZEBRAWOOD;
 
 	public static final float DEFAULT_HARDNESS = 2.0f;
 	public static final EnumForestryWoodType[] VALUES = values();
 
-	private final int carbonization;
-	private final int combustability;
 	private final float hardness;
 
-	EnumForestryWoodType(int carbonization, int combustability) {
-		this(carbonization, combustability, DEFAULT_HARDNESS);
+	EnumForestryWoodType() {
+		this(DEFAULT_HARDNESS);
 	}
 
-	EnumForestryWoodType(int carbonization, int combustability, float hardness) {
-		this.carbonization = carbonization;
-		this.combustability = combustability;
+	EnumForestryWoodType(float hardness) {
 		this.hardness = hardness;
 	}
 
@@ -91,39 +66,4 @@ public enum EnumForestryWoodType implements IWoodType {
 		}
 		return VALUES[meta];
 	}
-
-	@Override
-	public int getCarbonization() {
-		return carbonization;
-	}
-
-	@Override
-	public int getCombustability() {
-		return combustability;
-	}
-
-	@Override
-	public String getPlankTexture() {
-		return "forestry:blocks/wood/planks." + getName();
-	}
-
-	@Override
-	public String getDoorLowerTexture() {
-		return "forestry:blocks/doors/" + getName() + "_lower";
-	}
-
-	@Override
-	public String getDoorUpperTexture() {
-		return "forestry:blocks/doors/" + getName() + "_upper";
-	}
-
-	@Override
-	public String getBarkTexture() {
-		return "forestry:blocks/wood/bark." + getName();
-	}
-
-	@Override
-	public String getHeartTexture() {
-		return "forestry:blocks/wood/heart." + getName();
-	}
 }

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

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

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

@@ -7,12 +7,12 @@ import java.util.Random;
 import net.minecraft.block.BlockPlanks;
 
 public enum EnumVanillaWoodType implements IWoodType {
-	OAK(BlockPlanks.EnumType.OAK, 5, 20),
-	SPRUCE(BlockPlanks.EnumType.SPRUCE, 4, 19),
-	BIRCH(BlockPlanks.EnumType.BIRCH, 4, 19),
-	JUNGLE(BlockPlanks.EnumType.JUNGLE, 5, 20),
-	ACACIA(BlockPlanks.EnumType.ACACIA, 4, 20),
-	DARK_OAK(BlockPlanks.EnumType.DARK_OAK, 5, 20);
+	OAK(BlockPlanks.EnumType.OAK),
+	SPRUCE(BlockPlanks.EnumType.SPRUCE),
+	BIRCH(BlockPlanks.EnumType.BIRCH),
+	JUNGLE(BlockPlanks.EnumType.JUNGLE),
+	ACACIA(BlockPlanks.EnumType.ACACIA),
+	DARK_OAK(BlockPlanks.EnumType.DARK_OAK);
 
 	public static final EnumVanillaWoodType[] VALUES = values();
 
@@ -21,13 +21,9 @@ public enum EnumVanillaWoodType implements IWoodType {
 	}
 
 	private final BlockPlanks.EnumType vanillaType;
-	private final int carbonization;
-	private final int combustability;
 
-	EnumVanillaWoodType(BlockPlanks.EnumType vanillaType, int carbonization, int combustability) {
+	EnumVanillaWoodType(BlockPlanks.EnumType vanillaType) {
 		this.vanillaType = vanillaType;
-		this.carbonization = carbonization;
-		this.combustability = combustability;
 	}
 
 	public BlockPlanks.EnumType getVanillaType() {
@@ -61,54 +57,4 @@ public enum EnumVanillaWoodType implements IWoodType {
 	public float getHardness() {
 		return 2.0F;
 	}
-
-	@Override
-	public int getCarbonization() {
-		return carbonization;
-	}
-
-	@Override
-	public int getCombustability() {
-		return combustability;
-	}
-
-	@Override
-	public String getPlankTexture() {
-		if(this == DARK_OAK){
-			return "blocks/planks_big_oak";
-		}
-		return "blocks/planks_" + getName();
-	}
-
-	@Override
-	public String getDoorLowerTexture() {
-		if(this == OAK){
-			return "blocks/door_wood_lower";
-		}
-		return "blocks/door_wood_lower";
-	}
-
-	@Override
-	public String getDoorUpperTexture() {
-		if(this == OAK){
-			return "blocks/door_wood_upper";
-		}
-		return "blocks/door_" + getName() + "_upper";
-	}
-
-	@Override
-	public String getBarkTexture() {
-		if(this == DARK_OAK){
-			return "blocks/log_big_oak";
-		}
-		return "blocks/log_" + getName();
-	}
-
-	@Override
-	public String getHeartTexture() {
-		if(this == DARK_OAK){
-			return "blocks/log_big_oak_top";
-		}
-		return "blocks/log_" + getName() + "_top";
-	}
 }

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

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

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

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

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

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

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

@@ -8,17 +8,18 @@ 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
@@ -81,7 +82,7 @@ public interface ITreeRoot extends ISpeciesRoot {
 	boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, BlockPos pos);
 
 	/* GAME MODE */
-	List<ITreekeepingMode> getTreekeepingModes();
+	ArrayList<ITreekeepingMode> getTreekeepingModes();
 
 	ITreekeepingMode getTreekeepingMode(World world);
 
@@ -97,5 +98,6 @@ public interface ITreeRoot extends ISpeciesRoot {
 
 	/* MUTATIONS */
 	@Override
-	List<ITreeMutation> getMutations(boolean shuffle);
+	Collection<ITreeMutation> getMutations(boolean shuffle);
+
 }

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

@@ -5,8 +5,6 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import java.util.List;
-
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 
@@ -24,7 +22,5 @@ public interface IWoodAccess {
 	ItemStack getStack(IWoodType woodType, WoodBlockKind kind, boolean fireproof);
 
 	IBlockState getBlock(IWoodType woodType, WoodBlockKind kind, boolean fireproof);
-	
-	List<IWoodType> getRegisteredWoodTypes();
 
 }

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

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import net.minecraft.client.renderer.ItemMeshDefinition;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public interface IWoodItemMeshDefinition extends ItemMeshDefinition {
-
-	ResourceLocation getDefaultModelLocation(ItemStack stack);
-	
-}

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

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

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

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.renderer.block.statemap.IStateMapper;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public interface IWoodStateMapper extends IStateMapper {
-	
-	ModelResourceLocation getModelLocation(IBlockState state);
-	
-	ModelResourceLocation getDefaultModelResourceLocation(IBlockState state);
-
-}

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

@@ -10,18 +10,4 @@ public interface IWoodType extends IStringSerializable {
 	int getMetadata();
 
 	float getHardness();
-
-	int getCarbonization();
-
-	int getCombustability();
-	
-	String getPlankTexture();
-	
-	String getDoorLowerTexture();
-	
-	String getDoorUpperTexture();
-	
-	String getBarkTexture();
-	
-	String getHeartTexture();
 }

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

@@ -1,68 +1,12 @@
 package forestry.api.arboriculture;
 
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-
-import net.minecraftforge.client.model.IModel;
-import net.minecraftforge.client.model.ModelProcessingHelper;
 
 public enum WoodBlockKind {
-	LOG, PLANKS, SLAB, FENCE, FENCE_GATE, STAIRS, DOOR(false);
+	LOG, PLANKS, SLAB, FENCE, FENCE_GATE, STAIRS, DOOR;
 
-	public final boolean retextureItem;
-	
-	private WoodBlockKind() {
-		this(true);
-	}
-	
-	private WoodBlockKind(boolean retextureItem) {
-		this.retextureItem = retextureItem;
-	}
-	
 	@Override
 	public String toString() {
 		return super.toString().toLowerCase(Locale.ENGLISH);
 	}
-	
-	public IModel retextureModel(IModel model, IWoodType type, ImmutableMap<String, String> customTextures){
-		Map<String, String> textures = new HashMap<>();
-		switch (this) {
-		case SLAB:
-		case STAIRS:
-			String textureLocation = type.getPlankTexture();
-			textures.put("particle", textureLocation);
-			textures.put("side", textureLocation);
-			textures.put("top", textureLocation);
-			textures.put("bottom", textureLocation);
-			textures.put("all", textureLocation);
-			break;
-		case PLANKS:
-			textures.put("particle", type.getPlankTexture());
-			textures.put("all", type.getPlankTexture());
-			break;
-		case FENCE_GATE:
-		case FENCE:
-			textures.put("particle", type.getPlankTexture());
-			textures.put("side", type.getPlankTexture());
-			textures.put("texture", type.getPlankTexture());
-			break;
-		case DOOR:
-			textures.put("particle", type.getDoorLowerTexture());
-			textures.put("bottom", type.getDoorLowerTexture());
-			textures.put("top", type.getDoorUpperTexture());
-			break;
-		case LOG:
-			textures.put("particle", type.getBarkTexture());
-			textures.put("side", type.getBarkTexture());
-			textures.put("all", type.getBarkTexture());
-			textures.put("end", type.getHeartTexture());
-			break;
-		default:
-			break;
-		}
-		textures.putAll(customTextures);
-		return ModelProcessingHelper.retexture(model, new ImmutableMap.Builder<String, String>().putAll(textures).build());
-	}
 }

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

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

src/main/java/forestry/api/climate/EnumClimatiserModes.java

@@ -1,7 +0,0 @@
-package forestry.api.climate;
-
-public enum EnumClimatiserModes {
-
-	POSITIVE, NEGATIVE, NONE
-	
-}

src/main/java/forestry/api/climate/EnumClimatiserTypes.java

@@ -1,7 +0,0 @@
-package forestry.api.climate;
-
-public enum EnumClimatiserTypes {
-
-	TEMPERATURE, HUMIDITY, NONE
-	
-}

src/main/java/forestry/api/climate/IClimateControl.java

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.climate;
-
-public interface IClimateControl {
-
-    float getControlTemperature();
-
-    float getControlHumidity();
-    
-    void setControlTemperature(float temperature);
-
-    void setControlHumidity(float humidity);
-	
-}

src/main/java/forestry/api/climate/IClimateControlProvider.java

@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.climate;
-
-import forestry.api.core.ILocatable;
-
-public interface IClimateControlProvider extends ILocatable {
-
-	IClimateControl getClimateControl();
-	
-}

src/main/java/forestry/api/climate/IClimateManager.java

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.climate;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-public interface IClimateManager {
-
-	float getTemperature(World world, BlockPos pos);
-	
-	float getHumidity(World world, BlockPos pos);
-	
-	IClimateProvider getDefaultClimate(World world, BlockPos pos);
-	
-	void addRegion(IClimateRegion region);
-	
-	void removeRegion(IClimateRegion region);
-	
-	void addSource(IClimateSourceProvider source);
-	
-	void removeSource(IClimateSourceProvider source);
-	
-	@Nullable
-	IClimateRegion getRegionForPos(World world, BlockPos pos);
-	
-	@Nonnull
-	Map<Integer, List<IClimateRegion>> getRegions();
-	
-}

src/main/java/forestry/api/climate/IClimatePosition.java

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.climate;
-
-import javax.annotation.Nonnull;
-
-import forestry.api.core.INbtReadable;
-import forestry.api.core.INbtWritable;
-import net.minecraft.util.math.BlockPos;
-
-public interface IClimatePosition extends INbtReadable, INbtWritable {
-	
-	@Nonnull 
-	IClimateRegion getClimateRegion();
-	
-	@Nonnull 
-	BlockPos getPos();
-	
-	void setTemperature(float temperature);
-	
-	void addTemperature(float temperature);
-	
-	float getTemperature();
-
-	void setHumidity(float humidity);
-	
-	void addHumidity(float humidity);
-	
-	float getHumidity();
-
-}

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

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.climate;
-
-import forestry.api.core.EnumHumidity;
-import forestry.api.core.EnumTemperature;
-import net.minecraft.world.biome.Biome;
-
-public interface IClimateProvider {
-    Biome getBiome();
-
-    EnumTemperature getTemperature();
-
-    EnumHumidity getHumidity();
-}

src/main/java/forestry/api/climate/IClimateRegion.java

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.climate;
-
-import java.util.Collection;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import forestry.api.core.INbtReadable;
-import forestry.api.core.INbtWritable;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-public interface IClimateRegion extends INbtReadable, INbtWritable {
-	
-	@Nonnull
-	World getWorld();
-	
-	/**
-	 * Update the climate in a region.
-	 */
-	void updateClimate(int ticks);
-	
-	int getTicksPerUpdate();
-	
-	@Nonnull
-	Map<BlockPos, IClimatePosition> getPositions();
-	
-	void addSource(IClimateSource source);
-	
-	void removeSource(IClimateSource source);
-	
-	Collection<IClimateSource> getSources();
-	
-	Collection<BlockPos> getOtherPositions();
-	
-	float getTemperature();
-	
-	float getHumidity();
-	
-}

src/main/java/forestry/api/climate/IClimateSource.java

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.climate;
-
-/**
- * A climate source is used to change the climate in a region.
- */
-public interface IClimateSource {
-
-	/**
-	 * @param tickCount The current tick count.
-	 * @param region The climate region, in that the source stands.
-	 */
-	void changeClimate(int tickCount, IClimateRegion region);
-
-	/**
-	 * @return The ticks that are required for one change.
-	 */
-	int getTicksForChange(IClimateRegion region);
-	
-	IClimateSourceProvider getProvider();
-
-}

src/main/java/forestry/api/climate/IClimateSourceProvider.java

@@ -1,13 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.climate;
-
-import forestry.api.core.ILocatable;
-
-public interface IClimateSourceProvider extends ILocatable {
-	
-	IClimateSource getClimateSource();
-}

src/main/java/forestry/api/climate/IClimatiserDefinition.java

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.climate;
-
-public interface IClimatiserDefinition {
-
-	float getChange();
-	
-	double getRange();
-	
-	EnumClimatiserModes getMode();
-	
-	EnumClimatiserTypes getType();
-	
-}

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

@@ -3,7 +3,10 @@
  *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
-@API(apiVersion = "2.1.0", owner = "Forestry", provides = "ForestryAPI|climate")
-package forestry.api.climate;
+package forestry.api.core;
 
-import net.minecraftforge.fml.common.API;
+public enum EnumCamouflageType {
+	DEFAULT, GLASS, DOOR;
+	
+	public static final EnumCamouflageType[] VALUES = values();
+}

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

@@ -7,7 +7,6 @@ package forestry.api.core;
 
 import java.util.Set;
 
-import forestry.api.climate.IClimateManager;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 

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

@@ -5,23 +5,20 @@
  ******************************************************************************/
 package forestry.api.core;
 
-import forestry.api.arboriculture.ArboricultureCapabilities;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-/**
- * Naturalist armor allows players to see pollinated tree leaves.
- *
- * @see ArboricultureCapabilities#ARMOR_NATURALIST
- */
 public interface IArmorNaturalist {
 
 	/**
-	 * Called to see if this naturalist's armor allows for seeing pollinated tree leaves/flowers.
+	 * Called when the naturalist's armor acts as spectacles for seeing pollinated tree leaves/flowers.
 	 *
-	 * @param player Player doing the viewing
-	 * @param armor  Armor item
-	 * @param doSee  Whether or not to actually do the side effects of viewing
+	 * @param player
+	 *            Player doing the viewing
+	 * @param armor
+	 *            Armor item
+	 * @param doSee
+	 *            Whether or not to actually do the side effects of viewing
 	 * @return true if the armor actually allows the player to see pollination.
 	 */
 	boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee);

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

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.core;
-
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-import net.minecraft.item.ItemStack;
-
-public interface ICamouflageAccess {
-	
-	/**
-	 * Register a item camouflage handler for a type.
-	 * 
-	 * @param type The camouflage type for of handler.
-	 * @param itemHandler The handler that is to register.
-	 */
-	void registerCamouflageItemHandler(@Nonnull ICamouflageItemHandler itemHandler);
-	
-	/**
-	 * @return A list of all item camouflage handler's that are registered for that camouflage type.
-	 */
-	List<ICamouflageItemHandler> getCamouflageItemHandler(@Nonnull String type);
-	
-	void addItemToBlackList(@Nonnull String type, @Nonnull ItemStack camouflageBlock);
-	
-	boolean isItemBlackListed(@Nonnull String type, @Nonnull ItemStack camouflageBlock);
-	
-	ICamouflageItemHandler getHandlerFromItem(ItemStack stack);
-	
-}

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

@@ -6,26 +6,28 @@
 package forestry.api.core;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
 
-public interface ICamouflageHandler extends ILocatable {
+public interface ICamouflageHandler{
 
 	/**
-	 * @return The item of the block that is the camouflage of this handler for the type.
+	 * @return The item of the block that is the camouflage of this handler for the EnumCamouflageType.
 	 */
-    ItemStack getCamouflageBlock(String type);
+    ItemStack getCamouflageBlock(EnumCamouflageType type);
+    
+    /**
+     * @return The default camouflage block item for the EnumCamouflageType.
+     */
+    ItemStack getDefaultCamouflageBlock(EnumCamouflageType type);
 
     /**
-     * @return The default camouflage block item for the type.
+     * Set the camouflage block item for the EnumCamouflageType.
      */
-    ItemStack getDefaultCamouflageBlock(String type);
-
+    void setCamouflageBlock(EnumCamouflageType type, ItemStack camouflageBlock);
+    
     /**
-     * @return True if the handler can handle this type of camouflage.
+     * @return The coordinates of the handler as a BlockPos.
      */
-    boolean canHandleType(String type);
-
-    /**
-     * Set the camouflage block item for the type.
-     */
-    void setCamouflageBlock(String type, ItemStack camouflageBlock);
+	BlockPos getCoordinates();
+	
 }

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

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.core;
-
-import org.apache.commons.lang3.tuple.Pair;
-
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-public interface ICamouflageItemHandler {
-
-	boolean canHandle(ItemStack stack);
-	
-	String getType();
-	
-	float getLightTransmittance(ItemStack stack, ICamouflageHandler camouflageHandler);
-	
-	@SideOnly(Side.CLIENT)
-	Pair<IBlockState, IBakedModel> getModel(ItemStack stack, ICamouflageHandler camouflageHandler, ICamouflagedTile camouflageTile);
-	
-}

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

@@ -9,7 +9,7 @@ import net.minecraft.util.math.BlockPos;
 
 public interface ICamouflagedTile {
 
-	String getCamouflageType();
+	EnumCamouflageType getCamouflageType();
 	
 	BlockPos getCoordinates();
 	

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

@@ -1,9 +1,14 @@
 /*******************************************************************************
- * Copyright 2011-2014 SirSengir
+ * 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
  *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.api.climate;
+package forestry.api.core;
 
 public interface IClimateControlled {
 	/**

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

@@ -5,14 +5,13 @@
  ******************************************************************************/
 package forestry.api.core;
 
-public class CamouflageManager {
-	
-	public static ICamouflageAccess camouflageAccess;
-	
-	public static final String DEFAULT = "default";
-	
-	public static final String GLASS = "glass";
-	
-	public static final String DOOR = "door";
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 
+public interface IClimateManager {
+
+	float getTemperature(World world, BlockPos pos);
+	
+	float getHumidity(World world, BlockPos pos);
+	
 }

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

@@ -9,7 +9,6 @@ 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;
@@ -39,7 +38,7 @@ public interface IModelBaker {
 	
 	void addModel(@Nonnull AxisAlignedBB renderBounds, @Nonnull TextureAtlasSprite texture, int colorIndex);
 	
-	void addBakedModel(@Nullable IBlockState state, @Nonnull IBakedModel model);
+	void addBakedModel(@Nonnull IBakedModel model);
 	
 	void addFace(@Nonnull EnumFacing facing, @Nonnull TextureAtlasSprite sprite);
 	

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

@@ -8,6 +8,8 @@ package forestry.api.core;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.Item;
+import net.minecraft.util.ResourceLocation;
+
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 

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

@@ -8,10 +8,22 @@ package forestry.api.fuels;
 import net.minecraftforge.fluids.Fluid;
 
 public class EngineBronzeFuel {
-	private final Fluid liquid;
-	private final int powerPerCycle;
-	private final int burnDuration;
-	private final int dissipationMultiplier;
+	/**
+	 * 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;
 
 	public EngineBronzeFuel(Fluid liquid, int powerPerCycle, int burnDuration, int dissipationMultiplier) {
 		this.liquid = liquid;
@@ -19,32 +31,4 @@ 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,9 +9,18 @@ import net.minecraft.item.ItemStack;
 
 public class EngineCopperFuel {
 
-	private final ItemStack fuel;
-	private final int powerPerCycle;
-	private final int burnDuration;
+	/**
+	 * 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;
 
 	public EngineCopperFuel(ItemStack fuel, int powerPerCycle, int burnDuration) {
 		this.fuel = fuel;
@@ -19,24 +28,4 @@ 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,34 +8,22 @@ package forestry.api.fuels;
 import net.minecraft.item.ItemStack;
 
 public class FermenterFuel {
-	private final ItemStack item;
-	private final int fermentPerCycle;
-	private final int burnDuration;
+	/**
+	 * 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;
 
 	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,9 +9,18 @@ import net.minecraftforge.fluids.FluidStack;
 
 public class GeneratorFuel {
 
-	private final FluidStack fuelConsumed;
-	private final int eu;
-	private final int rate;
+	/**
+	 * 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;
 
 	public GeneratorFuel(FluidStack fuelConsumed, int eu, int rate) {
 		this.fuelConsumed = fuelConsumed;
@@ -19,24 +28,4 @@ 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,10 +8,22 @@ package forestry.api.fuels;
 import net.minecraft.item.ItemStack;
 
 public class MoistenerFuel {
-	private final ItemStack item;
-	private final ItemStack product;
-	private final int moistenerValue;
-	private final int stage;
+	/**
+	 * 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;
 
 	public MoistenerFuel(ItemStack item, ItemStack product, int stage, int moistenerValue) {
 		this.item = item;
@@ -19,32 +31,4 @@ 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 = "3.0.0", owner = "ForestryAPI|core", provides = "ForestryAPI|fuels")
+@API(apiVersion = "2.0.1", owner = "ForestryAPI|core", provides = "ForestryAPI|fuels")
 package forestry.api.fuels;
 
 import net.minecraftforge.fml.common.API;

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

@@ -1,20 +0,0 @@
-package forestry.api.genetics;
-
-import net.minecraftforge.fml.common.eventhandler.Event;
-
-/**
- * Called after Forestry has registered all his species alleles of a individual.
- */
-public class AlleleSpeciesRegisterEvent extends Event {
-	
-	private final ISpeciesRoot root;
-	
-	public AlleleSpeciesRegisterEvent(ISpeciesRoot root) {
-		this.root = root;
-	}
-	
-	public ISpeciesRoot getRoot() {
-		return root;
-	}
-
-}

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

@@ -3,22 +3,23 @@ package forestry.api.genetics;
 import java.util.List;
 import java.util.Map;
 
-import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.item.ItemStack;
 
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import forestry.core.gui.GuiAlyzer;
+
 public interface IAlyzerPlugin {
 
 	@SideOnly(Side.CLIENT)
-	void drawAnalyticsPage1(GuiScreen gui, ItemStack itemStack);
+	void drawAnalyticsPage1(GuiAlyzer gui, ItemStack itemStack);
 
 	@SideOnly(Side.CLIENT)
-	void drawAnalyticsPage2(GuiScreen gui, ItemStack itemStack);
+	void drawAnalyticsPage2(GuiAlyzer gui, ItemStack itemStack);
 
 	@SideOnly(Side.CLIENT)
-	void drawAnalyticsPage3(GuiScreen gui, ItemStack itemStack);
+	void drawAnalyticsPage3(GuiAlyzer gui, ItemStack itemStack);
 
 	Map<String, ItemStack> getIconStacks();
 

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

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

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

@@ -5,6 +5,7 @@
  ******************************************************************************/
 package forestry.api.genetics;
 
+import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 
 import net.minecraftforge.common.BiomeDictionary;
@@ -45,7 +46,7 @@ public interface IMutationBuilder {
 	IMutationBuilder requireNight();
 
 	/** Require a specific resource to be under the location of the mutation */
-	IMutationBuilder requireResource(IBlockState... acceptedBlockStates);
+	IMutationBuilder requireResource(IBlockState requiredBlockState);
 
 	IMutationBuilder requireResource(String oreDictName);
 

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

@@ -5,7 +5,6 @@
  ******************************************************************************/
 package forestry.api.genetics;
 
-import forestry.api.climate.IClimateProvider;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -16,7 +15,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, IClimateProvider climate);
+	float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
 
 	/**
 	 * A localized description of the mutation condition. (i.e. "A temperature of HOT is required.")

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

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

src/main/java/forestry/api/greenhouse/DefaultGreenhouseListener.java

@@ -10,7 +10,7 @@ import forestry.api.multiblock.IGreenhouseController;
 public class DefaultGreenhouseListener implements IGreenhouseListener {
 
 	@Override
-	public boolean canWork(IGreenhouseController greenhouse, boolean canWork) {
+	public <G extends IGreenhouseController & IGreenhouseHousing> boolean canWork(G greenhouse, boolean canWork) {
 		return true;
 	}
 

src/main/java/forestry/api/greenhouse/GreenhouseEvents.java

@@ -1,7 +1,12 @@
 /*******************************************************************************
- * Copyright 2011-2014 SirSengir
+ * 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
  *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
 package forestry.api.greenhouse;
 
@@ -10,17 +15,17 @@ import javax.annotation.Nullable;
 
 import net.minecraftforge.fml.common.eventhandler.Event;
 
+import forestry.api.core.EnumCamouflageType;
 import forestry.api.core.ICamouflageHandler;
 import forestry.api.core.ICamouflagedTile;
-import forestry.api.multiblock.IGreenhouseController;
 
 public class GreenhouseEvents extends Event {
 	
 	@Nullable
-	public final IGreenhouseController controller;
+	public final IGreenhouseState state;
 	
-	public GreenhouseEvents(@Nullable IGreenhouseController state) {
-		this.controller = state;
+	public GreenhouseEvents(@Nullable IGreenhouseState state) {
+		this.state = state;
 	}
 	
 	public static class CamouflageChangeEvent extends GreenhouseEvents{
@@ -30,10 +35,10 @@ public class GreenhouseEvents extends Event {
 		@Nonnull
 		public ICamouflageHandler camouflageHandler;
 		@Nonnull
-		public final String camouflageType;
+		public final EnumCamouflageType camouflageType;
 		
-		public CamouflageChangeEvent(IGreenhouseController controller, @Nullable ICamouflagedTile camouflagedBlock, @Nonnull ICamouflageHandler camouflageHandler, @Nonnull String camouflageType) {
-			super(controller);
+		public CamouflageChangeEvent(IGreenhouseState state, @Nullable ICamouflagedTile camouflagedBlock, @Nonnull ICamouflageHandler camouflageHandler, @Nonnull EnumCamouflageType camouflageType) {
+			super(state);
 			
 			this.camouflagedBlock = camouflagedBlock;
 			this.camouflageHandler = camouflageHandler;
@@ -46,8 +51,8 @@ public class GreenhouseEvents extends Event {
 		@Nonnull
 		public IInternalBlock internalBlock;
 		
-		public InternalBlockEvent(IGreenhouseController controller, @Nonnull IInternalBlock internalBlock) {
-			super(controller);
+		public InternalBlockEvent(IGreenhouseState state, @Nonnull IInternalBlock internalBlock) {
+			super(state);
 			
 			this.internalBlock = internalBlock;
 		}	
@@ -55,8 +60,8 @@ public class GreenhouseEvents extends Event {
 	
 	public static class CreateInternalBlockEvent extends InternalBlockEvent{
 
-		public CreateInternalBlockEvent(IGreenhouseController controller, IInternalBlock internalBlock) {
-			super(controller, internalBlock);
+		public CreateInternalBlockEvent(IGreenhouseState state, IInternalBlock internalBlock) {
+			super(state, internalBlock);
 		}
 	}
 	
@@ -65,8 +70,8 @@ public class GreenhouseEvents extends Event {
 		@Nonnull
 		public final IInternalBlockFace face;
 		
-		public CheckInternalBlockFaceEvent(IGreenhouseController controller, IInternalBlock internalBlock, @Nonnull IInternalBlockFace face) {
-			super(controller, internalBlock);
+		public CheckInternalBlockFaceEvent(IGreenhouseState state, IInternalBlock internalBlock, @Nonnull IInternalBlockFace face) {
+			super(state, internalBlock);
 			
 			this.face = face;
 		}

src/main/java/forestry/api/greenhouse/GreenhouseManager.java

@@ -5,8 +5,15 @@
  ******************************************************************************/
 package forestry.api.greenhouse;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class GreenhouseManager {
 	
+	public static IGreenhouseAccess greenhouseAccess;
+	
 	public static IGreenhouseHelper greenhouseHelper;
+	
+	public static List<Class<? extends IGreenhouseLogic>> greenhouseLogics = new ArrayList<>();
 
 }

src/main/java/forestry/api/greenhouse/IGreenhouseAccess.java

@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.greenhouse;
+
+import javax.annotation.Nonnull;
+
+import forestry.api.core.EnumCamouflageType;
+import net.minecraft.item.ItemStack;
+
+public interface IGreenhouseAccess {
+
+	void registerGreenhouseGlass(@Nonnull ItemStack glass, float lightTransmittance);
+	
+	boolean isGreenhouseGlass(@Nonnull ItemStack glass);
+	
+	float getGreenhouseGlassLightTransmittance(@Nonnull ItemStack glass);
+	
+	void addToCamouflageBlockBlackList(@Nonnull EnumCamouflageType type, @Nonnull ItemStack camouflageBlock);
+	
+	boolean isOnCamouflageBlockBlackList(@Nonnull EnumCamouflageType type, @Nonnull ItemStack camouflageBlock);
+	
+}

src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java

@@ -5,21 +5,14 @@
  ******************************************************************************/
 package forestry.api.greenhouse;
 
-import java.util.List;
-
-import forestry.api.multiblock.IGreenhouseController;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public interface IGreenhouseHelper {
 
 	/**
-	 * @return A {@link IGreenhouseController} of a greenhouse, when the pos is a greenhouse
+	 * @return A {@link IGreenhouseState} of a greenhouse, when the pos is a greenhouse
 	 */
-	IGreenhouseController getGreenhouseController(World world, BlockPos pos);
-	
-	void addGreenhouseLogic(Class<? extends IGreenhouseLogic> logic);
-	
-	List<Class<? extends IGreenhouseLogic>> getGreenhouseLogics();
+	IGreenhouseState getGreenhouseState(World world, BlockPos pos);
 	
 }

src/main/java/forestry/api/greenhouse/IGreenhouseListener.java

@@ -10,12 +10,12 @@ import forestry.api.multiblock.IGreenhouseController;
 public interface IGreenhouseListener  {
 
 	/**
-	 * Called before the greenhouse update the climate system.
+	 * Called before the greenhouse work.
 	 * 
-	 * @param greenhouse The greenhouse of the listener.
+	 * @param greenhouse The greenhouse multiblock.
 	 * @param canWork The actual {@link Boolean} value.
-	 * @return True if the greenhouse can update the climate.
+	 * @return True if the greenhouse can work.
 	 */
-	boolean canWork(IGreenhouseController greenhouse, boolean canWork);
+	<G extends IGreenhouseController & IGreenhouseHousing> boolean canWork(G greenhouse, boolean canWork);
 	
 }

src/main/java/forestry/api/greenhouse/IGreenhouseState.java

@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.greenhouse;
+
+import java.util.Collection;
+import java.util.Set;
+
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.multiblock.IMultiblockComponent;
+
+public interface IGreenhouseState {
+	
+	EnumTemperature getTemperature();
+
+	EnumHumidity getHumidity();
+
+	float getExactTemperature();
+
+	float getExactHumidity();
+	
+	Set<IInternalBlock> getInternalBlocks();
+	
+	Collection<IMultiblockComponent> getGreenhouseComponents();
+	
+}

src/main/java/forestry/api/greenhouse/IInternalBlock.java

@@ -7,7 +7,6 @@ package forestry.api.greenhouse;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.util.Collection;
 
 import net.minecraft.util.math.BlockPos;

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

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

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

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

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

@@ -7,16 +7,18 @@ package forestry.api.lepidopterology;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;
 
-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
@@ -65,7 +67,7 @@ public interface IButterflyRoot extends ISpeciesRoot {
 
 	/* MUTATIONS */
 	@Override
-	List<IButterflyMutation> getMutations(boolean shuffle);
+	Collection<IButterflyMutation> getMutations(boolean shuffle);
 
 	@Nullable
 	@Override

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

@@ -7,7 +7,7 @@ package forestry.api.multiblock;
 
 import forestry.api.apiculture.IBeeListener;
 import forestry.api.apiculture.IBeeModifier;
-import forestry.api.climate.IClimateControlled;
+import forestry.api.core.IClimateControlled;
 
 /**
  * Needs to be implemented by TileEntities that want to be part of an alveary.

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

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

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

@@ -5,10 +5,8 @@
  ******************************************************************************/
 package forestry.api.multiblock;
 
-import forestry.api.climate.IClimateControl;
-import forestry.api.climate.IClimateControlProvider;
-import forestry.api.climate.IClimateSourceProvider;
-import forestry.api.climate.IClimatiserDefinition;
+import forestry.api.core.IClimateControlled;
+import forestry.api.greenhouse.IGreenhouseHousing;
 import forestry.api.greenhouse.IGreenhouseListener;
 import forestry.api.lepidopterology.IButterflyCocoon;
 import net.minecraft.item.ItemStack;
@@ -21,17 +19,11 @@ public interface IGreenhouseComponent<T extends IMultiblockLogicGreenhouse> exte
 		IGreenhouseListener getGreenhouseListener();
 	}
 	
-	interface ClimateControl extends IGreenhouseComponent, IClimateControlProvider {
-		
-		@Override
-		IClimateControl getClimateControl();
-	}
-	
 	interface Door extends IGreenhouseComponent {
 	}
 
-	interface Climatiser extends IGreenhouseComponent, IClimateSourceProvider {
-		IClimatiserDefinition getDefinition();
+	interface Climatiser extends IGreenhouseComponent {
+		<G extends IGreenhouseController & IGreenhouseHousing & IClimateControlled> void changeClimate(int tickCount, G greenhouse);
 	}
 	
 	interface ButterflyHatch extends IGreenhouseComponent {

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

@@ -7,18 +7,13 @@ package forestry.api.multiblock;
 
 import java.util.List;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import forestry.api.climate.IClimateControl;
-import forestry.api.climate.IClimateControlProvider;
-import forestry.api.climate.IClimateRegion;
 import forestry.api.core.ICamouflageHandler;
+import forestry.api.core.IClimateControlled;
 import forestry.api.greenhouse.EnumGreenhouseEventType;
 import forestry.api.greenhouse.IGreenhouseHousing;
 import forestry.api.greenhouse.IGreenhouseLogic;
 
-public interface IGreenhouseController extends IMultiblockController, IGreenhouseHousing, ICamouflageHandler, IClimateControlProvider {
+public interface IGreenhouseController extends IMultiblockController, IGreenhouseHousing, ICamouflageHandler, IClimateControlled {
 	
 	/**
 	 * Handle change events.
@@ -29,12 +24,5 @@ public interface IGreenhouseController extends IMultiblockController, IGreenhous
 	 * @return The logics of the greenhouse.
 	 */
 	List<IGreenhouseLogic> getLogics();
-	
-	@Nullable
-	IClimateRegion getRegion();
-	
-	@Override
-	@Nonnull
-	IClimateControl getClimateControl();
 
 }

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

@@ -15,6 +15,4 @@ public interface IMultiblockLogicFactory {
 	IMultiblockLogicFarm createFarmLogic();
 	
 	IMultiblockLogicGreenhouse createGreenhouseLogic();
-	
-	IMultiblockLogicCharcoalPile createCharcoalPileLogic();
 }

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

@@ -8,6 +8,7 @@ package forestry.api.recipes;
 import javax.annotation.Nullable;
 
 import net.minecraft.item.ItemStack;
+
 import net.minecraftforge.fluids.FluidStack;
 
 public interface ICarpenterRecipe extends IForestryRecipe {

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

@@ -5,9 +5,6 @@
  ******************************************************************************/
 package forestry.api.recipes;
 
-import javax.annotation.Nonnull;
-
-import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 
 /**
@@ -33,7 +30,4 @@ public interface IDescriptiveRecipe extends IRecipe {
 	 */
 	Object[] getIngredients();
 
-	@Nonnull
-	@Override
-	ItemStack getRecipeOutput();
 }

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

@@ -5,42 +5,43 @@
  ******************************************************************************/
 package forestry.api.storage;
 
-import javax.annotation.Nonnull;
+import java.util.List;
 import java.util.function.Predicate;
 
 import net.minecraft.item.ItemStack;
 
-/**
- * To make your own backpack, create a backpack definition and register it with
- * {@link IBackpackInterface#registerBackpackDefinition(String, IBackpackDefinition)}.
- */
-public interface IBackpackDefinition {
+public interface IBackpackDefinition extends Predicate<ItemStack> {
+
 	/**
 	 * @return Human-readable name of the backpack.
 	 */
-	@Nonnull
 	String getName(ItemStack backpack);
 
 	/**
-	 * @return Primary color for the backpack icon.
+	 * @return Primary colour for the backpack icon.
 	 */
 	int getPrimaryColour();
 
 	/**
-	 * @return Secondary color for backpack icon, normally white.
+	 * @return Secondary colour for backpack icon.
 	 */
 	int getSecondaryColour();
 
 	/**
-	 * Filters items that can be put into a backpack.
+	 * Adds an item as valid for this backpack.
 	 *
-	 * 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.
+	 * @param validItem
 	 */
-	@Nonnull
-	Predicate<ItemStack> getFilter();
+	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);
+
 }

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

@@ -1,45 +0,0 @@
-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,83 +7,32 @@ 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 {
 	/**
-	 * 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.
+	 * 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.
 	 */
 	@Nullable
-	IBackpackDefinition getBackpackDefinition(@Nonnull String backpackUid);
+	IBackpackDefinition getBackpack(@Nonnull String uid);
 
 	/**
-	 * 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)}.
+	 * 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.
 	 *
-	 * @param backpackUid The unique ID of the backpack.
-	 * @param type        Type of backpack.
+	 * @param definition
+	 *            Definition of backpack behaviour.
+	 * @param type
+	 *            Type of backpack.
 	 * @return Created backpack item.
 	 */
 	@Nonnull
-	Item createBackpack(@Nonnull String backpackUid, @Nonnull EnumBackpackType type);
+	Item createBackpack(@Nonnull IBackpackDefinition definition, @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 = "5.0.0", owner = "ForestryAPI|core", provides = "ForestryAPI|storage")
+@API(apiVersion = "3.0.0", owner = "ForestryAPI|core", provides = "ForestryAPI|storage")
 package forestry.api.storage;
 
 import net.minecraftforge.fml.common.API;

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

@@ -10,13 +10,13 @@
  ******************************************************************************/
 package forestry.apiculture;
 
-import forestry.api.apiculture.ApicultureCapabilities;
-import forestry.api.apiculture.IArmorApiarist;
-import forestry.api.apiculture.IArmorApiaristHelper;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
+import forestry.api.apiculture.IArmorApiarist;
+import forestry.api.apiculture.IArmorApiaristHelper;
+
 public class ArmorApiaristHelper implements IArmorApiaristHelper {
 
 	@Override
@@ -25,16 +25,12 @@ public class ArmorApiaristHelper implements IArmorApiaristHelper {
 			return false;
 		}
 
-		final Item item = stack.getItem();
-		final IArmorApiarist armorApiarist;
-		if (item instanceof IArmorApiarist) { // legacy
-			armorApiarist = (IArmorApiarist) item;
-		} else if (stack.hasCapability(ApicultureCapabilities.ARMOR_APIARIST, null)) {
-			armorApiarist = stack.getCapability(ApicultureCapabilities.ARMOR_APIARIST, null);
-		} else {
+		Item item = stack.getItem();
+		if (!(item instanceof IArmorApiarist)) {
 			return false;
 		}
 
+		IArmorApiarist armorApiarist = (IArmorApiarist) item;
 		return armorApiarist.protectEntity(entity, stack, cause, doProtect);
 	}
 

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

@@ -16,6 +16,7 @@ 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;
@@ -26,8 +27,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) {
-		super(size, "Items");
+	public InventoryBeeHousing(int size, IAccessHandler accessHandler) {
+		super(size, "Items", accessHandler);
 	}
 
 	@Override

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

@@ -10,6 +10,8 @@
  ******************************************************************************/
 package forestry.apiculture;
 
+import com.google.common.collect.ImmutableMap;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -17,12 +19,38 @@ import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 
-import com.google.common.collect.ImmutableMap;
+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 forestry.Forestry;
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
 import forestry.api.apiculture.FlowerManager;
-import forestry.api.apiculture.IArmorApiarist;
 import forestry.api.apiculture.IBeekeepingMode;
 import forestry.api.apiculture.hives.HiveManager;
 import forestry.api.apiculture.hives.IHiveRegistry.HiveType;
@@ -37,7 +65,6 @@ import forestry.api.storage.StorageManager;
 import forestry.apiculture.blocks.BlockAlvearyType;
 import forestry.apiculture.blocks.BlockCandle;
 import forestry.apiculture.blocks.BlockRegistryApiculture;
-import forestry.apiculture.capabilities.ArmorApiarist;
 import forestry.apiculture.commands.CommandBee;
 import forestry.apiculture.entities.EntityMinecartApiary;
 import forestry.apiculture.entities.EntityMinecartBeehouse;
@@ -74,7 +101,6 @@ import forestry.apiculture.worldgen.HiveRegistry;
 import forestry.core.ISaveEventHandler;
 import forestry.core.PluginCore;
 import forestry.core.PluginFluids;
-import forestry.core.capabilities.NullStorage;
 import forestry.core.config.Config;
 import forestry.core.config.Constants;
 import forestry.core.config.LocalizedConfiguration;
@@ -93,33 +119,6 @@ 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.common.capabilities.CapabilityManager;
-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 {
@@ -165,9 +164,6 @@ public class PluginApiculture extends BlankForestryPlugin {
 		BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.hard);
 		BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.hardcore);
 		BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.insane);
-
-		// Capabilities
-		CapabilityManager.INSTANCE.register(IArmorApiarist.class, new NullStorage<>(), () -> ArmorApiarist.INSTANCE);
 	}
 
 	@Override
@@ -270,7 +266,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, Constants.TEXTURE_SKIN_ZOMBIE_BEEKPEEPER);
+			villagerApiarist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_APIARIST, Constants.TEXTURE_SKIN_BEEKPEEPER);
 			villagerRegistry.register(villagerApiarist);
 
 			ItemStack wildcardPrincess = new ItemStack(items.beePrincessGE, 1);
@@ -563,7 +559,7 @@ public class PluginApiculture extends BlankForestryPlugin {
 			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{items.honeydew.getItemStack()}, honeyDropFluid);
 
 			ItemStack phosphor = PluginCore.items.phosphor.getItemStack(2);
-			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.SAND)}, new FluidStack(FluidRegistry.LAVA, 2000));
+			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.SAND)}, new FluidStack(FluidRegistry.WATER, 2000));
 			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.SAND, 1, 1)}, new FluidStack(FluidRegistry.LAVA, 2000));
 			RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.DIRT)}, new FluidStack(FluidRegistry.LAVA, 1600));
 

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

@@ -12,11 +12,10 @@ 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, Material.WOOD);
+		super(type);
 		setCreativeTab(Tabs.tabApiculture);
 		setHarvestLevel("axe", 0);
 	}

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

@@ -286,11 +286,6 @@ public class BlockCandle extends BlockTorch implements IItemModelRegister, ITile
 		boolean isLit = isLit(stack);
 		tileCandle.setColour(colour);
 		tileCandle.setLit(isLit);
-		if (tileCandle.isLit()) {
-			world.theProfiler.startSection("checkLight");
-			world.checkLight(pos);
-			world.theProfiler.endSection();
-		}
 	}
 
 	@Override
@@ -327,11 +322,19 @@ public class BlockCandle extends BlockTorch implements IItemModelRegister, ITile
 	}
 
 	public ItemStack getUnlitCandle(int amount) {
-		return new ItemStack(this, amount, 0);
+		ItemStack itemStack = new ItemStack(this, amount, 0);
+		NBTTagCompound tag = new NBTTagCompound();
+		tag.setInteger(BlockCandle.colourTagName, 0xffffff);
+		itemStack.setTagCompound(tag);
+		return itemStack;
 	}
 
 	public ItemStack getLitCandle(int amount) {
-		return new ItemStack(this, amount, 1);
+		ItemStack itemStack = new ItemStack(this, amount, 1);
+		NBTTagCompound tag = new NBTTagCompound();
+		tag.setInteger(BlockCandle.colourTagName, 0xffffff);
+		itemStack.setTagCompound(tag);
+		return itemStack;
 	}
 
 	@Override

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

@@ -12,7 +12,6 @@ package forestry.apiculture.blocks;
 
 import java.util.Map;
 
-import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
 
 import forestry.api.core.Tabs;
@@ -37,7 +36,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, Material.WOOD);
+		beeChest = new BlockBase<>(BlockTypeApicultureTesr.APIARIST_CHEST);
 		registerBlock(beeChest, new ItemBlockForestry(beeChest), "bee_chest");
 		beeChest.setCreativeTab(Tabs.tabApiculture);
 		beeChest.setHarvestLevel("axe", 0);

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

@@ -60,11 +60,10 @@ public class BlockStump extends BlockTorch implements IItemModelRegister {
 		if (heldItem != null && BlockCandle.lightingItems.contains(heldItem.getItem())) {
 			IBlockState blockState = worldIn.getBlockState(pos);
 			Block block = blockState.getBlock();
-			IBlockState activatedState = PluginApiculture.blocks.candle.getStateFromMeta(block.getMetaFromState(blockState));
+			IBlockState activatedState = PluginApiculture.blocks.candle.getStateFromMeta(block.getMetaFromState(blockState) | 0x08);
 			worldIn.setBlockState(pos, activatedState, Constants.FLAG_BLOCK_SYNC);
 			TileCandle tc = new TileCandle();
-			tc.setColour(16777215); // default to white
-			tc.setLit(true);
+			tc.setColour(0); // default to white
 			worldIn.setTileEntity(pos, tc);
 			return true;
 		}

src/main/java/forestry/apiculture/capabilities/ArmorApiarist.java

@@ -1,20 +0,0 @@
-package forestry.apiculture.capabilities;
-
-import javax.annotation.Nullable;
-
-import forestry.api.apiculture.IArmorApiarist;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-
-public class ArmorApiarist implements IArmorApiarist {
-	public static final ArmorApiarist INSTANCE = new ArmorApiarist();
-
-	protected ArmorApiarist() {
-
-	}
-
-	@Override
-	public boolean protectEntity(EntityLivingBase entity, ItemStack armor, @Nullable String cause, boolean doProtect) {
-		return true;
-	}
-}

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

@@ -2,48 +2,47 @@ package forestry.apiculture.compat;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
 
-import forestry.api.apiculture.BeeManager;
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.apiculture.PluginApiculture;
-import forestry.apiculture.items.ItemRegistryApiculture;
-import forestry.core.genetics.Genome;
-import forestry.core.utils.JeiUtil;
+import forestry.apiculture.genetics.BeeGenome;
+
 import mezz.jei.api.BlankModPlugin;
 import mezz.jei.api.IModRegistry;
 import mezz.jei.api.ISubtypeRegistry;
 import mezz.jei.api.JEIPlugin;
-import net.minecraft.item.ItemStack;
 
 @JEIPlugin
 public class ApicultureJeiPlugin extends BlankModPlugin {
 	@Override
 	public void register(@Nonnull IModRegistry registry) {
-		ItemRegistryApiculture items = PluginApiculture.items;
-
-		JeiUtil.addDescription(registry, "frames",
-				items.frameImpregnated,
-				items.frameProven,
-				items.frameUntreated
+		List<ItemStack> frames = Arrays.asList(
+				new ItemStack(PluginApiculture.items.frameImpregnated),
+				new ItemStack(PluginApiculture.items.frameProven),
+				new ItemStack(PluginApiculture.items.frameUntreated)
 		);
+		registry.addDescription(frames, "for.jei.description.frames");
 
-		JeiUtil.addDescription(registry, "apiarist.suit",
-				items.apiaristBoots,
-				items.apiaristChest,
-				items.apiaristHat,
-				items.apiaristLegs
+		List<ItemStack> apiaristSuit = Arrays.asList(
+				new ItemStack(PluginApiculture.items.apiaristBoots),
+				new ItemStack(PluginApiculture.items.apiaristChest),
+				new ItemStack(PluginApiculture.items.apiaristHat),
+				new ItemStack(PluginApiculture.items.apiaristLegs)
 		);
+		registry.addDescription(apiaristSuit, "for.jei.description.apiarist.suit");
 
-		JeiUtil.addDescription(registry,
-				items.habitatLocator,
-				items.scoop,
-				items.imprinter
-		);
+		registry.addDescription(new ItemStack(PluginApiculture.items.habitatLocator), "for.jei.description.habitat.locator");
+
+		registry.addDescription(new ItemStack(PluginApiculture.items.scoop), "for.jei.description.scoop");
 
 		ISubtypeRegistry subtypeRegistry = registry.getJeiHelpers().getSubtypeRegistry();
-		subtypeRegistry.registerNbtInterpreter(items.beeDroneGE, BeeSubtypeInterpreter.INSTANCE);
-		subtypeRegistry.registerNbtInterpreter(items.beePrincessGE, BeeSubtypeInterpreter.INSTANCE);
-		subtypeRegistry.registerNbtInterpreter(items.beeQueenGE, BeeSubtypeInterpreter.INSTANCE);
+		subtypeRegistry.registerNbtInterpreter(PluginApiculture.items.beeDroneGE, BeeSubtypeInterpreter.INSTANCE);
+		subtypeRegistry.registerNbtInterpreter(PluginApiculture.items.beePrincessGE, BeeSubtypeInterpreter.INSTANCE);
+		subtypeRegistry.registerNbtInterpreter(PluginApiculture.items.beeQueenGE, BeeSubtypeInterpreter.INSTANCE);
 	}
 
 	private static class BeeSubtypeInterpreter implements ISubtypeRegistry.ISubtypeInterpreter {
@@ -52,7 +51,7 @@ public class ApicultureJeiPlugin extends BlankModPlugin {
 		@Nullable
 		@Override
 		public String getSubtypeInfo(@Nonnull ItemStack itemStack) {
-			IAlleleSpecies species = Genome.getSpeciesDirectly(BeeManager.beeRoot, itemStack);
+			IAlleleSpecies species = BeeGenome.getSpeciesDirectly(itemStack);
 			return species == null ? null : species.getUID();
 		}
 	}

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

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

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

@@ -42,7 +42,7 @@ public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implement
 	@Nonnull
 	private final IBeeListener beeListener = new ApiaryBeeListener(this);
 	@Nonnull
-	private final InventoryApiary inventory = new InventoryApiary();
+	private final InventoryApiary inventory = new InventoryApiary(getAccessHandler());
 
 	@SuppressWarnings("unused")
 	public EntityMinecartApiary(World world) {

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

@@ -10,12 +10,17 @@
  ******************************************************************************/
 package forestry.apiculture.entities;
 
-import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.Random;
 
-import com.google.common.base.Optional;
+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.mojang.authlib.GameProfile;
+
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeekeepingLogic;
@@ -31,24 +36,10 @@ 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;
@@ -58,23 +49,6 @@ 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;
@@ -89,18 +63,6 @@ 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() {
@@ -149,7 +111,7 @@ public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain
 
 	@Override
 	public GameProfile getOwner() {
-		return getOwnerHandler().getOwner();
+		return getAccessHandler().getOwner();
 	}
 
 	@Override
@@ -212,13 +174,11 @@ 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

@@ -34,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);
+	private final InventoryBeeHousing beeInventory = new InventoryBeeHousing(9, getAccessHandler());
 
 	@SuppressWarnings("unused")
 	public EntityMinecartBeehouse(World world) {

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

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

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

@@ -5,7 +5,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.item.ItemStack;
 
 import net.minecraftforge.fml.relauncher.Side;
@@ -48,217 +47,208 @@ public class BeeAlyzerPlugin implements IAlyzerPlugin {
 
 	@SideOnly(Side.CLIENT)
 	@Override
-	public void drawAnalyticsPage1(GuiScreen gui, ItemStack itemStack) {
-		if(gui instanceof GuiAlyzer){
-			GuiAlyzer guiAlyzer = (GuiAlyzer) gui;
-			IBee bee = BeeManager.beeRoot.getMember(itemStack);
-			if (bee == null) {
-				return;
+	public void drawAnalyticsPage1(GuiAlyzer gui, ItemStack itemStack) {
+		IBee bee = BeeManager.beeRoot.getMember(itemStack);
+		if (bee == null) {
+			return;
+		}
+		EnumBeeType type = BeeManager.beeRoot.getType(itemStack);
+
+		TextLayoutHelper textLayout = gui.getTextLayout();
+
+		textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2);
+
+		textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1);
+		textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), GuiAlyzer.COLUMN_2);
+
+		textLayout.newLine();
+		textLayout.newLine();
+
+		{
+			String customPrimaryBeeKey = "for.bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getPrimary().getUnlocalizedName().replace("bees.species.", "");
+			String customSecondaryBeeKey = "for.bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getSecondary().getUnlocalizedName().replace("bees.species.", "");
+
+			gui.drawSpeciesRow(Translator.translateToLocal("for.gui.species"), bee, EnumBeeChromosome.SPECIES, GuiAlyzer.checkCustomName(customPrimaryBeeKey), GuiAlyzer.checkCustomName(customSecondaryBeeKey));
+			textLayout.newLine();
+		}
+
+		gui.drawChromosomeRow(Translator.translateToLocal("for.gui.lifespan"), bee, EnumBeeChromosome.LIFESPAN);
+		textLayout.newLine();
+		gui.drawChromosomeRow(Translator.translateToLocal("for.gui.speed"), bee, EnumBeeChromosome.SPEED);
+		textLayout.newLine();
+		gui.drawChromosomeRow(Translator.translateToLocal("for.gui.pollination"), bee, EnumBeeChromosome.FLOWERING);
+		textLayout.newLine();
+		gui.drawChromosomeRow(Translator.translateToLocal("for.gui.flowers"), bee, EnumBeeChromosome.FLOWER_PROVIDER);
+		textLayout.newLine();
+
+		textLayout.drawLine(Translator.translateToLocal("for.gui.fertility"), GuiAlyzer.COLUMN_0);
+		IAlleleInteger primaryFertility = (IAlleleInteger) bee.getGenome().getActiveAllele(EnumBeeChromosome.FERTILITY);
+		IAlleleInteger secondaryFertility = (IAlleleInteger) bee.getGenome().getInactiveAllele(EnumBeeChromosome.FERTILITY);
+		gui.drawFertilityInfo(primaryFertility.getValue(), GuiAlyzer.COLUMN_1, gui.getColorCoding(primaryFertility.isDominant()), 0);
+		gui.drawFertilityInfo(secondaryFertility.getValue(), GuiAlyzer.COLUMN_2, gui.getColorCoding(secondaryFertility.isDominant()), 0);
+		textLayout.newLine();
+
+		gui.drawChromosomeRow(Translator.translateToLocal("for.gui.area"), bee, EnumBeeChromosome.TERRITORY);
+		textLayout.newLine();
+
+		gui.drawChromosomeRow(Translator.translateToLocal("for.gui.effect"), bee, EnumBeeChromosome.EFFECT);
+		textLayout.newLine();
+
+		textLayout.endPage();
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void drawAnalyticsPage2(GuiAlyzer gui, ItemStack itemStack) {
+		IBee bee = BeeManager.beeRoot.getMember(itemStack);
+		if (bee == null) {
+			return;
+		}
+		EnumBeeType type = BeeManager.beeRoot.getType(itemStack);
+
+		TextLayoutHelper textLayout = gui.getTextLayout();
+
+		textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2);
+
+		textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1);
+		textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), GuiAlyzer.COLUMN_2);
+
+		textLayout.newLine();
+
+		gui.drawRow(Translator.translateToLocal("for.gui.climate"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getTemperature()),
+				AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getTemperature()), bee, EnumBeeChromosome.SPECIES);
+
+		textLayout.newLine();
+
+		IAlleleTolerance tempToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE);
+		IAlleleTolerance tempToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE);
+		textLayout.drawLine("  " + Translator.translateToLocal("for.gui.tolerance"), GuiAlyzer.COLUMN_0);
+		gui.drawToleranceInfo(tempToleranceActive, GuiAlyzer.COLUMN_1);
+		gui.drawToleranceInfo(tempToleranceInactive, GuiAlyzer.COLUMN_2);
+
+		textLayout.newLine(16);
+
+		gui.drawRow(Translator.translateToLocal("for.gui.humidity"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getHumidity()),
+				AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getHumidity()), bee, EnumBeeChromosome.SPECIES);
+
+		textLayout.newLine();
+
+		IAlleleTolerance humidToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE);
+		IAlleleTolerance humidToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE);
+		textLayout.drawLine("  " + Translator.translateToLocal("for.gui.tolerance"), GuiAlyzer.COLUMN_0);
+		gui.drawToleranceInfo(humidToleranceActive, GuiAlyzer.COLUMN_1);
+		gui.drawToleranceInfo(humidToleranceInactive, GuiAlyzer.COLUMN_2);
+
+		textLayout.newLine(16);
+
+		String yes = Translator.translateToLocal("for.yes");
+		String no = Translator.translateToLocal("for.no");
+
+		String diurnal0, diurnal1, nocturnal0, nocturnal1;
+		if (bee.getGenome().getNeverSleeps()) {
+			nocturnal0 = diurnal0 = yes;
+		} else {
+			nocturnal0 = bee.getGenome().getPrimary().isNocturnal() ? yes : no;
+			diurnal0 = !bee.getGenome().getPrimary().isNocturnal() ? yes : no;
+		}
+		if (((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.NEVER_SLEEPS)).getValue()) {
+			nocturnal1 = diurnal1 = yes;
+		} else {
+			nocturnal1 = bee.getGenome().getSecondary().isNocturnal() ? yes : no;
+			diurnal1 = !bee.getGenome().getSecondary().isNocturnal() ? yes : no;
+		}
+
+		textLayout.drawLine(Translator.translateToLocal("for.gui.diurnal"), GuiAlyzer.COLUMN_0);
+		textLayout.drawLine(diurnal0, GuiAlyzer.COLUMN_1, gui.getColorCoding(false));
+		textLayout.drawLine(diurnal1, GuiAlyzer.COLUMN_2, gui.getColorCoding(false));
+		textLayout.newLineCompressed();
+
+		textLayout.drawLine(Translator.translateToLocal("for.gui.nocturnal"), GuiAlyzer.COLUMN_0);
+		textLayout.drawLine(nocturnal0, GuiAlyzer.COLUMN_1, gui.getColorCoding(false));
+		textLayout.drawLine(nocturnal1, GuiAlyzer.COLUMN_2, gui.getColorCoding(false));
+		textLayout.newLineCompressed();
+
+		String primary = StringUtil.readableBoolean(bee.getGenome().getToleratesRain(), yes, no);
+		String secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TOLERATES_RAIN)).getValue(), yes, no);
+
+		gui.drawRow(Translator.translateToLocal("for.gui.flyer"), primary, secondary, bee, EnumBeeChromosome.TOLERATES_RAIN);
+
+		textLayout.newLineCompressed();
+
+		primary = StringUtil.readableBoolean(bee.getGenome().getCaveDwelling(), yes, no);
+		secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.CAVE_DWELLING)).getValue(), yes, no);
+
+		gui.drawRow(Translator.translateToLocal("for.gui.cave"), primary, secondary, bee, EnumBeeChromosome.CAVE_DWELLING);
+
+		textLayout.newLine();
+
+		String displayText;
+		if (type == EnumBeeType.PRINCESS || type == EnumBeeType.QUEEN) {
+			String displayTextKey = "for.bees.stock.pristine";
+			if (!bee.isNatural()) {
+				displayTextKey = "for.bees.stock.ignoble";
 			}
-			EnumBeeType type = BeeManager.beeRoot.getType(itemStack);
-	
-			TextLayoutHelper textLayout = guiAlyzer.getTextLayout();
-	
-			textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2);
-	
-			textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1);
-			textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), GuiAlyzer.COLUMN_2);
-	
-			textLayout.newLine();
-			textLayout.newLine();
-	
-			{
-				String customPrimaryBeeKey = "for.bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getPrimary().getUnlocalizedName().replace("bees.species.", "");
-				String customSecondaryBeeKey = "for.bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getSecondary().getUnlocalizedName().replace("bees.species.", "");
-	
-				guiAlyzer.drawSpeciesRow(Translator.translateToLocal("for.gui.species"), bee, EnumBeeChromosome.SPECIES, GuiAlyzer.checkCustomName(customPrimaryBeeKey), GuiAlyzer.checkCustomName(customSecondaryBeeKey));
+			displayText = Translator.translateToLocal(displayTextKey);
+			textLayout.drawCenteredLine(displayText, 8, 208, gui.getFontColor().get("gui.beealyzer.binomial"));
+		}
+
+		if (bee.getGeneration() >= 0) {
+			textLayout.newLineCompressed();
+			displayText = Translator.translateToLocalFormatted("for.gui.beealyzer.generations", bee.getGeneration());
+			textLayout.drawCenteredLine(displayText, 8, 208, gui.getFontColor().get("gui.beealyzer.binomial"));
+		}
+
+		textLayout.endPage();
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void drawAnalyticsPage3(GuiAlyzer gui, ItemStack itemStack) {
+		IBee bee = BeeManager.beeRoot.getMember(itemStack);
+		if (bee == null) {
+			return;
+		}
+
+		TextLayoutHelper textLayout = gui.getTextLayout();
+		WidgetManager widgetManager = gui.getWidgetManager();
+		
+		textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2);
+
+		textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.produce") + ":", GuiAlyzer.COLUMN_0);
+
+		textLayout.newLine();
+
+		int x = GuiAlyzer.COLUMN_0;
+		for (ItemStack stack : bee.getProduceList()) {
+			widgetManager.add(new ItemStackWidget(widgetManager, x, textLayout.getLineY(), stack));
+
+			x += 18;
+			if (x > 148) {
+				x = GuiAlyzer.COLUMN_0;
 				textLayout.newLine();
 			}
-	
-			guiAlyzer.drawChromosomeRow(Translator.translateToLocal("for.gui.lifespan"), bee, EnumBeeChromosome.LIFESPAN);
-			textLayout.newLine();
-			guiAlyzer.drawChromosomeRow(Translator.translateToLocal("for.gui.speed"), bee, EnumBeeChromosome.SPEED);
-			textLayout.newLine();
-			guiAlyzer.drawChromosomeRow(Translator.translateToLocal("for.gui.pollination"), bee, EnumBeeChromosome.FLOWERING);
-			textLayout.newLine();
-			guiAlyzer.drawChromosomeRow(Translator.translateToLocal("for.gui.flowers"), bee, EnumBeeChromosome.FLOWER_PROVIDER);
-			textLayout.newLine();
-	
-			textLayout.drawLine(Translator.translateToLocal("for.gui.fertility"), GuiAlyzer.COLUMN_0);
-			IAlleleInteger primaryFertility = (IAlleleInteger) bee.getGenome().getActiveAllele(EnumBeeChromosome.FERTILITY);
-			IAlleleInteger secondaryFertility = (IAlleleInteger) bee.getGenome().getInactiveAllele(EnumBeeChromosome.FERTILITY);
-			guiAlyzer.drawFertilityInfo(primaryFertility.getValue(), GuiAlyzer.COLUMN_1, guiAlyzer.getColorCoding(primaryFertility.isDominant()), 0);
-			guiAlyzer.drawFertilityInfo(secondaryFertility.getValue(), GuiAlyzer.COLUMN_2, guiAlyzer.getColorCoding(secondaryFertility.isDominant()), 0);
-			textLayout.newLine();
-	
-			guiAlyzer.drawChromosomeRow(Translator.translateToLocal("for.gui.area"), bee, EnumBeeChromosome.TERRITORY);
-			textLayout.newLine();
-	
-			guiAlyzer.drawChromosomeRow(Translator.translateToLocal("for.gui.effect"), bee, EnumBeeChromosome.EFFECT);
-			textLayout.newLine();
-	
-			textLayout.endPage();
 		}
-	}
 
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void drawAnalyticsPage2(GuiScreen gui, ItemStack itemStack) {
-		if(gui instanceof GuiAlyzer){
-			GuiAlyzer guiAlyzer = (GuiAlyzer) gui;
-			IBee bee = BeeManager.beeRoot.getMember(itemStack);
-			if (bee == null) {
-				return;
-			}
-			EnumBeeType type = BeeManager.beeRoot.getType(itemStack);
-	
-			TextLayoutHelper textLayout = guiAlyzer.getTextLayout();
-	
-			textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2);
-	
-			textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1);
-			textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), GuiAlyzer.COLUMN_2);
-	
-			textLayout.newLine();
-	
-			guiAlyzer.drawRow(Translator.translateToLocal("for.gui.climate"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getTemperature()),
-					AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getTemperature()), bee, EnumBeeChromosome.SPECIES);
-	
-			textLayout.newLine();
-	
-			IAlleleTolerance tempToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE);
-			IAlleleTolerance tempToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE);
-			textLayout.drawLine("  " + Translator.translateToLocal("for.gui.tolerance"), GuiAlyzer.COLUMN_0);
-			guiAlyzer.drawToleranceInfo(tempToleranceActive, GuiAlyzer.COLUMN_1);
-			guiAlyzer.drawToleranceInfo(tempToleranceInactive, GuiAlyzer.COLUMN_2);
-	
-			textLayout.newLine(16);
-	
-			guiAlyzer.drawRow(Translator.translateToLocal("for.gui.humidity"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getHumidity()),
-					AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getHumidity()), bee, EnumBeeChromosome.SPECIES);
-	
-			textLayout.newLine();
-	
-			IAlleleTolerance humidToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE);
-			IAlleleTolerance humidToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE);
-			textLayout.drawLine("  " + Translator.translateToLocal("for.gui.tolerance"), GuiAlyzer.COLUMN_0);
-			guiAlyzer.drawToleranceInfo(humidToleranceActive, GuiAlyzer.COLUMN_1);
-			guiAlyzer.drawToleranceInfo(humidToleranceInactive, GuiAlyzer.COLUMN_2);
-	
-			textLayout.newLine(16);
-	
-			String yes = Translator.translateToLocal("for.yes");
-			String no = Translator.translateToLocal("for.no");
-	
-			String diurnal0, diurnal1, nocturnal0, nocturnal1;
-			if (bee.getGenome().getNeverSleeps()) {
-				nocturnal0 = diurnal0 = yes;
-			} else {
-				nocturnal0 = bee.getGenome().getPrimary().isNocturnal() ? yes : no;
-				diurnal0 = !bee.getGenome().getPrimary().isNocturnal() ? yes : no;
-			}
-			if (((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.NEVER_SLEEPS)).getValue()) {
-				nocturnal1 = diurnal1 = yes;
-			} else {
-				nocturnal1 = bee.getGenome().getSecondary().isNocturnal() ? yes : no;
-				diurnal1 = !bee.getGenome().getSecondary().isNocturnal() ? yes : no;
-			}
-	
-			textLayout.drawLine(Translator.translateToLocal("for.gui.diurnal"), GuiAlyzer.COLUMN_0);
-			textLayout.drawLine(diurnal0, GuiAlyzer.COLUMN_1, guiAlyzer.getColorCoding(false));
-			textLayout.drawLine(diurnal1, GuiAlyzer.COLUMN_2, guiAlyzer.getColorCoding(false));
-			textLayout.newLineCompressed();
-	
-			textLayout.drawLine(Translator.translateToLocal("for.gui.nocturnal"), GuiAlyzer.COLUMN_0);
-			textLayout.drawLine(nocturnal0, GuiAlyzer.COLUMN_1, guiAlyzer.getColorCoding(false));
-			textLayout.drawLine(nocturnal1, GuiAlyzer.COLUMN_2, guiAlyzer.getColorCoding(false));
-			textLayout.newLineCompressed();
-	
-			String primary = StringUtil.readableBoolean(bee.getGenome().getToleratesRain(), yes, no);
-			String secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TOLERATES_RAIN)).getValue(), yes, no);
-	
-			guiAlyzer.drawRow(Translator.translateToLocal("for.gui.flyer"), primary, secondary, bee, EnumBeeChromosome.TOLERATES_RAIN);
-	
-			textLayout.newLineCompressed();
-	
-			primary = StringUtil.readableBoolean(bee.getGenome().getCaveDwelling(), yes, no);
-			secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.CAVE_DWELLING)).getValue(), yes, no);
-	
-			guiAlyzer.drawRow(Translator.translateToLocal("for.gui.cave"), primary, secondary, bee, EnumBeeChromosome.CAVE_DWELLING);
-	
-			textLayout.newLine();
-	
-			String displayText;
-			if (type == EnumBeeType.PRINCESS || type == EnumBeeType.QUEEN) {
-				String displayTextKey = "for.bees.stock.pristine";
-				if (!bee.isNatural()) {
-					displayTextKey = "for.bees.stock.ignoble";
-				}
-				displayText = Translator.translateToLocal(displayTextKey);
-				textLayout.drawCenteredLine(displayText, 8, 208, guiAlyzer.getFontColor().get("gui.beealyzer.binomial"));
-			}
-	
-			if (bee.getGeneration() >= 0) {
-				textLayout.newLineCompressed();
-				displayText = Translator.translateToLocalFormatted("for.gui.beealyzer.generations", bee.getGeneration());
-				textLayout.drawCenteredLine(displayText, 8, 208, guiAlyzer.getFontColor().get("gui.beealyzer.binomial"));
-			}
-	
-			textLayout.endPage();
-		}
-	}
+		textLayout.newLine();
+		textLayout.newLine();
+		textLayout.newLine();
+		textLayout.newLine();
 
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void drawAnalyticsPage3(GuiScreen gui, ItemStack itemStack) {
-		if(gui instanceof GuiAlyzer){
-			GuiAlyzer guiAlyzer = (GuiAlyzer) gui;
-			IBee bee = BeeManager.beeRoot.getMember(itemStack);
-			if (bee == null) {
-				return;
+		textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.specialty") + ":", GuiAlyzer.COLUMN_0);
+		textLayout.newLine();
+
+		x = GuiAlyzer.COLUMN_0;
+		for (ItemStack stack : bee.getSpecialtyList()) {
+			widgetManager.add(new ItemStackWidget(widgetManager, x, textLayout.getLineY(), stack));
+
+			x += 18;
+			if (x > 148) {
+				x = GuiAlyzer.COLUMN_0;
+				textLayout.newLine();
 			}
-	
-			TextLayoutHelper textLayout = guiAlyzer.getTextLayout();
-			WidgetManager widgetManager = guiAlyzer.getWidgetManager();
-			
-			textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2);
-	
-			textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.produce") + ":", GuiAlyzer.COLUMN_0);
-	
-			textLayout.newLine();
-	
-			int x = GuiAlyzer.COLUMN_0;
-			for (ItemStack stack : bee.getProduceList()) {
-				widgetManager.add(new ItemStackWidget(widgetManager, x, textLayout.getLineY(), stack));
-	
-				x += 18;
-				if (x > 148) {
-					x = GuiAlyzer.COLUMN_0;
-					textLayout.newLine();
-				}
-			}
-	
-			textLayout.newLine();
-			textLayout.newLine();
-			textLayout.newLine();
-			textLayout.newLine();
-	
-			textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.specialty") + ":", GuiAlyzer.COLUMN_0);
-			textLayout.newLine();
-	
-			x = GuiAlyzer.COLUMN_0;
-			for (ItemStack stack : bee.getSpecialtyList()) {
-				widgetManager.add(new ItemStackWidget(widgetManager, x, textLayout.getLineY(), stack));
-	
-				x += 18;
-				if (x > 148) {
-					x = GuiAlyzer.COLUMN_0;
-					textLayout.newLine();
-				}
-			}
-	
-			textLayout.endPage();
 		}
+
+		textLayout.endPage();
 	}
 
 	@Override

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

@@ -21,7 +21,7 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 import net.minecraftforge.common.BiomeDictionary;
-import net.minecraftforge.common.MinecraftForge;
+
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeChromosome;
 import forestry.api.apiculture.EnumBeeType;
@@ -32,7 +32,6 @@ import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeMutationBuilder;
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
-import forestry.api.genetics.AlleleSpeciesRegisterEvent;
 import forestry.api.genetics.IAllele;
 import forestry.apiculture.PluginApiculture;
 import forestry.apiculture.genetics.alleles.AlleleEffect;
@@ -1020,7 +1019,6 @@ public enum BeeDefinition implements IBeeDefinition {
 		for (BeeDefinition bee : values()) {
 			bee.registerMutations();
 		}
-		MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(BeeManager.beeRoot));
 	}
 	
 	public static void preInit() {

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

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