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

[1.11] Add canApplyAtEnchantmentTable to Item (#3463) 

Allowing increased control of which enchantments can be put on an item over Vanilla's hard-coded item type checks.
Render enchantment buttons disabled when the item is enchantable but the enchantability requirement is not met on lower levels.
This commit is contained in:
BlayTheNinth 2016-12-03 19:43:29 +01:00 committed by LexManos
parent e09e6c0f24
commit 2009b3ec5e
5 changed files with 90 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
patches/minecraft/net/minecraft/client/gui/GuiEnchantment.java.patch Normal file
View File

@ -0,0 +1,26 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiEnchantment.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiEnchantment.java
@@ -171,7 +171,7 @@
FontRenderer fontrenderer = this.field_146297_k.field_71464_q;
int i2 = 6839882;
- if ((k < l + 1 || this.field_146297_k.field_71439_g.field_71068_ca < k1) && !this.field_146297_k.field_71439_g.field_71075_bZ.field_75098_d)
+ if (((k < l + 1 || this.field_146297_k.field_71439_g.field_71068_ca < k1) && !this.field_146297_k.field_71439_g.field_71075_bZ.field_75098_d) || this.field_147075_G.field_185001_h[l] == -1) // Forge: render buttons as disabled when enchantable but enchantability not met on lower levels
{
this.func_73729_b(i1, j + 14 + 19 * l, 0, 185, 108, 19);
this.func_73729_b(i1 + 1, j + 15 + 19 * l, 16 * l, 239, 16, 16);
@@ -217,11 +217,12 @@
int l = this.field_147075_G.field_185002_i[j];
int i1 = j + 1;
- if (this.func_146978_c(60, 14 + 19 * j, 108, 17, p_73863_1_, p_73863_2_) && k > 0 && l >= 0 && enchantment != null)
+ if (this.func_146978_c(60, 14 + 19 * j, 108, 17, p_73863_1_, p_73863_2_) && k > 0)
{
List<String> list = Lists.<String>newArrayList();
- list.add("" + TextFormatting.WHITE + TextFormatting.ITALIC + I18n.func_135052_a("container.enchant.clue", new Object[] {enchantment.func_77316_c(l)}));
+ list.add("" + TextFormatting.WHITE + TextFormatting.ITALIC + I18n.func_135052_a("container.enchant.clue", new Object[] {enchantment == null ? "" : enchantment.func_77316_c(l)}));
+ if(enchantment == null) java.util.Collections.addAll(list, "", TextFormatting.RED + I18n.func_135052_a("forge.container.enchant.limitedEnchantability")); else
if (!flag)
{
list.add("");

2
patches/minecraft/net/minecraft/enchantment/Enchantment.java.patch
View File

@ -33,7 +33,7 @@
+ */
+ public boolean canApplyAtEnchantingTable(ItemStack stack)
+ {
+ return this.field_77351_y.func_77557_a(stack.func_77973_b());
+ return stack.func_77973_b().canApplyAtEnchantingTable(stack, this);
+ }
+
+ /**

19
patches/minecraft/net/minecraft/item/Item.java.patch
View File

@ -60,7 +60,7 @@
return p_77621_1_.func_147447_a(vec3d, vec3d1, p_77621_3_, !p_77621_3_, false);
}
@@ -433,11 +440,600 @@
@@ -433,11 +440,613 @@
return false;
}
@ -585,6 +585,19 @@
+ }
+
+ /**
+ * Checks whether an item can be enchanted with a certain enchantment. This applies specifically to enchanting an item in the enchanting table and is called when retrieving the list of possible enchantments for an item.
+ * Enchantments may additionally (or exclusively) be doing their own checks in {@link net.minecraft.enchantment.Enchantment#canApplyAtEnchantingTable(ItemStack)}; check the individual implementation for reference.
+ * By default this will check if the enchantment type is valid for this item type.
+ * @param stack the item stack to be enchanted
+ * @param enchantment the enchantment to be applied
+ * @return true if the enchantment can be applied to this item
+ */
+ public boolean canApplyAtEnchantingTable(ItemStack stack, net.minecraft.enchantment.Enchantment enchantment)
+ {
+ return enchantment.field_77351_y.func_77557_a(stack.func_77973_b());
+ }
+
+ /**
+ * Whether this Item can be used as a payment to activate the vanilla beacon.
+ * @param stack the ItemStack
+ * @return true if this Item can be used
@ -661,7 +674,7 @@
public static void func_150900_l()
{
func_179214_a(Blocks.field_150350_a, new ItemAir(Blocks.field_150350_a));
@@ -971,6 +1567,8 @@
@@ -971,6 +1580,8 @@
private final float field_78010_h;
private final float field_78011_i;
private final int field_78008_j;
@ -670,7 +683,7 @@
private ToolMaterial(int p_i1874_3_, int p_i1874_4_, float p_i1874_5_, float p_i1874_6_, int p_i1874_7_)
{
@@ -1006,9 +1604,26 @@
@@ -1006,9 +1617,26 @@
return this.field_78008_j;
}

4
src/main/resources/assets/forge/lang/en_US.lang
View File

@ -182,4 +182,6 @@ fml.messages.version.restriction.bounded=between %s and %s
fml.button.visitjavadownloads=Oracle Java SE Downloads
fml.button.continue=Continue
fml.button.open.mods.folder=Open Mods Folder
fml.button.open.file=Open %s
fml.button.open.file=Open %s
forge.container.enchant.limitedEnchantability=Limited Enchantability

44
src/test/java/net/minecraftforge/test/CanApplyAtEnchantingTableTest.java Normal file
View File

@ -0,0 +1,44 @@
package net.minecraftforge.test;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.init.Enchantments;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
@Mod(modid="canapplyatenchantingtabletest", name="CanApplyAtEnchantingTableTest", version="0.0.0")
public class CanApplyAtEnchantingTableTest
{
public static final boolean ENABLE = true;
public static final Item testItem = new Item()
{
public boolean isItemTool(ItemStack stack)
{
return true;
}
@Override
public int getItemEnchantability()
{
return 30;
}
@Override
public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment)
{
return super.canApplyAtEnchantingTable(stack, enchantment) || enchantment == Enchantments.FORTUNE;
}
};
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
{
if(ENABLE)
{
GameRegistry.register(testItem.setRegistryName("test_item").setUnlocalizedName("FortuneEnchantableOnly").setMaxStackSize(1));
}
}
}