Merge pull request #301 from GrowthcraftCE/development

Fix Honey and Milk not being disabled correctly

README.md

@@ -2,10 +2,11 @@ Growthcraft
 ===========
 
 [![Minecraft Version](http://img.shields.io/minecraft/1.7.10.png?color=green)](https://minecraft.net/)
-[![Growthcraft Version](http://img.shields.io/growthcraft/2.5.0.png?color=green)](https://github.com/GrowthcraftCE/Growthcraft-1.7)
+[![Growthcraft Version](http://img.shields.io/growthcraft/2.5.1.png?color=green)](https://github.com/GrowthcraftCE/Growthcraft-1.7)
 [![Forge Version](http://img.shields.io/forge/10.13.4.1566.png?color=green)](http://files.minecraftforge.net/)
 [![Java Version](http://img.shields.io/java/7.png?color=green)](https://www.java.com/en/)
-[![Build Status](https://travis-ci.org/GrowthcraftCE/Growthcraft-1.7.svg?branch=master)](https://travis-ci.org/GrowthcraftCE/Growthcraft-1.7) [![Join the chat at https://gitter.im/GrowthcraftCE/Growthcraft-1.7](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/GrowthcraftCE/Growthcraft-1.7?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.org/GrowthcraftCE/Growthcraft-1.7.svg?branch=master)](https://travis-ci.org/GrowthcraftCE/Growthcraft-1.7) 
+[![Join the chat at https://gitter.im/GrowthcraftCE/Growthcraft-1.7](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/GrowthcraftCE/Growthcraft-1.7?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 This is a community fork of the original GrowthCraft developed by Gwafu. 
 The original forum post can be found on the [Minecraft Forums mod page](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1286298-growthcraft-jul-15-2014-proper-1-7-10-release). We have created a [forum post](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2505072-growthcraft-community-edition-proper-1-7-10) for [Growthcraft CE](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2505072-growthcraft-community-edition-proper-1-7-10) for general discussions, announcements and feedback. Likewise this repository is on [Gitter](https://gitter.im/alatyami/Growthcraft-1.7) and we have an IRC channel on EsperNet (#growthcraft).

gradle.properties

@@ -5,7 +5,7 @@
 #minecraft_forge_version=1.7.10-10.13.4.1558-1.7.10
 minecraft_forge_version=1.7.10-10.13.4.1566-1.7.10
 
-growthcraft_version=2.5.0
+growthcraft_version=2.5.1
 minecraft_version=1.7.10
 
 applecore_version=1.3.0

src/java/growthcraft/bees/init/GrcBeesFluids.java

@@ -86,7 +86,7 @@ public void preInit()
 	@Override
 	public void register()
 	{
-		honey.registerObjects("grc", "Honey");
+		if (honey != null) honey.registerObjects("grc", "Honey");
 		GameRegistry.registerItem(honeyMeadBottle.getItem(), "grc.honeyMead");
 		BoozeRegistryHelper.registerBooze(honeyMeadBooze, honeyMeadFluids, honeyMeadBuckets, honeyMeadBottle, "grc.honeyMead", null);
 		if (honey != null) CoreRegistry.instance().fluidDictionary().addFluidTags(honey.getFluid(), BeesFluidTag.HONEY);

src/java/growthcraft/cellar/common/tileentity/TileEntityFruitPress.java

@@ -91,14 +91,14 @@ public boolean canExtractItem(int index, ItemStack stack, int side)
 		// if this is the raw item slow
 		if (index == 0)
 		{
-			// only allow extraction from the top or bottom
-			if (side == 0 || side == 1) return true;
+			// only allow extraction from the top
+			if (side == 1) return true;
 		}
 		// else this is the residue slot
 		else
 		{
-			// if its the side, the item can be safely extracted
-			if (side > 1) return true;
+			// extract from sides, or bottom
+			if (side == 0 || side > 1) return true;
 		}
 		return false;
 	}

src/java/growthcraft/core/common/block/GrcBlockContainer.java

@@ -287,8 +287,7 @@ public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase e
 		setupCustomDisplayName(world, x, y, z, stack);
 	}
 
-	@Override
-	public void breakBlock(World world, int x, int y, int z, Block block, int par6)
+	protected void scatterInventory(World world, int x, int y, int z, Block block)
 	{
 		final TileEntity te = getTileEntity(world, x, y, z);
 		if (te instanceof IInventory)
@@ -304,6 +303,12 @@ public void breakBlock(World world, int x, int y, int z, Block block, int par6)
 				world.func_147453_f(x, y, z, block);
 			}
 		}
+	}
+
+	@Override
+	public void breakBlock(World world, int x, int y, int z, Block block, int par6)
+	{
+		scatterInventory(world, x, y, z, block);
 		super.breakBlock(world, x, y, z, block, par6);
 		world.removeTileEntity(x, y, z);
 	}

src/java/growthcraft/milk/client/handler/GrcMilkHandleTextureStitch.java

@@ -96,7 +96,9 @@ public void onTextureStitchPost(TextureStitchEvent.Post event)
 
 			GrowthCraftMilk.fluids.butterMilk.getFluid().setIcons(iconFluidButterMilkStill, iconFluidButterMilkFlow);
 			GrowthCraftMilk.fluids.cream.getFluid().setIcons(iconFluidCreamStill, iconFluidCreamFlow);
-			GrowthCraftMilk.fluids.milk.getFluid().setIcons(iconFluidMilkStill, iconFluidMilkFlow);
+			if (GrowthCraftMilk.fluids.milk != null)
+				GrowthCraftMilk.fluids.milk.getFluid().setIcons(iconFluidMilkStill, iconFluidMilkFlow);
+
 			GrowthCraftMilk.fluids.curds.getFluid().setIcons(iconFluidMilkStill, iconFluidMilkFlow);
 			GrowthCraftMilk.fluids.rennet.getFluid().setIcons(iconFluidRennetStill, iconFluidRennetFlow);
 			GrowthCraftMilk.fluids.skimMilk.getFluid().setIcons(iconFluidSkimMilkStill, iconFluidSkimMilkFlow);