From bc168a3937c2e0f372576bdf6fa1b5e6d7a20728 Mon Sep 17 00:00:00 2001 From: Richard Freimer Date: Sun, 3 Mar 2019 02:16:25 -0500 Subject: [PATCH] Use TextFormatting rather than including color codes in block lang name (#1546) --- .../compat/waila/provider/DataProviderAlchemyArray.java | 3 ++- src/main/resources/assets/bloodmagic/lang/de_DE.lang | 2 +- src/main/resources/assets/bloodmagic/lang/en_US.lang | 2 +- src/main/resources/assets/bloodmagic/lang/fr_FR.lang | 2 +- src/main/resources/assets/bloodmagic/lang/ja_JP.lang | 2 +- src/main/resources/assets/bloodmagic/lang/ru_RU.lang | 2 +- src/main/resources/assets/bloodmagic/lang/zh_CN.lang | 2 +- src/main/resources/assets/bloodmagic/lang/zh_TW.lang | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java index bc8ade1c..abfe0957 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java @@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import javax.annotation.Nonnull; @@ -25,7 +26,7 @@ public class DataProviderAlchemyArray implements IWailaDataProvider { @Nonnull @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES).setStackDisplayName(TextHelper.getFormattedText(RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getLocalizedName())); + return new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES).setStackDisplayName(TextFormatting.WHITE + RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getLocalizedName()); } @Nonnull diff --git a/src/main/resources/assets/bloodmagic/lang/de_DE.lang b/src/main/resources/assets/bloodmagic/lang/de_DE.lang index 0cb12242..db60bfb1 100644 --- a/src/main/resources/assets/bloodmagic/lang/de_DE.lang +++ b/src/main/resources/assets/bloodmagic/lang/de_DE.lang @@ -201,7 +201,7 @@ tile.bloodmagic.stone.ritual.imperfect.name=Imperfekter Ritualstein tile.bloodmagic.stone.ritual.inverted.name=Umgekehrter Meisterritualstein tile.bloodmagic.altar.name=Blutaltar -tile.bloodmagic.alchemyArray.name=&r&fAlchemische Anordnung +tile.bloodmagic.alchemyArray.name=Alchemische Anordnung tile.bloodmagic.rune.blank.name=Leere Rune tile.bloodmagic.rune.speed.name=Geschwindigkeitsrune diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 82c23c2e..f5cc5ff4 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -201,7 +201,7 @@ tile.bloodmagic.stone.ritual.imperfect.name=Imperfect Ritual Stone tile.bloodmagic.stone.ritual.inverted.name=Inverted Master Ritual Stone tile.bloodmagic.altar.name=Blood Altar -tile.bloodmagic.alchemyArray.name=&r&fAlchemy Array +tile.bloodmagic.alchemyArray.name=Alchemy Array tile.bloodmagic.rune.blank.name=Blank Rune tile.bloodmagic.rune.speed.name=Speed Rune diff --git a/src/main/resources/assets/bloodmagic/lang/fr_FR.lang b/src/main/resources/assets/bloodmagic/lang/fr_FR.lang index f75e010a..3493e25d 100644 --- a/src/main/resources/assets/bloodmagic/lang/fr_FR.lang +++ b/src/main/resources/assets/bloodmagic/lang/fr_FR.lang @@ -181,7 +181,7 @@ tile.bloodmagic.stone.ritual.master.name=Pierre Rituelle Maîtresse tile.bloodmagic.stone.ritual.imperfect.name=Pierre Rituelle Imparfaite tile.bloodmagic.altar.name=Autel de Sang -tile.bloodmagic.alchemyArray.name=&r&fÉtalage d'Alchimie +tile.bloodmagic.alchemyArray.name=Étalage d'Alchimie tile.bloodmagic.rune.blank.name=Rune de Sang tile.bloodmagic.rune.speed.name=Rune de Vitesse diff --git a/src/main/resources/assets/bloodmagic/lang/ja_JP.lang b/src/main/resources/assets/bloodmagic/lang/ja_JP.lang index 58d7b932..5cffaa40 100644 --- a/src/main/resources/assets/bloodmagic/lang/ja_JP.lang +++ b/src/main/resources/assets/bloodmagic/lang/ja_JP.lang @@ -201,7 +201,7 @@ tile.bloodmagic.stone.ritual.imperfect.name=簡易儀式石 tile.bloodmagic.stone.ritual.inverted.name=反転マスター儀式石 tile.bloodmagic.altar.name=血の祭壇 -tile.bloodmagic.alchemyArray.name=&r&f錬金術魔法陣 +tile.bloodmagic.alchemyArray.name=錬金術魔法陣 tile.bloodmagic.rune.blank.name=空のルーン tile.bloodmagic.rune.speed.name=速度のルーン diff --git a/src/main/resources/assets/bloodmagic/lang/ru_RU.lang b/src/main/resources/assets/bloodmagic/lang/ru_RU.lang index 0a76a026..a91e66e9 100644 --- a/src/main/resources/assets/bloodmagic/lang/ru_RU.lang +++ b/src/main/resources/assets/bloodmagic/lang/ru_RU.lang @@ -200,7 +200,7 @@ tile.bloodmagic.stone.ritual.imperfect.name=Неполноценный риту tile.bloodmagic.stone.ritual.inverted.name=Инвертированный ритуальный камень tile.bloodmagic.altar.name=Кровавый алтарь -tile.bloodmagic.alchemyArray.name=&r&fАлхимическая матрица +tile.bloodmagic.alchemyArray.name=Алхимическая матрица tile.bloodmagic.rune.blank.name=Чистая руна tile.bloodmagic.rune.speed.name=Руна скорости diff --git a/src/main/resources/assets/bloodmagic/lang/zh_CN.lang b/src/main/resources/assets/bloodmagic/lang/zh_CN.lang index 6ccec15a..d27f9496 100644 --- a/src/main/resources/assets/bloodmagic/lang/zh_CN.lang +++ b/src/main/resources/assets/bloodmagic/lang/zh_CN.lang @@ -198,7 +198,7 @@ tile.bloodmagic.stone.ritual.imperfect.name=不完善的仪式石 tile.bloodmagic.stone.ritual.inverted.name=反转的主仪式石 tile.bloodmagic.altar.name=血之祭坛 -tile.bloodmagic.alchemyArray.name=&r&f炼金矩阵 +tile.bloodmagic.alchemyArray.name=炼金矩阵 tile.bloodmagic.rune.blank.name=空白符文 tile.bloodmagic.rune.speed.name=速度符文 diff --git a/src/main/resources/assets/bloodmagic/lang/zh_TW.lang b/src/main/resources/assets/bloodmagic/lang/zh_TW.lang index 3632a10a..bdabcb85 100644 --- a/src/main/resources/assets/bloodmagic/lang/zh_TW.lang +++ b/src/main/resources/assets/bloodmagic/lang/zh_TW.lang @@ -152,7 +152,7 @@ tile.bloodmagic.stone.ritual.master.name=魔導師儀式石 tile.bloodmagic.stone.ritual.imperfect.name=次級儀式石 tile.bloodmagic.altar.name=血祭壇 -tile.bloodmagic.alchemyArray.name=&r&f煉金矩陣 +tile.bloodmagic.alchemyArray.name=煉金矩陣 tile.bloodmagic.rune.blank.name=空白符文石 tile.bloodmagic.rune.speed.name=速度符文石