From bdda88d74ef1d554a910511622843b9cc6dc9d9b Mon Sep 17 00:00:00 2001 From: Eloraam Date: Wed, 11 Jan 2012 18:39:42 +0000 Subject: [PATCH] Fixed MCP mappings again. Fixed the Entity NBT code. Added a new hook to support custom enchantments. --- .../minecraft/net/minecraft/src/Block.java.patch | 2 +- .../net/minecraft/src/Enchantment.java.patch | 16 ++++++++++++++++ .../minecraft/src/EnchantmentHelper.java.patch | 11 +++++++++++ .../net/minecraft/src/Entity.java.patch | 14 ++++++++------ .../net/minecraft/src/Block.java.patch | 2 +- .../net/minecraft/src/Enchantment.java.patch | 16 ++++++++++++++++ .../minecraft/src/EnchantmentHelper.java.patch | 11 +++++++++++ .../net/minecraft/src/Entity.java.patch | 14 ++++++++------ 8 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 forge/patches/minecraft/net/minecraft/src/Enchantment.java.patch create mode 100644 forge/patches/minecraft/net/minecraft/src/EnchantmentHelper.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/Enchantment.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/EnchantmentHelper.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index cfb0fcbcaf..cbfffae00e 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -35,7 +35,7 @@ + */ + public int quantityDropped(int meta, int fortune, Random random) + { -+ return func_40198_a(fortune, random); ++ return quantityDroppedWithBonus(fortune, random); + } + + /* FORGE: Metadata-sensitive version. diff --git a/forge/patches/minecraft/net/minecraft/src/Enchantment.java.patch b/forge/patches/minecraft/net/minecraft/src/Enchantment.java.patch new file mode 100644 index 0000000000..a3c31afb18 --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/Enchantment.java.patch @@ -0,0 +1,16 @@ +--- ../src_base/minecraft/net/minecraft/src/Enchantment.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Enchantment.java 0000-00-00 00:00:00.000000000 -0000 +@@ -109,6 +109,13 @@ + return (new StringBuilder()).append(s).append(" ").append(StatCollector.translateToLocal((new StringBuilder()).append("enchantment.level.").append(i).toString())).toString(); + } + ++ /* FORGE: Can enchantment be applied to item. Redirected to allow users to ++ * override it in their Enchantment class. ++ */ ++ public boolean canEnchantItem(ItemStack ist) { ++ return type.canEnchantItem(ist.getItem()); ++ } ++ + static + { + looting = new EnchantmentLootBonus(21, 2, EnumEnchantmentType.weapon); diff --git a/forge/patches/minecraft/net/minecraft/src/EnchantmentHelper.java.patch b/forge/patches/minecraft/net/minecraft/src/EnchantmentHelper.java.patch new file mode 100644 index 0000000000..b4346dc92f --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/EnchantmentHelper.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/src/EnchantmentHelper.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/EnchantmentHelper.java 0000-00-00 00:00:00.000000000 -0000 +@@ -271,7 +271,7 @@ + for(int k = 0; k < j; k++) + { + Enchantment enchantment = aenchantment[k]; +- if(enchantment == null || !enchantment.type.canEnchantItem(item)) ++ if(enchantment == null || !enchantment.canEnchantItem(itemstack)) + { + continue; + } diff --git a/forge/patches/minecraft/net/minecraft/src/Entity.java.patch b/forge/patches/minecraft/net/minecraft/src/Entity.java.patch index 6f42d95485..d929fdf66a 100644 --- a/forge/patches/minecraft/net/minecraft/src/Entity.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Entity.java.patch @@ -31,21 +31,23 @@ public DataWatcher getDataWatcher() { -@@ -955,6 +972,7 @@ +@@ -955,6 +972,10 @@ nbttagcompound.setShort("Fire", (short)fire); nbttagcompound.setShort("Air", (short)getAir()); nbttagcompound.setBoolean("OnGround", onGround); -+ nbttagcompound.setCompoundTag("ForgeEntityData", customEntityData); ++ if(customEntityData!=null) { ++ nbttagcompound.setCompoundTag("ForgeData", ++ customEntityData); ++ } writeEntityToNBT(nbttagcompound); } -@@ -989,6 +1007,10 @@ +@@ -989,6 +1010,9 @@ onGround = nbttagcompound.getBoolean("OnGround"); setPosition(posX, posY, posZ); setRotation(rotationYaw, rotationPitch); -+ if (nbttagcompound.hasKey("ForgeEntityData")) -+ { -+ customEntityData.getCompoundTag("ForgeEntityData"); ++ if(nbttagcompound.hasKey("ForgeData")) { ++ customEntityData=nbttagcompound.getCompoundTag("ForgeData"); + } readEntityFromNBT(nbttagcompound); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index 6a90465ee4..4ff735ce38 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -16,7 +16,7 @@ + */ + public int quantityDropped(int meta, int fortune, Random random) + { -+ return func_40162_a(fortune, random); ++ return quantityDroppedWithBonus(fortune, random); + } + + /* FORGE: Metadata-sensitive version. diff --git a/forge/patches/minecraft_server/net/minecraft/src/Enchantment.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Enchantment.java.patch new file mode 100644 index 0000000000..885a8728f4 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/Enchantment.java.patch @@ -0,0 +1,16 @@ +--- ../src_base/minecraft_server/net/minecraft/src/Enchantment.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Enchantment.java 0000-00-00 00:00:00.000000000 -0000 +@@ -98,6 +98,13 @@ + return this; + } + ++ /* FORGE: Can enchantment be applied to item. Redirected to allow users to ++ * override it in their Enchantment class. ++ */ ++ public boolean canEnchantItem(ItemStack ist) { ++ return type.canEnchantItem(ist.getItem()); ++ } ++ + static + { + looting = new EnchantmentLootBonus(21, 2, EnumEnchantmentType.weapon); diff --git a/forge/patches/minecraft_server/net/minecraft/src/EnchantmentHelper.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EnchantmentHelper.java.patch new file mode 100644 index 0000000000..30b7e78df9 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/EnchantmentHelper.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft_server/net/minecraft/src/EnchantmentHelper.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/EnchantmentHelper.java 0000-00-00 00:00:00.000000000 -0000 +@@ -271,7 +271,7 @@ + for(int k = 0; k < j; k++) + { + Enchantment enchantment = aenchantment[k]; +- if(enchantment == null || !enchantment.type.canEnchantItem(item)) ++ if(enchantment == null || !enchantment.canEnchantItem(itemstack)) + { + continue; + } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch index a07c2f4b74..3fa82ea364 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Entity.java.patch @@ -23,21 +23,23 @@ public DataWatcher getDataWatcher() { return dataWatcher; -@@ -873,6 +889,7 @@ +@@ -873,6 +889,10 @@ nbttagcompound.setShort("Fire", (short)fire); nbttagcompound.setShort("Air", (short)getAir()); nbttagcompound.setBoolean("OnGround", onGround); -+ nbttagcompound.setCompoundTag("ForgeEntityData", customEntityData); ++ if(customEntityData!=null) { ++ nbttagcompound.setCompoundTag("ForgeData", ++ customEntityData); ++ } writeEntityToNBT(nbttagcompound); } -@@ -907,6 +924,10 @@ +@@ -907,6 +927,9 @@ onGround = nbttagcompound.getBoolean("OnGround"); setPosition(posX, posY, posZ); setRotation(rotationYaw, rotationPitch); -+ if (nbttagcompound.hasKey("ForgeEntityData")) -+ { -+ customEntityData.getCompoundTag("ForgeEntityData"); ++ if(nbttagcompound.hasKey("ForgeData")) { ++ customEntityData=nbttagcompound.getCompoundTag("ForgeData"); + } readEntityFromNBT(nbttagcompound); }