diff --git a/src/main/java/binnie/botany/genetics/AlleleEffectNone.java b/src/main/java/binnie/botany/genetics/AlleleEffectNone.java index bbe1062d..759daab7 100644 --- a/src/main/java/binnie/botany/genetics/AlleleEffectNone.java +++ b/src/main/java/binnie/botany/genetics/AlleleEffectNone.java @@ -29,7 +29,7 @@ public class AlleleEffectNone implements IAlleleFlowerEffect { @Override public String getName() { - return I18N.localise("botany.allele.none"); + return I18N.localise("forestry.allele.effect.none"); } @Override diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java index 45354211..75113f09 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java @@ -49,7 +49,7 @@ public class PageSpeciesOverview extends PageSpecies { String descBody = EnumChatFormatting.ITALIC.toString(); String descSig = ""; - if (desc == null || desc.isEmpty() || desc.contains("for.description.")) { + if (desc == null || desc.isEmpty() || !desc.matches("(\\w+\\.?)+")) { descBody += I18N.localise("binniecore.gui.database.species.noDesc"); } else { String[] descStrings = desc.split("\\|"); diff --git a/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java b/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java index be4a29ee..39eb8a29 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java @@ -58,6 +58,6 @@ public class WindowAcclimatiser extends WindowMachine { @Override protected String getName() { - return getTitle(); + return "Acclimatiser"; } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java b/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java index e8998296..73be7907 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java @@ -74,6 +74,6 @@ public class WindowAnalyser extends WindowMachine { @Override protected String getName() { - return getTitle(); + return "Analyser"; } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java b/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java index 12d00599..39199e25 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java +++ b/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java @@ -20,6 +20,7 @@ import binnie.core.craftgui.minecraft.control.ControlTabIcon; import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.genetics.Engineering; import binnie.genetics.genetics.GeneTracker; @@ -82,7 +83,7 @@ public class WindowGeneBank extends WindowMachine { @Override public void initialiseClient() { - setTitle("Gene Bank"); + setTitle(getTitle()); addEventHandler(new EventValueChanged.Handler() { @Override public void onEvent(EventValueChanged event) { @@ -131,7 +132,7 @@ public class WindowGeneBank extends WindowMachine { } } } - tooltip.add("" + seqGenes + "/" + totalGenes + " Genes"); + tooltip.add(I18N.localise("genetics.gui.geneBank.sequencedGenes.short", seqGenes, totalGenes)); } }; } @@ -140,9 +141,12 @@ public class WindowGeneBank extends WindowMachine { tabBar.setValues(Binnie.Genetics.getActiveSystems()); tabBar.setValue(Binnie.Genetics.beeBreedingSystem); boxX -= 8; - ControlTabBar infoTabs = new ControlTabBar(this, boxX + 8, 160.0f, 16.0f, 50.0f, Position.LEFT); - infoTabs.setValues(Arrays.asList("Stats", "Ranking")); - infoTabs.setValue("Info"); + ControlTabBar infoTabs = new ControlTabBar<>(this, boxX + 8, 160.0f, 16.0f, 50.0f, Position.LEFT); + infoTabs.setValues(Arrays.asList( + I18N.localise("genetics.gui.geneBank.stats"), + I18N.localise("genetics.gui.geneBank.ranking") + )); + infoTabs.setValue(I18N.localise("genetics.gui.geneBank.info")); Panel panelProject = new Panel(this, boxX + 24, 160.0f, geneBoxWidth + 20, 50.0f, MinecraftGUI.PanelType.Black); int totalGenes = 0; int seqGenes = 0; @@ -161,13 +165,13 @@ public class WindowGeneBank extends WindowMachine { } } - new ControlText(panelProject, new IPoint(4.0f, 4.0f), EnumChatFormatting.UNDERLINE + "Full Genome Project"); - new ControlText(panelProject, new IPoint(4.0f, 18.0f), EnumChatFormatting.ITALIC.toString() + EnumChatFormatting.YELLOW + "quenced " + EnumChatFormatting.RESET + seqGenes + "/" + totalGenes + " " + EnumChatFormatting.ITALIC + "Genes"); + new ControlText(panelProject, new IPoint(4.0f, 4.0f), EnumChatFormatting.UNDERLINE + I18N.localise("genetics.gui.geneBank.project")); + new ControlText(panelProject, new IPoint(4.0f, 18.0f), EnumChatFormatting.ITALIC.toString() + EnumChatFormatting.YELLOW + I18N.localise("genetics.gui.geneBank.sequencedGenes", seqGenes, totalGenes)); } @Override public String getTitle() { - return "Gene Bank"; + return I18N.localise("genetics.gui.geneBank"); } @Override diff --git a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java b/src/main/java/binnie/genetics/craftgui/WindowGenepool.java index 1156f9cd..a3f18f1d 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java +++ b/src/main/java/binnie/genetics/craftgui/WindowGenepool.java @@ -70,6 +70,6 @@ public class WindowGenepool extends WindowMachine { @Override protected String getName() { - return getTitle(); + return "Genepool"; } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java b/src/main/java/binnie/genetics/craftgui/WindowIncubator.java index 8ffe4943..69db12ed 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowIncubator.java @@ -71,6 +71,6 @@ public class WindowIncubator extends WindowMachine { @Override protected String getName() { - return getTitle(); + return "Incubator"; } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java b/src/main/java/binnie/genetics/craftgui/WindowInoculator.java index 457f4514..c4e0142d 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowInoculator.java @@ -66,6 +66,6 @@ public class WindowInoculator extends WindowMachine { @Override protected String getName() { - return getTitle(); + return "Inoculator"; } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java b/src/main/java/binnie/genetics/craftgui/WindowIsolator.java index 931b33ed..70404d90 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowIsolator.java @@ -76,6 +76,6 @@ public class WindowIsolator extends WindowMachine { @Override protected String getName() { - return getTitle(); + return "Isolator"; } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java b/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java index 7c06cc03..763cd875 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java @@ -69,6 +69,6 @@ public class WindowPolymeriser extends WindowMachine { @Override protected String getName() { - return getTitle(); + return "Polymeriser"; } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowSequencer.java b/src/main/java/binnie/genetics/craftgui/WindowSequencer.java index a4dab9c5..77c13c45 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowSequencer.java +++ b/src/main/java/binnie/genetics/craftgui/WindowSequencer.java @@ -87,6 +87,6 @@ public class WindowSequencer extends WindowMachine { @Override protected String getName() { - return getTitle(); + return "Sequencer"; } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowSplicer.java b/src/main/java/binnie/genetics/craftgui/WindowSplicer.java index 01fd0c3f..91ad704b 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowSplicer.java +++ b/src/main/java/binnie/genetics/craftgui/WindowSplicer.java @@ -82,6 +82,6 @@ public class WindowSplicer extends WindowMachine { @Override protected String getName() { - return getTitle(); + return "Splicer"; } } diff --git a/src/main/java/binnie/genetics/genetics/AlleleHelper.java b/src/main/java/binnie/genetics/genetics/AlleleHelper.java index 455ca3b2..8b46becf 100644 --- a/src/main/java/binnie/genetics/genetics/AlleleHelper.java +++ b/src/main/java/binnie/genetics/genetics/AlleleHelper.java @@ -115,11 +115,11 @@ public class AlleleHelper extends forestry.core.genetics.alleles.AlleleHelper { if (flowering == EnumAllele.Flowering.AVERAGE) { return toAlleleDisplay("flowering", "normal"); } - return toAlleleDisplay("flowering", flowering.name()); + return toAlleleDisplay(null, flowering.name()); } public static String toDisplay(EnumAllele.Speed speed) { - return toAlleleDisplay("speed", speed.name()); + return toAlleleDisplay(null, speed.name()); } public static String toDisplay(EnumAllele.Lifespan lifespan) { @@ -211,6 +211,9 @@ public class AlleleHelper extends forestry.core.genetics.alleles.AlleleHelper { private static String toAlleleDisplay(String key, String valueName) { String name = valueName.toLowerCase().replace("_", ""); + if (key == null) { + return I18N.localise("forestry.allele." + name); + } return I18N.localise("forestry.allele." + key + "." + name); } } diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index 8b2ef774..dd78a4c2 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -139,3 +139,11 @@ genetics.machine.splicer.splicingIn.0=Splicing in %d/%d genes genetics.machine.splicer.splicingIn.1=Splicing in %d/%d gene genetics.machine.splicer.splicingIn.2=Splicing in %d genes genetics.machine.splicer.splicingIn.3=Splicing in %d gene + +genetics.gui.geneBank=Gene Bank +genetics.gui.geneBank.info=Info +genetics.gui.geneBank.stats=Stats +genetics.gui.geneBank.ranking=Ranking +genetics.gui.geneBank.project=Full Genome Project +genetics.gui.geneBank.sequencedGenes=Sequenced %d/%d Genes +genetics.gui.geneBank.sequencedGenes.short=%d/%d Genes diff --git a/src/main/resources/assets/genetics/lang/ru_RU.lang b/src/main/resources/assets/genetics/lang/ru_RU.lang index a7d2b7fc..91ef31ba 100644 --- a/src/main/resources/assets/genetics/lang/ru_RU.lang +++ b/src/main/resources/assets/genetics/lang/ru_RU.lang @@ -139,3 +139,11 @@ genetics.machine.splicer.splicingIn.0=Соединения в %d/%d генах genetics.machine.splicer.splicingIn.1=Соединения в %d/%d гене genetics.machine.splicer.splicingIn.2=Соединения в %d генах genetics.machine.splicer.splicingIn.3=Соединения в %d гене + +genetics.gui.geneBank=Генный банк +genetics.gui.geneBank.info=Инфо +genetics.gui.geneBank.stats=Статистика +genetics.gui.geneBank.ranking=Ранжирование +genetics.gui.geneBank.project=Полный проект генома +genetics.gui.geneBank.sequencedGenes=Секвенцировано %d/%d генов +genetics.gui.geneBank.sequencedGenes.short=%d/%d генов