From 00ec6f8b0886b875bc258bccaffb5c15441ed6c5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 11 Jun 2020 22:48:50 -0500 Subject: [PATCH] Brighten hopperhock hud, unify shift tooltip handling and fix the coloring for it --- .../client/core/handler/TooltipHandler.java | 20 +++++++++++++++++++ .../subtile/functional/SubTileHopperhock.java | 4 ++-- .../botania/common/item/ItemLexicon.java | 7 +++---- .../botania/common/item/ItemManaGun.java | 15 +++++++------- .../armor/manasteel/ItemManasteelArmor.java | 7 ++----- .../item/equipment/bauble/ItemBauble.java | 17 +++++++--------- .../equipment/bauble/ItemBaubleCosmetic.java | 8 ++++---- .../equipment/bauble/ItemBloodPendant.java | 10 +++++----- .../equipment/bauble/ItemFlightTiara.java | 6 +++--- .../botania/common/item/relic/ItemRelic.java | 19 +++++++++--------- .../common/item/relic/ItemRelicBauble.java | 6 +++--- .../resources/assets/botania/lang/en_us.json | 2 +- .../resources/assets/botania/lang/es_ar.json | 2 +- .../resources/assets/botania/lang/es_es.json | 2 +- .../resources/assets/botania/lang/fr_fr.json | 2 +- .../resources/assets/botania/lang/ja_jp.json | 2 +- .../resources/assets/botania/lang/ko_kr.json | 2 +- .../resources/assets/botania/lang/nl_nl.json | 2 +- .../resources/assets/botania/lang/pt_br.json | 2 +- .../resources/assets/botania/lang/ru_ru.json | 2 +- .../resources/assets/botania/lang/zh_cn.json | 2 +- .../resources/assets/botania/lang/zh_tw.json | 2 +- 22 files changed, 77 insertions(+), 64 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index 8405f6fee..7ad6f77ad 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -8,6 +8,10 @@ */ package vazkii.botania.client.core.handler; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.event.entity.player.ItemTooltipEvent; @@ -19,6 +23,9 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.lib.LibMisc; +import java.util.List; +import java.util.function.Consumer; + @Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class TooltipHandler { @@ -29,4 +36,17 @@ public final class TooltipHandler { } } + public static ITextComponent getShiftInfoTooltip() { + ITextComponent shift = new StringTextComponent("SHIFT").applyTextStyle(TextFormatting.AQUA); + return new TranslationTextComponent("botaniamisc.shiftinfo", shift).applyTextStyle(TextFormatting.GRAY); + } + + public static void addOnShift(List tooltip, Runnable lambda) { + if (Screen.hasShiftDown()) { + lambda.run(); + } else { + tooltip.add(getShiftInfoTooltip()); + } + } + } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 2c212f5e4..a0025265f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -24,6 +24,7 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandler; @@ -242,12 +243,11 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower { public void renderHUD(Minecraft mc) { super.renderHUD(mc); - int color = getColor(); String filter = I18n.format("botaniamisc.filter" + filterType); int x = mc.getMainWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(filter) / 2; int y = mc.getMainWindow().getScaledHeight() / 2 + 30; - mc.fontRenderer.drawStringWithShadow(filter, x, y, color); + mc.fontRenderer.drawStringWithShadow(filter, x, y, TextFormatting.GRAY.getColor()); RenderSystem.disableLighting(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 5eecdfb85..3476f8e63 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -29,6 +29,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.recipe.IElvenItem; +import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.common.advancements.UseItemSuccessTrigger; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lib.LibMisc; @@ -66,11 +67,9 @@ public class ItemLexicon extends Item implements IElvenItem { public void addInformation(ItemStack stack, World worldIn, List tooltip, ITooltipFlag flagIn) { super.addInformation(stack, worldIn, tooltip, flagIn); - if (Screen.hasShiftDown()) { + TooltipHandler.addOnShift(tooltip, () -> { tooltip.add(getEdition().applyTextStyle(TextFormatting.GRAY)); - } else { - tooltip.add(new TranslationTextComponent("botaniamisc.shiftinfo")); - } + }); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index e6db1ec90..b7e679b03 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -36,6 +36,7 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; +import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.common.advancements.ManaGunTrigger; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -176,24 +177,24 @@ public class ItemManaGun extends Item implements IManaUsingItem { @OnlyIn(Dist.CLIENT) @Override - public void addInformation(ItemStack stack, World world, List stacks, ITooltipFlag flags) { + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flags) { boolean clip = hasClip(stack); if (clip && !Screen.hasShiftDown()) { - stacks.add(new TranslationTextComponent("botaniamisc.shiftinfo")); + tooltip.add(TooltipHandler.getShiftInfoTooltip()); return; } ItemStack lens = getLens(stack); if (!lens.isEmpty()) { - List tooltip = lens.getTooltip(Minecraft.getInstance().player, ITooltipFlag.TooltipFlags.NORMAL); - if (tooltip.size() > 1) { - stacks.addAll(tooltip.subList(1, tooltip.size())); + List lensTip = lens.getTooltip(Minecraft.getInstance().player, ITooltipFlag.TooltipFlags.NORMAL); + if (lensTip.size() > 1) { + tooltip.addAll(lensTip.subList(1, lensTip.size())); } } if (clip) { int pos = getClipPos(stack); - stacks.add(new TranslationTextComponent("botaniamisc.hasClip")); + tooltip.add(new TranslationTextComponent("botaniamisc.hasClip")); for (int i = 0; i < CLIP_SLOTS; i++) { ItemStack lensAt = getLensAtPos(stack, i); @@ -206,7 +207,7 @@ public class ItemManaGun extends Item implements IManaUsingItem { ITextComponent tip = new StringTextComponent(" - ").appendSibling(name); tip.getStyle().setColor(i == pos ? TextFormatting.GREEN : TextFormatting.GRAY); - stacks.add(tip); + tooltip.add(tip); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index b32dc22e2..a586c1a85 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -33,6 +33,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.armor.ModelArmorManasteel; import vazkii.botania.common.core.handler.ConfigHandler; @@ -118,11 +119,7 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { - if (Screen.hasShiftDown()) { - addInformationAfterShift(stack, world, list, flags); - } else { - list.add(new TranslationTextComponent("botaniamisc.shiftinfo")); - } + TooltipHandler.addOnShift(list, () -> addInformationAfterShift(stack, world, list, flags)); } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index bb3fab8e3..9d3103f47 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -34,6 +34,7 @@ import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.client.core.handler.BaubleRenderHandler; +import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -60,29 +61,25 @@ public abstract class ItemBauble extends Item implements ICosmeticAttachable, IP @Override @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List stacks, ITooltipFlag flags) { - if (Screen.hasShiftDown()) { - addHiddenTooltip(stack, world, stacks, flags); - } else { - stacks.add(new TranslationTextComponent("botaniamisc.shiftinfo")); - } + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flags) { + TooltipHandler.addOnShift(tooltip, () -> addHiddenTooltip(stack, world, tooltip, flags)); } @OnlyIn(Dist.CLIENT) - public void addHiddenTooltip(ItemStack stack, World world, List stacks, ITooltipFlag flags) { + public void addHiddenTooltip(ItemStack stack, World world, List tooltip, ITooltipFlag flags) { String key = vazkii.botania.client.core.helper.RenderHelper.getKeyDisplayString("key.curios.open.desc"); if (key != null) { - stacks.add(new TranslationTextComponent("botania.baubletooltip", key)); + tooltip.add(new TranslationTextComponent("botania.baubletooltip", key)); } ItemStack cosmetic = getCosmeticItem(stack); if (!cosmetic.isEmpty()) { - stacks.add(new TranslationTextComponent("botaniamisc.hasCosmetic", cosmetic.getDisplayName())); + tooltip.add(new TranslationTextComponent("botaniamisc.hasCosmetic", cosmetic.getDisplayName())); } if (hasPhantomInk(stack)) { - stacks.add(new TranslationTextComponent("botaniamisc.hasPhantomInk")); + tooltip.add(new TranslationTextComponent("botaniamisc.hasPhantomInk")); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index e7a6d0cca..78345bc17 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -67,13 +67,13 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @OnlyIn(Dist.CLIENT) @Override - public void addHiddenTooltip(ItemStack stack, World world, List stacks, ITooltipFlag flags) { + public void addHiddenTooltip(ItemStack stack, World world, List tooltip, ITooltipFlag flags) { if (variant == Variant.THINKING_HAND) { - stacks.add(new TranslationTextComponent("botaniamisc.cosmeticThinking").applyTextStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("botaniamisc.cosmeticThinking").applyTextStyle(TextFormatting.GRAY)); } else { - stacks.add(new TranslationTextComponent("botaniamisc.cosmeticBauble").applyTextStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("botaniamisc.cosmeticBauble").applyTextStyle(TextFormatting.GRAY)); } - super.addHiddenTooltip(stack, world, stacks, flags); + super.addHiddenTooltip(stack, world, tooltip, flags); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 2ccc9f32c..cb66454b6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -70,16 +70,16 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @OnlyIn(Dist.CLIENT) @Override - public void addHiddenTooltip(ItemStack stack, World world, List list, ITooltipFlag adv) { - super.addHiddenTooltip(stack, world, list, adv); + public void addHiddenTooltip(ItemStack stack, World world, List tooltip, ITooltipFlag adv) { + super.addHiddenTooltip(stack, world, tooltip, adv); Brew brew = getBrew(stack); if (brew == ModBrews.fallbackBrew) { - list.add(new TranslationTextComponent("botaniamisc.notInfused").applyTextStyle(TextFormatting.LIGHT_PURPLE)); + tooltip.add(new TranslationTextComponent("botaniamisc.notInfused").applyTextStyle(TextFormatting.LIGHT_PURPLE)); return; } - list.add(new TranslationTextComponent("botaniamisc.brewOf", I18n.format(brew.getTranslationKey(stack))).applyTextStyle(TextFormatting.LIGHT_PURPLE)); + tooltip.add(new TranslationTextComponent("botaniamisc.brewOf", I18n.format(brew.getTranslationKey(stack))).applyTextStyle(TextFormatting.LIGHT_PURPLE)); for (EffectInstance effect : brew.getPotionEffects(stack)) { TextFormatting format = effect.getPotion().getEffectType().getColor(); ITextComponent cmp = new TranslationTextComponent(effect.getEffectName()); @@ -87,7 +87,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre cmp.appendText(" "); cmp.appendSibling(new TranslationTextComponent("botania.roman" + (effect.getAmplifier() + 1))); } - list.add(cmp.applyTextStyle(format)); + tooltip.add(cmp.applyTextStyle(format)); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 740769ab4..3ca559033 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -106,9 +106,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { @OnlyIn(Dist.CLIENT) @Override - public void addHiddenTooltip(ItemStack stack, World world, List stacks, ITooltipFlag flags) { - super.addHiddenTooltip(stack, world, stacks, flags); - stacks.add(new TranslationTextComponent("botania.wings" + getVariant(stack))); + public void addHiddenTooltip(ItemStack stack, World world, List tooltip, ITooltipFlag flags) { + super.addHiddenTooltip(stack, world, tooltip, flags); + tooltip.add(new TranslationTextComponent("botania.wings" + getVariant(stack))); } private void updatePlayerFlyStatus(LivingUpdateEvent event) { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 64c2ecaba..b802bdf10 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -28,6 +28,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; +import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.common.advancements.RelicBindTrigger; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; @@ -59,28 +60,26 @@ public class ItemRelic extends Item implements IRelic { } @OnlyIn(Dist.CLIENT) - public void addBindInfo(List list, ItemStack stack) { - if (Screen.hasShiftDown()) { + public void addBindInfo(List tooltip, ItemStack stack) { + TooltipHandler.addOnShift(tooltip, () -> { if (!hasUUID(stack)) { - list.add(new TranslationTextComponent("botaniamisc.relicUnbound")); + tooltip.add(new TranslationTextComponent("botaniamisc.relicUnbound")); } else { if (!getSoulbindUUID(stack).equals(Minecraft.getInstance().player.getUniqueID())) { - list.add(new TranslationTextComponent("botaniamisc.notYourSagittarius")); + tooltip.add(new TranslationTextComponent("botaniamisc.notYourSagittarius")); } else { - list.add(new TranslationTextComponent("botaniamisc.relicSoulbound", Minecraft.getInstance().player.getName())); + tooltip.add(new TranslationTextComponent("botaniamisc.relicSoulbound", Minecraft.getInstance().player.getName())); } } if (stack.getItem() == ModItems.dice) { - list.add(new StringTextComponent("")); + tooltip.add(new StringTextComponent("")); String name = stack.getTranslationKey() + ".poem"; for (int i = 0; i < 4; i++) { - list.add(new TranslationTextComponent(name + i).applyTextStyles(TextFormatting.GRAY, TextFormatting.ITALIC)); + tooltip.add(new TranslationTextComponent(name + i).applyTextStyles(TextFormatting.GRAY, TextFormatting.ITALIC)); } } - } else { - list.add(new TranslationTextComponent("botaniamisc.shiftinfo")); - } + }); } public boolean shouldDamageWrongPlayer() { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 13ffaf184..a4e4481a0 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -49,9 +49,9 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { @OnlyIn(Dist.CLIENT) @Override - public void addHiddenTooltip(ItemStack stack, World world, List stacks, ITooltipFlag flags) { - super.addHiddenTooltip(stack, world, stacks, flags); - dummy.addBindInfo(stacks, stack); + public void addHiddenTooltip(ItemStack stack, World world, List tooltip, ITooltipFlag flags) { + super.addHiddenTooltip(stack, world, tooltip, flags); + dummy.addBindInfo(tooltip, stack); } @Override diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index 8cf56f523..b1de355b4 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -31,7 +31,7 @@ "botaniamisc.lexiconcover0": "The official guide for", "botaniamisc.lexiconcover1": "all your Botania needs!", "botaniamisc.lexiconcover2": "A Book by Vazkii", - "botaniamisc.shiftinfo": "Hold \u00a7bSHIFT\u00a77 for more info", + "botaniamisc.shiftinfo": "Hold %s for more info", "botaniamisc.ratio": "%sx Zoom (hover to zoom out)", "botaniamisc.bottleTooltip": "It has an acquired taste", "botaniamisc.shardLevel": "Shard Power %s", diff --git a/src/main/resources/assets/botania/lang/es_ar.json b/src/main/resources/assets/botania/lang/es_ar.json index d240ad7fc..a48a6f3bc 100644 --- a/src/main/resources/assets/botania/lang/es_ar.json +++ b/src/main/resources/assets/botania/lang/es_ar.json @@ -27,7 +27,7 @@ "botaniamisc.lexiconcover3": "Lizbeth \"Vazkii\" Rika", "botaniamisc.lexiconcover4": "Editado por BevoLJ", "botaniamisc.lexiconcover5": "Editado por Saice", - "botaniamisc.shiftinfo": "Mantén &bSHIFT&7 apretado para más información", + "botaniamisc.shiftinfo": "Mantén %s apretado para más información", "botaniamisc.ratio": "%s:1 Ratio", "botaniamisc.bottleTooltip": "Ha adquirido gusto", "botaniamisc.shardLevel": "Shard Power %s", diff --git a/src/main/resources/assets/botania/lang/es_es.json b/src/main/resources/assets/botania/lang/es_es.json index 8e549c886..29cab4308 100644 --- a/src/main/resources/assets/botania/lang/es_es.json +++ b/src/main/resources/assets/botania/lang/es_es.json @@ -30,7 +30,7 @@ "botaniamisc.lexiconcover2": "de la autora de bestsellers", "botaniamisc.lexiconcover4": "Editado por BevoLJ", "botaniamisc.lexiconcover5": "Editado por Saice", - "botaniamisc.shiftinfo": "Mantén &bSHIFT&7 apretado para más información", + "botaniamisc.shiftinfo": "Mantén %s apretado para más información", "botaniamisc.ratio": "Zoom: %sx", "botaniamisc.bottleTooltip": "Tiene un gusto refinado", "botaniamisc.shardLevel": "Potencia de lasca %s", diff --git a/src/main/resources/assets/botania/lang/fr_fr.json b/src/main/resources/assets/botania/lang/fr_fr.json index a924d9f26..fe9953295 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.json +++ b/src/main/resources/assets/botania/lang/fr_fr.json @@ -30,7 +30,7 @@ "botaniamisc.lexiconcover3": "Lizbeth \"Vazkii\" Rika", "botaniamisc.lexiconcover4": "Edité par BevoLJ", "botaniamisc.lexiconcover5": "Edité par Saice", - "botaniamisc.shiftinfo": "Appuyez sur &bMaj&7 pour plus d'info", + "botaniamisc.shiftinfo": "Appuyez sur %s pour plus d'info", "botaniamisc.ratio": "Zoom: %sx", "botaniamisc.bottleTooltip": "Il a un goût d'acquis", "botaniamisc.shardLevel": "Puissance d'éclat %s", diff --git a/src/main/resources/assets/botania/lang/ja_jp.json b/src/main/resources/assets/botania/lang/ja_jp.json index f235948aa..b9e59d92f 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.lexiconcover0": "公式ガイドブック", "botaniamisc.lexiconcover1": "ボタニアのすべてがここに!", "botaniamisc.lexiconcover2": "Vazkii 著", - "botaniamisc.shiftinfo": "&bSHIFT$(7) キーを押して詳しい情報を見る", + "botaniamisc.shiftinfo": "%s キーを押して詳しい情報を見る", "botaniamisc.ratio": "%sx 拡大(カーソルで拡大解除)", "botaniamisc.bottleTooltip": "慣れ親しんだ味", "botaniamisc.shardLevel": "シャードパワー %s", diff --git a/src/main/resources/assets/botania/lang/ko_kr.json b/src/main/resources/assets/botania/lang/ko_kr.json index 97accfca3..70ac7b04c 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.json +++ b/src/main/resources/assets/botania/lang/ko_kr.json @@ -31,7 +31,7 @@ "botaniamisc.lexiconcover3": "Lizbeth \"Vazkii\" Rika 지음", "botaniamisc.lexiconcover4": "편집 BevoLJ", "botaniamisc.lexiconcover5": "편집 Saice", - "botaniamisc.shiftinfo": "Hold &bSHIFT&7시 더 많은 정보", + "botaniamisc.shiftinfo": "Hold %s 시 더 많은 정보", "botaniamisc.ratio": "확대: %sx", "botaniamisc.shardLevel": "%s 등급", "botaniamisc.lexiconIndex": "목차", diff --git a/src/main/resources/assets/botania/lang/nl_nl.json b/src/main/resources/assets/botania/lang/nl_nl.json index eb1cef904..352f2af5d 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.json +++ b/src/main/resources/assets/botania/lang/nl_nl.json @@ -33,7 +33,7 @@ "botaniamisc.lexiconcover4": "Bewerkt door BevoLJ", "botaniamisc.lexiconcover5": "Bewerkt door Saice", "botaniamisc.lexiconcover6": "Bewerkt door Hupster", - "botaniamisc.shiftinfo": "Druk &bSHIFT&7 voor meer informatie", + "botaniamisc.shiftinfo": "Druk %s voor meer informatie", "botaniamisc.ratio": "Inzoomen: %sx", "botaniamisc.bottleTooltip": "Het heeft een verworven smaak", "botaniamisc.shardLevel": "Schervenkracht %s", diff --git a/src/main/resources/assets/botania/lang/pt_br.json b/src/main/resources/assets/botania/lang/pt_br.json index 2b9e98730..ddc5d183d 100644 --- a/src/main/resources/assets/botania/lang/pt_br.json +++ b/src/main/resources/assets/botania/lang/pt_br.json @@ -27,7 +27,7 @@ "botaniamisc.lexiconcover0": "O guia oficial para", "botaniamisc.lexiconcover1": "suas dúvidas em Botania!", "botaniamisc.lexiconcover2": "Um livro por Vazkii", - "botaniamisc.shiftinfo": "Segure &bSHIFT&7 para mais informações", + "botaniamisc.shiftinfo": "Segure %s para mais informações", "botaniamisc.ratio": "Zoom: %sx (passe o mouse para ver normal)", "botaniamisc.bottleTooltip": "Desenvolveu um sabor", "botaniamisc.shardLevel": "Poder Cristalino %s", diff --git a/src/main/resources/assets/botania/lang/ru_ru.json b/src/main/resources/assets/botania/lang/ru_ru.json index dbc31f2d1..5ea68bd30 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.json +++ b/src/main/resources/assets/botania/lang/ru_ru.json @@ -30,7 +30,7 @@ "botaniamisc.lexiconcover0": "Руководство по всем", "botaniamisc.lexiconcover1": "ботаническим вопросам", "botaniamisc.lexiconcover2": "от Vazkii", - "botaniamisc.shiftinfo": "Зажмите &bShift&7 для подробной информации", + "botaniamisc.shiftinfo": "Зажмите %s для подробной информации", "botaniamisc.ratio": "%sx увеличение (наведите для уменьшения)", "botaniamisc.bottleTooltip": "Вкус на любителя", "botaniamisc.shardLevel": "Сила осколка %s", diff --git a/src/main/resources/assets/botania/lang/zh_cn.json b/src/main/resources/assets/botania/lang/zh_cn.json index d06630867..11d9921b1 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.json +++ b/src/main/resources/assets/botania/lang/zh_cn.json @@ -31,7 +31,7 @@ "botaniamisc.lexiconcover0": "官方权威指南", "botaniamisc.lexiconcover1": "植物魔法所需", "botaniamisc.lexiconcover2": "由Vazkii执笔编纂", - "botaniamisc.shiftinfo": "按住§bSHIFT§7显示更多", + "botaniamisc.shiftinfo": "按住%s显示更多", "botaniamisc.ratio": "放大:%s倍", "botaniamisc.bottleTooltip": "味道如何", "botaniamisc.shardLevel": "碎片能量 %s", diff --git a/src/main/resources/assets/botania/lang/zh_tw.json b/src/main/resources/assets/botania/lang/zh_tw.json index fea3ba9e0..3c0cdf4b0 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.json +++ b/src/main/resources/assets/botania/lang/zh_tw.json @@ -31,7 +31,7 @@ "botaniamisc.lexiconcover3": "植物魔法所需", "botaniamisc.lexiconcover4": "由BevoLJ校對編輯", "botaniamisc.lexiconcover5": "由Saice校對編輯", - "botaniamisc.shiftinfo": "按住&bSHIFT&7顯示更多", + "botaniamisc.shiftinfo": "按住%s顯示更多", "botaniamisc.ratio": "放大:%s倍", "botaniamisc.bottleTooltip": "味道如何", "botaniamisc.shardLevel": "碎片能量 %s",