Merge remote-tracking branch 'origin/dev' into 4.2

Update PlantMegaPack Plugin

gradle.properties

@@ -2,4 +2,4 @@ mcversion=1.7.10
 forgeversion=10.13.4.1566-1.7.10
 version_major=4
 version_minor=2
-version_patch=9
+version_patch=12

src/main/java/forestry/apiculture/VillageHandlerApiculture.java

@@ -49,6 +49,7 @@ public class VillageHandlerApiculture implements IVillageCreationHandler, IVilla
 	@Override
 	public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) {
 		ItemStack wildcardPrincess = new ItemStack(PluginApiculture.items.beePrincessGE, 1, OreDictionary.WILDCARD_VALUE);
+		ItemStack wildcardDrone = new ItemStack(PluginApiculture.items.beeDroneGE, 4, OreDictionary.WILDCARD_VALUE);
 		recipeList.add(new MerchantRecipe(wildcardPrincess, new ItemStack(Items.emerald, 1)));
 
 		ItemStack randomComb = PluginApiculture.items.beeComb.getRandomComb(1, random, false);
@@ -62,6 +63,23 @@ public class VillageHandlerApiculture implements IVillageCreationHandler, IVilla
 
 		ItemStack monasticDrone = BeeDefinition.MONASTIC.getMemberStack(EnumBeeType.DRONE);
 		recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 12), wildcardPrincess, monasticDrone));
+
+		ItemStack endDrone = BeeDefinition.ENDED.getMemberStack(EnumBeeType.DRONE);
+		recipeList.add(new MerchantRecipe(new ItemStack(Items.ender_eye, 16), wildcardPrincess, endDrone));
+
+		ItemStack propolis = new ItemStack(PluginApiculture.items.propolis,1);
+		ItemStack forestDrone = BeeDefinition.FOREST.getMemberStack(EnumBeeType.DRONE);
+		ItemStack meadowsDrone = BeeDefinition.MEADOWS.getMemberStack(EnumBeeType.DRONE);
+		ItemStack modestDrone = BeeDefinition.MODEST.getMemberStack(EnumBeeType.DRONE);
+		ItemStack tropicalDrone = BeeDefinition.TROPICAL.getMemberStack(EnumBeeType.DRONE);
+		ItemStack wintryDrone = BeeDefinition.WINTRY.getMemberStack(EnumBeeType.DRONE);
+		ItemStack marshyDrone = BeeDefinition.MARSHY.getMemberStack(EnumBeeType.DRONE);
+		recipeList.add(new MerchantRecipe(propolis, wildcardDrone, forestDrone));
+		recipeList.add(new MerchantRecipe(propolis, wildcardDrone, meadowsDrone));
+		recipeList.add(new MerchantRecipe(propolis, wildcardDrone, modestDrone));
+		recipeList.add(new MerchantRecipe(propolis, wildcardDrone, tropicalDrone));
+		recipeList.add(new MerchantRecipe(propolis, wildcardDrone, wintryDrone));
+		recipeList.add(new MerchantRecipe(propolis, wildcardDrone, marshyDrone));
 	}
 
 	@Override

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

@@ -49,7 +49,7 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
 
 			// Entities are not attacked if they wear a full set of apiarist's armor.
 			int count = BeeManager.armorApiaristHelper.wearsItems(entity, getUID(), true);
-			damage -= count;
+			damage -= (count * 2);
 			if (damage <= 0) {
 				continue;
 			}

src/main/java/forestry/core/fluids/Fluids.java

@@ -211,7 +211,31 @@ public enum Fluids {
 		@Override
 		public EnumSet<EnumContainerType> getContainerTypes() {
 			return EnumSet.of(
-					EnumContainerType.BUCKET
+					EnumContainerType.BUCKET,
+					EnumContainerType.CAN,
+					EnumContainerType.CAPSULE,
+					EnumContainerType.REFRACTORY
+			);
+		}
+	},
+	MEAD("Mead", new Color(202, 102, 0), 1000, 1200) {
+		@Override
+		public String getTag() {
+			return "mead";
+		}
+
+		@Override
+		public Block makeBlock() {
+			return new BlockForestryFluid(this);
+		}
+
+		@Override
+		public EnumSet<EnumContainerType> getContainerTypes() {
+			return EnumSet.of(
+					EnumContainerType.BUCKET,
+					EnumContainerType.CAN,
+					EnumContainerType.CAPSULE,
+					EnumContainerType.REFRACTORY
 			);
 		}
 	},
