diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java index 33bb6530..b0deb948 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java @@ -8,6 +8,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -88,49 +89,27 @@ public class ItemSanguineArmour extends ItemArmor if (this == ModItems.sanguinePants) { return "alchemicalwizardry:models/armor/sanguineArmour_layer_2.png"; + } + + return null; + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + if (this.armorType == 0) { + list.add(StatCollector.translateToLocal("tooltip.sanguinearmor.desc1")); } else { - return null; + list.add(StatCollector.translateToLocal("tooltip.sanguinearmor.desc2")); } + + list.add( + EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocalFormatted( + "tooltip.sanguinearmor.visdisc", + getVisDiscount(stack, player, null))); } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - int discount = 0; - - switch (this.armorType) { - case 0: - discount = 6; - break; - case 1: - discount = 3; - break; - case 2: - discount = 3; - break; - case 3: - discount = 2; - break; - } - - switch (this.armorType) { - case 0: - par3List.add(StatCollector.translateToLocal("tooltip.sanguinearmor.desc1")); - break; - case 1: - - case 2: - - case 3: - par3List.add(StatCollector.translateToLocal("tooltip.sanguinearmor.desc2")); - } - - par3List.add(StatCollector.translateToLocal("tooltip.sanguinearmor.visdisc") + " " + discount + "%"); - } - - @Override - public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) { - return; - } + public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) {} @Override public boolean isUpgrade() { @@ -149,17 +128,12 @@ public class ItemSanguineArmour extends ItemArmor @Override public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - switch (this.armorType) { - case 0: - return 7; - case 1: - return 3; - case 2: - return 2; - case 3: - return 2; - } - return 0; + return switch (this.armorType) { + case 0 -> 7; + case 1 -> 3; + case 2, 3 -> 2; + default -> 0; + }; } @Override diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 243fadf6..efab1ad1 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -509,7 +509,7 @@ tooltip.sacrificialdagger.desc2=Just a prick of the tooltip.sacrificialdagger.desc3=finger will suffice... tooltip.sanguinearmor.desc1=A pair of goggles imbued with power tooltip.sanguinearmor.desc2=Robes imbued with forbidden power -tooltip.sanguinearmor.visdisc=Vis discount: +tooltip.sanguinearmor.visdisc=Vis discount: %d%% tooltip.scribetool.desc=The writing is on the wall... tooltip.seersigil.desc=When seeing all is not enough tooltip.sigilofelementalaffinity.desc1=Perfect for a fire-breathing fish diff --git a/src/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang b/src/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang index 611b6e9d..83a05e3d 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang @@ -384,7 +384,7 @@ tooltip.sacrificialdagger.desc2=Простого укольчика tooltip.sacrificialdagger.desc3=будет достаточно... tooltip.sanguinearmor.desc1=Пара очков проникнутых силой tooltip.sanguinearmor.desc2=Одеяния проникнутые запретной силой -tooltip.sanguinearmor.visdisc=Уменьшение затрат Вис: +tooltip.sanguinearmor.visdisc=Уменьшение затрат Вис: %d%% tooltip.scribetool.desc=Росписи на стене... tooltip.seersigil.desc=Когда видеть всё, недостаточно. tooltip.sigilofelementalaffinity.desc1=Идеально подходит для огнедышащей рыбы, diff --git a/src/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang b/src/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang index 910ee218..095903a4 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang @@ -482,7 +482,7 @@ tooltip.sacrificialdagger.desc2=只是刺一下手指 tooltip.sacrificialdagger.desc3=你就能获得力量... tooltip.sanguinearmor.desc1=一双充满力量的护目镜 tooltip.sanguinearmor.desc2=灌入被禁止的力量的长袍 -tooltip.sanguinearmor.visdisc=魔力减免: +tooltip.sanguinearmor.visdisc=魔力减免: %d%% tooltip.scribetool.desc=书写是在墙壁上的... tooltip.seersigil.desc=看到更多总会有所不足 tooltip.sigilofelementalaffinity.desc1=在火中呼吸的鱼 diff --git a/src/main/resources/assets/alchemicalwizardry/lang/zh_TW.lang b/src/main/resources/assets/alchemicalwizardry/lang/zh_TW.lang index a8e37fd2..807eb0b2 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/zh_TW.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/zh_TW.lang @@ -396,7 +396,7 @@ tooltip.sacrificialdagger.desc2=Just a prick of the tooltip.sacrificialdagger.desc3=finger will suffice... tooltip.sanguinearmor.desc1=A pair of goggles imbued with power tooltip.sanguinearmor.desc2=Robes imbued with forbidden power -tooltip.sanguinearmor.visdisc=Vis discount: +tooltip.sanguinearmor.visdisc=Vis discount: %d%% tooltip.scribetool.desc=The writing is on the wall... tooltip.seersigil.desc=When seeing all is not enough tooltip.sigilofelementalaffinity.desc1=Perfect for a fire-breathing fish