mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 03:49:07 +00:00
Improve flower localization
This commit is contained in:
1 parent
941c377c58
commit
9989eef753
13 files changed
+174
-105
No files matched your search
+2
-2
@@ -12,10 +12,10 @@ import binnie.core.craftgui.controls.core.Control;
|
||||
import binnie.core.craftgui.controls.core.IControlValue;
|
||||
import binnie.core.craftgui.renderer.RenderUtil;
|
||||
|
||||
public class ControlColourDisplay extends Control implements IControlValue<IFlowerColour>, ITooltip {
|
||||
public class ControlColorDisplay extends Control implements IControlValue<IFlowerColour>, ITooltip {
|
||||
private IFlowerColour value;
|
||||
|
||||
public ControlColourDisplay(final IWidget parent, final int x, final int y, final IFlowerColour value) {
|
||||
public ControlColorDisplay(final IWidget parent, final int x, final int y, final IFlowerColour value) {
|
||||
super(parent, x, y, 16, 16);
|
||||
this.value = value;
|
||||
this.addAttribute(Attribute.MouseOver);
|
||||
+3
-3
@@ -4,18 +4,18 @@ import binnie.botany.api.IColourMix;
|
||||
import binnie.core.craftgui.IWidget;
|
||||
import binnie.core.craftgui.controls.listbox.ControlListBox;
|
||||
|
||||
public class ControlColourMixBox extends ControlListBox<IColourMix> {
|
||||
public class ControlColorMixBox extends ControlListBox<IColourMix> {
|
||||
private int index;
|
||||
private Type type;
|
||||
|
||||
public ControlColourMixBox(final IWidget parent, final int x, final int y, final int width, final int height, final Type type) {
|
||||
public ControlColorMixBox(final IWidget parent, final int x, final int y, final int width, final int height, final Type type) {
|
||||
super(parent, x, y, width, height, 12);
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IWidget createOption(final IColourMix value, final int y) {
|
||||
return new ControlColourMixItem(this.getContent(), value, y);
|
||||
return new ControlColorMixItem(this.getContent(), value, y);
|
||||
}
|
||||
|
||||
enum Type {
|
||||
@@ -0,0 +1,23 @@
|
||||
package binnie.botany.craftgui;
|
||||
|
||||
import binnie.botany.api.IColourMix;
|
||||
import binnie.core.craftgui.controls.listbox.ControlList;
|
||||
import binnie.core.craftgui.controls.listbox.ControlOption;
|
||||
|
||||
public class ControlColorMixItem extends ControlOption<IColourMix> {
|
||||
private final ControlColorDisplay itemWidget1;
|
||||
private final ControlColorDisplay itemWidget2;
|
||||
private final ControlColorDisplay itemWidget3;
|
||||
private final ControlColorMixSymbol addSymbol;
|
||||
private final ControlColorMixSymbol arrowSymbol;
|
||||
|
||||
public ControlColorMixItem(final ControlList<IColourMix> controlList, final IColourMix option, final int y) {
|
||||
super(controlList, option, y);
|
||||
IColourMix value = this.getValue();
|
||||
this.itemWidget1 = new ControlColorDisplay(this, 4, 4, value.getColourFirst());
|
||||
this.itemWidget2 = new ControlColorDisplay(this, 44, 4, value.getColourSecond());
|
||||
this.itemWidget3 = new ControlColorDisplay(this, 104, 4, value.getResult());
|
||||
this.addSymbol = new ControlColorMixSymbol(this, 24, 4, 0, value);
|
||||
this.arrowSymbol = new ControlColorMixSymbol(this, 64, 4, 1, value);
|
||||
}
|
||||
}
|
||||
+6
-5
@@ -14,14 +14,15 @@ import binnie.core.craftgui.geometry.Point;
|
||||
import binnie.core.craftgui.resource.Texture;
|
||||
import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet;
|
||||
import binnie.core.craftgui.resource.minecraft.StandardTexture;
|
||||
import binnie.core.util.I18N;
|
||||
|
||||
public class ControlColourMixSymbol extends Control implements ITooltip {
|
||||
public class ControlColorMixSymbol extends Control implements ITooltip {
|
||||
static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
|
||||
static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
|
||||
IColourMix value;
|
||||
int type;
|
||||
|
||||
protected ControlColourMixSymbol(final IWidget parent, final int x, final int y, final int type, final IColourMix value) {
|
||||
protected ControlColorMixSymbol(final IWidget parent, final int x, final int y, final int type, final IColourMix value) {
|
||||
super(parent, x, y, 16 + type * 16, 16);
|
||||
this.value = value;
|
||||
this.type = type;
|
||||
@@ -33,9 +34,9 @@ public class ControlColourMixSymbol extends Control implements ITooltip {
|
||||
public void onRenderBackground(int guiWidth, int guiHeight) {
|
||||
super.onRenderBackground(guiWidth, guiHeight);
|
||||
if (this.type == 0) {
|
||||
CraftGUI.render.texture(ControlColourMixSymbol.MutationPlus, Point.ZERO);
|
||||
CraftGUI.render.texture(ControlColorMixSymbol.MutationPlus, Point.ZERO);
|
||||
} else {
|
||||
CraftGUI.render.texture(ControlColourMixSymbol.MutationArrow, Point.ZERO);
|
||||
CraftGUI.render.texture(ControlColorMixSymbol.MutationArrow, Point.ZERO);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +49,7 @@ public class ControlColourMixSymbol extends Control implements ITooltip {
|
||||
public void getTooltip(final Tooltip tooltip) {
|
||||
if (this.type == 1) {
|
||||
final float chance = this.value.getChance();
|
||||
tooltip.add("Current Chance - " + chance + "%");
|
||||
tooltip.add(I18N.localise("botany.gui.controls.color_mix_symbol.chance", chance));
|
||||
}
|
||||
}
|
||||
}
|
||||
+4
-4
@@ -12,14 +12,14 @@ import binnie.core.craftgui.geometry.CraftGUIUtil;
|
||||
import binnie.core.craftgui.geometry.Point;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ControlColourOption extends ControlTextOption<IFlowerColour> {
|
||||
ControlColourDisplay controlBee;
|
||||
public class ControlColorOption extends ControlTextOption<IFlowerColour> {
|
||||
ControlColorDisplay controlBee;
|
||||
Point boxPosition;
|
||||
|
||||
public ControlColourOption(final ControlList<IFlowerColour> controlList, final IFlowerColour option, final int y) {
|
||||
public ControlColorOption(final ControlList<IFlowerColour> controlList, final IFlowerColour option, final int y) {
|
||||
super(controlList, option, option.getColourName(), y);
|
||||
this.setSize(new Point(this.getSize().x(), 20));
|
||||
this.controlBee = new ControlColourDisplay(this, 2, 2, option);
|
||||
this.controlBee = new ControlColorDisplay(this, 2, 2, option);
|
||||
this.addAttribute(Attribute.MouseOver);
|
||||
CraftGUIUtil.moveWidget(this.textWidget, new Point(22, 0));
|
||||
this.textWidget.setSize(this.textWidget.getSize().sub(new Point(24, 0)));
|
||||
@@ -1,23 +0,0 @@
|
||||
package binnie.botany.craftgui;
|
||||
|
||||
import binnie.botany.api.IColourMix;
|
||||
import binnie.core.craftgui.controls.listbox.ControlList;
|
||||
import binnie.core.craftgui.controls.listbox.ControlOption;
|
||||
|
||||
public class ControlColourMixItem extends ControlOption<IColourMix> {
|
||||
private final ControlColourDisplay itemWidget1;
|
||||
private final ControlColourDisplay itemWidget2;
|
||||
private final ControlColourDisplay itemWidget3;
|
||||
private final ControlColourMixSymbol addSymbol;
|
||||
private final ControlColourMixSymbol arrowSymbol;
|
||||
|
||||
public ControlColourMixItem(final ControlList<IColourMix> controlList, final IColourMix option, final int y) {
|
||||
super(controlList, option, y);
|
||||
IColourMix value = this.getValue();
|
||||
this.itemWidget1 = new ControlColourDisplay(this, 4, 4, value.getColourFirst());
|
||||
this.itemWidget2 = new ControlColourDisplay(this, 44, 4, value.getColourSecond());
|
||||
this.itemWidget3 = new ControlColourDisplay(this, 104, 4, value.getResult());
|
||||
this.addSymbol = new ControlColourMixSymbol(this, 24, 4, 0, value);
|
||||
this.arrowSymbol = new ControlColourMixSymbol(this, 64, 4, 1, value);
|
||||
}
|
||||
}
|
||||
+6
-5
@@ -11,15 +11,16 @@ import binnie.core.craftgui.controls.ControlText;
|
||||
import binnie.core.craftgui.controls.ControlTextCentered;
|
||||
import binnie.core.craftgui.database.DatabaseTab;
|
||||
import binnie.core.craftgui.database.PageAbstract;
|
||||
import binnie.core.util.I18N;
|
||||
|
||||
public class PageColourMix extends PageAbstract<IFlowerColour> {
|
||||
public class PageColorMix extends PageAbstract<IFlowerColour> {
|
||||
ControlText pageSpeciesFurther_Title;
|
||||
ControlColourMixBox pageSpeciesFurther_List;
|
||||
ControlColorMixBox pageSpeciesFurther_List;
|
||||
|
||||
public PageColourMix(final IWidget parent, final DatabaseTab tab) {
|
||||
public PageColorMix(final IWidget parent, final DatabaseTab tab) {
|
||||
super(parent, tab);
|
||||
this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8, "Further Mixes");
|
||||
this.pageSpeciesFurther_List = new ControlColourMixBox(this, 4, 20, 136, 152, ControlColourMixBox.Type.Further);
|
||||
this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8, I18N.localise("botany.gui.controls.page.color_further.title"));
|
||||
this.pageSpeciesFurther_List = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Further);
|
||||
}
|
||||
|
||||
@Override
|
||||
+6
-5
@@ -11,15 +11,16 @@ import binnie.core.craftgui.controls.ControlText;
|
||||
import binnie.core.craftgui.controls.ControlTextCentered;
|
||||
import binnie.core.craftgui.database.DatabaseTab;
|
||||
import binnie.core.craftgui.database.PageAbstract;
|
||||
import binnie.core.util.I18N;
|
||||
|
||||
public class PageColourMixResultant extends PageAbstract<IFlowerColour> {
|
||||
public class PageColorMixResultant extends PageAbstract<IFlowerColour> {
|
||||
ControlText pageSpeciesFurther_Title;
|
||||
ControlColourMixBox pageSpeciesFurther_List;
|
||||
ControlColorMixBox pageSpeciesFurther_List;
|
||||
|
||||
public PageColourMixResultant(final IWidget parent, final DatabaseTab tab) {
|
||||
public PageColorMixResultant(final IWidget parent, final DatabaseTab tab) {
|
||||
super(parent, tab);
|
||||
this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8, "Resultant Mixes");
|
||||
this.pageSpeciesFurther_List = new ControlColourMixBox(this, 4, 20, 136, 152, ControlColourMixBox.Type.Resultant);
|
||||
this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8, I18N.localise("botany.gui.controls.page.species_further.title"));
|
||||
this.pageSpeciesFurther_List = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Resultant);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -23,6 +23,7 @@ import binnie.core.craftgui.geometry.Area;
|
||||
import binnie.core.craftgui.geometry.Point;
|
||||
import binnie.core.craftgui.geometry.TextJustification;
|
||||
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
|
||||
import binnie.core.util.I18N;
|
||||
|
||||
public class PageSpeciesFlowerGenome extends PageSpecies {
|
||||
public PageSpeciesFlowerGenome(final IWidget parent, final DatabaseTab tab) {
|
||||
@@ -39,63 +40,64 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
|
||||
@Override
|
||||
public void onValueChanged(final IAlleleSpecies species) {
|
||||
this.deleteAllChildren();
|
||||
final IAllele[] template = Binnie.GENETICS.getFlowerRoot().getTemplate(species.getUID());
|
||||
IAllele[] template = Binnie.GENETICS.getFlowerRoot().getTemplate(species.getUID());
|
||||
if (template == null) {
|
||||
return;
|
||||
}
|
||||
final IFlower tree = Binnie.GENETICS.getFlowerRoot().templateAsIndividual(template);
|
||||
IFlower tree = Binnie.GENETICS.getFlowerRoot().templateAsIndividual(template);
|
||||
if (tree == null) {
|
||||
return;
|
||||
}
|
||||
final IFlowerGenome genome = tree.getGenome();
|
||||
final IAlleleFlowerSpecies treeSpecies = genome.getPrimary();
|
||||
final int w = 144;
|
||||
final int h = 176;
|
||||
new ControlText(this, new Area(0, 4, w, 16), "Genome", TextJustification.MiddleCenter);
|
||||
final ControlScrollableContent scrollable = new ControlScrollableContent(this, 4, 20, w - 8, h - 8 - 16, 12);
|
||||
final Control contents = new Control(scrollable, 0, 0, w - 8 - 12, h - 8 - 16);
|
||||
final int tw = w - 8 - 12;
|
||||
final int w2 = 55;
|
||||
final int w3 = tw - 50;
|
||||
IFlowerGenome genome = tree.getGenome();
|
||||
IAlleleFlowerSpecies treeSpecies = genome.getPrimary();
|
||||
int w = 144;
|
||||
int h = 176;
|
||||
new ControlText(this, new Area(0, 4, w, 16), I18N.localise("botany.gui.database.tab.genome"), TextJustification.MiddleCenter);
|
||||
ControlScrollableContent scrollable = new ControlScrollableContent(this, 4, 20, w - 8, h - 8 - 16, 12);
|
||||
Control contents = new Control(scrollable, 0, 0, w - 8 - 12, h - 8 - 16);
|
||||
int tw = w - 8 - 12;
|
||||
int w2 = 55;
|
||||
int w3 = tw - 50;
|
||||
int y = 0;
|
||||
final int th = 14;
|
||||
final int th2 = 18;
|
||||
new ControlText(contents, new Area(0, y, w2, th), "Temp. : ", TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.temp"), TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFTt);
|
||||
y += th;
|
||||
new ControlText(contents, new Area(0, y, w2, th), "Moist. : ", TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.moist"), TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getMoisture().getLocalisedName(false), TextJustification.MIDDLE_LEFTt);
|
||||
y += th;
|
||||
new ControlText(contents, new Area(0, y, w2, th), "pH. : ", TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.ph"), TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getPH().getLocalisedName(false), TextJustification.MIDDLE_LEFTt);
|
||||
y += th;
|
||||
new ControlText(contents, new Area(0, y, w2, th), "Fertility : ", TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.fertility"), TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFTt);
|
||||
y += th;
|
||||
final float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f;
|
||||
new ControlText(contents, new Area(0, y, w2, th), "Lifespan : ", TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(w2, y, w3, th), "" + String.format("%.2f", lifespan) + " days", TextJustification.MIDDLE_LEFTt);
|
||||
float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f;
|
||||
String lifespanValue = String.format("%.2f", lifespan);
|
||||
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.lifespan"), TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(w2, y, w3, th), I18N.localise("botany.gui.database.tab.genome.lifespan.value", lifespanValue), TextJustification.MIDDLE_LEFTt);
|
||||
y += th;
|
||||
new ControlText(contents, new Area(0, y, w2, th), "Nectar : ", TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.nectar"), TextJustification.MiddleRight);
|
||||
new ControlText(contents, new Area(w2, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MIDDLE_LEFTt);
|
||||
y += th;
|
||||
int x = w2;
|
||||
int tot = 0;
|
||||
for (final IIndividual vid : BotanyCore.getFlowerRoot().getIndividualTemplates()) {
|
||||
for (IIndividual vid : BotanyCore.getFlowerRoot().getIndividualTemplates()) {
|
||||
if (vid.getGenome().getPrimary() == treeSpecies) {
|
||||
if (tot > 0 && tot % 3 == 0) {
|
||||
x -= 54;
|
||||
y += 18;
|
||||
}
|
||||
final ItemStack stack = BotanyCore.getFlowerRoot().getMemberStack(vid, EnumFlowerStage.FLOWER);
|
||||
final ControlItemDisplay display = new ControlItemDisplay(contents, x, y);
|
||||
ItemStack stack = BotanyCore.getFlowerRoot().getMemberStack(vid, EnumFlowerStage.FLOWER);
|
||||
ControlItemDisplay display = new ControlItemDisplay(contents, x, y);
|
||||
display.setItemStack(stack);
|
||||
++tot;
|
||||
x += 18;
|
||||
}
|
||||
}
|
||||
final int numOfLines = 1 + (tot - 1) / 3;
|
||||
new ControlText(contents, new Area(0, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), "Varieties : ", TextJustification.MiddleRight);
|
||||
int numOfLines = 1 + (tot - 1) / 3;
|
||||
new ControlText(contents, new Area(0, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), I18N.localise("botany.gui.database.tab.genome.varieties"), TextJustification.MiddleRight);
|
||||
y += th;
|
||||
contents.setSize(new Point(contents.size().x(), y));
|
||||
scrollable.setScrollableContent(contents);
|
||||
|
||||
@@ -45,15 +45,15 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
|
||||
@SideOnly(Side.CLIENT)
|
||||
protected void addTabs() {
|
||||
new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.overview", 0));
|
||||
new PageSpeciesFlowerGenome(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.genome", 0));
|
||||
new PageSpeciesFlowerGenome(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "genome", 0));
|
||||
new PageSpeciesClassification(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.classification", 0));
|
||||
new PageSpeciesResultant(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.resultant", 0));
|
||||
new PageSpeciesMutations(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.further", 0));
|
||||
new PageBranchOverview(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(Botany.instance, "branches.overview", 0));
|
||||
new PageBranchSpecies(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(Botany.instance, "branches.species", 0));
|
||||
this.createMode(FlowerMode.Colour, new FlowerColourModeWidgets());
|
||||
new PageColourMixResultant(this.getInfoPages(FlowerMode.Colour), new DatabaseTab(Botany.instance, "colour.resultant", 0));
|
||||
new PageColourMix(this.getInfoPages(FlowerMode.Colour), new DatabaseTab(Botany.instance, "colour.further", 0));
|
||||
this.createMode(FlowerMode.Color, new FlowerColorModeWidgets());
|
||||
new PageColorMixResultant(this.getInfoPages(FlowerMode.Color), new DatabaseTab(Botany.instance, "color.resultant", 0));
|
||||
new PageColorMix(this.getInfoPages(FlowerMode.Color), new DatabaseTab(Botany.instance, "color.further", 0));
|
||||
new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(Botany.instance, "breeder", 0));
|
||||
}
|
||||
|
||||
@@ -68,18 +68,18 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
|
||||
}
|
||||
|
||||
enum FlowerMode implements IDatabaseMode {
|
||||
Colour;
|
||||
Color;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return I18N.localise("botany.gui.database.mode." + this.name().toLowerCase());
|
||||
return I18N.localise("botany.gui.database.tab." + this.name().toLowerCase());
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private class FlowerColourModeWidgets extends ModeWidgets {
|
||||
public FlowerColourModeWidgets() {
|
||||
super(FlowerMode.Colour, WindowBotanistDatabase.this);
|
||||
private class FlowerColorModeWidgets extends ModeWidgets {
|
||||
public FlowerColorModeWidgets() {
|
||||
super(FlowerMode.Color, WindowBotanistDatabase.this);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -87,7 +87,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
|
||||
this.listBox = new ControlListBox<IFlowerColour>(this.modePage, area.xPos(), area.yPos(), area.width(), area.height(), 12) {
|
||||
@Override
|
||||
public IWidget createOption(final IFlowerColour value, final int y) {
|
||||
return new ControlColourOption(this.getContent(), value, y);
|
||||
return new ControlColorOption(this.getContent(), value, y);
|
||||
}
|
||||
};
|
||||
final List<IFlowerColour> colors = Arrays.stream(EnumFlowerColor.values()).map( c -> c.getFlowerColorAllele()).collect(Collectors.toList());
|
||||
|
||||
@@ -19,30 +19,30 @@ import binnie.core.util.I18N;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class PageBranchOverview extends PageBranch {
|
||||
private ControlText pageBranchOverview_branchName;
|
||||
private ControlText pageBranchOverview_branchScientific;
|
||||
private ControlText pageBranchOverview_branchAuthority;
|
||||
private List<ControlText> pageBranchOverview_branchDescription;
|
||||
private ControlText branchName;
|
||||
private ControlText branchScientific;
|
||||
private ControlText branchAuthority;
|
||||
private List<ControlText> branchDescription;
|
||||
|
||||
public PageBranchOverview(final IWidget parent, final DatabaseTab tab) {
|
||||
super(parent, tab);
|
||||
this.pageBranchOverview_branchDescription = new ArrayList<>();
|
||||
this.pageBranchOverview_branchName = new ControlTextCentered(this, 8, "");
|
||||
this.pageBranchOverview_branchScientific = new ControlTextCentered(this, 32, "");
|
||||
this.pageBranchOverview_branchAuthority = new ControlTextCentered(this, 44, "");
|
||||
this.branchDescription = new ArrayList<>();
|
||||
this.branchName = new ControlTextCentered(this, 8, "");
|
||||
this.branchScientific = new ControlTextCentered(this, 32, "");
|
||||
this.branchAuthority = new ControlTextCentered(this, 44, "");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onValueChanged(final IClassification branch) {
|
||||
this.pageBranchOverview_branchName.setValue(TextFormatting.UNDERLINE + branch.getName() + I18N.localise("binniecore.gui.database.branch.branch"));
|
||||
this.pageBranchOverview_branchScientific.setValue(TextFormatting.ITALIC + I18N.localise("binniecore.gui.database.branch.apidae") + " " + branch.getScientific());
|
||||
this.pageBranchOverview_branchAuthority.setValue(I18N.localise("binniecore.gui.database.discovered") + " " + TextFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority());
|
||||
for (final IWidget widget : this.pageBranchOverview_branchDescription) {
|
||||
this.branchName.setValue(TextFormatting.UNDERLINE + branch.getName() + " " + I18N.localise("binniecore.gui.database.branch.branch"));
|
||||
this.branchScientific.setValue(TextFormatting.ITALIC + I18N.localise("binniecore.gui.database.branch.apidae") + " " + branch.getScientific());
|
||||
this.branchAuthority.setValue(I18N.localise("binniecore.gui.database.discovered") + " " + TextFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority());
|
||||
for (final IWidget widget : this.branchDescription) {
|
||||
this.deleteChild(widget);
|
||||
}
|
||||
this.pageBranchOverview_branchDescription.clear();
|
||||
this.branchDescription.clear();
|
||||
String desc = branch.getDescription();
|
||||
if (desc == null || Objects.equals(desc, "")) {
|
||||
if (desc == null || Objects.equals(desc, "") || desc.contains("for.")) {
|
||||
desc = I18N.localise("binniecore.gui.database.no.description");
|
||||
}
|
||||
StringBuilder line = new StringBuilder();
|
||||
@@ -57,7 +57,7 @@ public class PageBranchOverview extends PageBranch {
|
||||
descLines.add(line.toString());
|
||||
int i = 0;
|
||||
for (final String dLine : descLines) {
|
||||
this.pageBranchOverview_branchDescription.add(new ControlTextCentered(this, 84 + 12 * i++, dLine));
|
||||
this.branchDescription.add(new ControlTextCentered(this, 84 + 12 * i++, dLine));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ import forestry.api.genetics.IAlleleSpecies;
|
||||
import binnie.botany.api.IFlower;
|
||||
import binnie.botany.api.IFlowerGenome;
|
||||
import binnie.botany.api.IFlowerType;
|
||||
import binnie.botany.craftgui.ControlColourDisplay;
|
||||
import binnie.botany.craftgui.ControlColorDisplay;
|
||||
import binnie.botany.flower.FlowerSpriteManager;
|
||||
import binnie.core.craftgui.IWidget;
|
||||
import binnie.core.craftgui.controls.ControlTextCentered;
|
||||
@@ -31,11 +31,11 @@ public class AnalystPageAppearance extends ControlAnalystPage {
|
||||
final IAlleleSpecies species = genome.getPrimary();
|
||||
new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour());
|
||||
y += 12;
|
||||
final ControlColourDisplay a = new ControlColourDisplay(this, this.width() / 2 - 28, y, genome.getPrimaryColor());
|
||||
final ControlColorDisplay a = new ControlColorDisplay(this, this.width() / 2 - 28, y, genome.getPrimaryColor());
|
||||
a.addTooltip(I18N.localise("genetics.gui.analyst.appearance.primary"));
|
||||
final ControlColourDisplay b = new ControlColourDisplay(this, this.width() / 2 - 8, y, genome.getSecondaryColor());
|
||||
final ControlColorDisplay b = new ControlColorDisplay(this, this.width() / 2 - 8, y, genome.getSecondaryColor());
|
||||
b.addTooltip(I18N.localise("genetics.gui.analyst.appearance.secondary"));
|
||||
final ControlColourDisplay c = new ControlColourDisplay(this, this.width() / 2 + 12, y, genome.getStemColor());
|
||||
final ControlColorDisplay c = new ControlColorDisplay(this, this.width() / 2 + 12, y, genome.getStemColor());
|
||||
c.addTooltip(I18N.localise("genetics.gui.analyst.appearance.stem"));
|
||||
y += 26;
|
||||
IFlowerType type = genome.getType();
|
||||
|
||||
Reference in new issue
Block a user