@@ -260,7 +284,7 @@ public enum Fluids {
 	CREOSOTE(new Color(0x635c03)),
 	STEAM(new Color(0x91938F));
 
-	public static final Fluids[] forestryFluids = {ETHANOL, BIOMASS, GLASS, HONEY, LEGACY_HONEY, ICE, JUICE, MILK, SEEDOIL, SHORT_MEAD};
+	public static final Fluids[] forestryFluids = {ETHANOL, BIOMASS, GLASS, HONEY, LEGACY_HONEY, ICE, JUICE, MILK, SEEDOIL, SHORT_MEAD, MEAD};
 
 	private static final Map<String, Fluids> tagToFluid = new HashMap<>();
 

src/main/java/forestry/core/genetics/SpeciesRoot.java

@@ -148,7 +148,6 @@ public abstract class SpeciesRoot implements ISpeciesRoot {
 		return chromosomes;
 	}
 
-	/* BREEDING TRACKER */
 	@Override
 	public void syncBreedingTrackerToPlayer(EntityPlayer player) {
 		getBreedingTracker(player.worldObj, player.getGameProfile()).synchToPlayer(player);

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

@@ -407,6 +407,22 @@ public abstract class InventoryUtil {
 		return ((float) amount / (float) stackMax) >= percent;
 	}
 
+	public static boolean containsAmount(IInventory inventory, int amount) {
+		int total = 0;
+		int slot1 = 0;
+		int length = inventory.getSizeInventory();
+		for (ItemStack itemStack : getStacks(inventory, slot1, length)) {
+			if (itemStack == null) {
+				continue;
+			}
+			total += itemStack.stackSize;
+			if (total >= amount) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public static boolean isEmpty(IInventory inventory, int slotStart, int slotCount) {
 		for (int i = slotStart; i < slotStart + slotCount; i++) {
 			if (inventory.getStackInSlot(i) != null) {

src/main/java/forestry/energy/gui/ContainerEngineElectric.java

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package forestry.energy.gui;
 
+import forestry.core.network.packets.PacketGuiUpdate;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
 
@@ -36,13 +37,9 @@ public class ContainerEngineElectric extends ContainerSocketed<TileEngineElectri
 	@Override
 	public void detectAndSendChanges() {
 		super.detectAndSendChanges();
-
-		if (tile == null) {
-			return;
-		}
-
-		for (Object crafter : crafters) {
-			tile.sendGUINetworkData(this, (ICrafting) crafter);
+		if (tile != null) {
+			PacketGuiUpdate packet = new PacketGuiUpdate(tile);
+			sendPacketToCrafters(packet);
 		}
 	}
 

src/main/java/forestry/energy/tiles/TileEngineElectric.java

@@ -10,13 +10,6 @@
  ******************************************************************************/
 package forestry.energy.tiles;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
 import forestry.api.circuits.ChipsetManager;
 import forestry.api.circuits.CircuitSocketType;
 import forestry.api.circuits.ICircuitBoard;
@@ -26,15 +19,25 @@ import forestry.core.circuits.ISocketable;
 import forestry.core.config.Constants;
 import forestry.core.errors.EnumErrorCode;
 import forestry.core.inventory.InventoryAdapter;
+import forestry.core.network.DataInputStreamForestry;
+import forestry.core.network.DataOutputStreamForestry;
+import forestry.core.network.IStreamableGui;
 import forestry.core.tiles.TemperatureState;
 import forestry.core.tiles.TileEngine;
 import forestry.energy.gui.ContainerEngineElectric;
 import forestry.energy.gui.GuiEngineElectric;
 import forestry.plugins.compat.PluginIC2;
-
 import ic2.api.energy.prefab.BasicSink;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 
-public class TileEngineElectric extends TileEngine implements ISocketable, IInventory {
+import java.io.IOException;
+
+public class TileEngineElectric extends TileEngine implements ISocketable, IInventory, IStreamableGui {
 	protected static class EuConfig {
 
 		public int euForCycle;
@@ -92,6 +95,32 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 		sockets.writeToNBT(nbttagcompound);
 	}
 
+	@Override
+	public void writeGuiData(DataOutputStreamForestry data) throws IOException {
+		data.writeVarInt(currentOutput);
+		data.writeVarInt(heat);
+		sockets.writeData(data);
+		energyManager.writeData(data);
+		final boolean hasIc2EnergySink = (ic2EnergySink != null);
+		data.writeBoolean(hasIc2EnergySink);
+		if (hasIc2EnergySink) {
+			data.writeVarInt((int) ic2EnergySink.getEnergyStored());
+		}
+	}
+
+	@Override
+	public void readGuiData(DataInputStreamForestry data) throws IOException {
+		currentOutput = data.readVarInt();
+		heat = data.readVarInt();
+		sockets.readData(data);
+		energyManager.readData(data);
+		final boolean hasIc2EnergySink = data.readBoolean();
+		if (hasIc2EnergySink) {
+			final int energyStored = data.readVarInt();
+			ic2EnergySink.setEnergyStored(energyStored);
+		}
+	}
+
 	@Override
 	public void onChunkUnload() {
 		if (ic2EnergySink != null) {
@@ -219,35 +248,12 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve
 	// / SMP GUI
 	@Override
 	public void getGUINetworkData(int i, int j) {
-
-		switch (i) {
-
-			case 0:
-				currentOutput = j;
-				break;
-			case 1:
-				energyManager.fromGuiInt(j);
-				break;
-			case 2:
-				heat = j;
-				break;
-			case 3:
-				if (ic2EnergySink != null) {
-					ic2EnergySink.setEnergyStored(j);
-				}
-				break;
-		}
-
+		// handled by IStreamableGui
 	}
 
 	@Override
 	public void sendGUINetworkData(Container containerEngine, ICrafting iCrafting) {
-		iCrafting.sendProgressBarUpdate(containerEngine, 0, currentOutput);
-		iCrafting.sendProgressBarUpdate(containerEngine, 1, energyManager.toGuiInt());
-		iCrafting.sendProgressBarUpdate(containerEngine, 2, heat);
-		if (ic2EnergySink != null) {
-			iCrafting.sendProgressBarUpdate(containerEngine, 3, (short) ic2EnergySink.getEnergyStored());
-		}
+		// handled by IStreamableGui
 	}
 
 	// / ENERGY CONFIG CHANGE

src/main/java/forestry/factory/recipes/SqueezerRecipeManager.java

@@ -70,17 +70,21 @@ public class SqueezerRecipeManager implements ISqueezerManager {
 			}
 		}
 
-		// First try to match a specific recipe (without OreDictionary)
 		for (ISqueezerRecipe recipe : recipes) {
 			if (ItemStackUtil.containsSets(recipe.getResources(), items, false, false) > 0) {
 				return recipe;
 			}
 		}
 
-		// If that fails - try again with OreDictionary support enabled
+		return null;
+	}
+
+	public static ISqueezerRecipe findRecipeWithIngredient(ItemStack ingredient) {
 		for (ISqueezerRecipe recipe : recipes) {
-			if (ItemStackUtil.containsSets(recipe.getResources(), items, true, false) > 0) {
-				return recipe;
+			for (ItemStack recipeIngredient : recipe.getResources()) {
+				if (ItemStackUtil.isCraftingEquivalent(recipeIngredient, ingredient, false, false)) {
+					return recipe;
+				}
 			}
 		}
 

src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java

@@ -246,11 +246,9 @@ public class NEIHandlerSqueezer extends RecipeHandlerBase {
 			return;
 		}
 
-		ISqueezerRecipe recipe = SqueezerRecipeManager.findMatchingRecipe(new ItemStack[]{ingred});
+		ISqueezerRecipe recipe = SqueezerRecipeManager.findRecipeWithIngredient(ingred);
 		if (recipe != null) {
 			CachedSqueezerRecipe crecipe = new CachedSqueezerRecipe(recipe);
-			// Override recipe to show the right input in case it's OD
-			crecipe.setIngredients(new ItemStack[]{ingred});
 			this.arecipes.add(crecipe);
 		}
 	}

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

@@ -31,6 +31,9 @@ import forestry.core.utils.InventoryUtil;
 import forestry.core.utils.PlayerUtil;
 import forestry.core.utils.SlotUtil;
 import forestry.plugins.PluginCore;
+import forestry.plugins.PluginManager;
+
+import ic2.api.item.IC2Items;
 
 public class InventoryFarm extends InventoryAdapterRestricted implements IFarmInventory {
 	public static final int SLOT_RESOURCES_1 = 0;
@@ -132,8 +135,14 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
 		if (itemstack == null) {
 			return false;
 		}
-
 		Item item = itemstack.getItem();
+		if (PluginManager.Module.INDUSTRIALCRAFT.isEnabled()) {
+			Item ic2fert = IC2Items.getItem("fertilizer").getItem();
+			if (ic2fert == item) {
+					return true;
+			}
+		}
+
 		return PluginCore.items.fertilizerCompound == item;
 	}
 

src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java

@@ -44,6 +44,6 @@ public class TriggerLowFertilizer extends Trigger {
 
 		TileFarmHatch tileHatch = (TileFarmHatch) tile;
 		IInventory fertilizerInventory = tileHatch.getMultiblockLogic().getController().getFarmInventory().getFertilizerInventory();
-		return InventoryUtil.containsPercent(fertilizerInventory, threshold);
+		return !InventoryUtil.containsPercent(fertilizerInventory, threshold);
 	}
 }

src/main/java/forestry/farming/triggers/TriggerLowGermlings.java

@@ -47,6 +47,6 @@ public class TriggerLowGermlings extends Trigger {
 
 		TileFarmHatch tileHatch = (TileFarmHatch) tile;
 		IInventory germlingsInventory = tileHatch.getMultiblockLogic().getController().getFarmInventory().getGermlingsInventory();
-		return InventoryUtil.containsPercent(germlingsInventory, threshold);
+		return !InventoryUtil.containsPercent(germlingsInventory, threshold);
 	}
 }

src/main/java/forestry/farming/triggers/TriggerLowSoil.java

@@ -24,6 +24,7 @@ import forestry.farming.tiles.TileFarmHatch;
 
 import buildcraft.api.statements.IStatementContainer;
 import buildcraft.api.statements.IStatementParameter;
+import buildcraft.api.statements.StatementParameterItemStack;
 
 public class TriggerLowSoil extends Trigger {
 
@@ -49,6 +50,11 @@ public class TriggerLowSoil extends Trigger {
 		return 0;
 	}
 
+	@Override
+	public IStatementParameter createParameter(int index) {
+		return new StatementParameterItemStack();
+	}
+
 	/**
 	 * Return true if the tile given in parameter activates the trigger, given
 	 * the parameters.
@@ -67,14 +73,14 @@ public class TriggerLowSoil extends Trigger {
 		TileFarmHatch tileHatch = (TileFarmHatch) tile;
 		IFarmController farmController = tileHatch.getMultiblockLogic().getController();
 		IFarmInventory farmInventory = farmController.getFarmInventory();
+		IInventory resourcesInventory = farmInventory.getResourcesInventory();
 
 		if (parameter == null || parameter.getItemStack() == null) {
-			IInventory resourcesInventory = farmInventory.getResourcesInventory();
-			return InventoryUtil.containsPercent(resourcesInventory, threshold);
+			return !InventoryUtil.containsAmount(resourcesInventory, threshold);
 		} else {
 			ItemStack filter = parameter.getItemStack().copy();
 			filter.stackSize = threshold;
-			return farmInventory.hasResources(new ItemStack[]{filter});
+			return !InventoryUtil.contains(resourcesInventory, new ItemStack[]{filter});
 		}
 	}
 }

src/main/java/forestry/food/items/EnumBeverage.java

@@ -22,8 +22,8 @@ import forestry.core.render.TextureManager;
 
 public enum EnumBeverage implements ItemBeverage.IBeverageInfo {
 	MEAD_SHORT("meadShort", "glass", new Color(0xec9a19), new Color(0xffffff), 1, 0.2f, true),
-	MEAD_CURATIVE("meadCurative", "glass", new Color(0xc5feff), new Color(0xffffff), 1, 0.2f, true);
-
+	MEAD_CURATIVE("meadCurative", "glass", new Color(0xc5feff), new Color(0xffffff), 1, 0.2f, true),
+	MEAD("mead", "glass", new Color(0xcc6600), new Color(0xffffff), 10, 0.1f, true);
 	public static final EnumBeverage[] VALUES = values();
 
 	private final String name;

src/main/java/forestry/food/items/ItemBeverage.java

@@ -15,6 +15,7 @@ import java.util.List;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -49,7 +50,7 @@ public class ItemBeverage extends ItemForestryFood {
 
 	public ItemBeverage() {
 		super(1, 0.2f);
-		setMaxStackSize(1);
+		setMaxStackSize(8);
 		this.beverages = EnumBeverage.VALUES;
 	}
 
@@ -64,11 +65,18 @@ public class ItemBeverage extends ItemForestryFood {
 	@Override
 	public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) {
 		List<IBeverageEffect> effects = BeverageEffect.loadEffects(itemstack);
+		ItemStack container = new ItemStack(Items.glass_bottle, 1);
 
 		itemstack.stackSize--;
+		if (!entityplayer.inventory.addItemStackToInventory(container)) {
+				entityplayer.dropPlayerItemWithRandomChoice(container, false);
+		} else {
+			entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, container);
+		}
+		entityplayer.inventory.markDirty();
+
 		entityplayer.getFoodStats().func_151686_a(this, itemstack);
 		world.playSoundAtEntity(entityplayer, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F);
-
 		if (world.isRemote) {
 			return itemstack;
 		}

src/main/java/forestry/plugins/PluginApiculture.java

@@ -710,6 +710,8 @@ public class PluginApiculture extends ForestryPlugin {
 
 			// / FERMENTER
 			RecipeManagers.fermenterManager.addRecipe(items.honeydew.getItemStack(), 500, 1.0f, Fluids.SHORT_MEAD.getFluid(1), Fluids.HONEY.getFluid(1));
+			// / STILL
+			RecipeManagers.stillManager.addRecipe(Constants.STILL_DESTILLATION_DURATION, Fluids.SHORT_MEAD.getFluid(10), Fluids.MEAD.getFluid(5));
 		}
 
 		// ANALYZER

src/main/java/forestry/plugins/PluginFluids.java

@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.block.Block;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
@@ -175,6 +176,11 @@ public class PluginFluids extends ForestryPlugin {
 	public static class FillBucketHook {
 		@SubscribeEvent
 		public void fillBucket(FillBucketEvent event) {
+			ItemStack bucket = event.current;
+			if (bucket == null || bucket.getItem() != Items.bucket) {
+				return;
+			}
+			
 			MovingObjectPosition movingObjectPosition = event.target;
 			int x = movingObjectPosition.blockX;
 			int y = movingObjectPosition.blockY;

src/main/java/forestry/plugins/PluginFood.java

@@ -50,6 +50,7 @@ public class PluginFood extends ForestryPlugin {
 		super.preInit();
 
 		LiquidRegistryHelper.registerLiquidContainer(Fluids.SHORT_MEAD, Constants.BUCKET_VOLUME, items.beverage.get(EnumBeverage.MEAD_SHORT, 1), new ItemStack(Items.glass_bottle));
+		LiquidRegistryHelper.registerLiquidContainer(Fluids.MEAD, Constants.BUCKET_VOLUME, items.beverage.get(EnumBeverage.MEAD, 1), new ItemStack(Items.glass_bottle));
 
 		ItemRegistryApiculture beeItems = PluginApiculture.items;
 		if (beeItems != null) {

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

@@ -67,12 +67,20 @@ public class PluginPlantMegaPack extends ForestryPlugin {
 
 		ImmutableList<String> landCropPlant = ImmutableList.of(
 				"Beet",
+				"BellPepperOrange",
+				"BellPepperRed",
 				"BellPepperYellow",
+				"Broccoli",
+				"Cassava",
 				"Celery",
 				"Corn",
 				"Cucumber",
+				"Eggplant",
+				"GreenBean",
+				"Leek",
 				"Lettuce",
 				"Onion",
+				"Sorrel",
 				"Spinach",
 				"Tomato"
 		);

src/main/resources/assets/forestry/textures/blocks/liquid/mead_still.png.mcmeta

@@ -0,0 +1 @@
+{"animation":{"width":1,"height":32,"frametime":1,"frames":[{"index":0,"time":2},{"index":1,"time":2},{"index":2,"time":2},{"index":3,"time":2},{"index":4,"time":2},{"index":5,"time":2},{"index":6,"time":2},{"index":7,"time":2},{"index":8,"time":2},{"index":9,"time":2},{"index":10,"time":2},{"index":11,"time":2},{"index":12,"time":2},{"index":13,"time":2},{"index":14,"time":2},{"index":15,"time":2},{"index":16,"time":2},{"index":17,"time":2},{"index":18,"time":2},{"index":19,"time":2},{"index":20,"time":2},{"index":21,"time":2},{"index":22,"time":2},{"index":23,"time":2},{"index":24,"time":2},{"index":25,"time":2},{"index":26,"time":2},{"index":27,"time":2},{"index":28,"time":2},{"index":29,"time":2},{"index":30,"time":2},{"index":31,"time":2}]}}