From f07a7c1220c62c9ce6d237a5299e5b7c4ae61abe Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Oct 2019 15:03:27 -0500 Subject: [PATCH] Fix some item tooltips not being greyed, fix petals having incorrect name, fix lexicon open advancement being unobtainable --- .../botania/common/item/ItemAstrolabe.java | 3 +- .../common/item/ItemBlackHoleTalisman.java | 2 +- .../botania/common/item/ItemBlackLotus.java | 3 +- .../botania/common/item/ItemLaputaShard.java | 3 +- .../botania/common/item/ItemLexicon.java | 2 ++ .../botania/common/item/ItemManaTablet.java | 3 +- .../botania/common/item/ItemPinkinator.java | 3 +- .../botania/common/item/ItemTwigWand.java | 3 +- .../common/item/block/ItemBlockPool.java | 3 +- .../equipment/bauble/ItemBaubleCosmetic.java | 5 +-- .../common/item/material/ItemPetal.java | 9 ++++++ .../resources/assets/botania/lang/de_de.json | 32 +++++++++---------- .../resources/assets/botania/lang/en_us.json | 32 +++++++++---------- .../resources/assets/botania/lang/es_es.json | 32 +++++++++---------- .../resources/assets/botania/lang/fr_fr.json | 32 +++++++++---------- .../resources/assets/botania/lang/ja_jp.json | 32 +++++++++---------- .../resources/assets/botania/lang/ko_kr.json | 32 +++++++++---------- .../resources/assets/botania/lang/nl_nl.json | 32 +++++++++---------- .../resources/assets/botania/lang/pt_br.json | 32 +++++++++---------- .../resources/assets/botania/lang/zh_cn.json | 32 +++++++++---------- .../resources/assets/botania/lang/zh_tw.json | 32 +++++++++---------- 21 files changed, 189 insertions(+), 170 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index b94165b20..8d959f255 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -31,6 +31,7 @@ import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -266,7 +267,7 @@ public class ItemAstrolabe extends ItemMod { tip.add(new StringTextComponent(size + " x " + size)); if (block != Blocks.AIR) - tip.add(new ItemStack(block).getDisplayName()); + tip.add(new ItemStack(block).getDisplayName().applyTextStyle(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index eec6199c4..11905ad71 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -241,7 +241,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { Block block = getBlock(stack); if(block != null) { int count = getBlockCount(stack); - stacks.add(new StringTextComponent(Integer.toString(count) + " ").appendSibling(new ItemStack(block).getDisplayName())); + stacks.add(new StringTextComponent(Integer.toString(count) + " ").appendSibling(new ItemStack(block).getDisplayName()).applyTextStyle(TextFormatting.GRAY)); } if(ItemNBTHelper.getBoolean(stack, TAG_ACTIVE, false)) diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 488f0b402..a35ed0848 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -18,6 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; @@ -70,7 +71,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { - list.add(new TranslationTextComponent("botaniamisc.lotusDesc")); + list.add(new TranslationTextComponent("botaniamisc.lotusDesc").applyTextStyle(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index c588afb55..5859e9965 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -31,6 +31,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; 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.minecraft.world.server.ServerWorld; @@ -89,7 +90,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { int level = stack.getOrCreateTag().getInt(TAG_LEVEL); ITextComponent levelLoc = new TranslationTextComponent("botania.roman" + (level + 1)); - list.add(new TranslationTextComponent("botaniamisc.shardLevel", levelLoc)); + list.add(new TranslationTextComponent("botaniamisc.shardLevel", levelLoc).applyTextStyle(TextFormatting.GRAY)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 93bac58fe..be5fe8b53 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -117,6 +117,8 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { Book book = getBook(); if(playerIn instanceof ServerPlayerEntity) { + ServerPlayerEntity player= (ServerPlayerEntity) playerIn; + UseItemSuccessTrigger.INSTANCE.trigger(player, stack, player.getServerWorld(), player.posX, player.posY, player.posZ); NetworkHandler.sendToPlayer(new MessageOpenBookGui(book.resourceLoc.toString()), (ServerPlayerEntity) playerIn); SoundEvent sfx = PatchouliSounds.getSound(book.openSound, PatchouliSounds.book_open); worldIn.playSound(null, playerIn.posX, playerIn.posY, playerIn.posZ, sfx, SoundCategory.PLAYERS, 1F, (float) (0.7 + Math.random() * 0.4)); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 00f30bcdd..cfbb37f42 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -18,6 +18,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; 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; @@ -63,7 +64,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP @Override public void addInformation(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { if(isStackCreative(par1ItemStack)) - stacks.add(new TranslationTextComponent("botaniamisc.creative")); + stacks.add(new TranslationTextComponent("botaniamisc.creative").applyTextStyle(TextFormatting.GRAY)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index f17373710..680f591ef 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -29,6 +29,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.server.ServerWorld; @@ -77,7 +78,7 @@ public class ItemPinkinator extends ItemMod { @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flags) { - tooltip.add(new TranslationTextComponent("botaniamisc.pinkinatorDesc")); + tooltip.add(new TranslationTextComponent("botaniamisc.pinkinatorDesc").applyTextStyle(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index dfcc72fd4..1f6897d7d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -37,6 +37,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; 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; @@ -260,7 +261,7 @@ public class ItemTwigWand extends ItemMod implements ICoordBoundItem { @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { - list.add(new TranslationTextComponent(getModeString(stack))); + list.add(new TranslationTextComponent(getModeString(stack)).applyTextStyle(TextFormatting.GRAY)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 0130c7503..02159aba6 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -15,6 +15,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; 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; @@ -40,7 +41,7 @@ public class ItemBlockPool extends ItemBlockMod { public void addInformation(@Nonnull ItemStack par1ItemStack, World world, @Nonnull List stacks, @Nonnull ITooltipFlag flag) { if(((BlockPool) getBlock()).variant == BlockPool.Variant.CREATIVE) for(int i = 0; i < 2; i++) - stacks.add(new TranslationTextComponent("botaniamisc.creativePool" + i)); + stacks.add(new TranslationTextComponent("botaniamisc.creativePool" + i).applyTextStyle(TextFormatting.GRAY)); } } 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 eef0f4e74..f9789ddbd 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 @@ -26,6 +26,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.util.Direction; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; @@ -63,9 +64,9 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Override public void addHiddenTooltip(ItemStack stack, World world, List stacks, ITooltipFlag flags) { if(variant == Variant.THINKING_HAND) { - stacks.add(new TranslationTextComponent("botaniamisc.cosmeticThinking")); + stacks.add(new TranslationTextComponent("botaniamisc.cosmeticThinking").applyTextStyle(TextFormatting.GRAY)); } else { - stacks.add(new TranslationTextComponent("botaniamisc.cosmeticBauble")); + stacks.add(new TranslationTextComponent("botaniamisc.cosmeticBauble").applyTextStyle(TextFormatting.GRAY)); } super.addHiddenTooltip(stack, world, stacks, flags); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index c7c25adb2..1b21f3d3b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -16,6 +16,8 @@ import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.ICustomApothecaryColor; import vazkii.botania.common.item.block.ItemBlockMod; +import javax.annotation.Nonnull; + public class ItemPetal extends ItemBlockMod implements ICustomApothecaryColor { public final DyeColor color; @@ -24,6 +26,13 @@ public class ItemPetal extends ItemBlockMod implements ICustomApothecaryColor { this.color = color; } + @Nonnull + @Override + public String getTranslationKey() { + // Don't take name of the block + return getDefaultTranslationKey(); + } + @Override public int getParticleColor(ItemStack stack) { return color.colorValue; diff --git a/src/main/resources/assets/botania/lang/de_de.json b/src/main/resources/assets/botania/lang/de_de.json index b2b0eeff5..297747db6 100644 --- a/src/main/resources/assets/botania/lang/de_de.json +++ b/src/main/resources/assets/botania/lang/de_de.json @@ -628,22 +628,22 @@ "block.botania.floating_bergamute": "Schwebende Bergamute", "item.botania.lexicon": "Lexica Botania", - "item.botania.petal_white": "Mystisches Weißes Blütenblatt", - "item.botania.petal_orange": "Mystisches Oranges Blütenblatt", - "item.botania.petal_magenta": "Mystisches Magentafarbenes Blütenblatt", - "item.botania.petal_light_blue": "Mystisches Hellblaues Blütenblatt", - "item.botania.petal_yellow": "Mystisches Gelbes Blütenblatt", - "item.botania.petal_lime": "Mystisches Hellgrünes Blütenblatt", - "item.botania.petal_pink": "Mystisches Pinkes Blütenblatt", - "item.botania.petal_gray": "Mystisches Graues Blütenblatt", - "item.botania.petal_silver": "Mystisches Hellgraues Blütenblatt", - "item.botania.petal_cyan": "Mystisches Türkises Blütenblatt", - "item.botania.petal_purple": "Mystisches Violettes Blütenblatt", - "item.botania.petal_blue": "Mystisches Blaues Blütenblatt", - "item.botania.petal_brown": "Mystisches Braunes Blütenblatt", - "item.botania.petal_green": "Mystisches Grünes Blütenblatt", - "item.botania.petal_red": "Mystisches Red Blütenblatt", - "item.botania.petal_black": "Mystisches Black Blütenblatt", + "item.botania.white_petal": "Mystisches Weißes Blütenblatt", + "item.botania.orange_petal": "Mystisches Oranges Blütenblatt", + "item.botania.magenta_petal": "Mystisches Magentafarbenes Blütenblatt", + "item.botania.light_blue_petal": "Mystisches Hellblaues Blütenblatt", + "item.botania.yellow_petal": "Mystisches Gelbes Blütenblatt", + "item.botania.lime_petal": "Mystisches Hellgrünes Blütenblatt", + "item.botania.pink_petal": "Mystisches Pinkes Blütenblatt", + "item.botania.gray_petal": "Mystisches Graues Blütenblatt", + "item.botania.silver_petal": "Mystisches Hellgraues Blütenblatt", + "item.botania.cyan_petal": "Mystisches Türkises Blütenblatt", + "item.botania.purple_petal": "Mystisches Violettes Blütenblatt", + "item.botania.blue_petal": "Mystisches Blaues Blütenblatt", + "item.botania.brown_petal": "Mystisches Braunes Blütenblatt", + "item.botania.green_petal": "Mystisches Grünes Blütenblatt", + "item.botania.red_petal": "Mystisches Red Blütenblatt", + "item.botania.black_petal": "Mystisches Black Blütenblatt", "item.botania.white_dye": "Weißes Blumenpulver", "item.botania.orange_dye": "Oranges Blumenpulver", "item.botania.magenta_dye": "Magentafarbenes Blumenpulver", diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index e847c0461..e557da22e 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -1185,22 +1185,22 @@ "item.botania.lexicon": "Lexica Botania", "item.botania.lexicon.bevo": "Lexica Botana", "item.botania.lexicon.saice": "Lexica Botonia", - "item.botania.petal_white": "Mystical White Petal", - "item.botania.petal_orange": "Mystical Orange Petal", - "item.botania.petal_magenta": "Mystical Magenta Petal", - "item.botania.petal_light_blue": "Mystical Light Blue Petal", - "item.botania.petal_yellow": "Mystical Yellow Petal", - "item.botania.petal_lime": "Mystical Lime Petal", - "item.botania.petal_pink": "Mystical Pink Petal", - "item.botania.petal_gray": "Mystical Gray Petal", - "item.botania.petal_silver": "Mystical Light Gray Petal", - "item.botania.petal_cyan": "Mystical Cyan Petal", - "item.botania.petal_purple": "Mystical Purple Petal", - "item.botania.petal_blue": "Mystical Blue Petal", - "item.botania.petal_brown": "Mystical Brown Petal", - "item.botania.petal_green": "Mystical Green Petal", - "item.botania.petal_red": "Mystical Red Petal", - "item.botania.petal_black": "Mystical Black Petal", + "item.botania.white_petal": "Mystical White Petal", + "item.botania.orange_petal": "Mystical Orange Petal", + "item.botania.magenta_petal": "Mystical Magenta Petal", + "item.botania.light_blue_petal": "Mystical Light Blue Petal", + "item.botania.yellow_petal": "Mystical Yellow Petal", + "item.botania.lime_petal": "Mystical Lime Petal", + "item.botania.pink_petal": "Mystical Pink Petal", + "item.botania.gray_petal": "Mystical Gray Petal", + "item.botania.silver_petal": "Mystical Light Gray Petal", + "item.botania.cyan_petal": "Mystical Cyan Petal", + "item.botania.purple_petal": "Mystical Purple Petal", + "item.botania.blue_petal": "Mystical Blue Petal", + "item.botania.brown_petal": "Mystical Brown Petal", + "item.botania.green_petal": "Mystical Green Petal", + "item.botania.red_petal": "Mystical Red Petal", + "item.botania.black_petal": "Mystical Black Petal", "item.botania.white_dye": "Floral White Powder", "item.botania.orange_dye": "Floral Orange Powder", "item.botania.magenta_dye": "Floral Magenta Powder", diff --git a/src/main/resources/assets/botania/lang/es_es.json b/src/main/resources/assets/botania/lang/es_es.json index c177d472d..fc71306de 100644 --- a/src/main/resources/assets/botania/lang/es_es.json +++ b/src/main/resources/assets/botania/lang/es_es.json @@ -966,22 +966,22 @@ "item.botania.lexicon": "Lexica Botania", "item.botania.lexicon.bevo": "Lexica Botana", "item.botania.lexicon.saice": "Lexica Botonia", - "item.botania.petal_white": "Pétalo místico blanco", - "item.botania.petal_orange": "Pétalo místico naranja", - "item.botania.petal_magenta": "Pétalo místico magenta", - "item.botania.petal_light_blue": "Pétalo místico azul claro", - "item.botania.petal_yellow": "Pétalo místico amarillo", - "item.botania.petal_lime": "Pétalo místico lima", - "item.botania.petal_pink": "Pétalo místico rosa", - "item.botania.petal_gray": "Pétalo místico gris", - "item.botania.petal_silver": "Pétalo místico gris claro", - "item.botania.petal_cyan": "Pétalo místico cian", - "item.botania.petal_purple": "Pétalo místico púrpura", - "item.botania.petal_blue": "Pétalo místico azul", - "item.botania.petal_brown": "Pétalo místico marrón", - "item.botania.petal_green": "Pétalo místico verde", - "item.botania.petal_red": "Pétalo místico rojo", - "item.botania.petal_black": "Pétalo místico negro", + "item.botania.white_petal": "Pétalo místico blanco", + "item.botania.orange_petal": "Pétalo místico naranja", + "item.botania.magenta_petal": "Pétalo místico magenta", + "item.botania.light_blue_petal": "Pétalo místico azul claro", + "item.botania.yellow_petal": "Pétalo místico amarillo", + "item.botania.lime_petal": "Pétalo místico lima", + "item.botania.pink_petal": "Pétalo místico rosa", + "item.botania.gray_petal": "Pétalo místico gris", + "item.botania.silver_petal": "Pétalo místico gris claro", + "item.botania.cyan_petal": "Pétalo místico cian", + "item.botania.purple_petal": "Pétalo místico púrpura", + "item.botania.blue_petal": "Pétalo místico azul", + "item.botania.brown_petal": "Pétalo místico marrón", + "item.botania.green_petal": "Pétalo místico verde", + "item.botania.red_petal": "Pétalo místico rojo", + "item.botania.black_petal": "Pétalo místico negro", "item.botania.white_dye": "Polvo floral blanco", "item.botania.orange_dye": "Polvo floral naranja", "item.botania.magenta_dye": "Polvo floral magenta", diff --git a/src/main/resources/assets/botania/lang/fr_fr.json b/src/main/resources/assets/botania/lang/fr_fr.json index 01978312c..e52af5bb6 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.json +++ b/src/main/resources/assets/botania/lang/fr_fr.json @@ -830,22 +830,22 @@ "item.botania.lexicon": "Lexica Botania", "item.botania.lexicon.bevo": "Lexica Botana", "item.botania.lexicon.saice": "Lexica Botonia", - "item.botania.petal_white": "Pétale de fleur mystique blanche", - "item.botania.petal_orange": "Pétale de fleur mystique orange", - "item.botania.petal_magenta": "Pétale de fleur mystique magenta", - "item.botania.petal_light_blue": "Pétale de fleur mystique bleue claire", - "item.botania.petal_yellow": "Pétale de fleur mystique jaune", - "item.botania.petal_lime": "Pétale de fleur mystique citron", - "item.botania.petal_pink": "Pétale de fleur mystique rose", - "item.botania.petal_gray": "Pétale de fleur mystique grise", - "item.botania.petal_silver": "Pétale de fleur mystique grise claire", - "item.botania.petal_cyan": "Pétale de fleur mystique cyan", - "item.botania.petal_purple": "Pétale de fleur mystique violette", - "item.botania.petal_blue": "Pétale de fleur mystique bleue", - "item.botania.petal_brown": "Pétale de fleur mystique marron", - "item.botania.petal_green": "Pétale de fleur mystique verte", - "item.botania.petal_red": "Pétale de fleur mystique rouge", - "item.botania.petal_black": "Pétale de fleur mystique noire", + "item.botania.white_petal": "Pétale de fleur mystique blanche", + "item.botania.orange_petal": "Pétale de fleur mystique orange", + "item.botania.magenta_petal": "Pétale de fleur mystique magenta", + "item.botania.light_blue_petal": "Pétale de fleur mystique bleue claire", + "item.botania.yellow_petal": "Pétale de fleur mystique jaune", + "item.botania.lime_petal": "Pétale de fleur mystique citron", + "item.botania.pink_petal": "Pétale de fleur mystique rose", + "item.botania.gray_petal": "Pétale de fleur mystique grise", + "item.botania.silver_petal": "Pétale de fleur mystique grise claire", + "item.botania.cyan_petal": "Pétale de fleur mystique cyan", + "item.botania.purple_petal": "Pétale de fleur mystique violette", + "item.botania.blue_petal": "Pétale de fleur mystique bleue", + "item.botania.brown_petal": "Pétale de fleur mystique marron", + "item.botania.green_petal": "Pétale de fleur mystique verte", + "item.botania.red_petal": "Pétale de fleur mystique rouge", + "item.botania.black_petal": "Pétale de fleur mystique noire", "item.botania.white_dye": "Poudre florale bhanche", "item.botania.orange_dye": "Poudre florale orange", "item.botania.magenta_dye": "Poudre florale magenta", diff --git a/src/main/resources/assets/botania/lang/ja_jp.json b/src/main/resources/assets/botania/lang/ja_jp.json index 5db1719e4..0271f0236 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.json +++ b/src/main/resources/assets/botania/lang/ja_jp.json @@ -933,22 +933,22 @@ "item.botania.lexicon": "ボタニア植物辞典", "item.botania.lexicon.bevo": "ボタニア植物辞典", "item.botania.lexicon.saice": "ボタニア植物辞典", - "item.botania.petal_white": "白色の神秘的な花びら", - "item.botania.petal_orange": "橙色の神秘的な花びら", - "item.botania.petal_magenta": "赤紫色の神秘的な花びら", - "item.botania.petal_light_blue": "空色の神秘的な花びら", - "item.botania.petal_yellow": "黄色の神秘的な花びら", - "item.botania.petal_lime": "黄緑色の神秘的な花びら", - "item.botania.petal_pink": "桃色の神秘的な花びら", - "item.botania.petal_gray": "灰色の神秘的な花びら", - "item.botania.petal_silver": "薄灰色の神秘的な花びら", - "item.botania.petal_cyan": "水色の神秘的な花びら", - "item.botania.petal_purple": "紫色の神秘的な花びら", - "item.botania.petal_blue": "青色の神秘的な花びら", - "item.botania.petal_brown": "茶色の神秘的な花びら", - "item.botania.petal_green": "緑色の神秘的な花びら", - "item.botania.petal_red": "赤色の神秘的な花びら", - "item.botania.petal_black": "黒色の神秘的な花びら", + "item.botania.white_petal": "白色の神秘的な花びら", + "item.botania.orange_petal": "橙色の神秘的な花びら", + "item.botania.magenta_petal": "赤紫色の神秘的な花びら", + "item.botania.light_blue_petal": "空色の神秘的な花びら", + "item.botania.yellow_petal": "黄色の神秘的な花びら", + "item.botania.lime_petal": "黄緑色の神秘的な花びら", + "item.botania.pink_petal": "桃色の神秘的な花びら", + "item.botania.gray_petal": "灰色の神秘的な花びら", + "item.botania.silver_petal": "薄灰色の神秘的な花びら", + "item.botania.cyan_petal": "水色の神秘的な花びら", + "item.botania.purple_petal": "紫色の神秘的な花びら", + "item.botania.blue_petal": "青色の神秘的な花びら", + "item.botania.brown_petal": "茶色の神秘的な花びら", + "item.botania.green_petal": "緑色の神秘的な花びら", + "item.botania.red_petal": "赤色の神秘的な花びら", + "item.botania.black_petal": "黒色の神秘的な花びら", "item.botania.white_dye": "白色の花の粉末", "item.botania.orange_dye": "橙色の花の粉末", "item.botania.magenta_dye": "赤紫色の花の粉末", diff --git a/src/main/resources/assets/botania/lang/ko_kr.json b/src/main/resources/assets/botania/lang/ko_kr.json index 57124eef8..c04dbeae6 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.json +++ b/src/main/resources/assets/botania/lang/ko_kr.json @@ -925,22 +925,22 @@ "item.botania.lexicon": "보타니아 사전", "item.botania.lexicon.bevo": "보타니아 사전", "item.botania.lexicon.saice": "보타니아 사전", - "item.botania.petal_white": "신비로운 하얀색 꽃잎", - "item.botania.petal_orange": "신비로운 주황색 꽃잎", - "item.botania.petal_magenta": "신비로운 자홍색 꽃잎", - "item.botania.petal_light_blue": "신비로운 하늘색 꽃잎", - "item.botania.petal_yellow": "신비로운 노랑색 꽃잎", - "item.botania.petal_lime": "신비로운 연두색 꽃잎", - "item.botania.petal_pink": "신비로운 분홍색 꽃잎", - "item.botania.petal_gray": "신비로운 회색 꽃잎", - "item.botania.petal_silver": "신비로운 밝은 회색 꽃잎", - "item.botania.petal_cyan": "신비로운 청록색 꽃잎", - "item.botania.petal_purple": "신비로운 보라색 꽃잎", - "item.botania.petal_blue": "신비로운 파랑색 꽃잎", - "item.botania.petal_brown": "신비로운 갈색 꽃잎", - "item.botania.petal_green": "신비로운 초록색 꽃잎", - "item.botania.petal_red": "신비로운 빨강색 꽃잎", - "item.botania.petal_black": "신비로운 검은색 꽃잎", + "item.botania.white_petal": "신비로운 하얀색 꽃잎", + "item.botania.orange_petal": "신비로운 주황색 꽃잎", + "item.botania.magenta_petal": "신비로운 자홍색 꽃잎", + "item.botania.light_blue_petal": "신비로운 하늘색 꽃잎", + "item.botania.yellow_petal": "신비로운 노랑색 꽃잎", + "item.botania.lime_petal": "신비로운 연두색 꽃잎", + "item.botania.pink_petal": "신비로운 분홍색 꽃잎", + "item.botania.gray_petal": "신비로운 회색 꽃잎", + "item.botania.silver_petal": "신비로운 밝은 회색 꽃잎", + "item.botania.cyan_petal": "신비로운 청록색 꽃잎", + "item.botania.purple_petal": "신비로운 보라색 꽃잎", + "item.botania.blue_petal": "신비로운 파랑색 꽃잎", + "item.botania.brown_petal": "신비로운 갈색 꽃잎", + "item.botania.green_petal": "신비로운 초록색 꽃잎", + "item.botania.red_petal": "신비로운 빨강색 꽃잎", + "item.botania.black_petal": "신비로운 검은색 꽃잎", "item.botania.white_dye": "하얀색 꽃가루", "item.botania.orange_dye": "주황색 꽃가루", "item.botania.magenta_dye": "자홍색 꽃가루", diff --git a/src/main/resources/assets/botania/lang/nl_nl.json b/src/main/resources/assets/botania/lang/nl_nl.json index 8b4eb3c0d..40398f5da 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.json +++ b/src/main/resources/assets/botania/lang/nl_nl.json @@ -1014,22 +1014,22 @@ "item.botania.lexicon": "Lexica Botania", "item.botania.lexicon.bevo": "Lexica Botana", "item.botania.lexicon.saice": "Lexica Botonia", - "item.botania.petal_white": "Mystiek Wit Bloemblad", - "item.botania.petal_orange": "Mystiek Oranje Bloemblad", - "item.botania.petal_magenta": "Mystiek Magenta Bloemblad", - "item.botania.petal_light_blue": "Mystiek Lichtblauw Bloemblad", - "item.botania.petal_yellow": "Mystiek Geel Bloemblad", - "item.botania.petal_lime": "Mystiek Lichtgroen Bloemblad", - "item.botania.petal_pink": "Mystiek Roze Bloemblad", - "item.botania.petal_gray": "Mystiek Grijs Bloemblad", - "item.botania.petal_silver": "Mystiek Lichtgrijs Bloemblad", - "item.botania.petal_cyan": "Mystiek Blauwgroen Bloemblad", - "item.botania.petal_purple": "Mystiek Paars Bloemblad", - "item.botania.petal_blue": "Mystiek Blauw Bloemblad", - "item.botania.petal_brown": "Mystiek Bruin Bloemblad", - "item.botania.petal_green": "Mystiek Groen Bloemblad", - "item.botania.petal_red": "Mystiek Rood Bloemblad", - "item.botania.petal_black": "Mystiek Zwart Bloemblad", + "item.botania.white_petal": "Mystiek Wit Bloemblad", + "item.botania.orange_petal": "Mystiek Oranje Bloemblad", + "item.botania.magenta_petal": "Mystiek Magenta Bloemblad", + "item.botania.light_blue_petal": "Mystiek Lichtblauw Bloemblad", + "item.botania.yellow_petal": "Mystiek Geel Bloemblad", + "item.botania.lime_petal": "Mystiek Lichtgroen Bloemblad", + "item.botania.pink_petal": "Mystiek Roze Bloemblad", + "item.botania.gray_petal": "Mystiek Grijs Bloemblad", + "item.botania.silver_petal": "Mystiek Lichtgrijs Bloemblad", + "item.botania.cyan_petal": "Mystiek Blauwgroen Bloemblad", + "item.botania.purple_petal": "Mystiek Paars Bloemblad", + "item.botania.blue_petal": "Mystiek Blauw Bloemblad", + "item.botania.brown_petal": "Mystiek Bruin Bloemblad", + "item.botania.green_petal": "Mystiek Groen Bloemblad", + "item.botania.red_petal": "Mystiek Rood Bloemblad", + "item.botania.black_petal": "Mystiek Zwart Bloemblad", "item.botania.white_dye": "Wit Bloempoeder", "item.botania.orange_dye": "Oranje Bloempoeder", "item.botania.magenta_dye": "Magenta Bloempoeder", diff --git a/src/main/resources/assets/botania/lang/pt_br.json b/src/main/resources/assets/botania/lang/pt_br.json index b732f414c..d73dc0723 100644 --- a/src/main/resources/assets/botania/lang/pt_br.json +++ b/src/main/resources/assets/botania/lang/pt_br.json @@ -1082,22 +1082,22 @@ "item.botania.lexicon": "Lexica Botania", "item.botania.lexicon.bevo": "Lexica Botana", "item.botania.lexicon.saice": "Lexica Botonia", - "item.botania.petal_white": "Pétala Mística Branca", - "item.botania.petal_orange": "Pétala Mística Laranja", - "item.botania.petal_magenta": "Pétala Mística Magenta", - "item.botania.petal_light_blue": "Pétala Mística Azul Claro", - "item.botania.petal_yellow": "Pétala Mística Amarela", - "item.botania.petal_lime": "Pétala Mística Lima", - "item.botania.petal_pink": "Pétala Mística Rosa", - "item.botania.petal_gray": "Pétala Mística Cinza", - "item.botania.petal_silver": "Pétala Mística Cinza Claro", - "item.botania.petal_cyan": "Pétala Mística Ciano", - "item.botania.petal_purple": "Pétala Mística Roxa", - "item.botania.petal_blue": "Pétala Mística Azul", - "item.botania.petal_brown": "Pétala Mística Marrom", - "item.botania.petal_green": "Pétala Mística Verde", - "item.botania.petal_red": "Pétala Mística Vermelha", - "item.botania.petal_black": "Pétala Mística Preta", + "item.botania.white_petal": "Pétala Mística Branca", + "item.botania.orange_petal": "Pétala Mística Laranja", + "item.botania.magenta_petal": "Pétala Mística Magenta", + "item.botania.light_blue_petal": "Pétala Mística Azul Claro", + "item.botania.yellow_petal": "Pétala Mística Amarela", + "item.botania.lime_petal": "Pétala Mística Lima", + "item.botania.pink_petal": "Pétala Mística Rosa", + "item.botania.gray_petal": "Pétala Mística Cinza", + "item.botania.silver_petal": "Pétala Mística Cinza Claro", + "item.botania.cyan_petal": "Pétala Mística Ciano", + "item.botania.purple_petal": "Pétala Mística Roxa", + "item.botania.blue_petal": "Pétala Mística Azul", + "item.botania.brown_petal": "Pétala Mística Marrom", + "item.botania.green_petal": "Pétala Mística Verde", + "item.botania.red_petal": "Pétala Mística Vermelha", + "item.botania.black_petal": "Pétala Mística Preta", "item.botania.white_dye": "Pó Floral Branco", "item.botania.orange_dye": "Pó Floral Laranja", "item.botania.magenta_dye": "Pó Floral Magenta", diff --git a/src/main/resources/assets/botania/lang/zh_cn.json b/src/main/resources/assets/botania/lang/zh_cn.json index 3b48c5695..c95f42a60 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.json +++ b/src/main/resources/assets/botania/lang/zh_cn.json @@ -1113,22 +1113,22 @@ "item.botania.lexicon": "植物魔法辞典", "item.botania.lexicon.bevo": "植物魔法辞典", "item.botania.lexicon.saice": "植物魔法辞典", - "item.botania.petal_white": "白色神秘花瓣", - "item.botania.petal_orange": "橙色神秘花瓣", - "item.botania.petal_magenta": "品红色神秘花瓣", - "item.botania.petal_light_blue": "淡蓝色神秘花瓣", - "item.botania.petal_yellow": "黄色神秘花瓣", - "item.botania.petal_lime": "黄绿色神秘花瓣", - "item.botania.petal_pink": "粉色神秘花瓣", - "item.botania.petal_gray": "灰色神秘花瓣", - "item.botania.petal_silver": "淡灰色神秘花瓣", - "item.botania.petal_cyan": "青色神秘花瓣", - "item.botania.petal_purple": "紫色神秘花瓣", - "item.botania.petal_blue": "蓝色神秘花瓣", - "item.botania.petal_brown": "棕色神秘花瓣", - "item.botania.petal_green": "绿色神秘花瓣", - "item.botania.petal_red": "红色神秘花瓣", - "item.botania.petal_black": "黑色神秘花瓣", + "item.botania.white_petal": "白色神秘花瓣", + "item.botania.orange_petal": "橙色神秘花瓣", + "item.botania.magenta_petal": "品红色神秘花瓣", + "item.botania.light_blue_petal": "淡蓝色神秘花瓣", + "item.botania.yellow_petal": "黄色神秘花瓣", + "item.botania.lime_petal": "黄绿色神秘花瓣", + "item.botania.pink_petal": "粉色神秘花瓣", + "item.botania.gray_petal": "灰色神秘花瓣", + "item.botania.silver_petal": "淡灰色神秘花瓣", + "item.botania.cyan_petal": "青色神秘花瓣", + "item.botania.purple_petal": "紫色神秘花瓣", + "item.botania.blue_petal": "蓝色神秘花瓣", + "item.botania.brown_petal": "棕色神秘花瓣", + "item.botania.green_petal": "绿色神秘花瓣", + "item.botania.red_petal": "红色神秘花瓣", + "item.botania.black_petal": "黑色神秘花瓣", "item.botania.white_dye": "白色花粉", "item.botania.orange_dye": "橙色花粉", "item.botania.magenta_dye": "品红色花粉", diff --git a/src/main/resources/assets/botania/lang/zh_tw.json b/src/main/resources/assets/botania/lang/zh_tw.json index 4297c7315..1b886f5a8 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.json +++ b/src/main/resources/assets/botania/lang/zh_tw.json @@ -1126,22 +1126,22 @@ "item.botania.lexicon": "植物魔法辭典", "item.botania.lexicon.bevo": "植物魔法辭典", "item.botania.lexicon.saice": "植物魔法辭典", - "item.botania.petal_white": "白色神秘花瓣", - "item.botania.petal_orange": "橘色神秘花瓣", - "item.botania.petal_magenta": "洋紅色神秘花瓣", - "item.botania.petal_light_blue": "淺藍色神秘花瓣", - "item.botania.petal_yellow": "黃色神秘花瓣", - "item.botania.petal_lime": "淺綠色神秘花瓣", - "item.botania.petal_pink": "粉色神秘花瓣", - "item.botania.petal_gray": "灰色神秘花瓣", - "item.botania.petal_silver": "淺灰色神秘花瓣", - "item.botania.petal_cyan": "青色神秘花瓣", - "item.botania.petal_purple": "紫色神秘花瓣", - "item.botania.petal_blue": "藍色神秘花瓣", - "item.botania.petal_brown": "棕色神秘花瓣", - "item.botania.petal_green": "綠色神秘花瓣", - "item.botania.petal_red": "紅色神秘花瓣", - "item.botania.petal_black": "黑色神秘花瓣", + "item.botania.white_petal": "白色神秘花瓣", + "item.botania.orange_petal": "橘色神秘花瓣", + "item.botania.magenta_petal": "洋紅色神秘花瓣", + "item.botania.light_blue_petal": "淺藍色神秘花瓣", + "item.botania.yellow_petal": "黃色神秘花瓣", + "item.botania.lime_petal": "淺綠色神秘花瓣", + "item.botania.pink_petal": "粉色神秘花瓣", + "item.botania.gray_petal": "灰色神秘花瓣", + "item.botania.silver_petal": "淺灰色神秘花瓣", + "item.botania.cyan_petal": "青色神秘花瓣", + "item.botania.purple_petal": "紫色神秘花瓣", + "item.botania.blue_petal": "藍色神秘花瓣", + "item.botania.brown_petal": "棕色神秘花瓣", + "item.botania.green_petal": "綠色神秘花瓣", + "item.botania.red_petal": "紅色神秘花瓣", + "item.botania.black_petal": "黑色神秘花瓣", "item.botania.white_dye": "白色花粉", "item.botania.orange_dye": "橘色花粉", "item.botania.magenta_dye": "洋紅色花粉",