Bump version

Adding Greenhouse Window, Climate Control,  Camouflage Spray Can and Improve Recipes

build.gradle

@@ -108,13 +108,7 @@ allprojects {
 }
 
 jar {
-	// Copy redstone api into the jar, should shade this as a maven dep...
-	from (sourceSets.api.allSource) {
-		include 'cofh/**/*.txt'
-	}
-	from (sourceSets.api.output.classesDir) {
-		include 'cofh/**/*.*'
-	}
+
 }
 
 task sourcesJar(type: Jar) {

gradle.properties

@@ -1,11 +1,11 @@
 mcversion=1.10.2
-forgeversion=12.18.0.2005-1.10.0
+forgeversion=12.18.1.2080
 mcp_mappings=snapshot_20160525
 
-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.42
+jei_version=3.8.1.242
+ic2_version=2.6.38-ex110
 
 version_major=5
 version_minor=2
-version_patch=0
+version_patch=10

src/main/java/forestry/Forestry.java

@@ -28,6 +28,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
 
 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;
@@ -51,8 +52,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.8.0,);"
 				+ "after:" + PluginIC2.modId + ";")
 public class Forestry {
 
@@ -78,6 +79,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/IBeeHousing.java

@@ -9,16 +9,13 @@ 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.genetics.IHousing;
 
-public interface IBeeHousing extends IHousing, IErrorLogicSource {
+public interface IBeeHousing extends IHousing, IErrorLogicSource, IClimateProvider {
 
 	/**
 	 * Used by BeeManager.beeRoot.createBeeHousingModifier(IBeeHousing housing)
@@ -39,10 +36,6 @@ public interface IBeeHousing extends IHousing, IErrorLogicSource {
 
 	IBeekeepingLogic getBeekeepingLogic();
 
-	EnumTemperature getTemperature();
-
-	EnumHumidity getHumidity();
-
 	int getBlockLightValue();
 
 	boolean canBlockSeeTheSky();
@@ -50,8 +43,6 @@ public interface IBeeHousing extends IHousing, IErrorLogicSource {
 	/** Must not be named "getWorld" to avoid SpecialSource issue https://github.com/md-5/SpecialSource/issues/12 */
 	World getWorldObj();
 
-	Biome getBiome();
-
 	GameProfile getOwner();
 
 	/**

src/main/java/forestry/api/apiculture/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/EnumForestryWoodType.java

@@ -92,11 +92,38 @@ public enum EnumForestryWoodType implements IWoodType {
 		return VALUES[meta];
 	}
 
+	@Override
 	public int getCarbonization() {
 		return carbonization;
 	}
 
+	@Override
 	public int getCombustability() {
 		return combustability;
 	}
+
+	@Override
+	public String getPlankTexture() {
+		return "forestry:blocks/wood/planks." + getName();
+	}
+
+	@Override
+	public String getDoorLowerTexture() {
+		return "forestry:blocks/doors/" + getName() + "_lower";
+	}
+
+	@Override
+	public String getDoorUpperTexture() {
+		return "forestry:blocks/doors/" + getName() + "_upper";
+	}
+
+	@Override
+	public String getBarkTexture() {
+		return "forestry:blocks/wood/bark." + getName();
+	}
+
+	@Override
+	public String getHeartTexture() {
+		return "forestry:blocks/wood/heart." + getName();
+	}
 }

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

@@ -71,4 +71,44 @@ public enum EnumVanillaWoodType implements IWoodType {
 	public int getCombustability() {
 		return combustability;
 	}
+
+	@Override
+	public String getPlankTexture() {
+		if(this == DARK_OAK){
+			return "blocks/planks_big_oak";
+		}
+		return "blocks/planks_" + getName();
+	}
+
+	@Override
+	public String getDoorLowerTexture() {
+		if(this == OAK){
+			return "blocks/door_wood_lower";
+		}
+		return "blocks/door_wood_lower";
+	}
+
+	@Override
+	public String getDoorUpperTexture() {
+		if(this == OAK){
+			return "blocks/door_wood_upper";
+		}
+		return "blocks/door_" + getName() + "_upper";
+	}
+
+	@Override
+	public String getBarkTexture() {
+		if(this == DARK_OAK){
+			return "blocks/log_big_oak";
+		}
+		return "blocks/log_" + getName();
+	}
+
+	@Override
+	public String getHeartTexture() {
+		if(this == DARK_OAK){
+			return "blocks/log_big_oak_top";
+		}
+		return "blocks/log_" + getName() + "_top";
+	}
 }

src/main/java/forestry/api/arboriculture/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/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

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

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

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

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

@@ -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/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/ICamouflageAccess.java

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

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

@@ -6,28 +6,26 @@
 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.
+     */
+    void setCamouflageBlock(String type, ItemStack camouflageBlock);
 }

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/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/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/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/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/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/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/storage/IBackpackDefinition.java

@@ -6,6 +6,7 @@
 package forestry.api.storage;
 
 import javax.annotation.Nonnull;
+import java.util.function.Predicate;
 
 import net.minecraft.item.ItemStack;
 
@@ -41,5 +42,5 @@ public interface IBackpackDefinition {
 	 * @return the backpack's item filter.
 	 */
 	@Nonnull
-	IBackpackFilter getFilter();
+	Predicate<ItemStack> getFilter();
 }

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

@@ -1,21 +0,0 @@
-package forestry.api.storage;
-
-import java.util.function.Predicate;
-
-import net.minecraft.item.ItemStack;
-
-/**
- * Filters items that can be put into a backpack.
- * You can get a specific backpack's filter with {@link IBackpackDefinition#getFilter()}.
- * <p>
- * For Backpack Implementers: you can create a new filter with {@link IBackpackInterface#createBackpackFilter()} or implement your own.
- *
- * @see IBackpackFilterConfigurable
- */
-public interface IBackpackFilter extends Predicate<ItemStack> {
-	/**
-	 * Returns true if the ItemStack is a valid item for this backpack filter.
-	 */
-	@Override
-	boolean test(ItemStack itemstack);
-}

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

@@ -1,5 +1,7 @@
 package forestry.api.storage;
 
+import java.util.function.Predicate;
+
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
@@ -7,7 +9,7 @@ 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 IBackpackFilter {
+public interface IBackpackFilterConfigurable extends Predicate<ItemStack> {
 	/**
 	 * Adds an item as valid for this backpack to pick up.
 	 */

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

@@ -7,6 +7,7 @@ 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;
@@ -84,5 +85,5 @@ public interface IBackpackInterface {
 	 * @return a new backpack filter for the specified species root
 	 * @see #createNaturalistBackpack(String, ISpeciesRoot)
 	 */
-	IBackpackFilter createNaturalistBackpackFilter(String speciesRootUid);
+	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 = "4.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/PluginApiculture.java

@@ -556,7 +556,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/BlockRegistryApiculture.java

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

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

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

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

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

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

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

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

@@ -12,17 +12,6 @@ package forestry.apiculture.items;
 
 import java.util.List;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
 import forestry.api.core.ForestryAPI;
@@ -36,6 +25,15 @@ import forestry.apiculture.inventory.ItemInventoryHabitatLocator;
 import forestry.apiculture.render.TextureHabitatLocator;
 import forestry.core.items.ItemWithGui;
 import forestry.core.utils.Translator;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ItemHabitatLocator extends ItemWithGui implements ISpriteRegister {
 	private static final String iconName = "forestry:items/biomefinder";
@@ -69,6 +67,8 @@ public class ItemHabitatLocator extends ItemWithGui implements ISpriteRegister {
 
 	@Override
 	public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> list, boolean flag) {
+		super.addInformation(itemstack, player, list, flag);
+
 		Biome currentBiome = player.worldObj.getBiome(player.getPosition());
 
 		float temperatureValue = ForestryAPI.climateManager.getTemperature(player.worldObj, player.getPosition());

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

@@ -1,7 +1,10 @@
 package forestry.apiculture.items;
 
-import java.util.List;
-
+import forestry.api.apiculture.IArmorApiarist;
+import forestry.api.apiculture.IHiveTile;
+import forestry.api.core.Tabs;
+import forestry.core.items.ItemForestry;
+import forestry.core.proxy.Proxies;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -9,20 +12,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.EnumHandSide;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
-import forestry.api.apiculture.IArmorApiarist;
-import forestry.api.apiculture.IHiveTile;
-import forestry.api.core.Tabs;
-import forestry.core.items.ItemForestry;
-import forestry.core.proxy.Proxies;
-import forestry.core.utils.Translator;
-
 public class ItemSmoker extends ItemForestry implements IArmorApiarist {
 	public ItemSmoker() {
 		super(Tabs.tabApiculture);
@@ -106,12 +102,6 @@ public class ItemSmoker extends ItemForestry implements IArmorApiarist {
 		return 32;
 	}
 
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
-		super.addInformation(stack, playerIn, tooltip, advanced);
-		tooltip.add(Translator.translateToLocal("item.for.smoker.description"));
-	}
-
 	@Override
 	public boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect) {
 		return true;

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

@@ -15,25 +15,17 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-
 import com.mojang.authlib.GameProfile;
-
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeHousingInventory;
 import forestry.api.apiculture.IBeeListener;
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.apiculture.IBeekeepingLogic;
+import forestry.api.climate.IClimateControlled;
+import forestry.api.core.BiomeHelper;
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
 import forestry.api.core.ForestryAPI;
-import forestry.api.core.IClimateControlled;
 import forestry.api.multiblock.IAlvearyComponent;
 import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.AlvearyBeeModifier;
@@ -48,6 +40,13 @@ import forestry.core.network.DataOutputStreamForestry;
 import forestry.core.proxy.Proxies;
 import forestry.core.utils.BlockUtil;
 import forestry.core.utils.Translator;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
 
 public class AlvearyController extends RectangularMultiblockControllerBase implements IAlvearyControllerInternal, IClimateControlled {
 
@@ -355,8 +354,11 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple
 	@Override
 	public EnumTemperature getTemperature() {
 		IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(this);
-		if (beeModifier.isHellish() && tempChange >= 0) {
-			return EnumTemperature.HELLISH;
+		Biome biome = getBiome();
+		if (beeModifier.isHellish() || BiomeHelper.isBiomeHellish(biome)) {
+			if (tempChange >= 0) {
+				return EnumTemperature.HELLISH;
+			}
 		}
 
 		return EnumTemperature.getFromValue(getExactTemperature());

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

@@ -13,20 +13,20 @@ package forestry.apiculture.multiblock;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumFacing;
-
-import forestry.api.core.IClimateControlled;
+import forestry.api.climate.IClimateControlled;
 import forestry.api.multiblock.IAlvearyComponent;
 import forestry.apiculture.network.packets.PacketActiveUpdate;
 import forestry.core.proxy.Proxies;
 import forestry.core.tiles.IActivatable;
+import forestry.energy.EnergyHelper;
 import forestry.energy.EnergyManager;
-
-import cofh.api.energy.IEnergyReceiver;
+import forestry.energy.EnergyTransferMode;
+import forestry.energy.compat.rf.IEnergyReceiverDelegated;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
 
-public abstract class TileAlvearyClimatiser extends TileAlveary implements IEnergyReceiver, IActivatable, IAlvearyComponent.Climatiser {
+public abstract class TileAlvearyClimatiser extends TileAlveary implements IEnergyReceiverDelegated, IActivatable, IAlvearyComponent.Climatiser {
 
 	private static final int WORK_CYCLES = 1;
 	private static final int ENERGY_PER_OPERATION = 50;
@@ -51,13 +51,13 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner
 		this.definition = definition;
 
 		this.energyManager = new EnergyManager(1000, 2000);
-		this.energyManager.setReceiveOnly();
+		this.energyManager.setExternalMode(EnergyTransferMode.RECEIVE);
 	}
 
 	/* UPDATING */
 	@Override
 	public void changeClimate(int tick, IClimateControlled climateControlled) {
-		if (workingTime < 20 && energyManager.consumeEnergyToDoWork(WORK_CYCLES, ENERGY_PER_OPERATION)) {
+		if (workingTime < 20 && EnergyHelper.consumeEnergyToDoWork(energyManager, WORK_CYCLES, ENERGY_PER_OPERATION)) {
 			// one tick of work for every 10 RF
 			workingTime += ENERGY_PER_OPERATION / 10;
 		}
@@ -124,25 +124,9 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner
 		}
 	}
 
-	/* IEnergyHandler */
 	@Override
-	public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) {
-		return energyManager.receiveEnergy(from, maxReceive, simulate);
-	}
-
-	@Override
-	public int getEnergyStored(EnumFacing from) {
-		return energyManager.getEnergyStored(from);
-	}
-
-	@Override
-	public int getMaxEnergyStored(EnumFacing from) {
-		return energyManager.getMaxEnergyStored(from);
-	}
-
-	@Override
-	public boolean canConnectEnergy(EnumFacing from) {
-		return energyManager.canConnectEnergy(from);
+	public EnergyManager getEnergyManager() {
+		return energyManager;
 	}
 
 	@Override

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

@@ -22,8 +22,7 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
-
-import forestry.api.core.IClimateControlled;
+import forestry.api.climate.IClimateControlled;
 import forestry.api.multiblock.IAlvearyComponent;
 import forestry.apiculture.blocks.BlockAlvearyType;
 import forestry.apiculture.gui.ContainerAlvearyHygroregulator;

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

@@ -47,6 +47,8 @@ import forestry.core.utils.ItemStackUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.entity.monster.EntityPigZombie;
 import net.minecraft.entity.monster.IMob;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -55,6 +57,7 @@ import net.minecraft.network.NetworkManager;
 import net.minecraft.network.play.server.SPacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.EntitySelectors;
 import net.minecraft.util.ITickable;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
@@ -65,20 +68,6 @@ import net.minecraft.world.biome.Biome;
 
 public class TileHive extends TileEntity implements ITickable, IHiveTile, IActivatable, IBeeHousing {
 	private static final DamageSource damageSourceBeeHive = new DamageSourceForestry("bee.hive");
-	private static final Predicate<EntityLivingBase> BEE_TARGET_PREDICATE = new Predicate<EntityLivingBase>() {
-		@Override
-		public boolean apply(@Nullable EntityLivingBase input) {
-			if (input != null && input.isEntityAlive() && !input.isInvisible()) {
-				if (input instanceof EntityPlayer) {
-					EntityPlayer player = (EntityPlayer) input;
-					return !player.isSpectator() && !player.isCreative();
-				} else if (input instanceof IMob) {
-					return true;
-				}
-			}
-			return false;
-		}
-	};
 
 	@Nonnull
 	private final InventoryAdapter contained = new InventoryAdapter(2, "Contained");
@@ -88,6 +77,9 @@ public class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv
 	private final BeekeepingLogic beeLogic;
 	@Nonnull
 	private final IErrorLogic errorLogic;
+	@Nonnull
+	private final Predicate<EntityLivingBase> beeTargetPredicate;
+
 	private IBee containedBee = null;
 	private boolean active = false;
 	private boolean angry = false;
@@ -103,6 +95,7 @@ public class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv
 		inventory = new HiveBeeHousingInventory(this);
 		beeLogic = new BeekeepingLogic(this);
 		errorLogic = ForestryAPI.errorStateRegistry.createErrorLogic();
+		beeTargetPredicate = new BeeTargetPredicate(this);
 	}
 
 	@Override
@@ -127,7 +120,7 @@ public class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv
 				if (calmTime == 0) {
 					if (canWork) {
 						AxisAlignedBB boundingBox = AlleleEffect.getBounding(getContainedBee().getGenome(), this);
-						List<EntityLivingBase> entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, boundingBox, BEE_TARGET_PREDICATE);
+						List<EntityLivingBase> entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, boundingBox, beeTargetPredicate);
 						if (!entities.isEmpty()) {
 							Collections.shuffle(entities);
 							EntityLivingBase entity = entities.get(0);
@@ -371,4 +364,28 @@ public class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv
 		return getPos();
 	}
 
+	private static class BeeTargetPredicate implements Predicate<EntityLivingBase> {
+		@Nonnull
+		private final IHiveTile hive;
+
+		public BeeTargetPredicate(@Nonnull IHiveTile hive) {
+			this.hive = hive;
+		}
+
+		@Override
+		public boolean apply(@Nullable EntityLivingBase input) {
+			if (input != null && input.isEntityAlive() && !input.isInvisible()) {
+				if (input instanceof EntityPlayer) {
+					return EntitySelectors.CAN_AI_TARGET.apply(input);
+				} else if (hive.isAngry()) {
+					return true;
+				} else if (input instanceof IMob) {
+					// don't attack semi-passive vanilla mobs
+					return !(input instanceof EntityEnderman) && !(input instanceof EntityPigZombie);
+				}
+			}
+			return false;
+		}
+	}
+
 }

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

@@ -62,7 +62,7 @@ public enum HiveDescription implements IHiveDescription {
 		}
 	},
 	JUNGLE(IHiveRegistry.HiveType.JUNGLE, 6.0f, BeeDefinition.TROPICAL, HiveManager.genHelper.tree()),
-	END(IHiveRegistry.HiveType.END, 6.0f, BeeDefinition.ENDED, HiveManager.genHelper.ground(Blocks.END_STONE, Blocks.END_BRICKS)) {
+	END(IHiveRegistry.HiveType.END, 2.0f, BeeDefinition.ENDED, HiveManager.genHelper.ground(Blocks.END_STONE, Blocks.END_BRICKS)) {
 		@Override
 		public boolean isGoodBiome(Biome biome) {
 			return BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.END);

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

@@ -17,7 +17,7 @@ import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDoor;
-import net.minecraft.block.BlockFenceGate;
+import net.minecraft.block.BlockHorizontal;
 import net.minecraft.block.BlockLog;
 import net.minecraft.block.BlockSlab;
 import net.minecraft.block.BlockStairs;
@@ -57,9 +57,8 @@ import forestry.apiculture.flowers.Flower;
 import forestry.apiculture.flowers.FlowerRegistry;
 import forestry.apiculture.tiles.TileBeeHouse;
 import forestry.arboriculture.PluginArboriculture;
-import forestry.arboriculture.blocks.log.BlockArbLog;
 import forestry.core.PluginCore;
-import forestry.core.blocks.BlockCore;
+import forestry.core.blocks.BlockBase;
 import forestry.core.config.Constants;
 import forestry.core.tiles.TileUtil;
 import forestry.plugins.ForestryPluginUids;
@@ -140,9 +139,9 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
 		fillWithBlocks(world, structBoundingBox, 8, 1, 6, 8, 1, 10, fence, fence, false);
 		fillWithBlocks(world, structBoundingBox, 2, 1, 10, 7, 1, 10, fence, fence, false);
 
-		setBlockState(world, fenceGate.withProperty(BlockFenceGate.FACING, EnumFacing.EAST), 8, 1, 8, structBoundingBox);
-		setBlockState(world, fenceGate.withProperty(BlockFenceGate.FACING, EnumFacing.EAST), 1, 1, 8, structBoundingBox);
-		setBlockState(world, fenceGate.withProperty(BlockFenceGate.FACING, EnumFacing.NORTH), 4, 1, 10, structBoundingBox);
+		setBlockState(world, fenceGate.withProperty(BlockHorizontal.FACING, EnumFacing.EAST), 8, 1, 8, structBoundingBox);
+		setBlockState(world, fenceGate.withProperty(BlockHorizontal.FACING, EnumFacing.EAST), 1, 1, 8, structBoundingBox);
+		setBlockState(world, fenceGate.withProperty(BlockHorizontal.FACING, EnumFacing.NORTH), 4, 1, 10, structBoundingBox);
 
 		// Flowers
 		plantFlowerGarden(world, structBoundingBox, 2, 1, 5, 7, 1, 9);
@@ -171,7 +170,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
 		IBlockState slabCeiling = slabs.withProperty(BlockSlab.HALF, BlockSlab.EnumBlockHalf.TOP);
 		fillWithBlocks(world, structBoundingBox, 1, 4, 1, 7, 4, 4, slabCeiling, slabCeiling, false);
 
-		IBlockState logBracing = logs.withProperty(BlockArbLog.LOG_AXIS, BlockLog.EnumAxis.X);
+		IBlockState logBracing = logs.withProperty(BlockLog.LOG_AXIS, BlockLog.EnumAxis.X);
 		fillWithBlocks(world, structBoundingBox, 0, 4, 1, 8, 4, 1, logBracing, logBracing, false);
 		fillWithBlocks(world, structBoundingBox, 0, 4, 4, 8, 4, 4, logBracing, logBracing, false);
 
@@ -219,7 +218,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 {
 
 		// Escritoire
 		if (random.nextInt(2) == 0) {
-			IBlockState escritoireBlock = PluginCore.blocks.escritoire.getDefaultState().withProperty(BlockCore.FACING, EnumFacing.EAST);
+			IBlockState escritoireBlock = PluginCore.blocks.escritoire.getDefaultState().withProperty(BlockBase.FACING, EnumFacing.EAST);
 			setBlockState(world, escritoireBlock, 1, 1, 3, structBoundingBox);
 		}
 

src/main/java/forestry/arboriculture/CamouflageHandlerArbDoor.java

@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * 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.arboriculture;
+
+import forestry.api.core.CamouflageManager;
+import forestry.api.core.ICamouflageHandler;
+import forestry.api.core.ICamouflageItemHandler;
+import forestry.api.core.ICamouflagedTile;
+import forestry.arboriculture.items.ItemBlockWoodDoor;
+import org.apache.commons.lang3.tuple.Pair;
+
+import net.minecraft.block.BlockDoor;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BlockModelShapes;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+public class CamouflageHandlerArbDoor implements ICamouflageItemHandler {
+
+	@Override
+	public boolean canHandle(ItemStack stack) {
+		if(stack == null || stack.getItem() == null || stack.stackSize <= 0){
+			return false;
+		}
+		if(stack.getItem() instanceof ItemBlockWoodDoor){
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String getType() {
+		return CamouflageManager.DOOR;
+	}
+
+	@Override
+	public float getLightTransmittance(ItemStack stack, ICamouflageHandler camouflageHandler) {
+		return 0F;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public Pair<IBlockState, IBakedModel> getModel(ItemStack stack, ICamouflageHandler camouflageHandler, ICamouflagedTile camouflageTile) {
+		if(camouflageHandler == null || stack == null || stack.getItem() == null || stack.stackSize <= 0 || !(stack.getItem() instanceof ItemBlockWoodDoor)){
+			return null;
+		}
+		World world = camouflageHandler.getWorldObj();
+		BlockPos pos = camouflageTile.getCoordinates();
+		IBlockState blockState = world.getBlockState(pos);
+		IBlockState currentState = blockState.getActualState(world, pos);
+
+		ItemBlockWoodDoor itemDoor = (ItemBlockWoodDoor) stack.getItem();
+
+		IBlockState doorState = itemDoor.block.getDefaultState()
+				.withProperty(BlockDoor.FACING, currentState.getValue(BlockDoor.FACING))
+				.withProperty(BlockDoor.HINGE, currentState.getValue(BlockDoor.HINGE))
+				.withProperty(BlockDoor.OPEN, currentState.getValue(BlockDoor.OPEN))
+				.withProperty(BlockDoor.POWERED, currentState.getValue(BlockDoor.POWERED))
+				.withProperty(BlockDoor.HALF, currentState.getValue(BlockDoor.HALF));
+
+		BlockModelShapes modelShapes = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes();
+
+		return Pair.of(doorState, modelShapes.getModelForState(doorState));
+	}
+
+}

src/main/java/forestry/arboriculture/IWoodTyped.java

@@ -11,8 +11,8 @@
 package forestry.arboriculture;
 
 import javax.annotation.Nonnull;
-import java.util.Collection;
 
+import java.util.Collection;
 import forestry.api.arboriculture.IWoodType;
 import forestry.api.arboriculture.WoodBlockKind;
 

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

@@ -16,6 +16,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.Map.Entry;
 
 import forestry.api.arboriculture.EnumForestryWoodType;
 import forestry.api.arboriculture.EnumGermlingType;
@@ -27,6 +28,7 @@ import forestry.api.arboriculture.ITree;
 import forestry.api.arboriculture.IWoodType;
 import forestry.api.arboriculture.TreeManager;
 import forestry.api.arboriculture.WoodBlockKind;
+import forestry.api.core.CamouflageManager;
 import forestry.api.core.ForestryAPI;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.ILeafTranslator;
@@ -53,8 +55,10 @@ import forestry.arboriculture.items.ItemCharcoal;
 import forestry.arboriculture.items.ItemGrafter;
 import forestry.arboriculture.items.ItemRegistryArboriculture;
 import forestry.arboriculture.models.TextureLeaves;
+import forestry.arboriculture.models.WoodTextures;
 import forestry.arboriculture.network.PacketRegistryArboriculture;
 import forestry.arboriculture.proxy.ProxyArboriculture;
+import forestry.arboriculture.proxy.ProxyArboricultureClient;
 import forestry.arboriculture.tiles.TileFruitPod;
 import forestry.arboriculture.tiles.TileLeaves;
 import forestry.arboriculture.tiles.TilePile;
@@ -66,7 +70,9 @@ import forestry.core.fluids.Fluids;
 import forestry.core.genetics.alleles.AllelePlantType;
 import forestry.core.items.ItemFruit.EnumFruit;
 import forestry.core.network.IPacketRegistry;
+import forestry.core.proxy.Proxies;
 import forestry.core.recipes.RecipeUtil;
+import forestry.core.render.TextureManager;
 import forestry.core.utils.IMCUtil;
 import forestry.core.utils.ItemStackUtil;
 import forestry.core.utils.OreDictUtil;
@@ -87,7 +93,9 @@ import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
+import net.minecraftforge.client.event.ModelBakeEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.BlockEvent;
@@ -173,6 +181,8 @@ public class PluginArboriculture extends BlankForestryPlugin {
 
 		// Commands
 		PluginCore.rootCommand.addChildCommand(new CommandTree());
+		
+		CamouflageManager.camouflageAccess.registerCamouflageItemHandler(new CamouflageHandlerArbDoor());
 	}
 
 	@Override
@@ -409,7 +419,7 @@ public class PluginArboriculture extends BlankForestryPlugin {
 		}
 		
 		//Dirt Pile Block
-		RecipeUtil.addShapelessRecipe(new ItemStack(PluginArboriculture.blocks.piles.get(EnumPileType.DIRT)), OreDictUtil.DUST_ASH, Items.CLAY_BALL, OreDictUtil.DUST_ASH, OreDictUtil.DIRT, OreDictUtil.DIRT, OreDictUtil.DIRT, OreDictUtil.TREE_LEAVES, Items.CLAY_BALL, OreDictUtil.TREE_LEAVES);
+		RecipeUtil.addShapelessRecipe(new ItemStack(PluginArboriculture.blocks.piles.get(EnumPileType.DIRT)), PluginCore.items.fertilizerBio, Items.CLAY_BALL, PluginCore.items.fertilizerBio, OreDictUtil.DIRT, OreDictUtil.DIRT, OreDictUtil.DIRT, PluginCore.items.fertilizerBio, Items.CLAY_BALL, PluginCore.items.fertilizerBio);
 		
 	}
 
@@ -548,9 +558,33 @@ public class PluginArboriculture extends BlankForestryPlugin {
 	@SideOnly(Side.CLIENT)
 	public void registerSprites(TextureStitchEvent.Pre event) {
 		TextureLeaves.registerAllSprites();
+		WoodTextures.deserializeFile(Proxies.render.getSelectedTexturePack());
 		for (IAlleleFruit alleleFruit : AlleleFruit.getFruitAlleles()) {
 			alleleFruit.getProvider().registerSprites();
 		}
+		List<ResourceLocation> textures = new ArrayList<>();
+		for(IWoodType type : TreeManager.woodAccess.getRegisteredWoodTypes()){
+			textures.add(new ResourceLocation(type.getHeartTexture()));
+			textures.add(new ResourceLocation(type.getBarkTexture()));
+			textures.add(new ResourceLocation(type.getDoorLowerTexture()));
+			textures.add(new ResourceLocation(type.getDoorUpperTexture()));
+			textures.add(new ResourceLocation(type.getPlankTexture()));
+			for(WoodBlockKind kind : WoodBlockKind.values()){
+				for(Entry<String, String> loc : WoodTextures.getLocations(type, kind).entrySet()){
+					textures.add(new ResourceLocation(loc.getValue()));
+				}
+			}
+		}
+		for(ResourceLocation loc : textures){
+			TextureManager.getInstance();
+			TextureManager.registerSprite(loc);
+		}
+	}
+	
+	@SubscribeEvent
+	@SideOnly(Side.CLIENT)
+	public void onModelBake(ModelBakeEvent event) {
+		((ProxyArboricultureClient)proxy).onModelBake(event);
 	}
 
 	@SubscribeEvent

src/main/java/forestry/arboriculture/WoodAccess.java

@@ -11,6 +11,8 @@
 package forestry.arboriculture;
 
 import javax.annotation.Nonnull;
+
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.HashMap;
@@ -43,6 +45,7 @@ import forestry.core.utils.Log;
 
 public class WoodAccess implements IWoodAccess {
 	private static final Map<WoodBlockKind, WoodMap> woodMaps = new EnumMap<>(WoodBlockKind.class);
+	private static final List<IWoodType> registeredWoodTypes = new ArrayList<>();
 
 	static {
 		for (WoodBlockKind woodBlockKind : WoodBlockKind.values()) {
@@ -195,6 +198,9 @@ public class WoodAccess implements IWoodAccess {
 			int meta = woodTyped.getMetaFromState(blockState);
 			IWoodType woodType = woodTyped.getWoodType(meta);
 			ItemStack itemStack = new ItemStack(woodTyped, 1, meta);
+			if(!(woodType instanceof EnumVanillaWoodType)){
+				PluginArboriculture.proxy.registerWoodModel(woodTyped, true);
+			}
 			register(woodType, woodBlockKind, fireproof, blockState, itemStack);
 		}
 	}
@@ -207,6 +213,9 @@ public class WoodAccess implements IWoodAccess {
 		IBlockState blockState = woodTyped.getDefaultState();
 		IWoodType woodType = woodTyped.getWoodType(0);
 		ItemStack itemStack = new ItemStack(woodTyped);
+		if(!(woodType instanceof EnumVanillaWoodType)){
+			PluginArboriculture.proxy.registerWoodModel(woodTyped, false);
+		}
 		register(woodType, woodBlockKind, fireproof, blockState, itemStack);
 	}
 
@@ -218,6 +227,9 @@ public class WoodAccess implements IWoodAccess {
 			throw new NullPointerException("Invalid itemStack: " + itemStack);
 		}
 		WoodMap woodMap = woodMaps.get(woodBlockKind);
+		if(!registeredWoodTypes.contains(woodType)){
+			registeredWoodTypes.add(woodType);
+		}
 		woodMap.getItem(fireproof).put(woodType, itemStack);
 		woodMap.getBlock(fireproof).put(woodType, blockState);
 	}
@@ -249,4 +261,9 @@ public class WoodAccess implements IWoodAccess {
 		}
 		return blockState;
 	}
+	
+	@Override
+	public List<IWoodType> getRegisteredWoodTypes() {
+		return registeredWoodTypes;
+	}
 }

src/main/java/forestry/arboriculture/WoodHelper.java

@@ -4,7 +4,6 @@ import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
@@ -14,10 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 
 import forestry.api.arboriculture.EnumForestryWoodType;
 import forestry.api.arboriculture.EnumVanillaWoodType;
+import forestry.api.arboriculture.IWoodItemMeshDefinition;
 import forestry.api.arboriculture.IWoodType;
 import forestry.api.arboriculture.TreeManager;
 import forestry.api.arboriculture.WoodBlockKind;
 import forestry.api.core.ForestryAPI;
+import forestry.arboriculture.models.WoodModelLoader;
 import forestry.core.config.Constants;
 import forestry.core.utils.Translator;
 
@@ -50,6 +51,10 @@ public class WoodHelper {
 
 		return displayName;
 	}
+	
+	public static ResourceLocation getDefaultResourceLocations(IWoodTyped typed) {
+		return new ResourceLocation(Constants.MOD_ID, typed.getBlockKind().toString());
+	}
 
 	public static ResourceLocation[] getResourceLocations(IWoodTyped typed) {
 		List<ResourceLocation> resourceLocations = new ArrayList<>();
@@ -65,7 +70,7 @@ public class WoodHelper {
 	}
 
 	@SideOnly(Side.CLIENT)
-	public static class WoodMeshDefinition implements ItemMeshDefinition {
+	public static class WoodMeshDefinition implements IWoodItemMeshDefinition {
 		@Nonnull
 		public IWoodTyped wood;
 
@@ -75,6 +80,9 @@ public class WoodHelper {
 
 		@Override
 		public ModelResourceLocation getModelLocation(ItemStack stack) {
+			if(!WoodModelLoader.INSTANCE.isRegistered){
+				return new ModelResourceLocation(getDefaultModelLocation(stack), "inventory");
+			}
 			int meta = stack.getMetadata();
 			IWoodType woodType = wood.getWoodType(meta);
 			WoodBlockKind blockKind = wood.getBlockKind();
@@ -86,6 +94,12 @@ public class WoodHelper {
 				throw new IllegalArgumentException("Unknown wood type: " + woodType);
 			}
 		}
+		
+		@Override
+		public ResourceLocation getDefaultModelLocation(ItemStack stack) {
+			WoodBlockKind blockKind = wood.getBlockKind();
+			return new ResourceLocation("forestry:item/" + blockKind.toString());
+		}
 
 	}
 }

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

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

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

@@ -18,7 +18,6 @@ import java.util.List;
 import net.minecraft.block.BlockFenceGate;
 import net.minecraft.block.BlockPlanks.EnumType;
 import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.creativetab.CreativeTabs;
@@ -120,7 +119,7 @@ public class BlockForestryFenceGate<T extends Enum<T> & IWoodType> extends Block
 	@SideOnly(Side.CLIENT)
 	@Override
 	public void registerModel(Item item, IModelManager manager) {
-		ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this));
+		ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this));
 		manager.registerItemModel(item, new WoodMeshDefinition(this));
 	}
 }

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

@@ -5,7 +5,6 @@ import java.util.Collection;
 import java.util.Collections;
 
 import net.minecraft.block.BlockStairs;
-import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.item.Item;
@@ -43,7 +42,7 @@ public class BlockForestryStairs<T extends Enum<T> & IWoodType> extends BlockSta
 	@SideOnly(Side.CLIENT)
 	@Override
 	public void registerModel(Item item, IModelManager manager) {
-		ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this));
+		ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this));
 		manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this));
 	}
 

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

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

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

@@ -15,19 +15,19 @@ import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.renderer.block.statemap.StateMapperBase;
-
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-
 import forestry.api.arboriculture.EnumForestryWoodType;
 import forestry.api.arboriculture.EnumVanillaWoodType;
+import forestry.api.arboriculture.IWoodStateMapper;
 import forestry.api.arboriculture.IWoodType;
 import forestry.arboriculture.IWoodTyped;
 import forestry.arboriculture.blocks.property.PropertyWoodType;
+import forestry.arboriculture.models.WoodModelLoader;
 import forestry.core.config.Constants;
 
 @SideOnly(Side.CLIENT)
-public class WoodTypeStateMapper extends StateMapperBase {
+public class WoodTypeStateMapper extends StateMapperBase implements IWoodStateMapper {
 
 	@Nonnull
 	private final IWoodTyped woodTyped;
@@ -54,6 +54,11 @@ public class WoodTypeStateMapper extends StateMapperBase {
 		this.propertiesToRemove.add(property);
 		return this;
 	}
+	
+	@Override
+	public ModelResourceLocation getModelLocation(IBlockState state) {
+		return getModelResourceLocation(state);
+	}
 
 	@Override
 	protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
@@ -73,11 +78,34 @@ public class WoodTypeStateMapper extends StateMapperBase {
 		int meta = block.getMetaFromState(state);
 		IWoodType woodType = woodTyped.getWoodType(meta);
 		if (woodType instanceof EnumForestryWoodType) {
-			return getForestryModelResourceLocation(woodType, properties);
+			if(WoodModelLoader.INSTANCE.isRegistered){
+				return getForestryModelResourceLocation(woodType, properties);
+			}else{
+				return getDefaultModelResourceLocation(state);
+			}
 		} else {
 			return getVanillaModelResourceLocation(block, woodType, properties);
 		}
 	}
+	
+	@Override
+	public ModelResourceLocation getDefaultModelResourceLocation(IBlockState state) {
+		final Map<IProperty<?>, Comparable<?>> properties;
+		if (propertyWoodType != null) {
+			properties = Maps.newLinkedHashMap(state.getProperties());
+			properties.remove(propertyWoodType);
+		} else {
+			properties = Maps.newLinkedHashMap(state.getProperties());
+		}
+
+		for (IProperty property : propertiesToRemove) {
+			properties.remove(property);
+		}
+
+		String resourceLocation = "arboriculture/" + blockPath;
+		String propertyString = this.getPropertyString(properties);
+		return new ModelResourceLocation(Constants.MOD_ID + ':' + resourceLocation, propertyString);
+	}
 
 	private ModelResourceLocation getForestryModelResourceLocation(IWoodType woodType, Map<IProperty<?>, Comparable<?>> properties) {
 		String resourceLocation = "arboriculture/" + blockPath + '/' + woodType;

src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java

@@ -104,7 +104,7 @@ public abstract class BlockForestryFence<T extends Enum<T> & IWoodType> extends
 	@SideOnly(Side.CLIENT)
 	@Override
 	public void registerModel(Item item, IModelManager manager) {
-		ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this));
+		ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this));
 		manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this));
 	}
 

src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java

@@ -5,7 +5,6 @@ import java.util.Collection;
 import java.util.List;
 
 import net.minecraft.block.BlockLog;
-import net.minecraft.block.material.Material;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.ModelBakery;
@@ -182,7 +181,7 @@ public abstract class BlockForestryLog<T extends Enum<T> & IWoodType> extends Bl
 	@SideOnly(Side.CLIENT)
 	@Override
 	public final void registerModel(Item item, IModelManager manager) {
-		ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this));
+		ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this));
 		manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this));
 	}
 

