mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Addition: Added isAllowedOnBooks hook to Enchantments Closes #589
This commit is contained in:
1 parent
7ad79b42bc
commit
f65f042910
2 files changed
+12
-2
No files matched your search
@@ -10,7 +10,7 @@
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DamageSource;
|
||||
@@ -207,6 +210,27 @@
|
||||
@@ -207,6 +210,36 @@
|
||||
return this.type.canEnchantItem(par1ItemStack.getItem());
|
||||
}
|
||||
|
||||
@@ -34,6 +34,15 @@
|
||||
+ {
|
||||
+ 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
|
||||
{
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
--- ../src_base/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];
|
||||
|
||||
- if (enchantment != null && (enchantment.type.canEnchantItem(item) || flag))
|
||||
+ flag = (par1ItemStack.itemID == Item.book.itemID) && enchantment.isAllowedOnBooks();
|
||||
+ if (enchantment != null && (enchantment.canApplyAtEnchantingTable(par1ItemStack) || flag))
|
||||
{
|
||||
for (int l = enchantment.getMinLevel(); l <= enchantment.getMaxLevel(); ++l)
|
||||
|
||||
Reference in new issue
Block a user