diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java index 34ba446f..61eb7e5d 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java @@ -49,7 +49,7 @@ public class PageBranchOverview extends PageBranch { branchDescription.clear(); String desc = branch.getDescription(); - if (desc.contains("for.genus.bees.")) { // unlocalized + if (desc.matches("(\\w+\\.?)+")) { // unlocalized desc = I18N.localise("binniecore.gui.database.branch.noDesc"); } diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java index 75113f09..b67b91bc 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.matches("(\\w+\\.?)+")) { + 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/extratrees/craftgui/dictionary/PagePlanksOverview.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksOverview.java index 76887dd4..7bdeca4a 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksOverview.java @@ -55,7 +55,7 @@ public class PagePlanksOverview extends PageAbstract { String descBody = EnumChatFormatting.ITALIC.toString(); String descSig = ""; - if (desc == null || desc.length() == 0) { + if (desc == null || desc.length() == 0 || desc.matches("(\\w+\\.?)+")) { descBody += I18N.localise("binniecore.gui.database.nodescription"); } else { String[] descStrings = desc.split("\\|"); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java index 2e453650..8feb29a0 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java @@ -14,15 +14,15 @@ import net.minecraft.util.EnumChatFormatting; public class AnalystPageDescription extends ControlAnalystPage { public AnalystPageDescription(IWidget parent, IArea area, IIndividual ind) { super(parent, area); - setColor(3355443); + setColor(0x333333); int y = 4; + IAlleleSpecies species = ind.getGenome().getPrimary(); String branchBinomial = (species.getBranch() != null) ? species.getBranch().getScientific() : ""; - String branchName = (species.getBranch() != null) ? species.getBranch().getName() : "Unknown"; String desc = species.getDescription(); 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 += ""; } else { String[] descStrings = desc.split("\\|"); @@ -34,6 +34,7 @@ public class AnalystPageDescription extends ControlAnalystPage { descSig += descStrings[descStrings.length - 1]; } } + String authority = species.getAuthority(); if (authority.contains("Binnie")) { authority = EnumChatFormatting.DARK_BLUE.toString() + EnumChatFormatting.BOLD + authority; @@ -44,6 +45,7 @@ public class AnalystPageDescription extends ControlAnalystPage { if (authority.contains("MysteriousAges")) { authority = EnumChatFormatting.DARK_PURPLE.toString() + EnumChatFormatting.BOLD + authority; } + new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + "Description").setColor(getColor()); y += 16; new ControlTextCentered(this, y, species.getName() + EnumChatFormatting.RESET).setColor(getColor()); @@ -54,6 +56,7 @@ public class AnalystPageDescription extends ControlAnalystPage { y += (int) (3.0f + CraftGUI.Render.textHeight("Discovered by " + EnumChatFormatting.BOLD + authority + EnumChatFormatting.RESET, w())); new ControlTextCentered(this, y, "Genetic Complexity: " + species.getComplexity()).setColor(getColor()); y += 26; + ControlText descText = new ControlText(this, new IArea(8.0f, y, w() - 16.0f, 0.0f), descBody + EnumChatFormatting.RESET, TextJustification.TOP_CENTER); IWidget signatureText = new ControlText(this, new IArea(8.0f, y, w() - 16.0f, 0.0f), descSig + EnumChatFormatting.RESET, TextJustification.BOTTOM_RIGHT); descText.setColor(getColor());