diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 865343ca..03bb2227 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -211,9 +211,9 @@ public class ManagerGenetics extends ManagerBase { if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger && !(o1 instanceof AlleleColor)) { return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(((IAlleleInteger) o2).getValue()); } - if (o1.getName() != null && o2.getName() != null) { - return o1.getName().compareTo(o2.getName()); - } + // if (o1.getName() != null && o2.getName() != null) { + // return o1.getName().compareTo(o2.getName()); + // } return o1.getUID().compareTo(o2.getUID()); } } diff --git a/src/main/java/binnie/genetics/craftgui/ControlGene.java b/src/main/java/binnie/genetics/craftgui/ControlGene.java index 1613f836..24ec6ef0 100644 --- a/src/main/java/binnie/genetics/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/craftgui/ControlGene.java @@ -11,11 +11,14 @@ import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.Window; +import binnie.core.util.I18N; import binnie.genetics.api.IGene; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.genetics.Engineering; +import forestry.api.genetics.IAlleleSpecies; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; public class ControlGene extends Control implements IControlValue, ITooltip { protected IGene gene; @@ -30,6 +33,11 @@ public class ControlGene extends Control implements IControlValue, IToolt public void getTooltip(Tooltip tooltip) { String cName = Binnie.Genetics.getSystem(gene.getSpeciesRoot()).getChromosomeName(gene.getChromosome()); tooltip.add(cName + ": " + gene.getName()); + if (gene.getAllele() instanceof IAlleleSpecies) { + tooltip.add(I18N.localise( + "binniecore.gui.database.branch.discoveredBy", + ((IAlleleSpecies) gene.getAllele()).getAuthority() + EnumChatFormatting.RESET)); + } if (isMouseOver() && canFill(Window.get(this).getHeldItemStack())) { tooltip.add("Left click to assign gene"); IGene existingGene = Engineering.getGene(