remove redstone flux not working api

if crop havest is not possible at the optimal state, just harvest, ffs.

Signed-off-by: bartimaeusnek <[email protected]>

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "lang"]
 	path = lang
 	url = https://github.com/ForestryMC/Forestry-Localization.git
-[submodule "api/redstoneflux"]
-	path = api/redstoneflux
-	url = https://github.com/CoFH/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'
 	}
 }
 

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=19

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/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/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/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/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/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));
 			}