From 4cc278a1251d8eab40bb41f3c1f077e32c970e34 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Sun, 7 Dec 2014 05:37:11 -0800 Subject: [PATCH] Improved Control of Enchantment.canApplyTogether() in Mod Enchantments, allowing both enchantments to determine if they can apply together. Closes #1434 --- .../minecraft/command/CommandEnchant.java.patch | 11 +++++++++++ .../enchantment/EnchantmentHelper.java.patch | 13 ++++++++++++- .../minecraft/inventory/ContainerRepair.java.patch | 14 ++++++++++++-- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 patches/minecraft/net/minecraft/command/CommandEnchant.java.patch diff --git a/patches/minecraft/net/minecraft/command/CommandEnchant.java.patch b/patches/minecraft/net/minecraft/command/CommandEnchant.java.patch new file mode 100644 index 0000000000..7e5175c6ee --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandEnchant.java.patch @@ -0,0 +1,11 @@ +--- ../src-base/minecraft/net/minecraft/command/CommandEnchant.java ++++ ../src-work/minecraft/net/minecraft/command/CommandEnchant.java +@@ -76,7 +76,7 @@ + { + Enchantment enchantment1 = Enchantment.field_77331_b[short1]; + +- if (!enchantment1.func_77326_a(enchantment)) ++ if (!enchantment1.func_77326_a(enchantment) || !enchantment.func_77326_a(enchantment1)) //Forge BugFix: Let Both enchantments veto being together + { + throw new CommandException("commands.enchant.cantCombine", new Object[] {enchantment.func_77316_c(j), enchantment1.func_77316_c(nbttaglist.func_150305_b(k).func_74765_d("lvl"))}); + } diff --git a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch index 242648eb0e..f400f35da5 100644 --- a/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch +++ b/patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch @@ -18,7 +18,18 @@ if (j <= 0) { -@@ -435,7 +435,8 @@ +@@ -393,7 +393,9 @@ + { + EnchantmentData enchantmentdata1 = (EnchantmentData)iterator1.next(); + +- if (enchantmentdata1.field_76302_b.func_77326_a(Enchantment.field_77331_b[integer.intValue()])) ++ Enchantment e1 = enchantmentdata1.field_76302_b; ++ Enchantment e2 = Enchantment.field_77331_b[integer.intValue()]; ++ if (e1.func_77326_a(e2) && e2.func_77326_a(e1)) //Forge BugFix: Let Both enchantments veto being together + { + continue; + } +@@ -435,7 +437,8 @@ { Enchantment enchantment = aenchantment[k]; diff --git a/patches/minecraft/net/minecraft/inventory/ContainerRepair.java.patch b/patches/minecraft/net/minecraft/inventory/ContainerRepair.java.patch index 1ba939729e..ad320cfd98 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerRepair.java.patch +++ b/patches/minecraft/net/minecraft/inventory/ContainerRepair.java.patch @@ -13,7 +13,7 @@ } + float breakChance = ForgeHooks.onAnvilRepair(p_82870_1_, p_82870_2_, ContainerRepair.this.field_82853_g.func_70301_a(0), ContainerRepair.this.field_82853_g.func_70301_a(1)); -+ ++ ContainerRepair.this.field_82853_g.func_70299_a(0, (ItemStack)null); if (ContainerRepair.this.field_82856_l > 0) @@ -34,7 +34,17 @@ flag = itemstack2.func_77973_b() == Items.field_151134_bR && Items.field_151134_bR.func_92110_g(itemstack2).func_74745_c() > 0; if (itemstack1.func_77984_f() && itemstack1.func_77973_b().func_82789_a(itemstack, itemstack2)) -@@ -373,6 +377,8 @@ +@@ -258,7 +262,8 @@ + { + int j2 = ((Integer)iterator.next()).intValue(); + +- if (j2 != i1 && !enchantment.func_77326_a(Enchantment.field_77331_b[j2])) ++ Enchantment e2 = Enchantment.field_77331_b[j2]; ++ if (j2 != i1 && !(enchantment.func_77326_a(e2) && e2.func_77326_a(enchantment))) //Forge BugFix: Let Both enchantments veto being together + { + flag1 = false; + i += i2; +@@ -373,6 +378,8 @@ k2 = Math.max(1, k2 / 2); }