+ Made large chickens drop eggs under more relaxed circumstances. Children can lay normal eggs.

$ Fixed large chicken renderer.
$ Improved weight system of large eggs.

1 files changed, 32 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java
index 155950eb75..761cbf268f 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java
@@ -1,7 +1,10 @@
 package gtPlusPlus.core.item.general;
 
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 
 import gtPlusPlus.core.item.base.BaseItemBurnable;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -17,15 +20,39 @@ public class ItemGiantEgg extends BaseItemBurnable {
 	@Override
 	public String getItemStackDisplayName(ItemStack aStack) {
 		String localName = super.getItemStackDisplayName(aStack);
+		nbtWork(aStack);
 		int size = 1;
-		if (NBTUtils.hasKey(aStack, "size")) {
+		if (NBTUtils.hasKey(aStack, "size")){
 			size = NBTUtils.getInteger(aStack, "size");
+			return ""+size+" "+localName;
 		}
-		else {
-			NBTUtils.setInteger(aStack, "size", MathUtils.randInt(1, 8));
-			size = NBTUtils.getInteger(aStack, "size");
+		return "?? "+localName;
+	}
+
+	@Override
+	public void onUpdate(ItemStack aStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) {
+		if (entityHolding != null && entityHolding instanceof EntityPlayer) {
+			NBTUtils.setBoolean(aStack, "playerHeld", true);
 		}
-		return ""+size+localName;
+		else {
+			NBTUtils.setBoolean(aStack, "playerHeld", false);
+		}		
+		nbtWork(aStack);
+		super.onUpdate(aStack, world, entityHolding, p_77663_4_, p_77663_5_);
+	}
+
+	@Override
+	public void onCreated(ItemStack p_77622_1_, World p_77622_2_, EntityPlayer p_77622_3_) {
+		// TODO Auto-generated method stub
+		super.onCreated(p_77622_1_, p_77622_2_, p_77622_3_);
+	}
+	
+	public void nbtWork(ItemStack aStack) {
+		if (NBTUtils.hasKey(aStack, "playerHeld")) {
+			if (NBTUtils.getBoolean(aStack, "playerHeld") && !NBTUtils.hasKey(aStack, "size")) {
+				NBTUtils.setInteger(aStack, "size", MathUtils.randInt(1, 8));
+			}
+		}		
 	}
 
 }