bump version

Backport butterflys staying close to home

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/ForestryMC/Forestry-Localization.git
 [submodule "api/redstoneflux"]
 	path = api/redstoneflux
-	url = https://github.com/CoFH/RedstoneFlux-API.git
+	url = https://github.com/Texasjake95/RedstoneFlux-API.git
 [submodule "api/forestry"]
 	path = api/forestry
 	url = https://github.com/ForestryMC/ForestryAPI.git

build.gradle

@@ -35,8 +35,10 @@ ext.apiForestry = "./api/forestry"
 ext.apiRedstoneFlux = "./api/redstoneflux"
 
 // java version
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 minecraft {
 	version = mcversion + "-" + forgeversion
@@ -82,8 +84,8 @@ repositories {
 configurations {
 	api
 	compile.extendsFrom api
-	shade
-	compile.extendsFrom shade
+	//shade
+	//compile.extendsFrom shade
 }
 
 dependencies {
@@ -99,7 +101,7 @@ dependencies {
 	compile "codechicken:NotEnoughItems:1.7.10-1.0.5.111:src"
 
 	// http://maven.tterrag.com/
-	shade "chylex.javacheck:JavaChecker:v1.2-b1"
+	//shade "chylex.javacheck:JavaChecker:v1.2-b1"
 
 	testCompile 'junit:junit:4.12'
 }
@@ -158,11 +160,11 @@ jar {
 		from "./src/main/java/invtweaks/LICENSE.txt"
 	}
 
-	configurations.shade.each{ dep ->
-		from(project.zipTree(dep)){
-			exclude 'META-INF', 'META-INF/**', 'mcmod.info'
-		}
-	}
+	//configurations.shade.each{ dep ->
+	//	from(project.zipTree(dep)){
+	//		exclude 'META-INF', 'META-INF/**', 'mcmod.info'
+	//	}
+	//}
 }
 
 task mainJar(type: Jar, dependsOn: 'reobf') {
@@ -177,7 +179,7 @@ task mainJar(type: Jar, dependsOn: 'reobf') {
 	includeEmptyDirs = false
 
 	manifest{
-		attributes 'TweakClass': 'forestry.shade.javacheck.Java7Checker'
+		//attributes 'TweakClass': 'forestry.shade.javacheck.Java7Checker'
 	}
 }
 
@@ -255,3 +257,7 @@ def getBuildNumber() {
 	return "$System.env.BUILD_NUMBER" != "null" ? "$System.env.BUILD_NUMBER" : "0"
 }
 
+sourceSets {
+	main { output.resourcesDir = output.classesDir }
+}
+

gradle.properties

@@ -1,5 +1,5 @@
 mcversion=1.7.10
-forgeversion=10.13.4.1566-1.7.10
+forgeversion=10.13.4.1614-1.7.10
 version_major=4
 version_minor=2
-version_patch=13
+version_patch=22

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

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

@@ -116,9 +116,13 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
 		hasFlowersCache.writeToNBT(nbttagcompound);
 
 		Stack<ItemStack> spawnCopy = new Stack<>();
-		spawnCopy.addAll(spawn);
+		if (spawn.size()<128)
+			spawnCopy.addAll(spawn);
+		else
+			for (byte b=0;b<128;++b)
+			spawnCopy.add(spawn.get(b));
 		NBTTagList nbttaglist = new NBTTagList();
-		while (!spawnCopy.isEmpty()) {
+		while (!spawnCopy.isEmpty() && spawnCopy.size()<=128) {
 			NBTTagCompound nbttagcompound1 = new NBTTagCompound();
 			spawnCopy.pop().writeToNBT(nbttagcompound1);
 			nbttaglist.appendTag(nbttagcompound1);

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

@@ -283,7 +283,7 @@ public class Bee extends IndividualLiving implements IBee {
 		}
 
 		// / Check for the sky, except if in hell
-		if (biome != null && !BiomeHelper.isBiomeHellish(biome)) {
+		if (!world.provider.hasNoSky) {
 			if (!housing.canBlockSeeTheSky() && !canWorkUnderground(beeModifier)) {
 				errorStates.add(EnumErrorCode.NO_SKY);
 			}

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

@@ -12,6 +12,7 @@ package forestry.apiculture.genetics;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 
@@ -33,9 +34,17 @@ public class JubilanceRequiresResource implements IJubilanceProvider {
 	public boolean isJubilant(IAlleleBeeSpecies species, IBeeGenome genome, IBeeHousing housing) {
 		World world = housing.getWorld();
 		ChunkCoordinates housingCoords = housing.getCoordinates();
+		Block block;
+		TileEntity tile;
+		int meta;
+		int i = 1;
+		do {
+			block = world.getBlock(housingCoords.posX, housingCoords.posY - i, housingCoords.posZ);
+			meta = world.getBlockMetadata(housingCoords.posX, housingCoords.posY - i, housingCoords.posZ);
+			tile = world.getTileEntity(housingCoords.posX, housingCoords.posY - i, housingCoords.posZ);
+			i++;
+		} while (tile instanceof IBeeHousing);
 
-		Block block = world.getBlock(housingCoords.posX, housingCoords.posY - 1, housingCoords.posZ);
-		int meta = world.getBlockMetadata(housingCoords.posX, housingCoords.posY - 1, housingCoords.posZ);
 		return ItemStackUtil.equals(block, meta, blockRequired);
 	}
 

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

@@ -14,6 +14,7 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
+import forestry.api.core.BiomeHelper;
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -53,7 +54,6 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple
 	private final InventoryBeeHousing inventory;
 	private final IBeekeepingLogic beekeepingLogic;
 
-	private BiomeGenBase cachedBiome;
 	private float tempChange = 0.0f;
 	private float humidChange = 0.0f;
 
@@ -290,7 +290,6 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple
 
 		data.setFloat("TempChange", tempChange);
 		data.setFloat("HumidChange", humidChange);
-
 		beekeepingLogic.writeToNBT(data);
 		inventory.writeToNBT(data);
 	}
@@ -359,8 +358,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;
+		BiomeGenBase biome = getBiome();
+		if (beeModifier.isHellish() || BiomeHelper.isBiomeHellish(biome)) {
+			if (tempChange >= 0) {
+				return EnumTemperature.HELLISH;
+			}
 		}
 
 		return EnumTemperature.getFromValue(getExactTemperature());
@@ -383,11 +385,8 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple
 
 	@Override
 	public BiomeGenBase getBiome() {
-		if (cachedBiome == null) {
-			ChunkCoordinates coords = getReferenceCoord();
-			cachedBiome = worldObj.getBiomeGenForCoords(coords.posX, coords.posZ);
-		}
-		return cachedBiome;
+		ChunkCoordinates coords = getReferenceCoord();
+		return worldObj.getBiomeGenForCoords(coords.posX, coords.posZ);
 	}
 
 	@Override

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

@@ -35,7 +35,6 @@ import forestry.core.tiles.TileBase;
 
 public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing, IClimatised, IGuiBeeHousingInventory, IStreamableGui {
 	private final IBeekeepingLogic beeLogic;
-	private BiomeGenBase cachedBiome;
 
 	// CLIENT
 	private int breedingProgressPercent = 0;
@@ -142,10 +141,7 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing
 	// / IBEEHOUSING
 	@Override
 	public BiomeGenBase getBiome() {
-		if (cachedBiome == null) {
-			cachedBiome = worldObj.getBiomeGenForCoordsBody(xCoord, zCoord);
-		}
-		return cachedBiome;
+		return worldObj.getBiomeGenForCoordsBody(xCoord, zCoord);
 	}
 
 	@Override

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

@@ -21,6 +21,7 @@ import net.minecraft.world.gen.feature.WorldGenerator;
 
 import com.mojang.authlib.GameProfile;
 
+import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import forestry.api.arboriculture.EnumFruitFamily;
@@ -458,7 +459,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
 
 		@Override
 		protected void registerMutations() {
-			// only available by rare villager trade
+			registerMutation(Sequioa,Baobab,1).requireNight().restrictBiomeType(BiomeDictionary.Type.FOREST);
 		}
 	},
 	Jungle(TreeBranchDefinition.TROPICAL, "jungle", "tectona", false, EnumLeafType.JUNGLE, new Color(4764952), new Color(0x658917), 3, new ItemStack(Blocks.log, 1, 3)) {

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

@@ -184,17 +184,13 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable {
 
 			ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(world, x, y, z);
 
-			if (checkPollinatable == null) {
-				return false;
-			}
-
-			if (!checkPollinatable.canMateWith(tree)) {
+			if (checkPollinatable == null || !checkPollinatable.canMateWith(tree)) {
 				return false;
 			}
 
 			IPollinatable pollinatable = GeneticsUtil.getOrCreatePollinatable(player.getGameProfile(), world, x, y, z);
 
-			if (!pollinatable.canMateWith(tree)) {
+			if (pollinatable == null || !pollinatable.canMateWith(tree)) {
 				return false;
 			}
 

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

@@ -77,6 +77,12 @@ public class Config {
 	// Performance
 	public static boolean enableBackpackResupply = true;
 
+    // Optimization
+    public static boolean enableCraftingTimeout = true;
+    public static int craftingTimeout = 200; // Time given in ms
+    public static boolean cacheWorktableRecipes = true;
+    public static boolean promoteWorktableRecipesToFrontOfGlobalRecipemap = true;
+
 	// Customization
 	private static boolean craftingBronzeEnabled = true;
 
@@ -215,6 +221,11 @@ public class Config {
 
 		enableBackpackResupply = configCommon.getBooleanLocalized("performance", "backpacks.resupply", enableBackpackResupply);
 
+        enableCraftingTimeout = configCommon.getBooleanLocalized("optimization","enable.crafting.timeout", enableCraftingTimeout);
+        craftingTimeout = configCommon.getIntLocalized("optimization","crafting.timeout",craftingTimeout, 50, 2000 ); // min 50ms, default 200ms, max 2000 ms. Integer.MAX_VALUE is ~ 2100 ms because of multiplication by 1,000,000
+        cacheWorktableRecipes = configCommon.getBooleanLocalized("optimization","cache.worktable.recipes", cacheWorktableRecipes);
+        promoteWorktableRecipesToFrontOfGlobalRecipemap = configCommon.getBooleanLocalized("optimization","promote.worktable.recipes",promoteWorktableRecipesToFrontOfGlobalRecipemap);
+
 		// move legacy mail property
 		configCommon.moveProperty("tweaks.gui", "mail.alert", "tweaks.gui.mail.alert");
 		configCommon.renameProperty("tweaks.gui.mail.alert", "mail.alert", "enabled");

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

@@ -12,6 +12,7 @@ package forestry.core.genetics.mutations;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 import forestry.api.apiculture.IBeeHousing;
@@ -32,13 +33,15 @@ public class MutationConditionRequiresResource implements IMutationCondition {
 	@Override
 	public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
 		Block block;
+		TileEntity tile;
 		int meta;
 		int i = 1;
 		do {
 			block = world.getBlock(x, y - i, z);
 			meta = world.getBlockMetadata(x, y - i, z);
+			tile = world.getTileEntity(x, y - i, z);
 			i++;
-		} while (block instanceof IBeeHousing);
+		} while (tile instanceof IBeeHousing);
 
 		return ItemStackUtil.equals(block, meta, blockRequired) ? 1 : 0;
 	}

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

@@ -14,6 +14,7 @@ import java.util.ArrayList;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 import net.minecraftforge.oredict.OreDictionary;
@@ -44,12 +45,14 @@ public class MutationConditionRequiresResourceOreDict implements IMutationCondit
 	public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
 		Block block;
 		int meta;
+		TileEntity tile;
 		int i = 1;
 		do {
 			block = world.getBlock(x, y - i, z);
 			meta = world.getBlockMetadata(x, y - i, z);
+			tile = world.getTileEntity(x, y-i, z);
 			i++;
-		} while (block instanceof IBeeHousing);
+		} while (tile instanceof IBeeHousing);
 
 		int[] oreIds = OreDictionary.getOreIDs(new ItemStack(block, 1, meta));
 		for (int oreId : oreIds) {

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/recipes/RecipeUtil.java

@@ -30,13 +30,14 @@ import cpw.mods.fml.common.registry.GameRegistry;
 
 import forestry.api.recipes.IDescriptiveRecipe;
 import forestry.api.recipes.RecipeManagers;
+import forestry.core.config.Config;
 import forestry.core.fluids.Fluids;
 import forestry.core.utils.ItemStackUtil;
 import forestry.core.utils.Log;
 import forestry.factory.inventory.InventoryCraftingForestry;
 
 public abstract class RecipeUtil {
-
+    static List<Object> cachedRecipes = new ArrayList<Object>();
 	public static void addFermenterRecipes(ItemStack resource, int fermentationValue, Fluids output) {
 		if (RecipeManagers.fermenterManager == null) {
 			return;
@@ -99,7 +100,6 @@ public abstract class RecipeUtil {
 		if (ItemStackUtil.containsSets(recipeItems, availableItems, true, true) == 0) {
 			return null;
 		}
-
 		// Check that it doesn't make a different recipe.
 		// For example:
 		// Wood Logs are all ore dictionary equivalent with each other,
@@ -140,7 +140,6 @@ public abstract class RecipeUtil {
 				}
 			}
 		}
-
 		List<ItemStack> outputs = findMatchingRecipes(crafting, world);
 		if (!ItemStackUtil.containsItemStack(outputs, recipeOutput)) {
 			return null;
@@ -155,7 +154,29 @@ public abstract class RecipeUtil {
 		}
 
 		List<ItemStack> matchingRecipes = new ArrayList<>();
+        List<Integer> matchingIndex=new ArrayList();
+        List<Object> matchingRecipeMap = new ArrayList();
+        int index = 0;
 
+        if(Config.cacheWorktableRecipes) {
+            // Check across the whole cached recipe map
+            // Add each recipe to the matchingRecipes list
+            for (Object recipe : cachedRecipes) {
+    			IRecipe irecipe = (IRecipe) recipe;
+
+    			if (irecipe.matches(inventory, world)) {
+    				ItemStack result = irecipe.getCraftingResult(inventory);
+    				if (!ItemStackUtil.containsItemStack(matchingRecipes, result)) {
+    					matchingRecipes.add(result);
+    				}
+    			}
+            }
+            if( matchingRecipes.size() > 0 ) {
+                // If we found recipes here, we found all the potential recipes, so we can just return immediately.
+                return matchingRecipes;
+            }
+        }
+        // Only do this if there were no cached recipes hit
 		for (Object recipe : CraftingManager.getInstance().getRecipeList()) {
 			IRecipe irecipe = (IRecipe) recipe;
 
@@ -163,10 +184,39 @@ public abstract class RecipeUtil {
 				ItemStack result = irecipe.getCraftingResult(inventory);
 				if (!ItemStackUtil.containsItemStack(matchingRecipes, result)) {
 					matchingRecipes.add(result);
+                    if(Config.promoteWorktableRecipesToFrontOfGlobalRecipemap || Config.cacheWorktableRecipes) {
+                        // Add to the back of the list. That way when we cycle through the list
+                        // moving items to the front, the index locations for the following items doesn't change
+                        matchingRecipeMap.add(recipe);
+                        matchingIndex.add(new Integer(index));
+                    }
 				}
 			}
+            index++;
 		}
-
+        if (matchingRecipeMap.size() > 0 )
+        {
+            if (Config.promoteWorktableRecipesToFrontOfGlobalRecipemap) {
+                // Only move the recipes if the last one was beyond 500 in the recipeMap (in GTNH about 57k recipes)
+                if (matchingIndex.get(matchingIndex.size()-1) > 500) {
+                    List recipeMap = CraftingManager.getInstance().getRecipeList();
+                    System.out.println( "Highest recipe found at " + matchingIndex.get(matchingIndex.size()-1) + ", moving " + matchingIndex.size() + " to front" );
+                    System.out.println( "Size of recipe map " + recipeMap.size() );
+                    for (index = 0; index < matchingIndex.size(); index++) { // index is reused here, it goes through the matching groups.
+                        // Remove recipe and add back at the front
+                        int target = matchingIndex.get(index); // remove requires int
+                        System.out.println("Removing recipe at " + target);
+                        recipeMap.remove(target);
+                        recipeMap.add(0,matchingRecipeMap.get(index));
+                    }
+                }
+            }
+            if(Config.cacheWorktableRecipes) {
+                // However, we should always add found recipes the cached recipe map
+                // Location doesn't matter since we have to scan the whole cached recipe map anyways.
+                cachedRecipes.addAll(matchingRecipeMap);
+            }
+        }
 		return matchingRecipes;
 	}
 

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

@@ -141,6 +141,13 @@ public abstract class ItemStackUtil {
 	 * Counts how many full sets are contained in the passed stock
 	 */
 	public static int containsSets(ItemStack[] set, ItemStack[] stock, boolean oreDictionary, boolean craftingTools) {
+		return containsSets(set, stock, oreDictionary, craftingTools, false);
+	}
+
+	/**
+	 * Counts how many full sets are contained in the passed stock
+	 */
+	public static int containsSets(ItemStack[] set, ItemStack[] stock, boolean oreDictionary, boolean craftingTools, boolean matchTags) {
 		int totalSets = 0;
 
 		ItemStack[] condensedRequired = ItemStackUtil.condenseStacks(set);
@@ -150,7 +157,7 @@ public abstract class ItemStackUtil {
 
 			int reqCount = 0;
 			for (ItemStack offer : condensedOffered) {
-				if (isCraftingEquivalent(req, offer, oreDictionary, craftingTools)) {
+				if (isCraftingEquivalent(req, offer, oreDictionary, craftingTools) && (matchTags ? ItemStack.areItemStackTagsEqual(req, offer) : true)) {
 					int stackCount = (int) Math.floor(offer.stackSize / req.stackSize);
 					reqCount = Math.max(reqCount, stackCount);
 				}

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

@@ -265,6 +265,7 @@ public abstract class SlotUtil {
 	// if mergeOnly = true, don't shift into empty slots.
 	private static boolean shiftToMachineInventory(List inventorySlots, ItemStack stackToShift, int numSlots, boolean mergeOnly) {
 		for (int machineIndex = playerInventorySize; machineIndex < numSlots; machineIndex++) {
+//            System.out.println("SlotUtil::shiftToMachineinventory");
 			Slot slot = (Slot) inventorySlots.get(machineIndex);
 			if (mergeOnly && slot.getStack() == null) {
 				continue;

src/main/java/forestry/factory/tiles/TileWorktable.java

@@ -21,6 +21,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
 
+import forestry.core.config.Config;
 import forestry.core.inventory.InventoryAdapterTile;
 import forestry.core.inventory.wrappers.InventoryMapper;
 import forestry.core.network.DataInputStreamForestry;
@@ -41,7 +42,9 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
 	private final RecipeMemory recipeMemory;
 	private final InventoryAdapterTile craftingDisplay;
 	private MemorizedRecipe currentRecipe;
-
+    private long savedTick = 0;
+    private long savedSystemTimeExpiration = 0;
+    
 	public TileWorktable() {
 		super("worktable");
 		setInternalInventory(new InventoryWorktable(this));
@@ -121,10 +124,27 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
 			return false;
 		}
 
+        if( Config.enableCraftingTimeout ) {
+            long currentTick = worldObj.getTotalWorldTime();
+            if (currentTick == savedTick){
+                // Processing in the same tick, second call, check expiration timer
+                long currentTime = System.nanoTime();
+                if(currentTime > savedSystemTimeExpiration) {
+                    // Time to craft has expired, stop crafting loop
+                    return false;
+                }
+            } else {
+                // New tick has arrived, so reset timer data
+                savedTick=currentTick;
+                savedSystemTimeExpiration = System.nanoTime() + Config.craftingTimeout * 1000000;
+            }
+        }
+
 		ItemStack[] recipeItems = InventoryUtil.getStacks(currentRecipe.getCraftMatrix());
 		ItemStack[] inventory = InventoryUtil.getStacks(this);
 		InventoryCraftingForestry crafting = RecipeUtil.getCraftRecipe(recipeItems, inventory, worldObj, currentRecipe.getRecipeOutput());
-		return crafting != null;
+
+        return crafting != null;
 	}
 
 	@Override
@@ -147,7 +167,6 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
 		if (removed == null) {
 			return false;
 		}
-
 		// update crafting display to match the ingredients that were actually used
 		setCraftingDisplay(crafting);
 		return true;

src/main/java/forestry/farming/multiblock/InventoryFarm.java

@@ -208,7 +208,10 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
 
 	public void stowHarvest(Iterable<ItemStack> harvested, Stack<ItemStack> pendingProduce) {
 		for (ItemStack harvest : harvested) {
-
+			if (harvest == null) {
+				continue;
+			}
+			
 			if (acceptsAsGermling(harvest)) {
 				harvest.stackSize -= InventoryUtil.addStack(germlingsInventory, harvest, true);
 			}
@@ -253,4 +256,4 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
 		decrStackSize(SLOT_FERTILIZER, 1);
 		return true;
 	}
-}
+}

src/main/java/forestry/lepidopterology/ButterflySpawner.java

@@ -28,7 +28,7 @@ public class ButterflySpawner implements ILeafTickHandler {
 		if (world.rand.nextFloat() >= tree.getGenome().getSappiness() * tree.getGenome().getYield()) {
 			return false;
 		}
-		
+
 		IButterfly spawn = ButterflyManager.butterflyRoot.getIndividualTemplates().get(world.rand.nextInt(ButterflyManager.butterflyRoot.getIndividualTemplates().size()));
 		if (world.rand.nextFloat() >= spawn.getGenome().getPrimary().getRarity() * 0.5f) {
 			return false;

src/main/java/forestry/lepidopterology/entities/EntityButterfly.java

@@ -23,6 +23,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
@@ -69,6 +70,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
 	public static final int EXHAUSTION_REST = 1000;
 	public static final int EXHAUSTION_CONSUMPTION = 100 * EXHAUSTION_REST;
 	public static final int MAX_LIFESPAN = 24000 * 7; // one minecraft week in ticks
+	private int maximumHomeDistance = 64;
 
 	private Vec3 flightTarget;
 	private int exhaustion;
@@ -89,10 +91,11 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
 		setDefaults();
 	}
 
-	public EntityButterfly(World world, IButterfly butterfly) {
+	public EntityButterfly(World world, IButterfly butterfly, int x, int y, int z) {
 		super(world);
 		setDefaults();
 		setIndividual(butterfly);
+		setHomeArea(x, y, z, maximumHomeDistance);
 	}
 
 	@Override
@@ -194,6 +197,13 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
 	@Override
 	public float getBlockPathWeight(int x, int y, int z) {
 		float weight = 0.0f;
+		final ChunkCoordinates home = getHomePosition();
+		double distanceToHome = home.getDistanceSquared(x, y, z);
+
+		if(!isWithinHomeDistanceFromPosition(distanceToHome)){
+
+			weight -= 7.5f + 0.005 * (distanceToHome / 4);
+		}
 
 		if (!getButterfly().isAcceptedEnvironment(worldObj, x, y, z)) {
 			weight -= 15.0f;
@@ -232,6 +242,10 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
 		return weight;
 	}
 
+	private boolean isWithinHomeDistanceFromPosition(double distanceToHome) {
+		return distanceToHome < (maximumHomeDistance * maximumHomeDistance);
+	}
+
 	private int getFluidDepth(int x, int z) {
 		Chunk chunk = worldObj.getChunkFromBlockCoords(x, z);
 		int xx = x & 15;

src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java

@@ -149,7 +149,7 @@ public class ButterflyHelper extends SpeciesRoot implements IButterflyRoot {
 
 	@Override
 	public EntityButterfly spawnButterflyInWorld(World world, IButterfly butterfly, double x, double y, double z) {
-		return EntityUtil.spawnEntity(world, new EntityButterfly(world, butterfly), x, y, z);
+		return EntityUtil.spawnEntity(world, new EntityButterfly(world, butterfly, (int)x, (int)y, (int)z), x, y, z);
 	}
 
 	@Override

src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java

@@ -133,7 +133,7 @@ public class ItemButterflyGE extends ItemGE {
 			return false;
 		}
 
-		if (EntityUtil.spawnEntity(entityItem.worldObj, new EntityButterfly(entityItem.worldObj, butterfly), entityItem.posX, entityItem.posY, entityItem.posZ) != null) {
+		if (EntityUtil.spawnEntity(entityItem.worldObj, new EntityButterfly(entityItem.worldObj, butterfly, (int)entityItem.posX, (int)entityItem.posY, (int)entityItem.posZ), entityItem.posX, entityItem.posY, entityItem.posZ) != null) {
 			if (entityItem.getEntityItem().stackSize > 1) {
 				entityItem.getEntityItem().stackSize--;
 			} else {

src/main/java/forestry/lepidopterology/render/RenderButterflyItem.java

@@ -81,7 +81,7 @@ public class RenderButterflyItem implements IItemRenderer {
 		}
 		
 		if (entity == null) {
-			entity = new EntityButterfly(Proxies.common.getRenderWorld(), butterfly);
+			entity = new EntityButterfly(Proxies.common.getRenderWorld(), butterfly, 0, 0, 0);
 		} else {
 			entity.setIndividual(butterfly);
 		}

src/main/java/forestry/mail/TradeStation.java

@@ -176,7 +176,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve
 			return EnumStationState.INSUFFICIENT_PAPER;
 		}
 
-		int ordersToFillCount = ItemStackUtil.containsSets(InventoryUtil.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT), letter.getAttachments());
+		int ordersToFillCount = ItemStackUtil.containsSets(InventoryUtil.getStacks(inventory, SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT), letter.getAttachments(), false, false, true);
 
 		// Not a single match.
 		if (ordersToFillCount <= 0) {
@@ -523,6 +523,9 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve
 					if (!pol.isItemEqual(req)) {
 						continue;
 					}
+					if (!ItemStack.areItemStackTagsEqual(req, pol)) {
+						continue;
+					}
 
 					if (req.stackSize >= pol.stackSize) {
 						req.stackSize -= pol.stackSize;

src/main/java/forestry/plugins/compat/PluginIC2.java

@@ -400,7 +400,13 @@ public class PluginIC2 extends ForestryPlugin {
 	public ArrayList<ItemStack> getCropDrops(TileEntity tileEntity) {
 		if (isIC2Crop(tileEntity)) {
 			ICropTile crop = (ICropTile)tileEntity;
-			ItemStack[] cropDrops = crop.harvest_automated(true);
+			if (crop == null || crop.getCrop() == null)
+				return null;
+			ItemStack[] cropDrops;
+			if ((crop.getCrop().canGrow(crop) && crop.getSize() < crop.getCrop().getOptimalHavestSize(crop)) || crop.getSize() == crop.getCrop().getOptimalHavestSize(crop))
+				cropDrops = crop.harvest_automated(true);
+			else
+				cropDrops = crop.harvest_automated(false);
 			if (cropDrops != null) {
 				return new ArrayList<>(Arrays.asList(cropDrops));
 			}