keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Addition: Added isAllowedOnBooks hook to Enchantments Closes #589

Browse source
This commit is contained in:
LexManos 2013-08-10 23:23:41 -07:00
parent 7ad79b42bc
commit f65f042910
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
patches/minecraft/net/minecraft/enchantment/Enchantment.java.patch
View file

@ -10,7 +10,7 @@
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
@@ -207,6 +210,27 @@ @@ -207,6 +210,36 @@
return this.type.canEnchantItem(par1ItemStack.getItem()); return this.type.canEnchantItem(par1ItemStack.getItem());
} }
@ -34,6 +34,15 @@
+ { + {
+ ObjectArrays.concat(enchantmentsBookList, enchantment); + ObjectArrays.concat(enchantmentsBookList, enchantment);
+ } + }
+
+ /**
+ * Is this enchantment allowed to be enchanted on books via Enchantment Table
+ * @return false to disable the vanilla feature
+ */
+ public boolean isAllowedOnBooks()
+ {
+ return true;
+ }
+ +
static static
{ {

3
patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch
View file

@ -1,10 +1,11 @@
--- ../src_base/minecraft/net/minecraft/enchantment/EnchantmentHelper.java --- ../src_base/minecraft/net/minecraft/enchantment/EnchantmentHelper.java
+++ ../src_work/minecraft/net/minecraft/enchantment/EnchantmentHelper.java +++ ../src_work/minecraft/net/minecraft/enchantment/EnchantmentHelper.java
@@ -463,7 +463,7 @@ @@ -463,7 +463,8 @@
{ {
Enchantment enchantment = aenchantment[k]; Enchantment enchantment = aenchantment[k];
- if (enchantment != null && (enchantment.type.canEnchantItem(item) || flag)) - if (enchantment != null && (enchantment.type.canEnchantItem(item) || flag))
+ flag = (par1ItemStack.itemID == Item.book.itemID) && enchantment.isAllowedOnBooks();
+ if (enchantment != null && (enchantment.canApplyAtEnchantingTable(par1ItemStack) || flag)) + if (enchantment != null && (enchantment.canApplyAtEnchantingTable(par1ItemStack) || flag))
{ {
for (int l = enchantment.getMinLevel(); l <= enchantment.getMaxLevel(); ++l) for (int l = enchantment.getMinLevel(); l <= enchantment.getMaxLevel(); ++l)