From ea0201ec0e96759a92df5c627627f8209794ef8a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 23 Jan 2020 10:04:37 -0600 Subject: [PATCH] Remove botania's lang entries for vanilla colors as vanilla has them now --- .../botania/common/item/lens/ItemLens.java | 7 +++++-- .../resources/assets/botania/lang/de_de.json | 18 +----------------- .../resources/assets/botania/lang/en_us.json | 18 +----------------- .../resources/assets/botania/lang/es_ar.json | 18 +----------------- .../resources/assets/botania/lang/es_es.json | 18 +----------------- .../resources/assets/botania/lang/fr_fr.json | 18 +----------------- .../resources/assets/botania/lang/ja_jp.json | 18 +----------------- .../resources/assets/botania/lang/ko_kr.json | 18 +----------------- .../resources/assets/botania/lang/nl_nl.json | 18 +----------------- .../resources/assets/botania/lang/pt_br.json | 18 +----------------- .../resources/assets/botania/lang/ru_ru.json | 18 +----------------- .../resources/assets/botania/lang/zh_cn.json | 18 +----------------- .../resources/assets/botania/lang/zh_tw.json | 18 +----------------- 13 files changed, 17 insertions(+), 206 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 979ed0344..5af93a9bf 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -18,6 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -64,8 +65,10 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens @Override public void addInformation(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { int storedColor = getStoredColor(par1ItemStack); - if(storedColor != -1) - stacks.add(new TranslationTextComponent("botaniamisc.color", new TranslationTextComponent("botania.color" + storedColor))); + if(storedColor != -1) { + TranslationTextComponent colorName = new TranslationTextComponent(storedColor == 16 ? "botania.color.rainbow" : "color.minecraft." + DyeColor.byId(storedColor)); + stacks.add(new TranslationTextComponent("botaniamisc.color", colorName).applyTextStyle(TextFormatting.GRAY)); + } } @Nonnull diff --git a/src/main/resources/assets/botania/lang/de_de.json b/src/main/resources/assets/botania/lang/de_de.json index 4898d87a9..9fed8fda0 100644 --- a/src/main/resources/assets/botania/lang/de_de.json +++ b/src/main/resources/assets/botania/lang/de_de.json @@ -24,23 +24,7 @@ "botaniamisc.creativePool1": "Eines Egoisten würdig", "botaniamisc.toolRank": "%s&7-Rang", - "botania.color0": "Weiß", - "botania.color1": "Orange", - "botania.color2": "Magentafarben", - "botania.color3": "Hellblau", - "botania.color4": "Gelb", - "botania.color5": "Hellgrün", - "botania.color6": "Pink", - "botania.color7": "Grau", - "botania.color8": "Hellgrau", - "botania.color9": "Türkis", - "botania.color10": "Violett", - "botania.color11": "Blau", - "botania.color12": "Braun", - "botania.color13": "Grün", - "botania.color14": "Rot", - "botania.color15": "Schwarz", - "botania.color16": "Regenbogenfarben", + "botania.color.rainbow": "Regenbogenfarben", "botania.versioning.flavour0": "WAS ZUM!? BOTANIA IST NICHT AKTUALISIERT!?", "botania.versioning.flavour1": "Willst dur mir weismachen, dass du Botania noch nicht aktualisiert hast, du ignoranter Trottel?", diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index 0c882a181..32c67cf8d 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -127,23 +127,7 @@ "botania.triggers.manaFull": "Mana Full", "botania.triggers.runeAltarCanCraft": "Altar Can Craft", - "botania.color0": "White", - "botania.color1": "Orange", - "botania.color2": "Magenta", - "botania.color3": "Light Blue", - "botania.color4": "Yellow", - "botania.color5": "Lime", - "botania.color6": "Pink", - "botania.color7": "Gray", - "botania.color8": "Light Gray", - "botania.color9": "Cyan", - "botania.color10": "Purple", - "botania.color11": "Blue", - "botania.color12": "Brown", - "botania.color13": "Green", - "botania.color14": "Red", - "botania.color15": "Black", - "botania.color16": "Rainbow", + "botania.color.rainbow": "Rainbow", "botania.rank0": "\u00a7cD", "botania.rank1": "\u00a7eC", diff --git a/src/main/resources/assets/botania/lang/es_ar.json b/src/main/resources/assets/botania/lang/es_ar.json index 677afde9e..3bc869f05 100644 --- a/src/main/resources/assets/botania/lang/es_ar.json +++ b/src/main/resources/assets/botania/lang/es_ar.json @@ -34,23 +34,7 @@ "botaniamisc.shardLevel": "Shard Power %s", "botaniamisc.lexiconIndex": "Índice del Lexicon", - "botania.color0": "Blanco", - "botania.color1": "Naranja", - "botania.color2": "Magenta", - "botania.color3": "Celeste", - "botania.color4": "Amarillo", - "botania.color5": "Lima", - "botania.color6": "Rosado", - "botania.color7": "Gris", - "botania.color8": "Gris Claro", - "botania.color9": "Cian", - "botania.color10": "Púrpura", - "botania.color11": "Azul", - "botania.color12": "Marrón", - "botania.color13": "Verde", - "botania.color14": "Rojo", - "botania.color15": "Negro", - "botania.color16": "Arco Iris", + "botania.color.rainbow": "Arco Iris", "botania.wings0": "No Wings", "botania.wings1": "Wings: Flügel", diff --git a/src/main/resources/assets/botania/lang/es_es.json b/src/main/resources/assets/botania/lang/es_es.json index ff88c6a13..587a02fe9 100644 --- a/src/main/resources/assets/botania/lang/es_es.json +++ b/src/main/resources/assets/botania/lang/es_es.json @@ -104,23 +104,7 @@ "botania.triggers.manaFull": "Lleno de maná", "botania.triggers.runeAltarCanCraft": "El altar puede crear", - "botania.color0": "blanco", - "botania.color1": "naranja", - "botania.color2": "magenta", - "botania.color3": "celeste", - "botania.color4": "amarillo", - "botania.color5": "lima", - "botania.color6": "rosado", - "botania.color7": "gris", - "botania.color8": "gris claro", - "botania.color9": "cian", - "botania.color10": "púrpura", - "botania.color11": "azul", - "botania.color12": "marrón", - "botania.color13": "verde", - "botania.color14": "rojo", - "botania.color15": "negro", - "botania.color16": "arcoíris", + "botania.color.rainbow": "arcoíris", "botania.sign0": "Aries", "botania.sign1": "Tauro", diff --git a/src/main/resources/assets/botania/lang/fr_fr.json b/src/main/resources/assets/botania/lang/fr_fr.json index 03901b5ee..28dce43ed 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.json +++ b/src/main/resources/assets/botania/lang/fr_fr.json @@ -103,23 +103,7 @@ "botania.triggers.manaFull": "Plein de mana", "botania.triggers.runeAltarCanCraft": "L'autel peut fabriquer ça", - "botania.color0": "Blanc", - "botania.color1": "Orange", - "botania.color2": "Magenta", - "botania.color3": "Bleu clair", - "botania.color4": "Jaune", - "botania.color5": "Citron", - "botania.color6": "Rose", - "botania.color7": "Gris", - "botania.color8": "Gris clair", - "botania.color9": "Cyan", - "botania.color10": "Violet", - "botania.color11": "Bleu", - "botania.color12": "Marron", - "botania.color13": "Vert", - "botania.color14": "Rouge", - "botania.color15": "Noir", - "botania.color16": "Arc-en-ciel", + "botania.color.rainbow": "Arc-en-ciel", "botania.sign0": "Bélier", "botania.sign1": "Taureau", diff --git a/src/main/resources/assets/botania/lang/ja_jp.json b/src/main/resources/assets/botania/lang/ja_jp.json index 0870ddb5c..3c1835a3c 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.json +++ b/src/main/resources/assets/botania/lang/ja_jp.json @@ -111,23 +111,7 @@ "botania.triggers.manaFull": "マナが満タンのとき", "botania.triggers.runeAltarCanCraft": "祭壇がクラフト可能なとき", - "botania.color0": "白色", - "botania.color1": "橙色", - "botania.color2": "赤紫色", - "botania.color3": "空色", - "botania.color4": "黄色", - "botania.color5": "黄緑色", - "botania.color6": "桃色", - "botania.color7": "灰色", - "botania.color8": "薄灰色", - "botania.color9": "水色", - "botania.color10": "紫色", - "botania.color11": "青色", - "botania.color12": "茶色", - "botania.color13": "緑色", - "botania.color14": "赤色", - "botania.color15": "黒色", - "botania.color16": "虹色", + "botania.color.rainbow": "虹色", diff --git a/src/main/resources/assets/botania/lang/ko_kr.json b/src/main/resources/assets/botania/lang/ko_kr.json index a797fcf41..1437d8d1f 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.json +++ b/src/main/resources/assets/botania/lang/ko_kr.json @@ -101,23 +101,7 @@ "botania.trigger.manaFull": "마나가 꽉 차 있을 때", "botania.trigger.runeAltarCanCraft": "제단에서 조합 가능할 때", - "botania.color0": "하얀색", - "botania.color1": "주황색", - "botania.color2": "자홍색", - "botania.color3": "하늘색", - "botania.color4": "노랑색", - "botania.color5": "연두색", - "botania.color6": "분홍색", - "botania.color7": "회색", - "botania.color8": "밝은 회색", - "botania.color9": "청록색", - "botania.color10": "보라색", - "botania.color11": "파랑색", - "botania.color12": "갈색", - "botania.color13": "초록색", - "botania.color14": "빨강색", - "botania.color15": "검은색", - "botania.color16": "무지개", + "botania.color.rainbow": "무지개", "botania.rank0": "&cD", "botania.rank1": "&eC", diff --git a/src/main/resources/assets/botania/lang/nl_nl.json b/src/main/resources/assets/botania/lang/nl_nl.json index 90d8465f0..45121bcd6 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.json +++ b/src/main/resources/assets/botania/lang/nl_nl.json @@ -115,23 +115,7 @@ "botania.triggers.manaFull": "Mana Vol", "botania.triggers.runeAltarCanCraft": "Altaar kan vervaardigen", - "botania.color0": "Wit", - "botania.color1": "Oranje", - "botania.color2": "Magenta", - "botania.color3": "Lichtblauw", - "botania.color4": "Geel", - "botania.color5": "Lichtgroen", - "botania.color6": "Roze", - "botania.color7": "Grijs", - "botania.color8": "Lichtgrijs", - "botania.color9": "Blauwgroen", - "botania.color10": "Paars", - "botania.color11": "Blauw", - "botania.color12": "Bruin", - "botania.color13": "Groen", - "botania.color14": "Rood", - "botania.color15": "Zwart", - "botania.color16": "Regenboog", + "botania.color.rainbow": "Regenboog", "botania.sign0": "Ram", "botania.sign1": "Stier", diff --git a/src/main/resources/assets/botania/lang/pt_br.json b/src/main/resources/assets/botania/lang/pt_br.json index 1076df5cf..ec3bf0986 100644 --- a/src/main/resources/assets/botania/lang/pt_br.json +++ b/src/main/resources/assets/botania/lang/pt_br.json @@ -114,23 +114,7 @@ "botania.trigger.manaFull": "Cheio de Mana", "botania.trigger.runeAltarCanCraft": "Altar pode construir", - "botania.color0": "Branco", - "botania.color1": "Laranja", - "botania.color2": "Magenta", - "botania.color3": "Azul claro", - "botania.color4": "Amarelo", - "botania.color5": "Lima", - "botania.color6": "Rosa", - "botania.color7": "Cinza", - "botania.color8": "Cinza claro", - "botania.color9": "Ciano", - "botania.color10": "Roxo", - "botania.color11": "Azul", - "botania.color12": "Marrom", - "botania.color13": "Verde", - "botania.color14": "Vermelho", - "botania.color15": "Preto", - "botania.color16": "Arco-Íris", + "botania.color.rainbow": "Arco-Íris", "botania.rank0": "&cD", "botania.rank1": "&eC", diff --git a/src/main/resources/assets/botania/lang/ru_ru.json b/src/main/resources/assets/botania/lang/ru_ru.json index 91ea44b60..4a87ba954 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.json +++ b/src/main/resources/assets/botania/lang/ru_ru.json @@ -124,23 +124,7 @@ "botania.triggers.manaFull": "Переполнено маной", "botania.triggers.runeAltarCanCraft": "Алтарь готов к созданию", - "botania.color0": "Белый", - "botania.color1": "Оранжевый", - "botania.color2": "Пурпурный", - "botania.color3": "Голубой", - "botania.color4": "Жёлтый", - "botania.color5": "Лаймовый", - "botania.color6": "Розовый", - "botania.color7": "Серый", - "botania.color8": "Светло-серый", - "botania.color9": "Бирюзовый", - "botania.color10": "Фиолетовый", - "botania.color11": "Синий", - "botania.color12": "Коричневый", - "botania.color13": "Зелёный", - "botania.color14": "Красный", - "botania.color15": "Чёрный", - "botania.color16": "Радужный", + "botania.color.rainbow": "Радужный", "botania.rank0": "&cD", "botania.rank1": "&eC", diff --git a/src/main/resources/assets/botania/lang/zh_cn.json b/src/main/resources/assets/botania/lang/zh_cn.json index e7627e43f..e8221de39 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.json +++ b/src/main/resources/assets/botania/lang/zh_cn.json @@ -122,23 +122,7 @@ "botania.triggers.manaFull": "魔力已满", "botania.triggers.runeAltarCanCraft": "祭坛可合成符文", - "botania.color0": "白色", - "botania.color1": "橙色", - "botania.color2": "品红色", - "botania.color3": "淡蓝色", - "botania.color4": "黄色", - "botania.color5": "黄绿色", - "botania.color6": "粉色", - "botania.color7": "灰色", - "botania.color8": "淡灰色", - "botania.color9": "青色", - "botania.color10": "紫色", - "botania.color11": "蓝色", - "botania.color12": "棕色", - "botania.color13": "绿色", - "botania.color14": "红色", - "botania.color15": "黑色", - "botania.color16": "彩虹色", + "botania.color.rainbow": "彩虹色", "botania.sign0": "白羊", diff --git a/src/main/resources/assets/botania/lang/zh_tw.json b/src/main/resources/assets/botania/lang/zh_tw.json index 6bf389f8c..64e23d0db 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.json +++ b/src/main/resources/assets/botania/lang/zh_tw.json @@ -119,23 +119,7 @@ "botania.triggers.manaFull": "瑪那已滿", "botania.triggers.runeAltarCanCraft": "祭壇可合成符文", - "botania.color0": "白色", - "botania.color1": "橘色", - "botania.color2": "洋紅色", - "botania.color3": "淺藍色", - "botania.color4": "黃色", - "botania.color5": "淺綠色", - "botania.color6": "粉色", - "botania.color7": "灰色", - "botania.color8": "淺灰色", - "botania.color9": "青色", - "botania.color10": "紫色", - "botania.color11": "藍色", - "botania.color12": "棕色", - "botania.color13": "綠色", - "botania.color14": "紅色", - "botania.color15": "黑色", - "botania.color16": "虹色", + "botania.color.rainbow": "虹色", "botania.rank0": "&cD", "botania.rank1": "&eC",