diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index a6ff920a8..88b968853 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -24,6 +24,7 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ModItems; public class GuiFlowerBag extends ContainerScreen { @@ -42,7 +43,7 @@ public class GuiFlowerBag extends ContainerScreen { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - String s = I18n.format("item.botania:flowerBag.name"); + String s = I18n.format(ModItems.flowerBag.getTranslationKey()); font.drawString(s, xSize / 2 - font.getStringWidth(s) / 2, 6, 4210752); font.drawString(I18n.format("container.inventory"), 8, ySize - 96 + 2, 4210752); } 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 34cbbf778..979ed0344 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -76,7 +76,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens return super.getDisplayName(stack); String shortKeyA = stack.getTranslationKey() + ".short"; String shortKeyB = compositeLens.getTranslationKey() + ".short"; - return new TranslationTextComponent("item.botania:compositeLens", new TranslationTextComponent(shortKeyA), new TranslationTextComponent(shortKeyB)); + return new TranslationTextComponent("item.botania.composite_lens", new TranslationTextComponent(shortKeyA), new TranslationTextComponent(shortKeyB)); } @Override diff --git a/src/main/resources/assets/botania/lang/de_de.json b/src/main/resources/assets/botania/lang/de_de.json index 297747db6..b33973e35 100644 --- a/src/main/resources/assets/botania/lang/de_de.json +++ b/src/main/resources/assets/botania/lang/de_de.json @@ -25,7 +25,7 @@ "botaniamisc.inputtingPower": "Nimmt Energie von Items auf", "botaniamisc.creative": "Kreativ", "botaniamisc.invFull": "Dein Inventar ist voll.", - "botaniamisc.compositeLens": "Gemisch mit %s", + "botaniamisc.composite_lens": "Gemisch mit %s", "botaniamisc.filter0": "Nur Items in Rahmen aufsammeln", "botaniamisc.filter1": "Nur Items außerhalb von Rahmen aufsammeln", "botaniamisc.filter2": "Alle Items aufsammeln", @@ -707,7 +707,7 @@ "item.botania.signalflare": "Signalpistole", "item.botania.mana_tablet": "Manatablett", "item.botania.mana_gun": "Mana-Blaster", - "item.botania.compositelens": "Verbundmanalinse: %s %s", + "item.botania.composite_lens": "Verbundmanalinse: %s %s", "item.botania.mana_cookie": "Manakeks", "item.botania.fertilizer": "Blumendünger", "item.botania.grass_seeds": "Weidesamen", @@ -1307,7 +1307,7 @@ "botania.entry.manaDetector": "Manadetektor", - "botania.entry.compositeLens": "Verbundmanalinse", + "botania.entry.composite_lens": "Verbundmanalinse", "botania.entry.redstoneSpreader": "Redstone-Manaverbreiter", diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index a068b0dfc..aca38791d 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -32,7 +32,7 @@ "botaniamisc.inputtingPower": "Accepting Mana from Items", "botaniamisc.creative": "Creative", "botaniamisc.invFull": "Your inventory is full.", - "botaniamisc.compositeLens": "Composite with %s", + "botaniamisc.composite_lens": "Composite with %s", "botaniamisc.filter0": "Pickup only items in Frames", "botaniamisc.filter1": "Pickup only items not in Frames", "botaniamisc.filter2": "Pickup any items", @@ -1292,7 +1292,7 @@ "item.botania.signalflare": "Signal Flare", "item.botania.mana_tablet": "Mana Tablet", "item.botania.mana_gun": "Mana Blaster", - "item.botania.compositelens": "Composite Mana Lens: %s %s", + "item.botania.composite_lens": "Composite Mana Lens: %s %s", "item.botania.mana_cookie": "Biscuit of Totality", "item.botania.fertilizer": "Floral Fertilizer", "item.botania.grass_seeds": "Pasture Seeds", diff --git a/src/main/resources/assets/botania/lang/es_ar.json b/src/main/resources/assets/botania/lang/es_ar.json index 83cebc756..0e22249b2 100644 --- a/src/main/resources/assets/botania/lang/es_ar.json +++ b/src/main/resources/assets/botania/lang/es_ar.json @@ -24,7 +24,7 @@ "botaniamisc.inputtingPower": "Recibiendo Maná de Ítems", "botaniamisc.creative": "Creativo", "botaniamisc.invFull": "Tu inventario está lleno.", - "botaniamisc.compositeLens": "Composite with %s", + "botaniamisc.composite_lens": "Composite with %s", "botaniamisc.filter0": "Recoge solamente los objetos en los marcos.", "botaniamisc.filter1": "Recoge solamente los objetos que no están en los marcos.", "botaniamisc.filter2": "Recoge todos los objetos.", diff --git a/src/main/resources/assets/botania/lang/es_es.json b/src/main/resources/assets/botania/lang/es_es.json index fc71306de..49d3e2064 100644 --- a/src/main/resources/assets/botania/lang/es_es.json +++ b/src/main/resources/assets/botania/lang/es_es.json @@ -28,7 +28,7 @@ "botaniamisc.inputtingPower": "Aceptando maná de objetos", "botaniamisc.creative": "Creativo", "botaniamisc.invFull": "Tu inventario está lleno.", - "botaniamisc.compositeLens": "Compuesto de %s", + "botaniamisc.composite_lens": "Compuesto de %s", "botaniamisc.filter0": "Recoge solamente los objetos en los marcos.", "botaniamisc.filter1": "Recoge solamente los objetos que no están en los marcos.", "botaniamisc.filter2": "Recoge todos los objetos.", @@ -1075,7 +1075,7 @@ "item.botania.signalflare": "Bengala de señales", "item.botania.mana_tablet": "Tableta de maná", "item.botania.mana_gun": "Pistola de maná", - "item.botania.compositelens": "Lentes de maná compuestas: %s %s", + "item.botania.composite_lens": "Lentes de maná compuestas: %s %s", "item.botania.mana_cookie": "Galleta de maná", "item.botania.fertilizer": "Fertilizante floral", "item.botania.grass_seeds": "Semillas de pasto", diff --git a/src/main/resources/assets/botania/lang/fr_fr.json b/src/main/resources/assets/botania/lang/fr_fr.json index e52af5bb6..1b626619d 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.json +++ b/src/main/resources/assets/botania/lang/fr_fr.json @@ -27,7 +27,7 @@ "botaniamisc.inputtingPower": "Accepte du mana des éléments", "botaniamisc.creative": "Créatif", "botaniamisc.invFull": "Votre inventaire est plein.", - "botaniamisc.compositeLens": "Composé avec %s", + "botaniamisc.composite_lens": "Composé avec %s", "botaniamisc.filter0": "Ramassage seulement des éléments en cadres", "botaniamisc.filter1": "Ramassage seulement des éléments hors cadres", "botaniamisc.filter2": "Ramassage de tous les éléments", @@ -939,7 +939,7 @@ "item.botania.signalflare": "Feux de détresse", "item.botania.mana_tablet": "Tablette de mana", "item.botania.mana_gun": "Exploseur de mana", - "item.botania.compositelens": "Lentilles de mana composite: %s %s", + "item.botania.composite_lens": "Lentilles de mana composite: %s %s", "item.botania.mana_cookie": "Biscuit de mana", "item.botania.fertilizer": "Fertilisant floral", "item.botania.grass_seeds": "Graines de pâturage", diff --git a/src/main/resources/assets/botania/lang/ja_jp.json b/src/main/resources/assets/botania/lang/ja_jp.json index 0271f0236..a52364aed 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.json +++ b/src/main/resources/assets/botania/lang/ja_jp.json @@ -26,7 +26,7 @@ "botaniamisc.inputtingPower": "アイテムからマナを受け取る", "botaniamisc.creative": "クリエイティブ", "botaniamisc.invFull": "インベントリがいっぱいです", - "botaniamisc.compositeLens": "%s と複合している", + "botaniamisc.composite_lens": "%s と複合している", "botaniamisc.filter0": "フレーム内のアイテムのみを拾う", "botaniamisc.filter1": "フレーム内のアイテム以外を拾う", "botaniamisc.filter2": "すべてのアイテムを拾う", @@ -1036,7 +1036,7 @@ "item.botania.signalflare": "信号フレア", "item.botania.mana_tablet": "マナタブレット", "item.botania.mana_gun": "マナ銃", - "item.botania.compositelens": "複合マナレンズ: %s %s", + "item.botania.composite_lens": "複合マナレンズ: %s %s", "item.botania.mana_cookie": "全快クッキー", "item.botania.fertilizer": "花の肥料", "item.botania.grass_seeds": "牧草の種", diff --git a/src/main/resources/assets/botania/lang/ko_kr.json b/src/main/resources/assets/botania/lang/ko_kr.json index c04dbeae6..2426502c9 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.json +++ b/src/main/resources/assets/botania/lang/ko_kr.json @@ -28,7 +28,7 @@ "botaniamisc.inputtingPower": "아이템에서 마나를 추출합니다", "botaniamisc.creative": "크리에이티브", "botaniamisc.invFull": "당신의 인벤토리는 가득 찼습니다.", - "botaniamisc.compositeLens": "%s와 합성", + "botaniamisc.composite_lens": "%s와 합성", "botaniamisc.filter0": "프레임에 있는 아이템만 가져옵니다", "botaniamisc.filter1": "프레임에 없는 아이템만 가져옵니다", "botaniamisc.filter2": "아무 아이템이나 가져옵니다", @@ -1034,7 +1034,7 @@ "item.botania.signalflare": "신호탄", "item.botania.mana_tablet": "마나 태블릿", "item.botania.mana_gun": "마나 블래스터", - "item.botania.compositelens": "합성 마나렌즈: %s %s", + "item.botania.composite_lens": "합성 마나렌즈: %s %s", "item.botania.mana_cookie": "마나 쿠키", "item.botania.fertilizer": "꽃의 비료", "item.botania.grass_seeds": "초원의 씨", diff --git a/src/main/resources/assets/botania/lang/nl_nl.json b/src/main/resources/assets/botania/lang/nl_nl.json index 40398f5da..e6879c203 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.json +++ b/src/main/resources/assets/botania/lang/nl_nl.json @@ -27,7 +27,7 @@ "botaniamisc.inputtingPower": "Neemt Mana op van items", "botaniamisc.creative": "Creatief", "botaniamisc.invFull": "Je inventaris is vol.", - "botaniamisc.compositeLens": "Samengesteld met %s", + "botaniamisc.composite_lens": "Samengesteld met %s", "botaniamisc.filter0": "Alleen items binnen kader verzamelen", "botaniamisc.filter1": "Alleen items buiten kader verzamelen", "botaniamisc.filter2": "Alle items verzamelen", @@ -1123,7 +1123,7 @@ "item.botania.signalflare": "Signaalpistool", "item.botania.mana_tablet": "Mana Tablet", "item.botania.mana_gun": "Mana Blaster", - "item.botania.compositelens": "Samengestelde Mana Lens: %s %s", + "item.botania.composite_lens": "Samengestelde Mana Lens: %s %s", "item.botania.mana_cookie": "Biscuit der Totaalheid", "item.botania.fertilizer": "Bloemenvoeding", "item.botania.grass_seeds": "Weidezaden", diff --git a/src/main/resources/assets/botania/lang/pt_br.json b/src/main/resources/assets/botania/lang/pt_br.json index d73dc0723..8437c2bce 100644 --- a/src/main/resources/assets/botania/lang/pt_br.json +++ b/src/main/resources/assets/botania/lang/pt_br.json @@ -26,7 +26,7 @@ "botaniamisc.inputtingPower": "Aceitando Mana de itens", "botaniamisc.creative": "Criativo", "botaniamisc.invFull": "Seu inventário está cheio.", - "botaniamisc.compositeLens": "Composta de %s", + "botaniamisc.composite_lens": "Composta de %s", "botaniamisc.filter0": "Coletar itens da moldura", "botaniamisc.filter1": "Não coletar itens da moldura", "botaniamisc.filter2": "Coletar tudo", @@ -1185,7 +1185,7 @@ "item.botania.signalflare": "Fagulhas Sinalizadoras", "item.botania.mana_tablet": "Tablete de Mana", "item.botania.mana_gun": "Disparador de Mana", - "item.botania.compositelens": "Lentes de Mana Compostas: %s %s", + "item.botania.composite_lens": "Lentes de Mana Compostas: %s %s", "item.botania.mana_cookie": "Biscuit of Totality", "item.botania.fertilizer": "Fertilizante Floral", "item.botania.grass_seeds": "Sementes de Pasto", diff --git a/src/main/resources/assets/botania/lang/ru_ru.json b/src/main/resources/assets/botania/lang/ru_ru.json index 98474b445..183b55e65 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.json +++ b/src/main/resources/assets/botania/lang/ru_ru.json @@ -31,7 +31,7 @@ "botaniamisc.inputtingPower": "Выкачивание маны из предметов", "botaniamisc.creative": "Творческий", "botaniamisc.invFull": "Ваш инвентарь переполнен.", - "botaniamisc.compositeLens": "Совмещённый с %s", + "botaniamisc.composite_lens": "Совмещённый с %s", "botaniamisc.filter0": "Подбирать только предметы в рамках", "botaniamisc.filter1": "Подбирать только предметы без рамок", "botaniamisc.filter2": "Подбирать любые предметы", @@ -1354,7 +1354,7 @@ "item.botania:signalFlare": "Сигнальная ракета", "item.botania:manaTablet": "Планшет маны", "item.botania:manaGun": "Излучатель маны", - "item.botania:compositeLens": "Совмещённые линзы маны: %s %s", + "item.botania:composite_lens": "Совмещённые линзы маны: %s %s", "item.botania:manaCookie": "Печенье маны", "item.botania:fertilizer": "Цветочное удобрение", "item.botania:grassSeeds0": "Луговое семя", diff --git a/src/main/resources/assets/botania/lang/zh_cn.json b/src/main/resources/assets/botania/lang/zh_cn.json index c95f42a60..172f8d7a4 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.json +++ b/src/main/resources/assets/botania/lang/zh_cn.json @@ -30,7 +30,7 @@ "botaniamisc.inputtingPower": "接收来自物品的能量", "botaniamisc.creative": "创造模式", "botaniamisc.invFull": "你的物品栏已满。", - "botaniamisc.compositeLens": "与 %s 复合", + "botaniamisc.composite_lens": "与 %s 复合", "botaniamisc.filter0": "只拾取物品展示框内物品", "botaniamisc.filter1": "只拾取物品展示框以外物品", "botaniamisc.filter2": "拾取所有物品", @@ -1216,7 +1216,7 @@ "item.botania.signalflare": "信号弹", "item.botania.mana_tablet": "魔力石板", "item.botania.mana_gun": "魔力脉冲枪", - "item.botania.compositelens": "复合透镜: %s %s", + "item.botania.composite_lens": "复合透镜: %s %s", "item.botania.mana_cookie": "魔力曲奇", "item.botania.fertilizer": "花肥", "item.botania.grass_seeds": "草地之种", diff --git a/src/main/resources/assets/botania/lang/zh_tw.json b/src/main/resources/assets/botania/lang/zh_tw.json index 1b886f5a8..7ea4af709 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.json +++ b/src/main/resources/assets/botania/lang/zh_tw.json @@ -27,7 +27,7 @@ "botaniamisc.inputtingPower": "接收來自物品的能量", "botaniamisc.creative": "創造模式", "botaniamisc.invFull": "你的物品欄已滿。", - "botaniamisc.compositeLens": "與 %s 複合", + "botaniamisc.composite_lens": "與 %s 複合", "botaniamisc.filter0": "只拾取物品展示框內物品", "botaniamisc.filter1": "只拾取物品展示框以外物品", "botaniamisc.filter2": "拾取所有物品", @@ -1225,7 +1225,7 @@ "item.botania.signalflare": "信號彈", "item.botania.mana_tabletblet": "瑪那石板", "item.botania.mana_gun": "瑪那脈衝槍", - "item.botania.compositelens": "複合透鏡: %s %s", + "item.botania.composite_lens": "複合透鏡: %s %s", "item.botania.mana_cookie": "瑪那餅乾", "item.botania.fertilizer": "花肥", "item.botania.grass_seeds": "草地之種",