mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 03:49:07 +00:00
Improve/refactoring (#15)
* Improve the code * Code improve in binnie.core.utils package * Code improve in binnie.core.triggers package * Code improve in binnie.core.resource package * Code improve in binnie.core.proxy package * Code improve readability in binnie.core package * Add missed constructors * Some improve code readabilty * Expand import with * * Revert "Expand import with *" This reverts commit 3bb4a44f3b69a8559bd5753337e0f6793ad18dc4. * Fix using fully qualified names in imports * Fix missed unnessesary "this." * Removed binnie.craftgui package Optimised imports and removed unnessesary "this." * Some refactoring code in binnie.core.craftgui package * Merge from master1.7.10 * Improve code readability in binnie.core.craftgui.database package * Improve code readability in binnie.core.craftgui.events package * Improve code readability in binnie.core.craftgui.geometry package * Improve code readability in binnie.core.craftgui.* package
This commit is contained in:
1 parent
a3c2360ba6
commit
f402cb155f
428 files changed
+9515
-10103
No files matched your search
@@ -7,19 +7,19 @@ package binnie.genetics.gui;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import binnie.core.genetics.BreedingSystem;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
import binnie.craftgui.core.geometry.IPoint;
|
||||
import binnie.craftgui.controls.ControlText;
|
||||
import binnie.craftgui.core.geometry.TextJustification;
|
||||
import binnie.craftgui.core.CraftGUI;
|
||||
import binnie.core.craftgui.geometry.IPoint;
|
||||
import binnie.core.craftgui.controls.ControlText;
|
||||
import binnie.core.craftgui.geometry.TextJustification;
|
||||
import binnie.core.craftgui.CraftGUI;
|
||||
import forestry.api.genetics.IChromosomeType;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import binnie.craftgui.controls.core.Control;
|
||||
import binnie.core.craftgui.controls.core.Control;
|
||||
import binnie.Binnie;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import binnie.craftgui.controls.ControlTextCentered;
|
||||
import binnie.core.craftgui.controls.ControlTextCentered;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import binnie.craftgui.core.geometry.IArea;
|
||||
import binnie.craftgui.core.IWidget;
|
||||
import binnie.core.craftgui.geometry.IArea;
|
||||
import binnie.core.craftgui.IWidget;
|
||||
|
||||
public class AnalystPageGenome extends ControlAnalystPage
|
||||
{
|
||||
@@ -28,9 +28,9 @@ public class AnalystPageGenome extends ControlAnalystPage
|
||||
public AnalystPageGenome(final IWidget parent, final IArea area, final boolean active, final IIndividual ind) {
|
||||
super(parent, area);
|
||||
this.active = active;
|
||||
this.setColour(26265);
|
||||
this.setColor(26265);
|
||||
int y = 4;
|
||||
new ControlTextCentered(this, y, "§n" + this.getTitle()).setColour(this.getColour());
|
||||
new ControlTextCentered(this, y, "§n" + this.getTitle()).setColor(this.getColor());
|
||||
y += 16;
|
||||
final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind.getClass());
|
||||
final BreedingSystem system = Binnie.Genetics.getSystem(root);
|
||||
@@ -51,8 +51,8 @@ public class AnalystPageGenome extends ControlAnalystPage
|
||||
final IAllele allele = active ? ind.getGenome().getActiveAllele(chromo) : ind.getGenome().getInactiveAllele(chromo);
|
||||
final String alleleName = system.getAlleleName(chromo, allele);
|
||||
final float height = CraftGUI.Render.textHeight(alleleName, this.w() / 2.0f - 2.0f);
|
||||
new ControlText(scaled, new IArea(0.0f, y + (height - 9.0f) / 2.0f, this.w() / 2.0f - 2.0f, 0.0f), system.getChromosomeShortName(chromo) + " :", TextJustification.TopRight).setColour(this.getColour());
|
||||
new ControlText(scaled, new IArea(this.w() / 2.0f + 2.0f, y, this.w() / 2.0f - 2.0f, 0.0f), alleleName, TextJustification.TopLeft).setColour(this.getColour());
|
||||
new ControlText(scaled, new IArea(0.0f, y + (height - 9.0f) / 2.0f, this.w() / 2.0f - 2.0f, 0.0f), system.getChromosomeShortName(chromo) + " :", TextJustification.TopRight).setColor(this.getColor());
|
||||
new ControlText(scaled, new IArea(this.w() / 2.0f + 2.0f, y, this.w() / 2.0f - 2.0f, 0.0f), alleleName, TextJustification.TopLeft).setColor(this.getColor());
|
||||
y += (int) (3.0f + height);
|
||||
}
|
||||
this.setSize(new IPoint(this.w(), y + 8));
|
||||
|
||||
Reference in new issue
Block a user