src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java

@@ -121,7 +121,7 @@ public abstract class BlockForestryPlanks<T extends Enum<T> & IWoodType> extends
 	@SideOnly(Side.CLIENT)
 	@Override
 	public void registerModel(Item item, IModelManager manager) {
-		ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this));
+		ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this));
 		manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this));
 	}
 

src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java

@@ -133,7 +133,7 @@ public abstract class BlockForestrySlab<T extends Enum<T> & IWoodType> extends B
 	@SideOnly(Side.CLIENT)
 	@Override
 	public void registerModel(Item item, IModelManager manager) {
-		ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this));
+		ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this));
 		manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this));
 	}
 

src/main/java/forestry/arboriculture/compat/ArboricultureJeiPlugin.java

@@ -0,0 +1,23 @@
+package forestry.arboriculture.compat;
+
+import javax.annotation.Nonnull;
+
+import forestry.arboriculture.PluginArboriculture;
+import forestry.arboriculture.items.ItemRegistryArboriculture;
+import forestry.core.utils.JeiUtil;
+import mezz.jei.api.BlankModPlugin;
+import mezz.jei.api.IModRegistry;
+import mezz.jei.api.JEIPlugin;
+
+@JEIPlugin
+public class ArboricultureJeiPlugin extends BlankModPlugin {
+	@Override
+	public void register(@Nonnull IModRegistry registry) {
+		ItemRegistryArboriculture items = PluginArboriculture.items;
+
+		JeiUtil.addDescription(registry,
+				items.grafter,
+				items.grafterProven
+		);
+	}
+}

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

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

