Update dependencies

build.gradle

@@ -40,7 +40,6 @@ targetCompatibility = 1.8
 minecraft {
 	version = mcversion + "-" + forgeversion
 	runDir = "run"
-	useDepAts = true
 	mappings = mcp_mappings
 
 	replace '@VERSION@', project.version
@@ -66,7 +65,8 @@ repositories {
 }
 
 dependencies {
-	deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}"
+	deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}:api"
+	runtime "mezz.jei:jei_${mcversion}:${jei_version}"
 	deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
 }
 

gradle.properties

@@ -1,10 +1,10 @@
-mcversion=1.9.4
-forgeversion=12.17.0.1968
+mcversion=1.10
+forgeversion=12.18.0.1984-1.10.0
 mcp_mappings=snapshot_20160525
 
-jei_version=3.6.4.+
+jei_version=3.7.0.+
 ic2_version=2.5.5-ex19
 
 version_major=5
-version_minor=0
-version_patch=23
+version_minor=1
+version_patch=1

src/main/java/forestry/Forestry.java

@@ -49,16 +49,9 @@ import forestry.plugins.PluginManager;
 		name = "Forestry",
 		version = Constants.VERSION,
 		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
-		dependencies = "required-after:Forge@[12.17.0.1963,);"
-				+ "after:Buildcraft|Core@[7.2,);"
-				+ "after:BuildCraft|Energy@[7.2,);"
-				+ "after:ExtrabiomesXL;"
-				+ "after:BiomesOPlenty;"
-				+ "after:IC2@[2.3.235,);"
-				+ "after:Natura@[2.2.0,);"
-				+ "after:HardcoreEnderExpansion;"
-				+ "after:JEI@[3.6.4,);"
-				+ "after:basemetals;")
+		acceptedMinecraftVersions = "[1.10]",
+		dependencies = "required-after:Forge@[12.18.0.1984,);"
+				+ "after:JEI@[3.7.0,);")
 public class Forestry {
 
 	@Mod.Instance(Constants.MOD_ID)

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

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

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

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

src/main/java/forestry/core/gui/slots/SlotWorking.java

@@ -31,7 +31,7 @@ public class SlotWorking extends SlotForestry {
 	}
 
 	@Override
-	public boolean getHasStack() {
+	public boolean canTakeStack(EntityPlayer stack) {
 		return false;
 	}
 

src/main/java/forestry/core/utils/ItemStackUtil.java

@@ -423,9 +423,15 @@ public abstract class ItemStackUtil {
 	}
 
 	public static ItemStack copyWithRandomSize(ItemStack template, int max, Random rand) {
-		int size = rand.nextInt(max);
+		int size = max <= 0 ? 0 : rand.nextInt(max);
 		ItemStack created = template.copy();
-		created.stackSize = size <= 0 ? 1 : size > created.getMaxStackSize() ? created.getMaxStackSize() : size;
+		if (size <= 0) {
+			created.stackSize = 1;
+		} else if (size > created.getMaxStackSize()) {
+			created.stackSize = created.getMaxStackSize();
+		} else {
+			created.stackSize = size;
+		}
 		return created;
 	}
 

src/main/java/forestry/factory/recipes/jei/WorktableRecipeTransferHandler.java

@@ -6,19 +6,17 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.item.ItemStack;
-
 import forestry.factory.gui.ContainerWorktable;
 import forestry.factory.inventory.InventoryCraftingForestry;
 import forestry.factory.recipes.MemorizedRecipe;
-
+import mezz.jei.api.gui.IGuiIngredient;
 import mezz.jei.api.gui.IRecipeLayout;
 import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
 import mezz.jei.api.recipe.transfer.IRecipeTransferError;
 import mezz.jei.api.recipe.transfer.IRecipeTransferHandler;
-import mezz.jei.gui.ingredients.IGuiIngredient;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.ItemStack;
 
 class WorktableRecipeTransferHandler implements IRecipeTransferHandler {
 	@Override