Add cocoon world genartion with config entry(default false) and add c…

…ocoon loot and a greenhouse butterfly hatch

gradle.properties

@@ -1,6 +1,6 @@
 mcversion=1.8.9
-forgeversion=11.15.1.1755
-mcp_mappings=snapshot_20160219
+forgeversion=11.15.1.1808
+mcp_mappings=snapshot_20160223
 
 jei_version=2.28.+
 

src/main/java/forestry/Forestry.java

@@ -57,7 +57,7 @@
 		name = Constants.MOD_ID,
 		version = Constants.VERSION,
 		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
-		dependencies = "required-after:Forge@[10.13.4.1566,);"
+		dependencies = "required-after:Forge@[11.15.1.1808,);"
 				+ "after:Buildcraft|Core@[6.1.7,);"
 				+ "after:ExtrabiomesXL;"
 				+ "after:BiomesOPlenty;"

src/main/java/forestry/api/greenhouse/IGreenhouseState.java

@@ -5,10 +5,12 @@
  ******************************************************************************/
 package forestry.api.greenhouse;
 
+import java.util.Collection;
 import java.util.List;
 
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
+import forestry.api.multiblock.IMultiblockComponent;
 import net.minecraft.world.World;
 
 public interface IGreenhouseState {
@@ -22,6 +24,8 @@ public interface IGreenhouseState {
 	float getExactHumidity();
 
 	List<IInternalBlock> getInternalBlocks();
+
+	Collection<IMultiblockComponent> getGreenhouseComponents();
 
 	/**
 	 * @return The world in that the greenhouse standing

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|greenhouse", provides = "ForestryAPI|greenhouse")
+@API(apiVersion = "5.0.0", owner = "ForestryAPI|core", provides = "ForestryAPI|greenhouse")
 package forestry.api.greenhouse;
 
 import net.minecraftforge.fml.common.API;

src/main/java/forestry/api/lepidopterology/IAlleleButterflyCocoon.java

@@ -10,12 +10,17 @@
  ******************************************************************************/
 package forestry.api.lepidopterology;
 
+import java.util.Map;
+
 import forestry.api.genetics.IAllele;
+import net.minecraft.item.ItemStack;
 
 public interface IAlleleButterflyCocoon extends IAllele {
 
 	EnumCocoonType getCocoonType();
 
 	String getCocoonTexture(int age);
 
+	Map<ItemStack, Float> getCocoonLoot();
+
 }

src/main/java/forestry/api/lepidopterology/IButterfly.java

@@ -78,6 +78,12 @@ public interface IButterfly extends IIndividualLiving {
 	 */
 	ItemStack[] getCaterpillarDrop(IButterflyNursery nursery, boolean playerKill, int lootLevel);
 
+	/**
+	 * @param cocoon
+	 * @return Array of itemstacks to drop on breaking of the cocoon.
+	 */
+	ItemStack[] getCocoonDrop(IButterflyCocoon cocoon);
+
 	/**
 	 * Create an exact copy of this butterfly.
 	 */

src/main/java/forestry/api/lepidopterology/IButterflyCocoon.java

@@ -13,7 +13,7 @@
 import forestry.api.genetics.IHousing;
 
 public interface IButterflyCocoon extends IHousing{
-
+	
 	IButterfly getCaterpillar();
 
 	void setCaterpillar(IButterfly butterfly);
@@ -22,4 +22,6 @@ public interface IButterflyCocoon extends IHousing{
 
 	void setNursery(IButterflyNursery nursery);
 
+	boolean isSolid();
+
 }

src/main/java/forestry/api/multiblock/IGreenhouseComponent.java

@@ -8,6 +8,8 @@
 import forestry.api.core.IClimateControlled;
 import forestry.api.greenhouse.IGreenhouseHousing;
 import forestry.api.greenhouse.IGreenhouseListener;
+import forestry.api.lepidopterology.IButterflyCocoon;
+import net.minecraft.item.ItemStack;
 
 public interface IGreenhouseComponent<T extends IMultiblockLogicGreenhouse> extends IMultiblockComponent {
 	@Override
@@ -23,6 +25,10 @@ interface Door extends IGreenhouseComponent {
 	interface Climatiser extends IGreenhouseComponent {
 		<G extends IGreenhouseController & IGreenhouseHousing & IClimateControlled> void changeClimate(int tickCount, G greenhouse);
 	}
+
+	interface ButterflyHatch extends IGreenhouseComponent {
+		ItemStack[] addCocoonLoot(IButterflyCocoon cocoon);
+	}
 
 	interface Active extends IGreenhouseComponent {
 		void updateServer(int tickCount);

src/main/java/forestry/core/gui/GuiUtil.java

@@ -142,4 +142,4 @@ public static void drawToolTips(GuiForestry gui, Collection<?> objects, int mous
 			}
 		}
 	}
-}
+}

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

@@ -440,6 +440,11 @@ public static List<ItemStack> parseItemStackStrings(String itemStackStrings, int
 		List<Stack> stacks = Stack.parseStackStrings(itemStackStrings, missingMetaValue);
 		return getItemStacks(stacks);
 	}
+
+	public static ItemStack parseItemStackString(String itemStackString, int missingMetaValue) {
+		Stack stack = Stack.parseStackString(itemStackString, missingMetaValue);
+		return getItemStack(stack);
+	}
 
 	private static List<ItemStack> getItemStacks(List<Stack> stacks) {
 		List<ItemStack> itemStacks = new ArrayList<>(stacks.size());
@@ -453,5 +458,15 @@ private static List<ItemStack> getItemStacks(List<Stack> stacks) {
 		}
 		return itemStacks;
 	}
+
+	private static ItemStack getItemStack(Stack stack) {
+		Item item = stack.getItem();
+		if (item != null) {
+			int meta = stack.getMeta();
+			ItemStack itemStack = new ItemStack(item, 1, meta);
+			return itemStack;
+		}
+		return null;
+	}
 
 }

src/main/java/forestry/greenhouse/GreenhouseState.java

@@ -10,12 +10,14 @@
  ******************************************************************************/
 package forestry.greenhouse;
 
+import java.util.Collection;
 import java.util.List;
 
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
 import forestry.api.greenhouse.IGreenhouseState;
 import forestry.api.greenhouse.IInternalBlock;
+import forestry.api.multiblock.IMultiblockComponent;
 import forestry.greenhouse.multiblock.GreenhouseController;
 import net.minecraft.world.World;
 
@@ -25,16 +27,18 @@ public final class GreenhouseState implements IGreenhouseState {
 	private final float temperature;
 	private final World world;
 	private final List<IInternalBlock> internalBlocks;
+	private final Collection<IMultiblockComponent> greenhouseComponents;
 
-	public GreenhouseState(World world, float humidity, float temperature, List<IInternalBlock> internalBlocks) {
+	public GreenhouseState(World world, float humidity, float temperature, List<IInternalBlock> internalBlocks, Collection<IMultiblockComponent> greenhouseComponents) {
 		this.world = world;
 		this.humidity = humidity;
 		this.temperature = temperature;
 		this.internalBlocks = internalBlocks;
+		this.greenhouseComponents = greenhouseComponents;
 	}
 
 	public GreenhouseState(GreenhouseController controller) {
-		this(controller.getWorld(), controller.getExactHumidity(), controller.getExactTemperature(), controller.getInternalBlocks());
+		this(controller.getWorld(), controller.getExactHumidity(), controller.getExactTemperature(), controller.getInternalBlocks(), controller.getComponents());
 	}
 
 	@Override
@@ -66,5 +70,10 @@ public World getWorld() {
 	public List<IInternalBlock> getInternalBlocks() {
 		return internalBlocks;
 	}
+
+	@Override
+	public Collection<IMultiblockComponent> getGreenhouseComponents() {
+		return greenhouseComponents;
+	}
 
 }

src/main/java/forestry/greenhouse/PluginGreenhouse.java

@@ -26,6 +26,7 @@
 import forestry.greenhouse.logics.GreenhouseLogicGreenhouseEffect;
 import forestry.greenhouse.network.PacketRegistryGreenhouse;
 import forestry.greenhouse.proxy.ProxyGreenhouse;
+import forestry.greenhouse.tiles.TileGreenhouseButterflyHatch;
 import forestry.greenhouse.tiles.TileGreenhouseControl;
 import forestry.greenhouse.tiles.TileGreenhouseDoor;
 import forestry.greenhouse.tiles.TileGreenhouseDryer;
@@ -191,6 +192,9 @@ public void doInit() {
 		GameRegistry.registerTileEntity(TileGreenhousePlain.class, "forestry.GreenhousePlain");
 		GameRegistry.registerTileEntity(TileGreenhouseDoor.class, "forestry.GreenhouseDoor");
 		GameRegistry.registerTileEntity(TileGreenhouseHatch.class, "forestry.GreenhouseHatch");
+		if(ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)){
+			GameRegistry.registerTileEntity(TileGreenhouseButterflyHatch.class, "forestry.GreenhouseButterflyHatch");
+		}
 	}
 
 	@Override

src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java

@@ -80,6 +80,12 @@ public String getName() {
 	public static Map<BlockGreenhouseType, BlockGreenhouse> create() {
 		Map<BlockGreenhouseType, BlockGreenhouse> blockMap = new EnumMap<>(BlockGreenhouseType.class);
 		for (final BlockGreenhouseType type : BlockGreenhouseType.VALUES) {
+			if(type == BlockGreenhouseType.BUTTERFLY_HATCH){
+				if(!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) {
+					continue;
+				}
+			}
+
 			BlockGreenhouse block;
 			if(type == BlockGreenhouseType.DOOR){
 				block = new BlockGreenhouseDoor();
@@ -204,6 +210,8 @@ public TileEntity createTileEntity(World world, IBlockState state) {
 			case HATCH_INPUT:
 			case HATCH_OUTPUT:
 				return new TileGreenhouseHatch();
+			case BUTTERFLY_HATCH:
+				return new TileGreenhouseHatch();
 			default:
 				return new TileGreenhousePlain();
 		}

src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java

@@ -31,7 +31,8 @@ public enum BlockGreenhouseType {
 	DRYER(true, true),
 	CONTROL(true),
 	SPRINKLER(false, true),
-	DOOR;
+	DOOR,
+	BUTTERFLY_HATCH(true);
 
 	public static final BlockGreenhouseType[] VALUES = values();
 
@@ -57,7 +58,7 @@ public enum BlockGreenhouseType {
 	private static EnumMap<BlockGreenhouseSprites, TextureAtlasSprite> sprites;
 
 	private static enum BlockGreenhouseSprites{
-		PLAIN, GLASS, GEARS("gears"), VALVE("valve"), FAN_OFF("fan.off"), FAN_ON("fan.on"), HEATER_OFF("heater.off"), HEATER_ON("heater.on"), DRYER("dryer"), CONTROL("control"), HATCH_DEFAULT("hatch"), HATCH_INPUT("hatch_input"), HATCH_OUTPUT("hatch_output");
+		PLAIN, GLASS, GEARS("gears"), VALVE("valve"), FAN_OFF("fan.off"), FAN_ON("fan.on"), HEATER_OFF("heater.off"), HEATER_ON("heater.on"), DRYER("dryer"), CONTROL("control"), HATCH_DEFAULT("hatch"), HATCH_INPUT("hatch_input"), HATCH_OUTPUT("hatch_output"), BUTTERFLY_HATCH("butterfly_hatch");
 
 		public static final BlockGreenhouseSprites[] VALUES = values();
 
@@ -135,6 +136,11 @@ public static TextureAtlasSprite getSprite(BlockGreenhouseType type, EnumFacing
 					return sprites.get(BlockGreenhouseSprites.HATCH_INPUT);
 				}
 				return null;
+			case BUTTERFLY_HATCH:
+				if(facing == EnumFacing.DOWN || facing == EnumFacing.UP){
+					return null;
+				}
+				return sprites.get(BlockGreenhouseSprites.BUTTERFLY_HATCH);
 			default:
 				return Minecraft.getMinecraft().getTextureMapBlocks().getMissingSprite();	
 		}

src/main/java/forestry/greenhouse/gui/ContainerGreenhouseButterflyHatch.java

@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * 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.greenhouse.gui;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraftforge.fluids.IFluidTank;
+import forestry.core.gui.ContainerTile;
+import forestry.core.gui.slots.SlotOutput;
+import forestry.core.network.packets.PacketGuiUpdate;
+import forestry.greenhouse.tiles.TileGreenhouseButterflyHatch;
+
+public class ContainerGreenhouseButterflyHatch extends ContainerTile<TileGreenhouseButterflyHatch> {
+
+	public ContainerGreenhouseButterflyHatch(InventoryPlayer playerInventory, TileGreenhouseButterflyHatch tile) {
+		super(tile, playerInventory, 8, 84);
+
+		addSlotToContainer(new SlotOutput(tile, 0, 60, 40));
+		addSlotToContainer(new SlotOutput(tile, 1, 80, 27));
+		addSlotToContainer(new SlotOutput(tile, 2, 101, 40));
+		addSlotToContainer(new SlotOutput(tile, 3, 80, 53));
+	}
+
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		PacketGuiUpdate packet = new PacketGuiUpdate(tile);
+		sendPacketToCrafters(packet);
+	}
+
+	public IFluidTank getTank(int slot) {
+		return tile.getMultiblockLogic().getController().getTankManager().getTank(slot);
+	}
+
+}

src/main/java/forestry/greenhouse/gui/GuiGreenhouseButterflyHatch.java

@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * 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.greenhouse.gui;
+
+import net.minecraft.entity.player.EntityPlayer;
+import forestry.core.config.Constants;
+import forestry.core.gui.GuiForestryTitled;
+import forestry.core.gui.ledgers.ClimateLedger;
+import forestry.greenhouse.gui.widgets.WidgetCamouflageSlot;
+import forestry.greenhouse.multiblock.IGreenhouseControllerInternal;
+import forestry.greenhouse.tiles.TileGreenhouseButterflyHatch;
+
+public class GuiGreenhouseButterflyHatch extends GuiForestryTitled<ContainerGreenhouseButterflyHatch, TileGreenhouseButterflyHatch> {
+
+	public GuiGreenhouseButterflyHatch(EntityPlayer player, TileGreenhouseButterflyHatch tile) {
+		super(Constants.TEXTURE_PATH_GUI + "/greenhouse_butterfly_hatch.png", new ContainerGreenhouseButterflyHatch(player.inventory, tile), tile);
+
+		//Add the tile camouflage slots
+		widgetManager.add(new WidgetCamouflageSlot(widgetManager, 8, 17, inventory, tile.getCamouflageType()));
+	}
+
+	@Override
+	protected void addLedgers() {
+		IGreenhouseControllerInternal greenhouseController = inventory.getMultiblockLogic().getController();
+
+		ledgerManager.add(new ClimateLedger(ledgerManager, greenhouseController));
+		super.addLedgers();
+	}
+}

src/main/java/forestry/greenhouse/multiblock/InventoryGreenhouse.java → src/main/java/forestry/greenhouse/inventory/InventoryGreenhouse.java

@@ -8,11 +8,12 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package forestry.greenhouse.multiblock;
+package forestry.greenhouse.inventory;
 
 import forestry.core.fluids.FluidHelper;
 import forestry.core.fluids.TankManager;
 import forestry.core.inventory.InventoryAdapterRestricted;
+import forestry.greenhouse.multiblock.GreenhouseController;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 

src/main/java/forestry/greenhouse/inventory/InventoryGreenhouseButterflyHatch.java

@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * 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.greenhouse.inventory;
+
+import forestry.core.inventory.InventoryAdapterTile;
+import forestry.greenhouse.tiles.TileGreenhouseButterflyHatch;
+
+public class InventoryGreenhouseButterflyHatch extends InventoryAdapterTile<TileGreenhouseButterflyHatch> {
+
+	public static final int SLOTS = 4;
+
+	public InventoryGreenhouseButterflyHatch(TileGreenhouseButterflyHatch tile) {
+		super(tile, SLOTS, "Items");
+	}
+
+}

src/main/java/forestry/greenhouse/models/ModelGreenhouse.java

@@ -52,6 +52,7 @@ private void bakeBlockModel(@Nonnull BlockGreenhouse block, @Nullable IBlockAcce
 			BlockModelShapes modelShapes = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes();
 
 			baker.addBakedModel(modelShapes.getModelForState(Block.getBlockFromItem(camouflageStack.getItem()).getStateFromMeta(camouflageStack.getItemDamage())));
+			baker.setParticleSprite(modelShapes.getModelForState(Block.getBlockFromItem(camouflageStack.getItem()).getStateFromMeta(camouflageStack.getItemDamage())).getParticleTexture());
 		}
 
 		//Bake the default blocks