src/main/java/forestry/arboriculture/models/ModelWoodPile.java

@@ -14,7 +14,7 @@ import forestry.arboriculture.genetics.TreeDefinition;
 import forestry.arboriculture.tiles.TilePile;
 import forestry.core.blocks.propertys.UnlistedBlockAccess;
 import forestry.core.blocks.propertys.UnlistedBlockPos;
-import forestry.core.models.BlankItemModel;
+import forestry.core.models.BlankModel;
 import forestry.core.models.DefaultTextureGetter;
 import forestry.core.tiles.TileUtil;
 import net.minecraft.block.state.IBlockState;
@@ -38,7 +38,7 @@ import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class ModelWoodPile extends BlankItemModel{
+public class ModelWoodPile extends BlankModel{
 
 	private final Function<ResourceLocation, TextureAtlasSprite> textureGetter = new DefaultTextureGetter();
 	@SideOnly(Side.CLIENT)

src/main/java/forestry/arboriculture/models/WoodModelLoader.java

@@ -0,0 +1,296 @@
+package forestry.arboriculture.models;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
+import forestry.core.config.Constants;
+import forestry.core.utils.Log;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.ModelBlockDefinition;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.model.Variant;
+import net.minecraft.client.renderer.block.model.VariantList;
+import net.minecraft.client.renderer.block.model.WeightedBakedModel;
+import net.minecraft.client.renderer.block.model.ModelBlockDefinition.MissingVariantException;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.vertex.VertexFormat;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.model.Attributes;
+import net.minecraftforge.client.model.ICustomModelLoader;
+import net.minecraftforge.client.model.IModel;
+import net.minecraftforge.client.model.IRetexturableModel;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
+import net.minecraftforge.client.model.ModelProcessingHelper;
+import net.minecraftforge.client.model.MultiModel;
+import net.minecraftforge.client.model.MultiModelState;
+import net.minecraftforge.common.model.IModelState;
+import net.minecraftforge.common.model.TRSRTransformation;
+import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
+
+public enum WoodModelLoader implements ICustomModelLoader{
+    INSTANCE;
+
+    public static Map<ResourceLocation, Exception> loadingExceptions = Maps.newHashMap();
+    private final Map<ResourceLocation, ModelBlockDefinition> blockDefinitions = Maps.newHashMap();
+    public static final List<String> validFiles = new ArrayList<>();
+    public boolean isRegistered = false;
+    
+    static{
+    	validFiles.add("door");
+    	validFiles.add("double_slab");
+    	validFiles.add("fence");
+    	validFiles.add("fence_gate");
+    	validFiles.add("log");
+    	validFiles.add("planks");
+    	validFiles.add("slab");
+    	validFiles.add("stairs");
+    }
+
+    // NOOP, handled in loader
+    @Override
+    public void onResourceManagerReload(IResourceManager resourceManager) {}
+
+    @Override
+    public boolean accepts(ResourceLocation modelLocation){
+    	if(!(modelLocation instanceof ModelResourceLocation) || !modelLocation.getResourceDomain().equals(Constants.MOD_ID) || !modelLocation.getResourcePath().contains("arboriculture")){
+    		return false;
+    	}
+    	String path = modelLocation.getResourcePath();
+    	for(String validFile : validFiles){
+    		if(path.endsWith(validFile)){
+    			return true;
+    		}
+    	}
+        return false;
+    }
+
+    @Override
+    public IModel loadModel(ResourceLocation modelLocation) throws Exception{
+        ModelResourceLocation variant = (ModelResourceLocation) modelLocation;
+		 ModelBlockDefinition definition = getModelBlockDefinition(variant);
+        try{
+            VariantList variants = definition.getVariant(variant.getVariant());
+            return new WeightedRandomModel(variant, variants);
+        }catch(MissingVariantException e){
+            if(definition.hasMultipartData()){
+            	Log.error("The forestry model loader can't load the model with the location: %s, because it dons't support multipart models.", modelLocation.toString());
+            }
+            throw e;
+        }
+    }
+    
+    /* MODEL LOADER PRIVATE METHODS */
+    private ModelBlockDefinition getModelBlockDefinition(ResourceLocation location){
+        try{
+            ResourceLocation resourcelocation = this.getBlockstateLocation(location);
+            ModelBlockDefinition modelblockdefinition = this.blockDefinitions.get(resourcelocation);
+
+            if (modelblockdefinition == null){
+                modelblockdefinition = this.loadMultipartMBD(location, resourcelocation);
+                this.blockDefinitions.put(resourcelocation, modelblockdefinition);
+            }
+
+            return modelblockdefinition;
+        }
+        catch (Exception exception){
+            loadingExceptions.put(location, new Exception("Could not load model definition for variant " + location, exception));
+        }
+        return new ModelBlockDefinition(new ArrayList<ModelBlockDefinition>());
+    }
+    
+    private ResourceLocation getBlockstateLocation(ResourceLocation location){
+        return new ResourceLocation(location.getResourceDomain(), "blockstates/" + location.getResourcePath() + ".json");
+    }
+    
+    private ModelBlockDefinition loadMultipartMBD(ResourceLocation location, ResourceLocation fileIn){
+        List<ModelBlockDefinition> list = Lists.<ModelBlockDefinition>newArrayList();
+
+        try{
+            for (IResource iresource : Minecraft.getMinecraft().getResourceManager().getAllResources(fileIn)){
+                list.add(this.loadModelBlockDefinition(location, iresource));
+            }
+        }catch (IOException ioexception){
+            throw new RuntimeException("Encountered an exception when loading model definition of model " + fileIn, ioexception);
+        }
+
+        return new ModelBlockDefinition(list);
+    }
+    
+    private ModelBlockDefinition loadModelBlockDefinition(ResourceLocation location, IResource iresource){
+        InputStream inputstream = null;
+        ModelBlockDefinition definition;
+
+        try{
+            inputstream = iresource.getInputStream();
+            definition = ModelBlockDefinition.parseFromReader(new InputStreamReader(inputstream, Charsets.UTF_8));
+        }catch (Exception exception){
+            throw new RuntimeException("Encountered an exception when loading model definition of \'" + location + "\' from: \'" + iresource.getResourceLocation() + "\' in resourcepack: \'" + iresource.getResourcePackName() + "\'", exception);
+        }finally{
+            IOUtils.closeQuietly(inputstream);
+        }
+
+        return definition;
+    }
+    
+    private class WeightedRandomModel implements IRetexturableModel {
+        private final List<Variant> variants;
+        private final List<ResourceLocation> locations = new ArrayList<ResourceLocation>();
+        private final Set<ResourceLocation> textures = Sets.newHashSet();
+        private final List<IModel> models = new ArrayList<IModel>();
+        private final IModelState defaultState;
+
+        public WeightedRandomModel(List<ResourceLocation> locations, List<IModel> models, List<Variant> variants, IModelState defaultState){
+        	this.locations.addAll(locations);
+        	this.models.addAll(models);
+        	this.variants = variants;
+        	this.defaultState = defaultState;
+        	for(IModel model : models){
+        		textures.addAll(model.getTextures());
+        	}
+        }
+        
+        public WeightedRandomModel(ResourceLocation parent, VariantList variants) throws Exception{
+            this.variants = variants.getVariantList();
+            ImmutableList.Builder<Pair<IModel, IModelState>> builder = ImmutableList.builder();
+            for (Variant v : this.variants){
+                ResourceLocation loc = v.getModelLocation();
+                locations.add(loc);
+
+                /*
+                 * Vanilla eats this, which makes it only show variants that have models.
+                 * But that doesn't help debugging, so throw the exception
+                 */
+                IModel model;
+                if(loc.equals(new ModelResourceLocation("builtin/missing", "missing"))){
+                    // explicit missing location, happens if blockstate has "model"=null
+                    model = ModelLoaderRegistry.getMissingModel();
+                }else{
+                    model = ModelLoaderRegistry.getModel(loc);
+                }
+
+                // FIXME: is this the place? messes up dependency and texture resolution
+                model = v.process(model);
+                for(ResourceLocation location : model.getDependencies()){
+                    ModelLoaderRegistry.getModelOrMissing(location);
+                }
+                //FMLLog.getLogger().error("Exception resolving indirect dependencies for model" + loc, e);
+                textures.addAll(model.getTextures()); // Kick this, just in case.
+
+                models.add(model);
+                builder.add(Pair.of(model, v.getState()));
+            }
+
+            if (models.size() == 0){ //If all variants are missing, add one with the missing model and default rotation.
+                // FIXME: log this?
+                IModel missing = ModelLoaderRegistry.getMissingModel();
+                models.add(missing);
+                builder.add(Pair.<IModel, IModelState>of(missing, TRSRTransformation.identity()));
+            }
+
+            defaultState = new MultiModelState(builder.build());
+        }
+
+        @Override
+		public Collection<ResourceLocation> getDependencies(){
+            return ImmutableList.copyOf(locations);
+        }
+
+        @Override
+		public Collection<ResourceLocation> getTextures(){
+            return ImmutableSet.copyOf(textures);
+        }
+
+        @Override
+		public IBakedModel bake(IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter){
+            if(!Attributes.moreSpecific(format, Attributes.DEFAULT_BAKED_FORMAT)){
+                throw new IllegalArgumentException("can't bake vanilla weighted models to the format that doesn't fit into the default one: " + format);
+            }
+            if(variants.size() == 1){
+                IModel model = models.get(0);
+                return model.bake(MultiModelState.getPartState(state, model, 0), format, bakedTextureGetter);
+            }
+            WeightedBakedModel.Builder builder = new WeightedBakedModel.Builder();
+            for(int i = 0; i < variants.size(); i++){
+                IModel model = models.get(i);
+                builder.add(model.bake(MultiModelState.getPartState(state, model, i), format, bakedTextureGetter), variants.get(i).getWeight());
+            }
+            return builder.build();
+        }
+
+        @Override
+		public IModelState getDefaultState(){
+            return defaultState;
+        }
+
+		@Override
+		public IModel retexture(ImmutableMap<String, String> textures) {
+		   List<IModel> models = new ArrayList<IModel>();
+		   ImmutableList.Builder<Pair<IModel, IModelState>> builder = ImmutableList.builder();
+           for (Variant v : this.variants){
+        	   try{
+	                ResourceLocation loc = v.getModelLocation();
+	                locations.add(loc);
+	
+	                IModel model;
+	                if(loc.equals(new ModelResourceLocation("builtin/missing", "missing"))){
+	                    model = ModelLoaderRegistry.getMissingModel();
+	                }else{
+	                    model = ModelLoaderRegistry.getModel(loc);
+	                }
+	
+	                model = v.process(model);
+	                for(ResourceLocation location : model.getDependencies()){
+	                    ModelLoaderRegistry.getModelOrMissing(location);
+	                }
+	                
+	                if(model instanceof MultiModel){
+	                    IModel base = ObfuscationReflectionHelper.getPrivateValue(MultiModel.class, (MultiModel)model, 1);
+	                    Map<String, Pair<IModel, IModelState>> parts = ObfuscationReflectionHelper.getPrivateValue(MultiModel.class, (MultiModel)model, 3);
+	                    
+	                    ImmutableMap.Builder<String, Pair<IModel, IModelState>> partBuilder = new ImmutableMap.Builder<>();
+	                    IModel retexturedModel = ModelProcessingHelper.retexture(base, textures);
+	                    for(Entry<String, Pair<IModel, IModelState>> part : parts.entrySet()){
+	                    	partBuilder.put(part.getKey(), Pair.of(ModelProcessingHelper.retexture(part.getValue().getLeft(), textures), part.getValue().getRight()));
+	                    }
+	                    
+	                    ObfuscationReflectionHelper.setPrivateValue(MultiModel.class, (MultiModel)model, retexturedModel, 1);
+	                    ObfuscationReflectionHelper.setPrivateValue(MultiModel.class, (MultiModel)model, partBuilder.build(), 3);
+	                }          
+	                model = ModelProcessingHelper.retexture(model, textures);
+	
+	                models.add(model);
+	                builder.add(Pair.of(model, v.getState()));
+        	   }catch(Exception e){}
+            }
+
+            if (models.size() == 0){ 
+                IModel missing = ModelLoaderRegistry.getMissingModel();
+                models.add(missing);
+                builder.add(Pair.<IModel, IModelState>of(missing, TRSRTransformation.identity()));
+            }
+			return new WeightedRandomModel(locations, models, variants, new MultiModelState(builder.build()));
+		}
+    }
+}

src/main/java/forestry/arboriculture/models/WoodTextures.java

@@ -0,0 +1,148 @@
+package forestry.arboriculture.models;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.internal.Streams;
+import com.google.gson.stream.JsonReader;
+
+import forestry.api.arboriculture.IWoodType;
+import forestry.api.arboriculture.WoodBlockKind;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class WoodTextures {
+	
+	public static final Gson GSON = new GsonBuilder().create();
+	protected static final Map<String, Texture> textures = new HashMap<>();
+	
+	public static void deserializeFile(IResourceManager resourceManager){
+		try {
+			InputStream stream = resourceManager.getResource(new ResourceLocation("forestry:textures/woodTextures.json")).getInputStream();
+			if(stream != null){
+				JsonReader reader = null;
+				try {
+					reader = new JsonReader(new BufferedReader(new InputStreamReader(stream)));
+					JsonElement json = Streams.parse(reader);
+					if(json.isJsonObject()){
+						for(Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()){
+							JsonElement ele = entry.getValue();
+							if(ele.isJsonObject()){
+								textures.put(entry.getKey(), loadTexture(ele.getAsJsonObject()));
+							}else if(ele.isJsonArray()){
+								ImmutableMap.Builder<String, SimpleTexture> locations = new ImmutableMap.Builder<>();
+								for(JsonElement eleEntry : ele.getAsJsonArray()){
+									if(eleEntry.isJsonObject()){
+										JsonObject obj = eleEntry.getAsJsonObject();
+										if(!obj.has("kind") || !obj.get("kind").isJsonPrimitive() || !obj.get("kind").getAsJsonPrimitive().isString()){
+											continue;
+										}
+										String kind = obj.get("kind").getAsString();
+										locations.put(kind, loadTexture(obj));
+									}
+								}
+								textures.put(entry.getKey(), new KindTexture(locations.build()));
+							}
+						}
+					}
+				}finally{
+					if(reader != null){
+						reader.close();
+					}
+				}
+			}
+		} catch (IOException e) {
+			if(!(e instanceof FileNotFoundException)){
+				e.printStackTrace();
+			}
+		} 
+	}
+	
+	private static SimpleTexture loadTexture(JsonObject obj){
+		ImmutableMap.Builder<String, String> locations = new ImmutableMap.Builder<>();
+		for(Entry<String, JsonElement> eleEntry : obj.entrySet()){
+			JsonElement e = eleEntry.getValue();
+			if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isString()){
+				locations.put(eleEntry.getKey(), e.getAsString());
+			}
+		}
+		return new SimpleTexture(locations.build());
+	}
+	
+	public static ImmutableMap<String, String> getLocations(IWoodType woodType, WoodBlockKind blockKind){
+		if(woodType != null && blockKind != null && woodType.getName() != null){
+			String kindName = blockKind.toString();
+			Texture kindTex = textures.get(blockKind);
+			Texture tex = textures.get(woodType.getName().toLowerCase(Locale.ENGLISH));
+			Map<String, String> locations = new HashMap<>();
+			if(kindTex != null && kindTex instanceof SimpleTexture){
+				locations.putAll(((SimpleTexture)kindTex).locations);
+			}
+			if(tex != null){
+				if(tex instanceof SimpleTexture){
+					locations.putAll(((SimpleTexture) tex).locations);
+				}else{
+					SimpleTexture kind = ((KindTexture)tex).kindLocations.get(kindName);
+					locations.putAll(kind.locations);
+				}
+			}
+			ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<>();
+			for(Entry<String, String> location : locations.entrySet()){
+				String texture = location.getValue();
+				if(texture.equals("plank")){
+					texture = woodType.getPlankTexture();
+				}else if(texture.equals("bark")){
+					texture = woodType.getBarkTexture();
+				}else if(texture.equals("heart")){
+					texture = woodType.getHeartTexture();
+				}else if(texture.equals("doorUp")){
+					texture = woodType.getDoorUpperTexture();
+				}else if(texture.equals("doorLow")){
+					texture = woodType.getDoorLowerTexture();
+				}else{
+					builder.put(location.getKey(), texture.replace("%woodType", woodType.getName().toLowerCase(Locale.ENGLISH)));
+					continue;
+				}
+				builder.put(location.getKey(), texture);
+			}
+			return builder.build();
+		}
+		return ImmutableMap.of();
+	}
+	
+	private static class Texture{
+		
+	}
+	
+	private static class SimpleTexture extends Texture{
+		public final ImmutableMap<String, String> locations;
+		
+		public SimpleTexture(ImmutableMap<String, String> locations) {
+			this.locations = locations;
+		}
+	}
+	
+	private static class KindTexture extends Texture{
+		public final ImmutableMap<String, SimpleTexture> kindLocations;
+		
+		public KindTexture(ImmutableMap<String, SimpleTexture> kindLocations) {
+			this.kindLocations = kindLocations;
+		}
+	}
+
+}

src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java

@@ -10,6 +10,9 @@
  ******************************************************************************/
 package forestry.arboriculture.proxy;
 
+import forestry.arboriculture.IWoodTyped;
+import net.minecraft.block.Block;
+
 public class ProxyArboriculture {
 
 	public void initializeModels() {
@@ -26,5 +29,7 @@ public class ProxyArboriculture {
 	public int getFoliageColorPine() {
 		return 6396257;
 	}
-
+	
+	public <T extends Block & IWoodTyped> void registerWoodModel(T woodTyped, boolean withVariants){
+	}
 }

src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java

@@ -10,28 +10,64 @@
  ******************************************************************************/
 package forestry.arboriculture.proxy;
 
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.ItemMeshDefinition;
+import net.minecraft.client.renderer.ItemModelMesher;
+import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.statemap.BlockStateMapper;
+import net.minecraft.client.renderer.block.statemap.IStateMapper;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.IRegistry;
 import net.minecraft.world.ColorizerFoliage;
+import net.minecraftforge.client.event.ModelBakeEvent;
+import net.minecraftforge.client.model.IModel;
+import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
+import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableMap;
+
 import forestry.api.arboriculture.EnumPileType;
+import forestry.api.arboriculture.IWoodItemMeshDefinition;
+import forestry.api.arboriculture.IWoodStateMapper;
+import forestry.api.arboriculture.IWoodType;
+import forestry.api.arboriculture.WoodBlockKind;
+import forestry.arboriculture.IWoodTyped;
 import forestry.arboriculture.PluginArboriculture;
 import forestry.arboriculture.blocks.BlockDecorativeLeaves;
+import forestry.arboriculture.blocks.slab.BlockArbSlab;
 import forestry.arboriculture.models.ModelDecorativeLeaves;
 import forestry.arboriculture.models.ModelLeaves;
 import forestry.arboriculture.models.ModelWoodPile;
+import forestry.arboriculture.models.WoodModelLoader;
+import forestry.arboriculture.models.WoodTextures;
 import forestry.arboriculture.render.CharcoalPileRenderer;
 import forestry.arboriculture.tiles.TilePile;
-import forestry.core.models.BlockModelIndex;
+import forestry.core.models.BlockModelEntry;
+import forestry.core.models.SimpleRetexturedModel;
+import forestry.core.models.WoodModelEntry;
 import forestry.core.proxy.Proxies;
 
-@SuppressWarnings("unused")
 public class ProxyArboricultureClient extends ProxyArboriculture {
+	private static Set<WoodModelEntry> woodModelEntrys = new HashSet<>();
+	
 	@Override
 	public void initializeModels() {
 		{
 			ModelResourceLocation blockModelLocation = new ModelResourceLocation("forestry:leaves");
 			ModelResourceLocation itemModelLocation = new ModelResourceLocation("forestry:leaves", "inventory");
-			BlockModelIndex blockModelIndex = new BlockModelIndex(blockModelLocation, itemModelLocation, new ModelLeaves(), PluginArboriculture.blocks.leaves);
+			BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModelLocation, new ModelLeaves(), PluginArboriculture.blocks.leaves);
 			Proxies.render.registerBlockModel(blockModelIndex);
 		}
 
@@ -39,17 +75,89 @@ public class ProxyArboricultureClient extends ProxyArboriculture {
 			String resourceName = "forestry:leaves.decorative." + leaves.getBlockNumber();
 			ModelResourceLocation blockModelLocation = new ModelResourceLocation(resourceName);
 			ModelResourceLocation itemModeLocation = new ModelResourceLocation(resourceName, "inventory");
-			BlockModelIndex blockModelIndex = new BlockModelIndex(blockModelLocation, itemModeLocation, new ModelDecorativeLeaves(), leaves);
+			BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModeLocation, new ModelDecorativeLeaves(), leaves);
 			Proxies.render.registerBlockModel(blockModelIndex);
 		}
 		
 		{
 			ModelResourceLocation blockModelLocation = new ModelResourceLocation("forestry:pile", "type=wood");
 			ModelResourceLocation itemModelLocation = new ModelResourceLocation("forestry:woodPile", "inventory");
-			BlockModelIndex blockModelIndex = new BlockModelIndex(blockModelLocation, itemModelLocation, new ModelWoodPile(), PluginArboriculture.blocks.piles.get(EnumPileType.WOOD));
+			BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModelLocation, new ModelWoodPile(), PluginArboriculture.blocks.piles.get(EnumPileType.WOOD));
 			Proxies.render.registerBlockModel(blockModelIndex);
 		}
+		
 		ClientRegistry.bindTileEntitySpecialRenderer(TilePile.class, new CharcoalPileRenderer());
+		ModelLoaderRegistry.registerLoader(WoodModelLoader.INSTANCE);
+		for(BlockArbSlab slab : PluginArboriculture.blocks.slabsDouble){
+			registerWoodModel(slab, true);
+		}
+		for(BlockArbSlab slab : PluginArboriculture.blocks.slabsDoubleFireproof){
+			registerWoodModel(slab, true);
+		}
+	}
+	
+	@SubscribeEvent
+	public <T extends Block & IWoodTyped> void onModelBake(ModelBakeEvent event){
+		WoodModelLoader.INSTANCE.isRegistered = true;
+		IRegistry<ModelResourceLocation, IBakedModel> registry = event.getModelRegistry();
+		Minecraft minecraft = Proxies.common.getClientInstance();
+		Map<ResourceLocation, Exception> loadingExceptions = ObfuscationReflectionHelper.getPrivateValue(ModelLoader.class, event.getModelLoader(), 2);
+		
+		if(minecraft.getBlockRendererDispatcher() != null){
+			BlockStateMapper stateMapper = minecraft.getBlockRendererDispatcher().getBlockModelShapes().getBlockStateMapper();
+			Map<Item, ItemMeshDefinition> definitions = ObfuscationReflectionHelper.getPrivateValue(ItemModelMesher.class, minecraft.getRenderItem().getItemModelMesher(), 2);
+			Map<Block, IStateMapper> blockStateMap = ObfuscationReflectionHelper.getPrivateValue(BlockStateMapper.class, stateMapper, 0);
+			
+			for(WoodModelEntry<T> entry : woodModelEntrys){
+				T woodTyped = entry.woodTyped;
+				WoodBlockKind woodKind = woodTyped.getBlockKind();
+				
+				IStateMapper mapper = blockStateMap.get(woodTyped);
+				if(mapper instanceof IWoodStateMapper){
+					IWoodStateMapper woodMapper = (IWoodStateMapper) mapper;
+					try{
+						for(IBlockState state : woodTyped.getBlockState().getValidStates()) {
+							IWoodType woodType;
+							ItemStack itemStack;
+							if(entry.withVariants){
+								int meta = woodTyped.getMetaFromState(state);
+								woodType = woodTyped.getWoodType(meta);
+								itemStack = new ItemStack(woodTyped, 1, meta);
+							}else{
+								woodType = woodTyped.getWoodType(0);
+								itemStack = new ItemStack(woodTyped);
+							}
+							ImmutableMap<String, String> customTextures = WoodTextures.getLocations(woodType, woodKind);
+							if(woodKind.retextureItem){
+								ItemMeshDefinition definition = definitions.get(itemStack.getItem());
+								if(definition instanceof IWoodItemMeshDefinition){
+									IWoodItemMeshDefinition woodDefinition = (IWoodItemMeshDefinition) definition;
+									IModel basicItemModel = ModelLoaderRegistry.getModel(woodDefinition.getDefaultModelLocation(itemStack));
+									ModelResourceLocation basicItemLocation = definition.getModelLocation(itemStack);
+											
+									registry.putObject(basicItemLocation, new SimpleRetexturedModel(woodKind.retextureModel(basicItemModel, woodType, customTextures)));
+								}
+							}
+							IModel basicModel = ModelLoaderRegistry.getModel(woodMapper.getDefaultModelResourceLocation(state));
+							ModelResourceLocation basicLocation = woodMapper.getModelLocation(state);
+							if(loadingExceptions.containsKey(basicLocation)){
+								loadingExceptions.remove(basicLocation);
+							}
+							registry.putObject(basicLocation, new SimpleRetexturedModel(woodKind.retextureModel(basicModel, woodType, customTextures)));
+						}
+					}catch(Exception e){
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		
+		loadingExceptions.putAll(WoodModelLoader.loadingExceptions);
+	}
+	
+	@Override
+	public <T extends Block & IWoodTyped> void registerWoodModel(T woodTyped, boolean withVariants){
+		woodModelEntrys.add(new WoodModelEntry(woodTyped, withVariants));
 	}
 
 	@Override

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

@@ -27,6 +27,9 @@ import forestry.api.arboriculture.ITree;
 import forestry.api.arboriculture.ITreeGenome;
 import forestry.api.arboriculture.ITreekeepingMode;
 import forestry.api.arboriculture.TreeManager;
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.core.ForestryAPI;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IEffectData;
@@ -55,6 +58,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
 import net.minecraftforge.common.EnumPlantType;
 
 public class TileLeaves extends TileTreeContainer implements IPollinatable, IFruitBearer, IButterflyNursery, IRipeningPacketReceiver {
@@ -495,4 +499,19 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru
 		ITree tree = getTree();
 		return !isDestroyed(tree, damage) && caterpillar == null;
 	}
+
+	@Override
+	public Biome getBiome() {
+		return worldObj.getBiome(pos);
+	}
+
+	@Override
+	public EnumTemperature getTemperature() {
+		return EnumTemperature.getFromBiome(worldObj.getBiome(pos), worldObj, pos);
+	}
+
+	@Override
+	public EnumHumidity getHumidity() {
+		return EnumHumidity.getFromValue(ForestryAPI.climateManager.getHumidity(worldObj, pos));
+	}
 }

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

@@ -10,12 +10,8 @@
  ******************************************************************************/
 package forestry.arboriculture.worldgen;
 
-import javax.annotation.Nonnull;
-import java.util.Collections;
 import java.util.List;
 import java.util.Random;
-import java.util.Set;
-
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 

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

@@ -10,12 +10,8 @@
  ******************************************************************************/
 package forestry.arboriculture.worldgen;
 
-import javax.annotation.Nonnull;
-import java.util.Collections;
 import java.util.List;
 import java.util.Random;
-import java.util.Set;
-
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;