Version 5.2.17

Add Actuallly Additions crops also to orchard.

README.md

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

build.gradle

@@ -1,14 +1,7 @@
 buildscript {
 	repositories {
 		jcenter()
-		maven {
-			name = "forge"
-			url = "http://files.minecraftforge.net/maven"
-		}
-				maven {
-			name = "sonatype"
-			url = "https://oss.sonatype.org/content/repositories/snapshots/"
-		}
+		maven { url = "http://files.minecraftforge.net/maven" }
 	}
 	dependencies {
 		classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
@@ -16,11 +9,10 @@ buildscript {
 }
 
 plugins {
-	id "net.minecraftforge.gradle.forge" version "2.0.2"
 	id "com.matthewprenger.cursegradle" version "1.0.7"
 	id "se.bjurr.gitchangelog.git-changelog-gradle-plugin" version "1.32"
 }
-
+apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'maven'
 
 version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber()
@@ -98,6 +90,9 @@ processResources {
 		exclude 'mcmod.info'
 		exclude '**/*.md'
 	}
+
+	// Move access transformers to META-INF
+	rename '(.+_at.cfg)', 'META-INF/$1'
 }
 
 // prevent java 8's strict doclint for javadocs from failing builds
@@ -108,12 +103,8 @@ 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/**/*.*'
+	manifest {
+		attributes 'FMLAT': 'forestry_at.cfg'
 	}
 }
 

gradle.properties

@@ -1,11 +1,11 @@
 mcversion=1.10.2
-forgeversion=12.18.0.2005-1.10.0
-mcp_mappings=snapshot_20160525
+forgeversion=12.18.2.2125
+mcp_mappings=snapshot_20161111
 
-tesla_version=1.9.4-1.1.0.24
-jei_version=3.7.3.221
-ic2_version=2.6.5-ex110
+tesla_version=1.10.2-1.2.1.49
+jei_version=3.13.2.349
+ic2_version=2.6.76-ex110
 
 version_major=5
-version_minor=1
-version_patch=11
+version_minor=2
+version_patch=17

src/main/java/forestry/Forestry.java

@@ -12,6 +12,20 @@ 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;
@@ -26,20 +40,6 @@ 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
  *
@@ -51,8 +51,8 @@ import forestry.plugins.PluginManager;
 		version = Constants.VERSION,
 		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
 		acceptedMinecraftVersions = "[1.10]",
-		dependencies = "required-after:Forge@[12.18.0.1989,);"
-				+ "after:JEI@[3.7.0,);"
+		dependencies = "required-after:Forge@[12.18.1.2080,);"
+				+ "after:JEI@[3.11.2.278,);"
 				+ "after:" + PluginIC2.modId + ";")
 public class Forestry {
 
@@ -78,6 +78,7 @@ 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

@@ -0,0 +1,13 @@
+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,21 +5,24 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import javax.annotation.Nullable;
+
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 
 /**
- * When implemented by armor piece items, allows them to act as apiarist's armor.
+ * When implemented as a capability by armor items, protects the wearer from negative bee effects.
+ * @see ApicultureCapabilities#ARMOR_APIARIST
  */
 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, String cause, boolean doProtect);
+	boolean protectEntity(EntityLivingBase entity, ItemStack armor, @Nullable String cause, boolean doProtect);
 }

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

@@ -13,9 +13,9 @@ import java.util.Set;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.biome.Biome;
 
-import forestry.api.arboriculture.ITree;
 import forestry.api.core.IErrorState;
 import forestry.api.genetics.IEffectData;
