diff --git a/client/src/main/java/client/renderer/layers/LayerArmor.java b/client/src/main/java/client/renderer/layers/LayerArmor.java index d57d29fc..fae679cd 100755 --- a/client/src/main/java/client/renderer/layers/LayerArmor.java +++ b/client/src/main/java/client/renderer/layers/LayerArmor.java @@ -7,6 +7,8 @@ import client.renderer.GlState; import client.renderer.entity.RendererLivingEntity; import client.renderer.model.ModelArmor; import client.renderer.model.ModelBiped; +import common.enchantment.Enchantment; +import common.enchantment.EnchantmentHelper; import common.entity.types.EntityLiving; import common.item.ItemStack; import common.item.material.ItemArmor; @@ -50,9 +52,8 @@ public class LayerArmor implements LayerRenderer { ItemStack itemstack = this.getCurrentArmor(entitylivingbaseIn, armorSlot); - if (itemstack != null && itemstack.getItem() instanceof ItemArmor) + if (itemstack != null && itemstack.getItem() instanceof ItemArmor itemarmor && (this.renderer == null || EnchantmentHelper.getEnchantmentLevel(Enchantment.VANITY, itemstack) <= 0)) { - ItemArmor itemarmor = (ItemArmor)itemstack.getItem(); ModelArmor t = this.getArmorModel(armorSlot); t.setModelAttributes(this.renderer != null ? this.renderer.getMainModel() : null); t.setLivingAnimations(entitylivingbaseIn, limbSwing, limbSwingAmount, partial); diff --git a/common/src/main/java/common/enchantment/Enchantment.java b/common/src/main/java/common/enchantment/Enchantment.java index 94d30c18..36df99fd 100755 --- a/common/src/main/java/common/enchantment/Enchantment.java +++ b/common/src/main/java/common/enchantment/Enchantment.java @@ -507,6 +507,22 @@ public enum Enchantment implements Displayable, Identifyable user.heal((int)((entity.arePotionsInverted() ? 0.2f : 1.0f) * (float)level)); } } + }, + VANITY("vanity", 2, EnchantmentType.ARMOR, "Transparenz") { + public int getMinEnchantability(int enchantmentLevel) + { + return 3; + } + + public int getMaxEnchantability(int enchantmentLevel) + { + return this.getMinEnchantability(enchantmentLevel) + 20; + } + + public int getMaxLevel() + { + return 1; + } }; private static final String[] LEVELS = new String[] {"I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X"}; diff --git a/common/src/main/java/common/init/Items.java b/common/src/main/java/common/init/Items.java index 46cd269b..0432e5c0 100755 --- a/common/src/main/java/common/init/Items.java +++ b/common/src/main/java/common/init/Items.java @@ -878,6 +878,7 @@ public abstract class Items { public static final ItemEnchantedBook enchanted_book_thorns_3 = get("enchanted_book_thorns_3"); public static final ItemEnchantedBook enchanted_book_unbreaking = get("enchanted_book_unbreaking"); public static final ItemEnchantedBook enchanted_book_unbreaking_3 = get("enchanted_book_unbreaking_3"); + public static final ItemEnchantedBook enchanted_book_vanity = get("enchanted_book_vanity"); public static final ItemRocketLauncher rocket_launcher = get("rocket_launcher"); public static final ItemAmmo rocket = get("rocket"); public static final ItemPotion water_bottle = get("water_bottle");