--- ../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); @@ -220,11 +220,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 list = Lists.newArrayList(); - list.add("" + TextFormatting.WHITE + TextFormatting.ITALIC + I18n.func_135052_a("container.enchant.clue", enchantment.func_77316_c(l))); + list.add("" + TextFormatting.WHITE + TextFormatting.ITALIC + I18n.func_135052_a("container.enchant.clue", 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("");