+import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IIndividualLiving;
 
 /**
@@ -85,8 +85,8 @@ public interface IBee extends IIndividualLiving {
 
 	void plantFlowerRandom(IBeeHousing housing);
 
-	ITree retrievePollen(IBeeHousing housing);
+	IIndividual retrievePollen(IBeeHousing housing);
 
-	boolean pollinateRandom(IBeeHousing housing, ITree pollen);
+	boolean pollinateRandom(IBeeHousing housing, IIndividual pollen);
 
 }

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

@@ -5,6 +5,8 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.util.math.Vec3i;
 
 import forestry.api.genetics.EnumTolerance;
@@ -20,9 +22,11 @@ import forestry.api.genetics.IGenome;
 public interface IBeeGenome extends IGenome {
 
 	@Override
+	@Nonnull
 	IAlleleBeeSpecies getPrimary();
 	
 	@Override
+	@Nonnull
 	IAlleleBeeSpecies getSecondary();
 
 	float getSpeed();

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

@@ -5,58 +5,44 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import javax.annotation.Nonnull;
-
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-
 import com.mojang.authlib.GameProfile;
-
-import forestry.api.core.EnumHumidity;
-import forestry.api.core.EnumTemperature;
+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;
 
-public interface IBeeHousing extends IHousing, IErrorLogicSource {
+public interface IBeeHousing extends IHousing, IErrorLogicSource, IClimateProvider, ILocatable {
 
 	/**
-	 * Used by BeeManager.beeRoot.createBeeHousingModifier(IBeeHousing housing)
+	 * Used by {@link IBeeRoot#createBeeHousingModifier(IBeeHousing)}
 	 * to combine bee modifiers from several sources that can change over time.
 	 * @return IBeeModifiers from the housing, frames, etc.
 	 */
 	Iterable<IBeeModifier> getBeeModifiers();
 
 	/**
-	 * Used by BeeManager.beeRoot.createBeeHousingListener(IBeeHousing housing)
+	 * Used by {@link IBeeRoot#createBeeHousingListener(IBeeHousing)}
 	 * 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();
+	
+	boolean isRaining();
 
 	GameProfile getOwner();
 
 	/**
 	 * @since Forestry 4.2
-	 * @return exact coordinates where bee FX should spawn from
+	 * @return exact coordinates where bee particle FX should spawn from
 	 */
 	Vec3d getBeeFXCoordinates();
 }

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

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

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

