diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 6a4b1834..ac5df017 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -41,9 +41,8 @@ public class BlockCeramic extends Block implements IBlockMetadata { return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); } - // TODO replace deprecated @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index 7985668b..c71161ed 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -23,8 +23,8 @@ public class ControlColourMixSymbol extends Control implements ITooltip { protected ControlColourMixSymbol(IWidget parent, int x, int y, int type) { super(parent, x, y, 16 + type * 16, 16.0f); - value = null; this.type = type; + value = null; addAttribute(WidgetAttribute.MouseOver); } diff --git a/src/main/java/binnie/botany/craftgui/PageColourMix.java b/src/main/java/binnie/botany/craftgui/PageColourMix.java index b7dfed40..2c391fd0 100644 --- a/src/main/java/binnie/botany/craftgui/PageColourMix.java +++ b/src/main/java/binnie/botany/craftgui/PageColourMix.java @@ -26,7 +26,7 @@ public class PageColourMix extends PageAbstract { @Override public void onValueChanged(IFlowerColor colour) { - List mixes = new ArrayList(); + List mixes = new ArrayList<>(); for (IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) { if (mix.getColor1() == colour || mix.getColor2() == colour) { mixes.add(mix); diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index d14720f0..a5bb1bd7 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -1,6 +1,7 @@ package binnie.botany.craftgui; import binnie.Binnie; +import binnie.botany.Botany; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.IAlleleFlowerSpecies; @@ -44,8 +45,8 @@ public class PageSpeciesFlowerGenome extends PageSpecies { IAlleleFlowerSpecies treeSpecies = genome.getPrimary(); int w = 144; int h = 176; - // TODO localise - new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), "Genome", TextJustification.MiddleCenter); + + new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome"), TextJustification.MiddleCenter); ControlScrollableContent scrollable = new ControlScrollableContent(this, 4.0f, 20.0f, w - 8, h - 8 - 16, 12.0f); Control contents = new Control(scrollable, 0.0f, 0.0f, w - 8 - 12, h - 8 - 16); @@ -54,29 +55,31 @@ public class PageSpeciesFlowerGenome extends PageSpecies { int w3 = tw - 50; int y = 0; int th = 14; - new ControlText(contents, new IArea(0.0f, y, w2, th), "Temp. : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MiddleLeft); + int valueX = w2 + 4; + new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.temp"), TextJustification.MiddleRight); + new ControlText(contents, new IArea(valueX, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MiddleLeft); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), "Moist. : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), Binnie.I18N.localise(treeSpecies.getMoisture()), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.moist"), TextJustification.MiddleRight); + new ControlText(contents, new IArea(valueX, y, w3, th), Binnie.I18N.localise(treeSpecies.getMoisture()), TextJustification.MiddleLeft); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), "pH. : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), Binnie.I18N.localise(treeSpecies.getPH()), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.ph"), TextJustification.MiddleRight); + new ControlText(contents, new IArea(valueX, y, w3, th), Binnie.I18N.localise(treeSpecies.getPH()), TextJustification.MiddleLeft); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), "Fertility : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.fertility"), TextJustification.MiddleRight); + new ControlText(contents, new IArea(valueX, y, w3, th), genome.getFertility() + "x", TextJustification.MiddleLeft); y += th; float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f; - new ControlText(contents, new IArea(0.0f, y, w2, th), "Lifespan : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), "" + String.format("%.2f", lifespan) + " days", TextJustification.MiddleLeft); + String lifespanValue = String.format("%.2f", lifespan); + new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.lifespan"), TextJustification.MiddleRight); + new ControlText(contents, new IArea(valueX, y, w3, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.lifespan.value", lifespanValue), TextJustification.MiddleLeft); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), "Nectar : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.nectar"), TextJustification.MiddleRight); + new ControlText(contents, new IArea(valueX, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MiddleLeft); y += th; int x = w2; @@ -96,7 +99,7 @@ public class PageSpeciesFlowerGenome extends PageSpecies { } int numOfLines = 1 + (tot - 1) / 3; - new ControlText(contents, new IArea(0.0f, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), "Varieties : ", TextJustification.MiddleRight); + new ControlText(contents, new IArea(0.0f, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), Binnie.I18N.localise(Botany.instance, "gui.database.tab.genome.varieties"), TextJustification.MiddleRight); y += th; contents.setSize(new IPoint(contents.size().x(), y)); scrollable.setScrollableContent(contents); diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index a4fc7d0f..e82ead01 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -38,7 +38,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { @Override protected void addTabs() { new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.overview", 0)); - new PageSpeciesFlowerGenome(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.genome", 0)); + new PageSpeciesFlowerGenome(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "genome", 0)); new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.classification", 0)); new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.resultant", 0)); new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.further", 0)); @@ -65,7 +65,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { @Override public String getName() { - return Botany.proxy.localise("gui.database.mode." + name().toLowerCase()); + return Botany.proxy.localise("gui.database.tab." + name().toLowerCase()); } } diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 8cbdd67f..37f79a69 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -68,13 +68,13 @@ public abstract class ItemBotany extends Item { } @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean flag) { if (!itemstack.hasTagCompound()) { return; } IFlower individual = (IFlower) getIndividual(itemstack); if (individual == null) { - list.add("This item is bugged. Destroy it!"); + tooltip.add(Binnie.I18N.localise(Botany.instance, "item.tooltip.bugged")); return; } @@ -82,17 +82,16 @@ public abstract class ItemBotany extends Item { IFlowerColor primaryColor = genome.getPrimaryColor(); IFlowerColor secondColor = genome.getSecondaryColor(); IFlowerColor stemColor = genome.getStemColor(); - list.add(EnumChatFormatting.YELLOW + primaryColor.getName() + ((primaryColor == secondColor) ? "" : (" and " + secondColor.getName())) + ", " + stemColor.getName() + " Stem"); + tooltip.add(EnumChatFormatting.YELLOW + primaryColor.getName() + ((primaryColor == secondColor) ? "" : (" and " + secondColor.getName())) + ", " + stemColor.getName() + " Stem"); if (individual.isAnalyzed()) { if (BinnieCore.proxy.isShiftDown()) { - individual.addTooltip(list); + individual.addTooltip(tooltip); } else { - // TODO remove hardcode strings and localize - list.add(EnumChatFormatting.GRAY + ""); + tooltip.add(EnumChatFormatting.GRAY + Binnie.I18N.localise(Botany.instance, "item.tooltip.holdMore")); } } else { - list.add(""); + tooltip.add(Binnie.I18N.localise(Botany.instance, "item.tooltip.unknownGenome")); } } @@ -116,12 +115,18 @@ public abstract class ItemBotany extends Item { @Override public String getItemStackDisplayName(ItemStack itemstack) { if (!itemstack.hasTagCompound()) { - return "Unknown"; + return Binnie.I18N.localise(Botany.instance, "item.tooltip.unknown"); } + IIndividual individual = getIndividual(itemstack); - return (individual != null && individual.getGenome() != null) ? - (individual.getDisplayName() + getTag()) : - "Corrupted Flower"; + if (individual != null && individual.getGenome() != null) { + String tag = getTag(); + if (tag == null || tag.isEmpty()) { + return individual.getDisplayName(); + } + return Binnie.I18N.localise(Botany.instance, "item.botany.name", individual.getDisplayName(), tag); + } + return Binnie.I18N.localise(Botany.instance, "item.flowerCorrupted.name"); } @Override @@ -195,7 +200,7 @@ public abstract class ItemBotany extends Item { } pollinatable.mateWith(flower); if (!player.capabilities.isCreativeMode) { - --itemstack.stackSize; + itemstack.stackSize--; } return true; } @@ -264,14 +269,14 @@ public abstract class ItemBotany extends Item { } public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - Block field_150939_a = Botany.flower; - if (!world.setBlock(x, y, z, field_150939_a, metadata, 3)) { + Block block = Botany.flower; + if (!world.setBlock(x, y, z, block, metadata, 3)) { return false; } - if (world.getBlock(x, y, z) == field_150939_a) { - field_150939_a.onBlockPlacedBy(world, x, y, z, player, stack); - field_150939_a.onPostBlockPlaced(world, x, y, z, metadata); + if (world.getBlock(x, y, z) == block) { + block.onBlockPlacedBy(world, x, y, z, player, stack); + block.onPostBlockPlaced(world, x, y, z, metadata); } return true; } diff --git a/src/main/java/binnie/botany/flower/ItemPollen.java b/src/main/java/binnie/botany/flower/ItemPollen.java index dcd4ad83..bb18512a 100644 --- a/src/main/java/binnie/botany/flower/ItemPollen.java +++ b/src/main/java/binnie/botany/flower/ItemPollen.java @@ -1,5 +1,7 @@ package binnie.botany.flower; +import binnie.Binnie; +import binnie.botany.Botany; import binnie.botany.api.EnumFlowerStage; public class ItemPollen extends ItemBotany { @@ -14,6 +16,6 @@ public class ItemPollen extends ItemBotany { @Override public String getTag() { - return " Pollen"; + return Binnie.I18N.localise(Botany.instance, "item.pollen.tag.name"); } } diff --git a/src/main/java/binnie/botany/flower/ItemSeed.java b/src/main/java/binnie/botany/flower/ItemSeed.java index c0c5d7ce..781418ba 100644 --- a/src/main/java/binnie/botany/flower/ItemSeed.java +++ b/src/main/java/binnie/botany/flower/ItemSeed.java @@ -1,5 +1,7 @@ package binnie.botany.flower; +import binnie.Binnie; +import binnie.botany.Botany; import binnie.botany.api.EnumFlowerStage; public class ItemSeed extends ItemBotany { @@ -14,6 +16,6 @@ public class ItemSeed extends ItemBotany { @Override public String getTag() { - return " Germling"; + return Binnie.I18N.localise(Botany.instance, "item.germling.tag.name"); } } diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index 707498ac..8e657452 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -216,15 +216,15 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt flower.setWilted(false); } - float CHANCE_DISPERSAL = 0.8f; - CHANCE_DISPERSAL += 0.2f * flower.getGenome().getFertility(); - CHANCE_DISPERSAL *= 1.0f + soil.ordinal() * 0.5f; - float CHANCE_POLLINATE = 1.0f; - CHANCE_POLLINATE += 0.25f * flower.getGenome().getFertility(); - CHANCE_POLLINATE *= 1.0f + soil.ordinal() * 0.5f; - float CHANCE_SELFPOLLINATE = 0.2f * CHANCE_POLLINATE; + float chanceDispersal = 0.8f; + chanceDispersal += 0.2f * flower.getGenome().getFertility(); + chanceDispersal *= 1.0f + soil.ordinal() * 0.5f; + float chancePollinate = 1.0f; + chancePollinate += 0.25f * flower.getGenome().getFertility(); + chancePollinate *= 1.0f + soil.ordinal() * 0.5f; + float chanceSelfPollinate = 0.2f * chancePollinate; - if (worldObj.rand.nextFloat() < CHANCE_DISPERSAL && flower.hasFlowered() && !flower.isWilted()) { + if (worldObj.rand.nextFloat() < chanceDispersal && flower.hasFlowered() && !flower.isWilted()) { IFlowerGenome mate = flower.getMate(); if (mate != null) { boolean dispersed = false; @@ -250,7 +250,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } } - if (worldObj.rand.nextFloat() < CHANCE_POLLINATE && flower.hasFlowered() && !flower.isWilted()) { + if (worldObj.rand.nextFloat() < chancePollinate && flower.hasFlowered() && !flower.isWilted()) { for (int a2 = 0; a2 < 4; ++a2) { int dx3 = 0; int dz2 = 0; @@ -266,7 +266,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } } - if (worldObj.rand.nextFloat() < CHANCE_SELFPOLLINATE && flower.hasFlowered() && flower.getMate() == null) { + if (worldObj.rand.nextFloat() < chanceSelfPollinate && flower.hasFlowered() && flower.getMate() == null) { mateWith(getFlower()); } spawnButterflies(); @@ -635,5 +635,4 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return super.equals(obj); } } - } diff --git a/src/main/resources/assets/botany/lang/en_GB.lang b/src/main/resources/assets/botany/lang/en_GB.lang index 0810c641..d0c48b9f 100644 --- a/src/main/resources/assets/botany/lang/en_GB.lang +++ b/src/main/resources/assets/botany/lang/en_GB.lang @@ -25,8 +25,17 @@ botany.soil.soil=Soil botany.soil.loam=Loam botany.soil.flowerbed=Flowerbed +botany.item.tooltip.holdMore= +botany.item.tooltip.bugged=This item is bugged. Destroy it! +botany.item.tooltip.unknownGenome= +botany.item.tooltip.unknown=Unknown + botany.item.pigment.name=Pigment botany.item.clay.name=Clay +botany.item.botany.name=%1$s %2$s +botany.item.pollen.tag.name=Pollen +botany.item.germling.tag.name=Germling +botany.item.flowerCorrupted.name=Corrupted Flower item.trowelWood.name=Wooden Trowel item.trowelStone.name=Stone Trowel item.trowelIron.name=Iron Trowel @@ -176,13 +185,24 @@ botany.tube.insulate.hardenedClay=Hardened Clay botany.tube.insulate.smoothStone=Smooth Stone botany.tube.insulate.sandstone=Sandstone -botany.gui.controls.colorMixSymbol.chance=Current Chance - %f% +botany.gui.controls.colorMixSymbol.chance=Current Chance - %f%% botany.gui.controls.pageSpeciesFurtherTitle=Resultant Mixes botany.gui.controls.pageColorFurtherTitle=Further Mixes botany.gui.database.name=FlowerDatabase +botany.gui.database.tab.colour=Colour botany.gui.database.tab.species.overview=Overview -botany.gui.database.tab.species.genome=Genome + +botany.gui.database.tab.genome=Genome +botany.gui.database.tab.genome.temp=Temp. : +botany.gui.database.tab.genome.moist=Moist. : +botany.gui.database.tab.genome.ph=pH. : +botany.gui.database.tab.genome.fertility=Fertility : +botany.gui.database.tab.genome.lifespan=Lifespan : +botany.gui.database.tab.genome.lifespan.value=%s days +botany.gui.database.tab.genome.nectar=Nectar : +botany.gui.database.tab.genome.varieties=Varieties : + botany.gui.database.tab.species.classification=Classification botany.gui.database.tab.species.resultant=Resultant Mutations botany.gui.database.tab.species.further=Further Mutations diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index 0a07054c..13f6e2c4 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -25,8 +25,17 @@ botany.soil.soil=Soil botany.soil.loam=Loam botany.soil.flowerbed=Flowerbed +botany.item.tooltip.holdMore= +botany.item.tooltip.bugged=This item is bugged. Destroy it! +botany.item.tooltip.unknownGenome= +botany.item.tooltip.unknown=Unknown + botany.item.pigment.name=Pigment botany.item.clay.name=Clay +botany.item.botany.name=%1$s %2$s +botany.item.pollen.tag.name=Pollen +botany.item.germling.tag.name=Germling +botany.item.flowerCorrupted.name=Corrupted Flower item.trowelWood.name=Wooden Trowel item.trowelStone.name=Stone Trowel item.trowelIron.name=Iron Trowel @@ -177,13 +186,24 @@ botany.tube.insulate.hardenedClay=Hardened Clay botany.tube.insulate.smoothStone=Smooth Stone botany.tube.insulate.sandstone=Sandstone -botany.gui.controls.colorMixSymbol.chance=Current Chance - %f% +botany.gui.controls.colorMixSymbol.chance=Current Chance - %f%% botany.gui.controls.pageSpeciesFurtherTitle=Resultant Mixes botany.gui.controls.pageColorFurtherTitle=Further Mixes botany.gui.database.name=FlowerDatabase +botany.gui.database.tab.colour=Color botany.gui.database.tab.species.overview=Overview -botany.gui.database.tab.species.genome=Genome + +botany.gui.database.tab.genome=Genome +botany.gui.database.tab.genome.temp=Temp. : +botany.gui.database.tab.genome.moist=Moist. : +botany.gui.database.tab.genome.ph=pH. : +botany.gui.database.tab.genome.fertility=Fertility : +botany.gui.database.tab.genome.lifespan=Lifespan : +botany.gui.database.tab.genome.lifespan.value=%s days +botany.gui.database.tab.genome.nectar=Nectar : +botany.gui.database.tab.genome.varieties=Varieties : + botany.gui.database.tab.species.classification=Classification botany.gui.database.tab.species.resultant=Resultant Mutations botany.gui.database.tab.species.further=Further Mutations diff --git a/src/main/resources/assets/botany/lang/ru_RU.lang b/src/main/resources/assets/botany/lang/ru_RU.lang index 5edb4e3c..75c82e58 100644 --- a/src/main/resources/assets/botany/lang/ru_RU.lang +++ b/src/main/resources/assets/botany/lang/ru_RU.lang @@ -25,8 +25,17 @@ botany.soil.soil=Почва botany.soil.loam=Суглинок botany.soil.flowerbed=Цветник +botany.item.tooltip.holdMore=<Зажмите SHIFT для подробностей> +botany.item.tooltip.bugged=Предмет содержит ошибки. Уничтожь его! +botany.item.tooltip.unknownGenome=<Неизвестный геном> +botany.item.tooltip.unknown=Неизвестно + botany.item.pigment.name=Краситель botany.item.clay.name=Глиняный порошок +botany.item.botany.name=%2$s %1$s +botany.item.pollen.tag.name=Пыльца +botany.item.germling.tag.name=Росток +botany.item.flowerCorrupted.name=Поврежденный цветок item.trowelWood.name=Деревянный совок item.trowelStone.name=Каменный совок item.trowelIron.name=Железный совок @@ -176,13 +185,24 @@ botany.tube.insulate.hardenedClay=Твердая глина botany.tube.insulate.smoothStone=Гладкий камень botany.tube.insulate.sandstone=Песчаник -botany.gui.controls.colorMixSymbol.chance=Текущий шанс - %f% +botany.gui.controls.colorMixSymbol.chance=Текущий шанс - %f%% botany.gui.controls.pageSpeciesFurtherTitle=Результат botany.gui.controls.pageColorFurtherTitle=Дополнительные смеси botany.gui.database.name=База данных цветов +botany.gui.database.tab.colour=Цвет botany.gui.database.tab.species.overview=Обзор -botany.gui.database.tab.species.genome=Генотип + +botany.gui.database.tab.genome=Генотип +botany.gui.database.tab.genome.temp=Темп. : +botany.gui.database.tab.genome.moist=Влажн. : +botany.gui.database.tab.genome.ph=pH. : +botany.gui.database.tab.genome.fertility=Плодовитость : +botany.gui.database.tab.genome.lifespan=Жизнь : +botany.gui.database.tab.genome.lifespan.value=%s дней +botany.gui.database.tab.genome.nectar=Нектар : +botany.gui.database.tab.genome.varieties=Сорта : + botany.gui.database.tab.species.classification=Классификация botany.gui.database.tab.species.resultant=Произведённые мутации botany.gui.database.tab.species.further=Дальнейшие возможные мутации diff --git a/src/main/resources/assets/botany/lang/zh_CN.lang b/src/main/resources/assets/botany/lang/zh_CN.lang index 8ebe5570..8b1c9310 100644 --- a/src/main/resources/assets/botany/lang/zh_CN.lang +++ b/src/main/resources/assets/botany/lang/zh_CN.lang @@ -184,7 +184,7 @@ botany.gui.controls.pageColorFurtherTitle=次代突变 botany.gui.database.name=花卉数据库 botany.gui.database.tab.species.overview=概述 -botany.gui.database.tab.species.genome=基因組 +botany.gui.database.tab.genome=基因組 botany.gui.database.tab.species.classification=科学分类 botany.gui.database.tab.species.resultant=导向突变 botany.gui.database.tab.species.further=次代突变