From bea2d8599f5da0e21c163f2c3d6bf921b9e2a824 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 19 Aug 2012 11:35:22 -0400 Subject: [PATCH] Update FML: 46c563a 46c563a Expose more of the village construction parts for building village piece 1380c2e Allow access to the type "ComponentVillage" 71a3818 Documentation and registration for villager stuff e3a343c Fix javadoc derp 195b1a0 Villager trading, manipulation and village enhancement. Still WIP but sh 69e66c3 Fix exception based logging to actually log the exception! --- ...c-3.0.92.299.zip => fml-src-3.0.98.304.zip | Bin 785079 -> 787976 bytes .../net/minecraft/src/EntityItem.java.patch | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) rename fml-src-3.0.92.299.zip => fml-src-3.0.98.304.zip (96%) diff --git a/fml-src-3.0.92.299.zip b/fml-src-3.0.98.304.zip similarity index 96% rename from fml-src-3.0.92.299.zip rename to fml-src-3.0.98.304.zip index 5f044de56f3182ab40ca4aa531fdd0833e6fff37..243bddc5fbd2fa92866c96c3f1e8d51d71327678 100644 GIT binary patch delta 13481 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 F{2!}(MpFO) diff --git a/patches/common/net/minecraft/src/EntityItem.java.patch b/patches/common/net/minecraft/src/EntityItem.java.patch index afcd936d31..3128721b65 100644 --- a/patches/common/net/minecraft/src/EntityItem.java.patch +++ b/patches/common/net/minecraft/src/EntityItem.java.patch @@ -8,9 +8,9 @@ +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; - public class EntityItem extends Entity - { -@@ -120,6 +123,11 @@ + import cpw.mods.fml.common.registry.GameRegistry; + +@@ -122,6 +125,11 @@ { this.setDead(); } @@ -22,7 +22,7 @@ } public boolean func_70289_a(EntityItem par1EntityItem) -@@ -223,7 +231,7 @@ +@@ -225,7 +233,7 @@ NBTTagCompound var2 = par1NBTTagCompound.getCompoundTag("Item"); this.item = ItemStack.loadItemStackFromNBT(var2); @@ -31,7 +31,7 @@ { this.setDead(); } -@@ -236,9 +244,21 @@ +@@ -238,9 +246,21 @@ { if (!this.worldObj.isRemote) {