@@ -0,0 +1,14 @@
+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,51 @@ 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(4),
+	TEAK(4),
+	ACACIA(4),
+	LIME(4),
+	CHESTNUT(4),
+	WENGE(4),
+	BAOBAB(4),
+	SEQUOIA(3, 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(4),
+	EBONY(4),
+	MAHOGANY(4),
+	BALSA(4, 1.0f),
+	WILLOW(4),
+	WALNUT(4),
+	GREENHEART(4, 7.5f),
+	CHERRY(4),
 
-	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(4),
+	POPLAR(4),
+	PALM(4),
+	PAPAYA(4),
+	PINE(4, 3.0f),
+	PLUM(4),
+	MAPLE(4),
+	CITRUS(4),
 
-	GIGANTEUM(3, 18, 4.0f),
-	IPE(4, 20),
-	PADAUK(4, 20),
-	COCOBOLO(4, 20),
-	ZEBRAWOOD(4, 20);
+	GIGANTEUM(3, 4.0f),
+	IPE(4),
+	PADAUK(4),
+	COCOBOLO(4),
+	ZEBRAWOOD(4);
 
 	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(int carbonization) {
+		this(carbonization, DEFAULT_HARDNESS);
 	}
 
-	EnumForestryWoodType(int carbonization, int combustability, float hardness) {
+	EnumForestryWoodType(int carbonization, float hardness) {
 		this.carbonization = carbonization;
-		this.combustability = combustability;
 		this.hardness = hardness;
 	}
 
@@ -92,11 +90,45 @@ public enum EnumForestryWoodType implements IWoodType {
 		return VALUES[meta];
 	}
 
+	@Override
 	public int getCarbonization() {
 		return carbonization;
 	}
+	
+	@Override
+	public float getCharcoalChance(int numberOfCharcoal) {
+		if(numberOfCharcoal == 3){
+			return 0.75F;
+		}else if(numberOfCharcoal == 4){
+			return 0.5F;
+		}else if(numberOfCharcoal == 5){
+			return 0.25F;
+		}
+		return 0.15F;
+	}
 
-	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/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, 5),
+	SPRUCE(BlockPlanks.EnumType.SPRUCE, 4),
+	BIRCH(BlockPlanks.EnumType.BIRCH, 4),
+	JUNGLE(BlockPlanks.EnumType.JUNGLE, 5),
+	ACACIA(BlockPlanks.EnumType.ACACIA, 4),
+	DARK_OAK(BlockPlanks.EnumType.DARK_OAK, 5);
 
 	public static final EnumVanillaWoodType[] VALUES = values();
 
@@ -22,12 +22,10 @@ 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, int carbonization) {
 		this.vanillaType = vanillaType;
 		this.carbonization = carbonization;
-		this.combustability = combustability;
 	}
 
 	public BlockPlanks.EnumType getVanillaType() {
@@ -66,9 +64,56 @@ public enum EnumVanillaWoodType implements IWoodType {
 	public int getCarbonization() {
 		return carbonization;
 	}
+	
+	@Override
+	public float getCharcoalChance(int numberOfCharcoal) {
+		if(numberOfCharcoal == 3){
+			return 0.75F;
+		}else if(numberOfCharcoal == 4){
+			return 0.5F;
+		}else if(numberOfCharcoal == 5){
+			return 0.25F;
+		}
+		return 0.15F;
+	}
 
 	@Override
-	public int getCombustability() {
-		return combustability;
+	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/IGermlingModelProvider.java

@@ -26,4 +26,12 @@ public interface IGermlingModelProvider {
 
 	@Nonnull
 	ModelResourceLocation getModel(EnumGermlingType type);
+
+	/**
+	 * Provides color for sapling. See {@link ILeafSpriteProvider} for pollen color.
+	 * @param type the germling type to render
+	 * @param renderPass renderPass of rendering
+	 * @return sapling color for renderPass
+	 */
+	int getSpriteColor(EnumGermlingType type, int renderPass);
 }

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

@@ -12,9 +12,11 @@ import forestry.api.genetics.IGenome;
 public interface ITreeGenome extends IGenome {
 
 	@Override
+	@Nonnull
 	IAlleleTreeSpecies getPrimary();
 
 	@Override
+	@Nonnull
 	IAlleleTreeSpecies getSecondary();
 
 	@Nonnull

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

@@ -5,6 +5,7 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -13,13 +14,13 @@ 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 forestry.api.genetics.ISpeciesRootPollinatable;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-public interface ITreeRoot extends ISpeciesRoot {
+public interface ITreeRoot extends ISpeciesRootPollinatable {
 
 	@Override
 	boolean isMember(ItemStack itemstack);
@@ -78,7 +79,7 @@ public interface ITreeRoot extends ISpeciesRoot {
 	@Override
 	IChromosome[] templateAsChromosomes(IAllele[] templateActive, IAllele[] templateInactive);
 
-	boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, BlockPos pos);
+	boolean setFruitBlock(@Nonnull World world, @Nonnull IAlleleFruit allele, float sappiness, BlockPos pos);
 
 	/* GAME MODE */
 	List<ITreekeepingMode> getTreekeepingModes();

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

@@ -5,6 +5,8 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
+import java.util.List;
+
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 
@@ -22,5 +24,7 @@ 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

@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * 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

@@ -31,13 +31,13 @@ public interface IWoodProvider {
 	 */
 	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();
+	
+	/**
+	 * The chance that a pile has to drop a extra charcoal
+	 */
+	float getCharcoalChance(int numberOfCharcoal);
 }

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

@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * 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

@@ -12,6 +12,16 @@ public interface IWoodType extends IStringSerializable {
 	float getHardness();
 
 	int getCarbonization();
-
-	int getCombustability();
+	
+	float getCharcoalChance(int numberOfCharcoal);
+	
+	String getPlankTexture();
+	
+	String getDoorLowerTexture();
+	
+	String getDoorUpperTexture();
+	
+	String getBarkTexture();
+	
+	String getHeartTexture();
 }

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

@@ -1,12 +1,68 @@
 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;
+	LOG, PLANKS, SLAB, FENCE, FENCE_GATE, STAIRS, DOOR(false);
 
+	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,10 +10,6 @@ import java.util.List;
 public interface ICircuit {
 	String getUID();
 
-	boolean requiresDiscovery();
-
-	int getLimit();
-
 	String getUnlocalizedName();
 
 	boolean isCircuitable(Object tile);

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

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

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

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

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

@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * 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

@@ -0,0 +1,14 @@
+/*******************************************************************************
+ * 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/IClimateControlled.java

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

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

@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * 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);
+	
+	@Nonnull
+	IClimateProvider getDefaultClimate(World world, BlockPos pos);
+	
+	void addRegion(IClimateRegion region);
+	
+	void removeRegion(IClimateRegion region);
+	
+	void addSource(IClimateSourceProvider source);
+	
+	void removeSource(IClimateSourceProvider source);
+	
+	@Nullable
+	IClimatePosition getPosition(World world, BlockPos pos);
+	
+	@Nullable
+	IClimateRegion getRegionForPos(World world, BlockPos pos);
+	
+	@Nonnull
+	Map<Integer, List<IClimateRegion>> getRegions();
+	
+}

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

@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * 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

@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * 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

@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * 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

@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * 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.
+	 * @return Return true if the the climate has changed.
+	 */
+	boolean 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

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * 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

@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * 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/climate/package-info.java

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

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

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

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

@@ -60,15 +60,15 @@ public enum EnumTemperature {
 		}
 	}
 
-	public static EnumTemperature getFromBiome(Biome Biome) {
-		if (BiomeHelper.isBiomeHellish(Biome)) {
+	public static EnumTemperature getFromBiome(Biome biome) {
+		if (BiomeHelper.isBiomeHellish(biome)) {
 			return HELLISH;
 		}
-		return getFromValue(Biome.getTemperature());
+		return getFromValue(biome.getTemperature());
 	}
 
-	public static EnumTemperature getFromBiome(Biome Biome, World world, BlockPos pos) {
-		if (BiomeHelper.isBiomeHellish(Biome)) {
+	public static EnumTemperature getFromBiome(Biome biome, World world, BlockPos pos) {
+		if (BiomeHelper.isBiomeHellish(biome)) {
 			return HELLISH;
 		}
 		float temperature = ForestryAPI.climateManager.getTemperature(world, pos);

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

@@ -7,6 +7,7 @@ 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,20 +5,23 @@
  ******************************************************************************/
 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 when the naturalist's armor acts as spectacles for seeing pollinated tree leaves/flowers.
+	 * Called to see if this naturalist's armor allows 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

@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * 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);
+	
+	void addModIdToBlackList(@Nonnull String type, @Nonnull String modID);
+	
+	boolean isItemBlackListed(@Nonnull String type, @Nonnull ItemStack camouflageBlock);
+	
+	ICamouflageItemHandler getHandlerFromItem(ItemStack stack);
+	
+}

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

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

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

@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * 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 {
 
-	EnumCamouflageType getCamouflageType();
+	String getCamouflageType();
 	
 	BlockPos getCoordinates();
 	

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

@@ -6,7 +6,6 @@
 package forestry.api.core;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -27,7 +26,10 @@ public interface IErrorState {
 	@SideOnly(Side.CLIENT)
 	void registerSprite();
 
-	@SideOnly(value = Side.CLIENT)
+	/**
+	 * Sprite registered to the Gui Texture Map at {@link ITextureManager}
+	 */
+	@SideOnly(Side.CLIENT)
 	TextureAtlasSprite getSprite();
 
 }

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

@@ -1,21 +1,21 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package forestry.core.tiles;
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-public interface ILocatable {
-	BlockPos getCoordinates();
-
-	/** Must not be named "getWorld" to avoid SpecialSource issue https://github.com/md-5/SpecialSource/issues/12 */
-	World getWorldObj();
-}
+/*******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v3
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ ******************************************************************************/
+package forestry.api.core;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface ILocatable {
+	BlockPos getCoordinates();
+
+	/** Must not be named "getWorld" to avoid SpecialSource issue https://github.com/md-5/SpecialSource/issues/12 */
+	World getWorldObj();
+}

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

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

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

@@ -8,8 +8,6 @@ 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/core/ITextureManager.java

@@ -6,13 +6,29 @@
 package forestry.api.core;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+/**
+ * Get the instance from {@link ForestryAPI#textureManager}.
+ */
 @SideOnly(Side.CLIENT)
 public interface ITextureManager {
 
+	/**
+	 * Location of the Forestry Gui Texture Map.
+	 * Used for binding with {@link net.minecraft.client.renderer.texture.TextureManager#bindTexture(ResourceLocation)}
+	 */
+	ResourceLocation getGuiTextureMap();
+
+	/**
+	 * Get a texture atlas sprite that has been registered by Forestry, for Forestry's Gui Texture Map.
+	 */
 	TextureAtlasSprite getDefault(String ident);
 
+	/**
+	 * Register a sprite with Forestry's Gui Texture Map.
+	 */
+	TextureAtlasSprite registerGuiSprite(ResourceLocation location);
 }

src/main/java/forestry/api/core/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 = "Forestry", provides = "ForestryAPI|core")
+@API(apiVersion = "5.1.0", owner = "Forestry", provides = "ForestryAPI|core")
 package forestry.api.core;
 
 import net.minecraftforge.fml.common.API;

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

@@ -8,6 +8,10 @@ package forestry.api.farming;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 
+import net.minecraft.item.ItemStack;
+
+import java.util.LinkedHashMap;
+
 import javax.annotation.Nonnull;
 
 public class Farmables {
@@ -18,5 +22,8 @@ public class Farmables {
 	 */
 	@Nonnull
 	public static final Multimap<String, IFarmable> farmables = HashMultimap.create();
+	
+	@Nonnull
+	public static final LinkedHashMap<ItemStack, Integer> fertilizers = new LinkedHashMap();
 
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,20 @@
+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,23 +3,22 @@ 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(GuiAlyzer gui, ItemStack itemStack);
+	void drawAnalyticsPage1(GuiScreen gui, ItemStack itemStack);
 
 	@SideOnly(Side.CLIENT)
-	void drawAnalyticsPage2(GuiAlyzer gui, ItemStack itemStack);
+	void drawAnalyticsPage2(GuiScreen gui, ItemStack itemStack);
 
 	@SideOnly(Side.CLIENT)
-	void drawAnalyticsPage3(GuiAlyzer gui, ItemStack itemStack);
+	void drawAnalyticsPage3(GuiScreen gui, ItemStack itemStack);
 
 	Map<String, ItemStack> getIconStacks();
 

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

@@ -10,7 +10,6 @@
  ******************************************************************************/
 package forestry.api.genetics;
 
-import forestry.api.arboriculture.ITree;
 import net.minecraftforge.common.EnumPlantType;
 
 /**
@@ -28,7 +27,7 @@ public interface ICheckPollinatable {
 	/**
 	 * @return IIndividual containing the genetic information of this IPollinatable
 	 */
-	ITree getPollen();
+	IIndividual getPollen();
 
 	/**
 	 * Checks whether this can mate with the given pollen.
@@ -38,7 +37,7 @@ public interface ICheckPollinatable {
 	 * @param pollen IIndividual representing the pollen.
 	 * @return true if mating is possible, false otherwise.
 	 */
-	boolean canMateWith(ITree pollen);
+	boolean canMateWith(IIndividual pollen);
 
 	/**
 	 * @return true if this has already been pollinated.

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

@@ -5,6 +5,8 @@
  ******************************************************************************/
 package forestry.api.genetics;
 
+import javax.annotation.Nonnull;
+
 import forestry.api.core.INbtWritable;
 
 /**
@@ -14,17 +16,23 @@ import forestry.api.core.INbtWritable;
  */
 public interface IGenome extends INbtWritable {
 
+	@Nonnull
 	IAlleleSpecies getPrimary();
 
+	@Nonnull
 	IAlleleSpecies getSecondary();
 
+	@Nonnull
 	IChromosome[] getChromosomes();
 
+	@Nonnull
 	IAllele getActiveAllele(IChromosomeType chromosomeType);
 
+	@Nonnull
 	IAllele getInactiveAllele(IChromosomeType chromosomeType);
 
 	boolean isGeneticEqual(IGenome other);
-	
+
+	@Nonnull
 	ISpeciesRoot getSpeciesRoot();
 }

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

@@ -5,10 +5,12 @@
  ******************************************************************************/
 package forestry.api.genetics;
 
+import net.minecraft.block.state.IBlockState;
+
+import net.minecraftforge.common.BiomeDictionary;
+
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
-import net.minecraft.block.state.IBlockState;
-import net.minecraftforge.common.BiomeDictionary;
 
 /** Set custom mutation requirements */
 public interface IMutationBuilder {

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

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

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

@@ -5,8 +5,6 @@
  ******************************************************************************/
 package forestry.api.genetics;
 
-import forestry.api.arboriculture.ITree;
-
 /**
  * Can be implemented by tile entities, if they wish to be pollinatable.
  *
@@ -20,5 +18,5 @@ public interface IPollinatable extends ICheckPollinatable {
 	 * @param pollen
 	 *            IIndividual representing the pollen.
 	 */
-	void mateWith(ITree pollen);
+	void mateWith(IIndividual pollen);
 }

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

@@ -0,0 +1,18 @@
+package forestry.api.genetics;
+
+import com.mojang.authlib.GameProfile;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+/**
+ * @since 5.12.16
+ * @author Nedelosk
+ */
+public interface ISpeciesRootPollinatable extends ISpeciesRoot {
+
+	ICheckPollinatable createPollinatable(IIndividual individual);
+	
+	IPollinatable tryConvertToPollinatable(GameProfile owner, World world, final BlockPos pos, final IIndividual pollen);
+	
+}

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

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

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

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

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

@@ -5,15 +5,8 @@
  ******************************************************************************/
 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

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * 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,14 +5,21 @@
  ******************************************************************************/
 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 IGreenhouseState} of a greenhouse, when the pos is a greenhouse
+	 * @return A {@link IGreenhouseController} of a greenhouse, when the pos is a greenhouse
 	 */
-	IGreenhouseState getGreenhouseState(World world, BlockPos pos);
+	IGreenhouseController getGreenhouseController(World world, BlockPos pos);
+	
+	void addGreenhouseLogic(Class<? extends IGreenhouseLogic> logic);
+	
+	List<Class<? extends IGreenhouseLogic>> getGreenhouseLogics();
 	
 }

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

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

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

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * 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,6 +7,7 @@ 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.0.0", owner = "ForestryAPI|core", provides = "ForestryAPI|greenhouse")
+@API(apiVersion = "5.2.0", owner = "ForestryAPI|core", provides = "ForestryAPI|greenhouse")
 package forestry.api.greenhouse;
 
 import net.minecraftforge.fml.common.API;

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

@@ -5,6 +5,8 @@
  ******************************************************************************/
 package forestry.api.lepidopterology;
 
+import javax.annotation.Nonnull;
+
 import forestry.api.genetics.EnumTolerance;
 import forestry.api.genetics.IFlowerProvider;
 import forestry.api.genetics.IGenome;
@@ -12,9 +14,11 @@ import forestry.api.genetics.IGenome;
 public interface IButterflyGenome extends IGenome {
 	
 	@Override
+	@Nonnull
 	IAlleleButterflySpecies getPrimary();
 
 	@Override
+	@Nonnull
 	IAlleleButterflySpecies getSecondary();
 
 	float getSize();

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

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

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

@@ -8,7 +8,7 @@ package forestry.api.lepidopterology;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.passive.IAnimals;
 
-import forestry.api.arboriculture.ITree;
+import forestry.api.genetics.IIndividual;
 
 public interface IEntityButterfly extends IAnimals {
 
@@ -23,9 +23,9 @@ public interface IEntityButterfly extends IAnimals {
 	 */
 	EntityCreature getEntity();
 
-	ITree getPollen();
+	IIndividual getPollen();
 
-	void setPollen(ITree pollen);
+	void setPollen(IIndividual pollen);
 	
 	boolean canMateWith(IEntityButterfly butterfly);
 	

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

@@ -5,10 +5,10 @@
  ******************************************************************************/
 package forestry.api.mail;
 
+import forestry.api.core.ITextureManager;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -31,6 +31,10 @@ public interface IPostalCarrier {
 	 */
 	String getName();
 
+	/**
+	 * Sprite registered to the Gui Texture Map at {@link ITextureManager}.
+	 * Must be 26 pixels wide and 15 pixels tall. The texture itself must be 32x32 square.
+	 */
 	@SideOnly(Side.CLIENT)
 	TextureAtlasSprite getSprite();
 

src/main/java/forestry/api/mail/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|mail")
+@API(apiVersion = "3.1.0", owner = "ForestryAPI|core", provides = "ForestryAPI|mail")
 package forestry.api.mail;
 
 import net.minecraftforge.fml.common.API;

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.core.IClimateControlled;
+import forestry.api.climate.IClimateControlled;
 
 /**
  * Needs to be implemented by TileEntities that want to be part of an alveary.

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

@@ -5,8 +5,10 @@
  ******************************************************************************/
 package forestry.api.multiblock;
 
-import forestry.api.core.IClimateControlled;
-import forestry.api.greenhouse.IGreenhouseHousing;
+import forestry.api.climate.IClimateControl;
+import forestry.api.climate.IClimateControlProvider;
+import forestry.api.climate.IClimateSourceProvider;
+import forestry.api.climate.IClimatiserDefinition;
 import forestry.api.greenhouse.IGreenhouseListener;
 import forestry.api.lepidopterology.IButterflyCocoon;
 import net.minecraft.item.ItemStack;
@@ -19,11 +21,17 @@ 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 {
-		<G extends IGreenhouseController & IGreenhouseHousing & IClimateControlled> void changeClimate(int tickCount, G greenhouse);
+	interface Climatiser extends IGreenhouseComponent, IClimateSourceProvider {
+		IClimatiserDefinition getDefinition();
 	}
 	
 	interface ButterflyHatch extends IGreenhouseComponent {

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

@@ -7,13 +7,18 @@ 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, IClimateControlled {
+public interface IGreenhouseController extends IMultiblockController, IGreenhouseHousing, ICamouflageHandler, IClimateControlProvider {
 	
 	/**
 	 * Handle change events.
@@ -24,5 +29,12 @@ 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,4 +15,6 @@ public interface IMultiblockLogicFactory {
 	IMultiblockLogicFarm createFarmLogic();
 	
 	IMultiblockLogicGreenhouse createGreenhouseLogic();
+	
+	IMultiblockLogicCharcoalPile createCharcoalPileLogic();
 }

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

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

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

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

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

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

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

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

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

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

src/main/java/forestry/apiculture/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,12 +25,16 @@ public class ArmorApiaristHelper implements IArmorApiaristHelper {
 			return false;
 		}
 
-		Item item = stack.getItem();
-		if (!(item instanceof IArmorApiarist)) {
+		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 {
 			return false;
 		}
 
-		IArmorApiarist armorApiarist = (IArmorApiarist) item;
 		return armorApiarist.protectEntity(entity, stack, cause, doProtect);
 	}
 

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

@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.Stack;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
@@ -38,10 +39,10 @@ import forestry.api.apiculture.IBeeHousingInventory;
 import forestry.api.apiculture.IBeeListener;
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.apiculture.IBeekeepingLogic;
-import forestry.api.arboriculture.ITree;
 import forestry.api.core.IErrorLogic;
 import forestry.api.core.IErrorState;
 import forestry.api.genetics.IEffectData;
+import forestry.api.genetics.IIndividual;
 import forestry.apiculture.network.packets.PacketBeeLogicActive;
 import forestry.apiculture.network.packets.PacketBeeLogicActiveEntity;
 import forestry.core.config.Constants;
@@ -195,7 +196,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 			queenStack = null;
 		}
 
-		if (!ItemStack.areItemStacksEqual(this.queenStack, queenStack)) {
+		if (this.queenStack != queenStack) {
 			this.queen = BeeManager.beeRoot.getMember(queenStack);
 			this.queenStack = queenStack;
 			hasFlowersCache.clear();
@@ -486,6 +487,9 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 
 	@Override
 	public boolean canDoBeeFX() {
+		if(Proxies.common.getClientInstance().isGamePaused()){
+			return false;
+		}
 		return active;
 	}
 
@@ -528,7 +532,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 	private static class PollenHandler {
 		private static final int MAX_POLLINATION_ATTEMPTS = 20;
 
-		private ITree pollen;
+		private IIndividual pollen;
 		private int attemptedPollinations = 0;
 
 		public void doPollination(IBee queen, IBeeHousing beeHousing, IBeeListener beeListener) {

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

@@ -10,8 +10,6 @@
  ******************************************************************************/
 package forestry.apiculture;
 
-import com.google.common.collect.ImmutableMap;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -19,38 +17,12 @@ import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 
-import net.minecraft.block.BlockFlower;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.entity.passive.EntityVillager;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.chunk.IChunkGenerator;
-import net.minecraft.world.storage.loot.LootTableList;
-
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.BiomeDictionary;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fml.common.FMLCommonHandler;
-import net.minecraftforge.fml.common.SidedProxy;
-import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.fml.common.registry.VillagerRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
+import com.google.common.collect.ImmutableMap;
 import forestry.Forestry;
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
 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;
@@ -65,6 +37,7 @@ 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;
@@ -101,6 +74,7 @@ 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;
@@ -119,6 +93,33 @@ 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 {
@@ -164,6 +165,9 @@ 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
@@ -266,7 +270,7 @@ public class PluginApiculture extends BlankForestryPlugin {
 			VillagerRegistry villagerRegistry = VillagerRegistry.instance();
 			villagerRegistry.registerVillageCreationHandler(villageHandler);
 
-			villagerApiarist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_APIARIST, Constants.TEXTURE_SKIN_BEEKPEEPER);
+			villagerApiarist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_APIARIST, Constants.TEXTURE_SKIN_BEEKPEEPER, Constants.TEXTURE_SKIN_ZOMBIE_BEEKPEEPER);
 			villagerRegistry.register(villagerApiarist);
 
 			ItemStack wildcardPrincess = new ItemStack(items.beePrincessGE, 1);
@@ -316,6 +320,8 @@ public class PluginApiculture extends BlankForestryPlugin {
 
 		// Register acceptable plants
 		flowerRegistry.registerAcceptableFlower(Blocks.DRAGON_EGG, FlowerManager.FlowerTypeEnd);
+		flowerRegistry.registerAcceptableFlower(Blocks.CHORUS_PLANT, FlowerManager.FlowerTypeEnd);
+		flowerRegistry.registerAcceptableFlower(Blocks.CHORUS_FLOWER, FlowerManager.FlowerTypeEnd);
 		flowerRegistry.registerAcceptableFlower(Blocks.VINE, FlowerManager.FlowerTypeJungle);
 		flowerRegistry.registerAcceptableFlower(Blocks.TALLGRASS, FlowerManager.FlowerTypeJungle);
 		flowerRegistry.registerAcceptableFlower(Blocks.WHEAT, FlowerManager.FlowerTypeWheat);
@@ -559,7 +565,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.WATER, 2000));
+			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, 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,10 +12,11 @@ package forestry.apiculture.blocks;
 
 import forestry.api.core.Tabs;
 import forestry.core.blocks.BlockBase;
+import net.minecraft.block.material.Material;
 
 public class BlockApiculture extends BlockBase<BlockTypeApiculture> {
 	public BlockApiculture(BlockTypeApiculture type) {
-		super(type);
+		super(type, Material.WOOD);
 		setCreativeTab(Tabs.tabApiculture);
 		setHarvestLevel("axe", 0);
 	}

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

@@ -162,7 +162,7 @@ public class BlockBeeHives extends BlockContainer implements IItemModelRegister,
 
 	private static List<IHiveDrop> getDropsForHive(int meta) {
 		String hiveName = getHiveNameForMeta(meta);
-		if (hiveName == null) {
+		if (hiveName == null || hiveName.equals(HiveType.SWARM.getHiveUid())) {
 			return Collections.emptyList();
 		}
 		return PluginApiculture.hiveRegistry.getDrops(hiveName);

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

@@ -120,7 +120,8 @@ public class BlockCandle extends BlockTorch implements IItemModelRegister, ITile
 	
 	@Override
 	public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
-		if (((TileCandle) world.getTileEntity(pos)).isLit()) {
+		TileCandle tileCandle = TileUtil.getTile(world, pos, TileCandle.class);
+		if (tileCandle != null && tileCandle.isLit()) {
 			state = state.withProperty(STATE, State.ON);
 		}
 		return super.getActualState(state, world, pos);
@@ -286,6 +287,11 @@ 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
@@ -322,19 +328,11 @@ public class BlockCandle extends BlockTorch implements IItemModelRegister, ITile
 	}
 
 	public ItemStack getUnlitCandle(int amount) {
-		ItemStack itemStack = new ItemStack(this, amount, 0);
-		NBTTagCompound tag = new NBTTagCompound();
-		tag.setInteger(BlockCandle.colourTagName, 0xffffff);
-		itemStack.setTagCompound(tag);
-		return itemStack;
+		return new ItemStack(this, amount, 0);
 	}
 
 	public ItemStack getLitCandle(int amount) {
-		ItemStack itemStack = new ItemStack(this, amount, 1);
-		NBTTagCompound tag = new NBTTagCompound();
-		tag.setInteger(BlockCandle.colourTagName, 0xffffff);
-		itemStack.setTagCompound(tag);
-		return itemStack;
+		return new ItemStack(this, amount, 1);
 	}
 
 	@Override

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

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

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

@@ -60,10 +60,11 @@ 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) | 0x08);
+			IBlockState activatedState = PluginApiculture.blocks.candle.getStateFromMeta(block.getMetaFromState(blockState));
 			worldIn.setBlockState(pos, activatedState, Constants.FLAG_BLOCK_SYNC);
 			TileCandle tc = new TileCandle();
-			tc.setColour(0); // default to white
+			tc.setColour(16777215); // default to white
+			tc.setLit(true);
 			worldIn.setTileEntity(pos, tc);
 			return true;
 		}

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

@@ -34,7 +34,7 @@ public enum BlockTypeApicultureTesr implements IBlockTypeTesr {
 	private final IMachinePropertiesTesr<?> machineProperties;
 
 	<T extends TileForestry> BlockTypeApicultureTesr(@Nonnull Class<T> teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer<? super T> renderer, AxisAlignedBB boundingBox) {
-		this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.MOD_ID + ":blocks/" + name + ".0");
+		this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.MOD_ID + ":blocks/" + name + ".0", false);
 	}
 
 	@Nonnull

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

@@ -0,0 +1,20 @@
+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;
+	}
+}