Clean Up Gui

This commit is contained in:
Nedelosk committed 2017-07-31 12:09:50 +02:00
1 parent 724c3d1fbd
commit 21aa0c43a6
296 files changed
+1792 -1712

No files matched your search

@@ -8,9 +8,9 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import binnie.botany.craftgui.WindowBotanistDatabase;
import binnie.core.craftgui.minecraft.Window;
import binnie.botany.gui.database.WindowBotanistDatabase;
import binnie.core.gui.IBinnieGUID;
import binnie.core.gui.minecraft.Window;
public enum BotanyGUI implements IBinnieGUID {
DATABASE,
@@ -1,36 +0,0 @@
package binnie.botany.craftgui;
import java.util.ArrayList;
import java.util.List;
import binnie.botany.api.IColorMix;
import binnie.botany.api.IFlowerColor;
import binnie.botany.core.BotanyCore;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.util.I18N;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageAbstract;
public class PageColorMix extends PageAbstract<IFlowerColor> {
ControlText pageSpeciesFurther_Title;
ControlColorMixBox pageSpeciesFurther_List;
public PageColorMix(IWidget parent, DatabaseTab tab) {
super(parent, tab);
pageSpeciesFurther_Title = new ControlTextCentered(this, 8, I18N.localise("botany.gui.controls.page.color_further.title"));
pageSpeciesFurther_List = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.FURTHER);
}
@Override
public void onValueChanged(IFlowerColor colour) {
List<IColorMix> mixes = new ArrayList<>();
for (IColorMix mix : BotanyCore.getFlowerRoot().getColorMixes(false)) {
if (mix.getColorFirst() == colour || mix.getColorSecond() == colour) {
mixes.add(mix);
}
}
pageSpeciesFurther_List.setOptions(mixes);
}
}
@@ -22,8 +22,8 @@ import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.FlowerManager;
import binnie.botany.api.IFlower;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.renderer.RenderUtil;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.renderer.RenderUtil;
import binnie.core.util.I18N;
// TODO write flower alyzer plugin
@@ -1,16 +1,16 @@
package binnie.botany.craftgui;
package binnie.botany.gui.database;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.botany.api.IFlowerColor;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.renderer.RenderUtil;
import binnie.core.gui.Attribute;
import binnie.core.gui.ITooltip;
import binnie.core.gui.IWidget;
import binnie.core.gui.Tooltip;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.controls.core.IControlValue;
import binnie.core.gui.renderer.RenderUtil;
public class ControlColorDisplay extends Control implements IControlValue<IFlowerColor>, ITooltip {
private IFlowerColor value;
@@ -1,8 +1,8 @@
package binnie.botany.craftgui;
package binnie.botany.gui.database;
import binnie.botany.api.IColorMix;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.listbox.ControlListBox;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.listbox.ControlListBox;
public class ControlColorMixBox extends ControlListBox<IColorMix> {
private int index;
@@ -1,8 +1,8 @@
package binnie.botany.craftgui;
package binnie.botany.gui.database;
import binnie.botany.api.IColorMix;
import binnie.core.craftgui.controls.listbox.ControlList;
import binnie.core.craftgui.controls.listbox.ControlOption;
import binnie.core.gui.controls.listbox.ControlList;
import binnie.core.gui.controls.listbox.ControlOption;
public class ControlColorMixItem extends ControlOption<IColorMix> {
private final ControlColorDisplay itemWidget1;
@@ -1,19 +1,20 @@
package binnie.botany.craftgui;
package binnie.botany.gui.database;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.botany.api.IColorMix;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.controls.core.Control;
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.gui.Attribute;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.ITooltip;
import binnie.core.gui.IWidget;
import binnie.core.gui.Tooltip;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.database.DatabaseConstants;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.resource.Texture;
import binnie.core.gui.resource.minecraft.CraftGUITextureSheet;
import binnie.core.gui.resource.minecraft.StandardTexture;
import binnie.core.util.I18N;
public class ControlColorMixSymbol extends Control implements ITooltip {
@@ -49,7 +50,7 @@ public class ControlColorMixSymbol extends Control implements ITooltip {
public void getTooltip(Tooltip tooltip) {
if (type == 1) {
float chance = value.getChance();
tooltip.add(I18N.localise("botany.gui.controls.color_mix_symbol.chance", chance));
tooltip.add(I18N.localise(DatabaseConstants.BOTANY_CONTROL_KEY + ".color_mix_symbol.chance", chance));
}
}
}
@@ -1,15 +1,15 @@
package binnie.botany.craftgui;
package binnie.botany.gui.database;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.botany.api.IFlowerColor;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.controls.listbox.ControlList;
import binnie.core.craftgui.controls.listbox.ControlTextOption;
import binnie.core.craftgui.geometry.CraftGUIUtil;
import binnie.core.craftgui.geometry.Point;
import binnie.core.gui.Attribute;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.controls.listbox.ControlList;
import binnie.core.gui.controls.listbox.ControlTextOption;
import binnie.core.gui.geometry.CraftGUIUtil;
import binnie.core.gui.geometry.Point;
@SideOnly(Side.CLIENT)
public class ControlColorOption extends ControlTextOption<IFlowerColor> {
@@ -0,0 +1,37 @@
package binnie.botany.gui.database;
import java.util.ArrayList;
import java.util.List;
import binnie.botany.api.IColorMix;
import binnie.botany.api.IFlowerColor;
import binnie.botany.core.BotanyCore;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.ControlTextCentered;
import binnie.core.gui.database.DatabaseConstants;
import binnie.core.gui.database.DatabaseTab;
import binnie.core.gui.database.PageAbstract;
import binnie.core.util.I18N;
public class PageColorMix extends PageAbstract<IFlowerColor> {
ControlText title;
ControlColorMixBox list;
public PageColorMix(IWidget parent, DatabaseTab tab) {
super(parent, tab);
title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.BOTANY_PAGES_KEY + ".color_further.title"));
list = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.FURTHER);
}
@Override
public void onValueChanged(IFlowerColor colour) {
List<IColorMix> mixes = new ArrayList<>();
for (IColorMix mix : BotanyCore.getFlowerRoot().getColorMixes(false)) {
if (mix.getColorFirst() == colour || mix.getColorSecond() == colour) {
mixes.add(mix);
}
}
list.setOptions(mixes);
}
}
@@ -1,4 +1,4 @@
package binnie.botany.craftgui;
package binnie.botany.gui.database;
import java.util.ArrayList;
import java.util.List;
@@ -6,12 +6,13 @@ import java.util.List;
import binnie.botany.api.IColorMix;
import binnie.botany.api.IFlowerColor;
import binnie.botany.core.BotanyCore;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.ControlTextCentered;
import binnie.core.gui.database.DatabaseConstants;
import binnie.core.gui.database.DatabaseTab;
import binnie.core.gui.database.PageAbstract;
import binnie.core.util.I18N;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageAbstract;
public class PageColorMixResultant extends PageAbstract<IFlowerColor> {
ControlText pageSpeciesFurther_Title;
@@ -19,7 +20,7 @@ public class PageColorMixResultant extends PageAbstract<IFlowerColor> {
public PageColorMixResultant(IWidget parent, DatabaseTab tab) {
super(parent, tab);
pageSpeciesFurther_Title = new ControlTextCentered(this, 8, I18N.localise("botany.gui.controls.page.species_further.title"));
pageSpeciesFurther_Title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.BOTANY_PAGES_KEY + ".species_further.title"));
pageSpeciesFurther_List = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.RESULTANT);
}
@@ -1,4 +1,4 @@
package binnie.botany.craftgui;
package binnie.botany.gui.database;
import net.minecraft.item.ItemStack;
@@ -13,29 +13,31 @@ import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IFlower;
import binnie.botany.api.IFlowerGenome;
import binnie.botany.core.BotanyCore;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.scroll.ControlScrollableContent;
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.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.controls.scroll.ControlScrollableContent;
import binnie.core.gui.database.DatabaseConstants;
import binnie.core.gui.database.DatabaseTab;
import binnie.core.gui.database.PageSpecies;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.geometry.TextJustification;
import binnie.core.gui.minecraft.control.ControlItemDisplay;
import binnie.core.util.I18N;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageSpecies;
public class PageSpeciesFlowerGenome extends PageSpecies {
public PageSpeciesFlowerGenome(IWidget parent, DatabaseTab tab) {
super(parent, tab);
}
public static String tolerated(boolean t) {
//TODO: unused ?
/*public static String tolerated(boolean t) {
if (t) {
return "Tolerated";
}
return "Not Tolerated";
}
}*/
@Override
public void onValueChanged(IAlleleSpecies species) {
@@ -50,7 +52,7 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
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.MIDDLE_CENTER);
new ControlText(this, new Area(0, 4, w, 16), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".title"), TextJustification.MIDDLE_CENTER);
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;
@@ -59,29 +61,29 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
int y = 0;
int th = 14;
int th2 = 18;
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.temp"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + DatabaseConstants.BOTANY_GENOME_KEY + ".temp"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFT);
y += th;
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.moist"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".moist"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getMoisture().getLocalisedName(false), TextJustification.MIDDLE_LEFT);
y += th;
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.ph"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".ph"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getPH().getLocalisedName(false), TextJustification.MIDDLE_LEFT);
y += th;
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.fertility"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".fertility"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFT);
y += th;
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.MIDDLE_RIGHT);
new ControlText(contents, new Area(w2, y, w3, th), I18N.localise("botany.gui.database.tab.genome.lifespan.value", lifespanValue), TextJustification.MIDDLE_LEFT);
new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".lifespan"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(w2, y, w3, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".lifespan.value", lifespanValue), TextJustification.MIDDLE_LEFT);
y += th;
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.nectar"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".nectar"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(w2, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getAlleleName(), TextJustification.MIDDLE_LEFT);
y += th;
@@ -102,7 +104,7 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
}
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.MIDDLE_RIGHT);
new ControlText(contents, new Area(0, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".varieties"), TextJustification.MIDDLE_RIGHT);
y += th;
contents.setSize(new Point(contents.size().x(), y));
scrollable.setScrollableContent(contents);
@@ -1,4 +1,4 @@
package binnie.botany.craftgui;
package binnie.botany.gui.database;
import java.util.Arrays;
import java.util.List;
@@ -14,21 +14,22 @@ import binnie.botany.Botany;
import binnie.botany.api.IFlowerColor;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.AbstractMod;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.listbox.ControlListBox;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.listbox.ControlListBox;
import binnie.core.gui.database.DatabaseConstants;
import binnie.core.gui.database.DatabaseTab;
import binnie.core.gui.database.IDatabaseMode;
import binnie.core.gui.database.PageBranchOverview;
import binnie.core.gui.database.PageBranchSpecies;
import binnie.core.gui.database.PageBreeder;
import binnie.core.gui.database.PageSpeciesClassification;
import binnie.core.gui.database.PageSpeciesMutations;
import binnie.core.gui.database.PageSpeciesOverview;
import binnie.core.gui.database.PageSpeciesResultant;
import binnie.core.gui.database.WindowAbstractDatabase;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.minecraft.Window;
import binnie.core.util.I18N;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.IDatabaseMode;
import binnie.genetics.gui.database.PageBranchOverview;
import binnie.genetics.gui.database.PageBranchSpecies;
import binnie.genetics.gui.database.PageBreeder;
import binnie.genetics.gui.database.PageSpeciesClassification;
import binnie.genetics.gui.database.PageSpeciesMutations;
import binnie.genetics.gui.database.PageSpeciesOverview;
import binnie.genetics.gui.database.PageSpeciesResultant;
import binnie.genetics.gui.database.WindowAbstractDatabase;
public class WindowBotanistDatabase extends WindowAbstractDatabase {
private ControlListBox<EnumFlowerColor> selectionBoxColors;
@@ -72,7 +73,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
@Override
public String getName() {
return I18N.localise("botany.gui.database.tab." + name().toLowerCase());
return I18N.localise(DatabaseConstants.BOTANY_TAB_KEY + "." + name().toLowerCase());
}
}
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.window;
package binnie.botany.gui.database;
import javax.annotation.ParametersAreNonnullByDefault;
+1 -1
View File
@@ -30,10 +30,10 @@ import forestry.plugins.PluginManager;
import binnie.Binnie;
import binnie.Constants;
import binnie.core.block.TileEntityMetadata;
import binnie.core.craftgui.minecraft.ModuleCraftGUI;
import binnie.core.gui.BinnieCoreGUI;
import binnie.core.gui.BinnieGUIHandler;
import binnie.core.gui.IBinnieGUID;
import binnie.core.gui.minecraft.ModuleCraftGUI;
import binnie.core.integration.extrabees.ExtraBeesIntegration;
import binnie.core.item.ItemFieldKit;
import binnie.core.item.ItemGenesis;
@@ -1,9 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.controls.button;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,9 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.controls.listbox;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,9 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.controls.page;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,9 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.controls.scroll;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,9 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.minecraft.control;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,9 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.minecraft;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,9 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.minecraft.render;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,9 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.renderer;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,9 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.resource.minecraft;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,9 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.resource;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,4 +1,4 @@
package binnie.core.craftgui;
package binnie.core.gui;
public enum Attribute implements IWidgetAttribute {
MouseOver,
@@ -10,9 +10,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import binnie.core.craftgui.WindowFieldKit;
import binnie.core.craftgui.WindowGenesis;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.gui.minecraft.Window;
import binnie.core.machines.storage.WindowCompartment;
public enum BinnieCoreGUI implements IBinnieGUID {
@@ -11,7 +11,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.gui.minecraft.Window;
public final class BinnieGUIHandler implements IGuiHandler {
private AbstractMod mod;
@@ -1,10 +1,10 @@
package binnie.core.craftgui;
package binnie.core.gui;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.renderer.TextureRenderer;
import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager;
import binnie.core.gui.renderer.TextureRenderer;
import binnie.core.gui.resource.minecraft.CraftGUIResourceManager;
@SideOnly(Side.CLIENT)
public class CraftGUI {
@@ -7,7 +7,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.gui.minecraft.Window;
import binnie.core.network.IOrdinaled;
public interface IBinnieGUID extends IOrdinaled {
@@ -1,4 +1,4 @@
package binnie.core.craftgui;
package binnie.core.gui;
public interface ITooltip {
void getTooltip(final Tooltip p0);
@@ -1,4 +1,4 @@
package binnie.core.craftgui;
package binnie.core.gui;
public interface ITooltipHelp {
void getHelpTooltip(final Tooltip p0);
@@ -1,8 +1,8 @@
package binnie.core.craftgui;
package binnie.core.gui;
import javax.annotation.Nullable;
import binnie.core.craftgui.geometry.Point;
import binnie.core.gui.geometry.Point;
public interface ITopLevelWidget extends IWidget {
void setMousePosition(final int p0, final int p1);
@@ -1,4 +1,4 @@
package binnie.core.craftgui;
package binnie.core.gui;
import javax.annotation.Nullable;
import java.util.List;
@@ -6,10 +6,10 @@ import java.util.List;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.events.Event;
import binnie.core.craftgui.events.EventHandler;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.gui.events.Event;
import binnie.core.gui.events.EventHandler;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
public interface IWidget {
@Nullable
@@ -1,4 +1,4 @@
package binnie.core.craftgui;
package binnie.core.gui;
public interface IWidgetAttribute {
}
@@ -1,4 +1,4 @@
package binnie.core.craftgui;
package binnie.core.gui;
public enum RenderStage {
PreChildren,
@@ -1,4 +1,4 @@
package binnie.core.craftgui;
package binnie.core.gui;
import java.util.ArrayList;
import java.util.List;
@@ -1,4 +1,4 @@
package binnie.core.craftgui;
package binnie.core.gui;
import javax.annotation.Nullable;
import java.util.ArrayDeque;
@@ -10,10 +10,10 @@ import java.util.ListIterator;
import org.lwjgl.input.Mouse;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.events.EventWidget;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.events.EventWidget;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
public abstract class TopLevelWidget extends Widget implements ITopLevelWidget {
protected Point mousePosition;
@@ -1,4 +1,4 @@
package binnie.core.craftgui;
package binnie.core.gui;
import javax.annotation.Nullable;
import java.util.ArrayList;
@@ -8,11 +8,11 @@ import java.util.List;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.events.Event;
import binnie.core.craftgui.events.EventHandler;
import binnie.core.craftgui.events.EventWidget;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.gui.events.Event;
import binnie.core.gui.events.EventHandler;
import binnie.core.gui.events.EventWidget;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
public class Widget implements IWidget {
@Nullable
@@ -1,4 +1,4 @@
package binnie.core.craftgui;
package binnie.core.gui;
import javax.annotation.Nullable;
import java.util.ArrayList;
@@ -27,21 +27,21 @@ import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.core.ExtraBeeTexture;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.events.EventHandler;
import binnie.core.craftgui.events.EventValueChanged;
import binnie.core.craftgui.fieldkit.ControlChromosome;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.craftgui.minecraft.InventoryType;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.craftgui.minecraft.control.ControlImage;
import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
import binnie.core.craftgui.minecraft.control.ControlSlot;
import binnie.core.craftgui.resource.StyleSheetPunnett;
import binnie.core.craftgui.resource.minecraft.StandardTexture;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.events.EventHandler;
import binnie.core.gui.events.EventValueChanged;
import binnie.core.gui.fieldkit.ControlChromosome;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.geometry.TextJustification;
import binnie.core.gui.minecraft.InventoryType;
import binnie.core.gui.minecraft.Window;
import binnie.core.gui.minecraft.control.ControlImage;
import binnie.core.gui.minecraft.control.ControlPlayerInventory;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.resource.StyleSheetPunnett;
import binnie.core.gui.resource.minecraft.StandardTexture;
import binnie.core.machines.inventory.SlotValidator;
import binnie.core.util.I18N;
import binnie.genetics.machine.analyser.Analyser;
@@ -1,4 +1,4 @@
package binnie.core.craftgui;
package binnie.core.gui;
import javax.annotation.Nullable;
import java.util.ArrayList;
@@ -23,23 +23,23 @@ import forestry.api.genetics.ISpeciesType;
import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.core.craftgui.controls.listbox.ControlListBox;
import binnie.core.craftgui.controls.listbox.ControlTextOption;
import binnie.core.craftgui.controls.tab.ControlTab;
import binnie.core.craftgui.controls.tab.ControlTabBar;
import binnie.core.craftgui.events.EventHandler;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.events.EventValueChanged;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Position;
import binnie.core.craftgui.minecraft.MinecraftGUI;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
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.gui.controls.listbox.ControlListBox;
import binnie.core.gui.controls.listbox.ControlTextOption;
import binnie.core.gui.controls.tab.ControlTab;
import binnie.core.gui.controls.tab.ControlTabBar;
import binnie.core.gui.events.EventHandler;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.events.EventValueChanged;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Position;
import binnie.core.gui.minecraft.MinecraftGUI;
import binnie.core.gui.minecraft.Window;
import binnie.core.gui.minecraft.control.ControlItemDisplay;
import binnie.core.gui.minecraft.control.ControlPlayerInventory;
import binnie.core.gui.minecraft.control.ControlTabIcon;
import binnie.core.gui.window.Panel;
import binnie.genetics.gui.ControlGenesisOption;
public class WindowGenesis extends Window {
@@ -1,20 +1,20 @@
package binnie.core.craftgui.controls;
package binnie.core.gui.controls;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.events.EventHandler;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.events.EventValueChanged;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.gui.Attribute;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.controls.core.IControlValue;
import binnie.core.gui.events.EventHandler;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.events.EventValueChanged;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.geometry.TextJustification;
import binnie.core.gui.resource.minecraft.CraftGUITexture;
public class ControlCheckbox extends Control implements IControlValue<Boolean> {
private boolean value;
@@ -1,15 +1,15 @@
package binnie.core.craftgui.controls;
package binnie.core.gui.controls;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.craftgui.renderer.RenderUtil;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.controls.core.IControlValue;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.geometry.TextJustification;
import binnie.core.gui.renderer.RenderUtil;
public class ControlText extends Control implements IControlValue<String> {
private String text;
@@ -1,9 +1,9 @@
package binnie.core.craftgui.controls;
package binnie.core.gui.controls;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.gui.IWidget;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.geometry.TextJustification;
public class ControlTextCentered extends ControlText {
public ControlTextCentered(final IWidget parent, final int y, final String text) {
@@ -1,21 +1,21 @@
package binnie.core.craftgui.controls;
package binnie.core.gui.controls;
import net.minecraft.client.gui.GuiTextField;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.events.EventHandler;
import binnie.core.craftgui.events.EventKey;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.events.EventTextEdit;
import binnie.core.craftgui.events.EventWidget;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.gui.Attribute;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.controls.core.IControlValue;
import binnie.core.gui.events.EventHandler;
import binnie.core.gui.events.EventKey;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.events.EventTextEdit;
import binnie.core.gui.events.EventWidget;
import binnie.core.gui.resource.minecraft.CraftGUITexture;
@SideOnly(Side.CLIENT)
public class ControlTextEdit extends Control implements IControlValue<String> {
@@ -1,4 +1,4 @@
package binnie.core.craftgui.controls;
package binnie.core.gui.controls;
public interface IControlSelection<T> {
T getSelectedValue();
@@ -1,4 +1,4 @@
package binnie.core.craftgui.controls;
package binnie.core.gui.controls;
public interface IControlSelectionOption<T> {
T getValue();
@@ -1,20 +1,20 @@
package binnie.core.craftgui.controls.button;
package binnie.core.gui.controls.button;
import javax.annotation.Nullable;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.events.EventButtonClicked;
import binnie.core.craftgui.events.EventHandler;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.gui.Attribute;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.events.EventButtonClicked;
import binnie.core.gui.events.EventHandler;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.geometry.TextJustification;
import binnie.core.gui.resource.minecraft.CraftGUITexture;
public class ControlButton extends Control {
@Nullable
@@ -1,4 +1,4 @@
package binnie.core.craftgui.controls.button;
package binnie.core.gui.controls.button;
import com.google.common.base.Preconditions;
@@ -6,10 +6,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.events.EventValueChanged;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.IControlValue;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.events.EventValueChanged;
public class ControlEnumButton<T> extends ControlButton implements IControlValue<T> {
public static final String eventEnumChanged = "eventEnumButtonChanged";
@@ -1,8 +1,8 @@
package binnie.core.craftgui.controls.button;
package binnie.core.gui.controls.button;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.events.EventToggleButtonClicked;
import binnie.core.gui.IWidget;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.events.EventToggleButtonClicked;
public class ControlToggleButton extends ControlButton {
boolean toggled;
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.gui.controls.button;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.controls.core;
package binnie.core.gui.controls.core;
import javax.annotation.Nonnull;
import java.util.ArrayList;
@@ -7,15 +7,15 @@ import java.util.List;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.ITooltipHelp;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.Widget;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.gui.Attribute;
import binnie.core.gui.ITooltip;
import binnie.core.gui.ITooltipHelp;
import binnie.core.gui.IWidget;
import binnie.core.gui.Tooltip;
import binnie.core.gui.Widget;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.minecraft.Window;
public class Control extends Widget implements ITooltipHelp, ITooltip {
public int extraLevel;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.controls.core;
package binnie.core.gui.controls.core;
public interface IControlIndexed {
int getIndex();
@@ -1,8 +1,8 @@
package binnie.core.craftgui.controls.core;
package binnie.core.gui.controls.core;
import javax.annotation.Nullable;
import binnie.core.craftgui.IWidget;
import binnie.core.gui.IWidget;
public interface IControlValue<T> extends IWidget {
@Nullable
@@ -1,4 +1,4 @@
package binnie.core.craftgui.controls.core;
package binnie.core.gui.controls.core;
import java.util.Collection;
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.geometry;
package binnie.core.gui.controls.core;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -1,15 +1,15 @@
package binnie.core.craftgui.controls.listbox;
package binnie.core.gui.controls.listbox;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.events.EventValueChanged;
import binnie.core.craftgui.geometry.Point;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.controls.core.IControlValue;
import binnie.core.gui.events.EventValueChanged;
import binnie.core.gui.geometry.Point;
import binnie.core.util.IValidator;
public class ControlList<T> extends Control implements IControlValue<T> {
@@ -1,11 +1,11 @@
package binnie.core.craftgui.controls.listbox;
package binnie.core.gui.controls.listbox;
import java.util.Collection;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.controls.scroll.ControlScrollableContent;
import binnie.core.craftgui.events.EventKey;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.IControlValue;
import binnie.core.gui.controls.scroll.ControlScrollableContent;
import binnie.core.gui.events.EventKey;
import binnie.core.util.IValidator;
public class ControlListBox<T> extends ControlScrollableContent<ControlList<T>> implements IControlValue<T> {
@@ -1,14 +1,14 @@
package binnie.core.craftgui.controls.listbox;
package binnie.core.gui.controls.listbox;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.gui.Attribute;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.controls.core.IControlValue;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.resource.minecraft.CraftGUITexture;
public class ControlOption<T> extends Control implements IControlValue<T> {
private T value;
@@ -1,9 +1,9 @@
package binnie.core.craftgui.controls.listbox;
package binnie.core.gui.controls.listbox;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.events.EventHandler;
import binnie.core.craftgui.events.EventWidget;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.events.EventHandler;
import binnie.core.gui.events.EventWidget;
import binnie.core.gui.geometry.TextJustification;
public class ControlTextOption<T> extends ControlOption<T> {
protected ControlText textWidget;
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.gui.controls.listbox;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.events;
package binnie.core.gui.controls;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -1,8 +1,8 @@
package binnie.core.craftgui.controls.page;
package binnie.core.gui.controls.page;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.controls.core.IControlValue;
public class ControlPage<T> extends Control implements IControlValue<T> {
private T value;
@@ -1,14 +1,14 @@
package binnie.core.craftgui.controls.page;
package binnie.core.gui.controls.page;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.controls.core.IControlValues;
import binnie.core.craftgui.events.EventValueChanged;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.controls.core.IControlValue;
import binnie.core.gui.controls.core.IControlValues;
import binnie.core.gui.events.EventValueChanged;
public class ControlPages<T> extends Control implements IControlValues<T>, IControlValue<T> {
T value;
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.controls;
package binnie.core.gui.controls.page;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -1,7 +1,7 @@
package binnie.core.craftgui.controls.scroll;
package binnie.core.gui.controls.scroll;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.Control;
public class ControlScroll extends Control {
private IControlScrollable scrollWidget;
@@ -1,15 +1,15 @@
package binnie.core.craftgui.controls.scroll;
package binnie.core.gui.controls.scroll;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.gui.Attribute;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.resource.minecraft.CraftGUITexture;
public class ControlScrollBar extends Control {
protected final IControlScrollable scrollable;
@@ -35,13 +35,13 @@ public class ControlScrollBar extends Control {
final float percentageIndex = ControlScrollBar.this.scrollable.getPercentageIndex();
final float minPercent = (1.0f - shownPercentage) * percentageIndex;
final float maxPercent = minPercent + shownPercentage;
float clickedPercentage = (float)ControlScrollBar.this.getRelativeMousePosition().y() / (float) (ControlScrollBar.this.height() - 2.0f);
float clickedPercentage = (float)ControlScrollBar.this.getRelativeMousePosition().y() / (ControlScrollBar.this.height() - 2.0f);
clickedPercentage = Math.max(Math.min(clickedPercentage, 1.0f), 0.0f);
if (clickedPercentage > maxPercent) {
ControlScrollBar.this.scrollable.setPercentageIndex((float) (clickedPercentage - shownPercentage) / (float) (1.0f - shownPercentage));
ControlScrollBar.this.scrollable.setPercentageIndex((clickedPercentage - shownPercentage) / (1.0f - shownPercentage));
}
if (clickedPercentage < minPercent) {
ControlScrollBar.this.scrollable.setPercentageIndex(clickedPercentage / (float) (1.0f - shownPercentage));
ControlScrollBar.this.scrollable.setPercentageIndex(clickedPercentage / (1.0f - shownPercentage));
}
}
});
@@ -1,13 +1,13 @@
package binnie.core.craftgui.controls.scroll;
package binnie.core.gui.controls.scroll;
import javax.annotation.Nullable;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.events.EventWidget;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.events.EventWidget;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
public class ControlScrollableContent<T extends IWidget> extends Control implements IControlScrollable {
@Nullable
@@ -1,6 +1,6 @@
package binnie.core.craftgui.controls.scroll;
package binnie.core.gui.controls.scroll;
import binnie.core.craftgui.IWidget;
import binnie.core.gui.IWidget;
public interface IControlScrollable extends IWidget {
float getPercentageShown();
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.gui.controls.scroll;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,24 +1,24 @@
package binnie.core.craftgui.controls.tab;
package binnie.core.gui.controls.tab;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.events.EventValueChanged;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.geometry.Position;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.craftgui.minecraft.control.ControlTabIcon;
import binnie.core.craftgui.renderer.RenderUtil;
import binnie.core.craftgui.resource.Texture;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.gui.Attribute;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.ITooltip;
import binnie.core.gui.Tooltip;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.controls.core.IControlValue;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.events.EventValueChanged;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.geometry.Position;
import binnie.core.gui.minecraft.control.ControlItemDisplay;
import binnie.core.gui.minecraft.control.ControlTabIcon;
import binnie.core.gui.renderer.RenderUtil;
import binnie.core.gui.resource.Texture;
import binnie.core.gui.resource.minecraft.CraftGUITexture;
public class ControlTab<T> extends Control implements ITooltip, IControlValue<T> {
protected T value;
@@ -1,15 +1,15 @@
package binnie.core.craftgui.controls.tab;
package binnie.core.gui.controls.tab;
import com.google.common.collect.Iterables;
import java.util.Collection;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.controls.core.IControlValue;
import binnie.core.craftgui.events.EventHandler;
import binnie.core.craftgui.events.EventValueChanged;
import binnie.core.craftgui.geometry.Position;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.controls.core.IControlValue;
import binnie.core.gui.events.EventHandler;
import binnie.core.gui.events.EventValueChanged;
import binnie.core.gui.geometry.Position;
public class ControlTabBar<T> extends Control implements IControlValue<T> {
private T value;
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.gui.controls.tab;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,9 +1,9 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import forestry.api.genetics.IClassification;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.listbox.ControlListBox;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.listbox.ControlListBox;
class ControlBranchBox extends ControlListBox<IClassification> {
public ControlBranchBox(final IWidget parent, final int x, final int y, final int width, final int height) {
@@ -1,9 +1,9 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import forestry.api.genetics.IClassification;
import binnie.core.craftgui.controls.listbox.ControlList;
import binnie.core.craftgui.controls.listbox.ControlTextOption;
import binnie.core.gui.controls.listbox.ControlList;
import binnie.core.gui.controls.listbox.ControlTextOption;
class ControlBranchBoxOption extends ControlTextOption<IClassification> {
public ControlBranchBoxOption(final ControlList<IClassification> controlList, final IClassification option, final int y) {
@@ -1,19 +1,19 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.renderer.RenderUtil;
import binnie.core.craftgui.resource.Texture;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet;
import binnie.core.craftgui.resource.minecraft.StandardTexture;
import binnie.core.genetics.BreedingSystem;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.renderer.RenderUtil;
import binnie.core.gui.resource.Texture;
import binnie.core.gui.resource.minecraft.CraftGUITexture;
import binnie.core.gui.resource.minecraft.CraftGUITextureSheet;
import binnie.core.gui.resource.minecraft.StandardTexture;
class ControlBreedingProgress extends Control {
private static Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2);
@@ -1,4 +1,4 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import javax.annotation.Nullable;
@@ -15,16 +15,17 @@ import forestry.api.genetics.IIndividual;
import forestry.api.genetics.ISpeciesRoot;
import binnie.Binnie;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.craftgui.renderer.RenderUtil;
import binnie.core.genetics.BreedingSystem;
import binnie.core.gui.Attribute;
import binnie.core.gui.ITooltip;
import binnie.core.gui.IWidget;
import binnie.core.gui.Tooltip;
import binnie.core.gui.events.EventMouse;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.minecraft.Window;
import binnie.core.gui.minecraft.control.ControlItemDisplay;
import binnie.core.gui.renderer.RenderUtil;
import binnie.core.util.I18N;
public class ControlDatabaseIndividualDisplay extends ControlItemDisplay implements ITooltip {
EnumDiscoveryState discovered;
@@ -108,11 +109,11 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme
break;
}
case Discovered: {
tooltip.add("Discovered Species");
tooltip.add(I18N.localise(DatabaseConstants.DISCOVERED_KEY + ".discovered"));
break;
}
case Undiscovered: {
tooltip.add("Undiscovered Species");
tooltip.add(I18N.localise(DatabaseConstants.DISCOVERED_KEY + ".undiscovered"));
break;
}
}
@@ -1,17 +1,17 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.controls.listbox.ControlList;
import binnie.core.craftgui.controls.listbox.ControlTextOption;
import binnie.core.craftgui.geometry.CraftGUIUtil;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.gui.Attribute;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.controls.listbox.ControlList;
import binnie.core.gui.controls.listbox.ControlTextOption;
import binnie.core.gui.geometry.CraftGUIUtil;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.minecraft.control.ControlItemDisplay;
@SideOnly(Side.CLIENT)
public class ControlItemStackOption extends ControlTextOption<ItemStack> {
@@ -1,14 +1,14 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import java.util.List;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IMutation;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.listbox.ControlListBox;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.genetics.BreedingSystem;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.listbox.ControlListBox;
import binnie.core.gui.minecraft.Window;
class ControlMutationBox extends ControlListBox<IMutation> {
private int index;
@@ -1,12 +1,12 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IMutation;
import binnie.core.craftgui.controls.listbox.ControlList;
import binnie.core.craftgui.controls.listbox.ControlOption;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.genetics.BreedingSystem;
import binnie.core.gui.controls.listbox.ControlList;
import binnie.core.gui.controls.listbox.ControlOption;
import binnie.core.gui.minecraft.Window;
class ControlMutationItem extends ControlOption<IMutation> {
private ControlDatabaseIndividualDisplay itemWidget1;
@@ -1,4 +1,4 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -6,18 +6,19 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IMutation;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.craftgui.resource.Texture;
import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet;
import binnie.core.craftgui.resource.minecraft.StandardTexture;
import binnie.core.genetics.BreedingSystem;
import binnie.core.gui.Attribute;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.ITooltip;
import binnie.core.gui.IWidget;
import binnie.core.gui.Tooltip;
import binnie.core.gui.controls.core.Control;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.minecraft.Window;
import binnie.core.gui.resource.Texture;
import binnie.core.gui.resource.minecraft.CraftGUITextureSheet;
import binnie.core.gui.resource.minecraft.StandardTexture;
import binnie.core.util.I18N;
class ControlMutationSymbol extends Control implements ITooltip {
private static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
@@ -63,7 +64,7 @@ class ControlMutationSymbol extends Control implements ITooltip {
final IAlleleSpecies species2 = this.value.getAllele1();
final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem();
final float chance = system.getChance(this.value, Window.get(this).getPlayer(), species1, species2);
tooltip.add("Current Chance - " + chance + "%");
tooltip.add(I18N.localise(DatabaseConstants.CONTROL_KEY+ ".chance", chance));
for (final String string : this.value.getSpecialConditions()) {
tooltip.add(string);
}
@@ -1,4 +1,4 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import java.util.ArrayList;
import java.util.Collection;
@@ -12,9 +12,9 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IClassification;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.listbox.ControlListBox;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.listbox.ControlListBox;
import binnie.core.gui.minecraft.Window;
@SideOnly(Side.CLIENT)
public class ControlSpeciesBox extends ControlListBox<IAlleleSpecies> {
@@ -1,16 +1,16 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.IAlleleSpecies;
import binnie.core.craftgui.Attribute;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.controls.listbox.ControlList;
import binnie.core.craftgui.controls.listbox.ControlTextOption;
import binnie.core.craftgui.geometry.CraftGUIUtil;
import binnie.core.craftgui.geometry.Point;
import binnie.core.gui.Attribute;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.controls.listbox.ControlList;
import binnie.core.gui.controls.listbox.ControlTextOption;
import binnie.core.gui.geometry.CraftGUIUtil;
import binnie.core.gui.geometry.Point;
@SideOnly(Side.CLIENT)
class ControlSpeciesBoxOption extends ControlTextOption<IAlleleSpecies> {
@@ -23,7 +23,7 @@ class ControlSpeciesBoxOption extends ControlTextOption<IAlleleSpecies> {
if (this.controlBee.discovered == EnumDiscoveryState.Discovered) {
this.controlBee.discovered = EnumDiscoveryState.Show;
}
this.textWidget.setValue((this.controlBee.discovered == EnumDiscoveryState.Show) ? option.getAlleleName() : "Undiscovered");
this.textWidget.setValue((this.controlBee.discovered == EnumDiscoveryState.Show) ? option.getAlleleName() : DatabaseConstants.CONTROL_KEY + ".undiscovered");
if (this.controlBee.discovered == EnumDiscoveryState.Show) {
this.addAttribute(Attribute.MouseOver);
}
@@ -0,0 +1,33 @@
package binnie.core.gui.database;
public class DatabaseConstants {
private static final String TAB_PRE_FIX = ".tab";
private static final String TAB_SPECIES_PRE_FIX = TAB_PRE_FIX + ".species";
public static final String CONTROL_PRE_FIX = ".control";
public static final String PRODUCTS_PRE_FIX = ".products";
public static final String PAGES_PRE_FIX = ".pages";
public static final String KEY = "binniecore.gui.database";
public static final String DISCOVERED_KEY= KEY + ".discovered";
public static final String MUTATIONS_KEY = KEY + ".mutations";
public static final String BREEDER_KEY = KEY + ".breeder";
public static final String SPECIES_KEY = KEY + ".species";
public static final String BRANCH_KEY = KEY + ".branch";
public static final String MODE_KEY = KEY + ".mode";
public static final String CONTROL_KEY = KEY + CONTROL_PRE_FIX;
public static final String GENETICS_KEY = "genetics.gui.database";
public static final String BEE_GENOME_KEY = GENETICS_KEY + TAB_SPECIES_PRE_FIX + ".genome.extrabees";
public static final String BEE_CONTROL_KEY = GENETICS_KEY + CONTROL_PRE_FIX + ".extrabees";
public static final String BEE_PRODUCTS_KEY = GENETICS_KEY + PRODUCTS_PRE_FIX + ".extrabees";
public static final String BOTANY_KEY = "botany.gui.database";
public static final String BOTANY_CONTROL_KEY = BOTANY_KEY + CONTROL_PRE_FIX;
public static final String BOTANY_PAGES_KEY = BOTANY_KEY + PAGES_PRE_FIX;
public static final String BOTANY_TAB_KEY = BOTANY_KEY + TAB_PRE_FIX;
public static final String BOTANY_GENOME_KEY = BOTANY_TAB_KEY + ".genome";
public static final String TIME_KEY = KEY + ".time";
}
@@ -1,8 +1,8 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import binnie.core.AbstractMod;
import binnie.core.craftgui.ITooltipHelp;
import binnie.core.craftgui.Tooltip;
import binnie.core.gui.ITooltipHelp;
import binnie.core.gui.Tooltip;
import binnie.core.util.I18N;
public class DatabaseTab implements ITooltipHelp {
@@ -1,4 +1,4 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
public enum EnumDiscoveryState {
Show,
@@ -1,4 +1,4 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
public interface IDatabaseMode {
String getName();
@@ -1,7 +1,7 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.page.ControlPage;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.page.ControlPage;
public abstract class PageAbstract<T> extends ControlPage<DatabaseTab> {
public PageAbstract(final IWidget parent, final DatabaseTab tab) {
@@ -1,8 +1,8 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import forestry.api.genetics.IClassification;
import binnie.core.craftgui.IWidget;
import binnie.core.gui.IWidget;
abstract class PageBranch extends PageAbstract<IClassification> {
public PageBranch(final IWidget parent, final DatabaseTab tab) {
@@ -1,4 +1,4 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import java.util.ArrayList;
import java.util.List;
@@ -11,10 +11,10 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.IClassification;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.renderer.RenderUtil;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.ControlTextCentered;
import binnie.core.gui.renderer.RenderUtil;
import binnie.core.util.I18N;
@SideOnly(Side.CLIENT)
@@ -34,16 +34,16 @@ public class PageBranchOverview extends PageBranch {
@Override
public void onValueChanged(final IClassification branch) {
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());
this.branchName.setValue(TextFormatting.UNDERLINE + I18N.localise(DatabaseConstants.BRANCH_KEY + ".name", branch.getName()));
this.branchScientific.setValue(TextFormatting.ITALIC + I18N.localise(DatabaseConstants.BRANCH_KEY + ".apidae", branch.getScientific()));
this.branchAuthority.setValue(I18N.localise(DatabaseConstants.BRANCH_KEY + ".discoveredBy", TextFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority()));
for (final IWidget widget : this.branchDescription) {
this.deleteChild(widget);
}
this.branchDescription.clear();
String desc = branch.getDescription();
if (desc == null || Objects.equals(desc, "") || desc.contains("for.")) {
desc = I18N.localise("binniecore.gui.database.no.description");
desc = I18N.localise(DatabaseConstants.BRANCH_KEY + ".noDesc");
}
StringBuilder line = new StringBuilder();
final List<String> descLines = new ArrayList<>();
@@ -1,4 +1,4 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -6,10 +6,10 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IClassification;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.events.EventValueChanged;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.ControlTextCentered;
import binnie.core.gui.events.EventValueChanged;
import binnie.core.util.I18N;
@SideOnly(Side.CLIENT)
@@ -23,7 +23,7 @@ public class PageBranchSpecies extends PageBranch {
public PageBranchSpecies(final IWidget parent, final DatabaseTab tab) {
super(parent, tab);
this.pageBranchSpecies_title = new ControlTextCentered(this, 8, I18N.localise("binniecore.gui.database.species"));
this.pageBranchSpecies_title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.SPECIES_KEY));
this.addEventHandler(new EventValueChanged.Handler() {
@Override
public void onEvent(final EventValueChanged event) {
@@ -1,14 +1,14 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import net.minecraft.util.text.TextFormatting;
import com.mojang.authlib.GameProfile;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.controls.page.ControlPage;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.genetics.BreedingSystem;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlTextCentered;
import binnie.core.gui.controls.page.ControlPage;
import binnie.core.gui.minecraft.Window;
import binnie.core.util.I18N;
public class PageBreeder extends ControlPage<DatabaseTab> {
@@ -26,13 +26,13 @@ public class PageBreeder extends ControlPage<DatabaseTab> {
}
final BreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem();
final String descriptor = system.getDescriptor();
new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + system.getDescriptor() + " " + I18N.localise("binniecore.gui.database.breeder.profile"));
new ControlTextCentered(this, 75, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + I18N.localise("binniecore.gui.database.species"));
new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + system.getDescriptor() + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".profile"));
new ControlTextCentered(this, 75, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".species"));
new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.discoveredSpeciesPercentage);
new ControlTextCentered(this, 115, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " " + I18N.localise("binniecore.gui.database.breeder.branches"));
new ControlTextCentered(this, 115, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".breeder.branches"));
new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.discoveredBranchPercentage);
if (system.discoveredSecretCount > 0) {
new ControlTextCentered(this, 155, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " " + I18N.localise("binniecore.gui.database.breeder.species.secret"));
new ControlTextCentered(this, 155, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".breeder.species.secret"));
}
new ControlTextCentered(this, 32, this.player.getName());
new ControlTextCentered(this, 44, TextFormatting.ITALIC + system.getEpitome());
@@ -1,12 +1,12 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import net.minecraft.util.text.TextFormatting;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.controls.core.Control;
import binnie.core.genetics.BreedingSystem;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.ControlTextCentered;
import binnie.core.gui.controls.core.Control;
import binnie.core.util.I18N;
public class PageBreederStats extends Control {
@@ -15,7 +15,7 @@ public class PageBreederStats extends Control {
public PageBreederStats(final IWidget parent, final int w, final int h, final String player) {
super(parent, 0, 0, w, h);
this.player = player;
final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + I18N.localise("binniecore.gui.database.breeder.stats"));
final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + I18N.localise(DatabaseConstants.BREEDER_KEY + ".stats"));
final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem();
}
}
@@ -1,8 +1,8 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import forestry.api.genetics.IAlleleSpecies;
import binnie.core.craftgui.IWidget;
import binnie.core.gui.IWidget;
public abstract class PageSpecies extends PageAbstract<IAlleleSpecies> {
public PageSpecies(final IWidget parent, final DatabaseTab tab) {
@@ -1,4 +1,4 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -6,9 +6,9 @@ import java.util.Map;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IClassification;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.ControlTextCentered;
public class PageSpeciesClassification extends PageSpecies {
private Map<IClassification.EnumClassLevel, ControlText> levels;
@@ -1,10 +1,10 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import forestry.api.genetics.IAlleleSpecies;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.ControlTextCentered;
import binnie.core.util.I18N;
public class PageSpeciesMutations extends PageSpecies {
@@ -13,7 +13,7 @@ public class PageSpeciesMutations extends PageSpecies {
public PageSpeciesMutations(final IWidget parent, final DatabaseTab tab) {
super(parent, tab);
this.title = new ControlTextCentered(this, 8, I18N.localise("binniecore.gui.database.mutations.further"));
this.title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.MUTATIONS_KEY+ ".further"));
this.list = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Further);
}
@@ -1,4 +1,4 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import java.util.Objects;
@@ -9,13 +9,13 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.IAlleleSpecies;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.ControlTextCentered;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.geometry.TextJustification;
import binnie.core.util.I18N;
@SideOnly(Side.CLIENT)
@@ -49,13 +49,13 @@ public class PageSpeciesOverview extends PageSpecies {
final String branchName = species.getBranch().getName();
this.controlName.setValue(TextFormatting.UNDERLINE + species.getAlleleName());
this.controlScientific.setValue(TextFormatting.ITALIC + branchBinomial + " " + species.getBinomial());
this.controlAuthority.setValue(I18N.localise("binniecore.gui.database.discovered") + ": " + TextFormatting.BOLD + species.getAuthority());
this.controlComplexity.setValue(I18N.localise("binniecore.gui.database.overview.complexity") + ": " + species.getComplexity());
this.controlAuthority.setValue(I18N.localise(DatabaseConstants.KEY + ".discovered") + ": " + TextFormatting.BOLD + species.getAuthority());
this.controlComplexity.setValue(I18N.localise(DatabaseConstants.KEY + ".overview.complexity") + ": " + species.getComplexity());
final String desc = species.getDescription();
StringBuilder descBody = new StringBuilder(TextFormatting.ITALIC.toString());
String descSig = "";
if (desc == null || Objects.equals(desc, "") || desc.contains("for.description") || desc.contains(".desc")) {
descBody.append(I18N.localise("binniecore.gui.database.no.description"));
descBody.append(I18N.localise(DatabaseConstants.KEY + ".no.description"));
} else {
final String[] descStrings = desc.split("\\|");
descBody.append(descStrings[0]);
@@ -1,10 +1,10 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import forestry.api.genetics.IAlleleSpecies;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.controls.ControlTextCentered;
import binnie.core.util.I18N;
public class PageSpeciesResultant extends PageSpecies {
@@ -13,7 +13,7 @@ public class PageSpeciesResultant extends PageSpecies {
public PageSpeciesResultant(final IWidget parent, final DatabaseTab tab) {
super(parent, tab);
this.pageSpeciesResultant_Title = new ControlTextCentered(this, 8, I18N.localise("binniecore.gui.database.mutations.resultant"));
this.pageSpeciesResultant_Title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.MUTATIONS_KEY + ".resultant"));
this.pageSpeciesResultant_List = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Resultant);
}
@@ -1,4 +1,4 @@
package binnie.genetics.gui.database;
package binnie.core.gui.database;
import javax.annotation.Nullable;
import java.util.Collection;
@@ -17,26 +17,26 @@ import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IClassification;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlTextEdit;
import binnie.core.craftgui.controls.listbox.ControlListBox;
import binnie.core.craftgui.controls.listbox.ControlTextOption;
import binnie.core.craftgui.controls.page.ControlPage;
import binnie.core.craftgui.controls.page.ControlPages;
import binnie.core.craftgui.controls.tab.ControlTab;
import binnie.core.craftgui.controls.tab.ControlTabBar;
import binnie.core.craftgui.events.EventHandler;
import binnie.core.craftgui.events.EventTextEdit;
import binnie.core.craftgui.events.EventValueChanged;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.CraftGUIUtil;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.geometry.Position;
import binnie.core.craftgui.minecraft.MinecraftGUI;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.craftgui.minecraft.control.ControlHelp;
import binnie.core.craftgui.window.Panel;
import binnie.core.genetics.BreedingSystem;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.ControlTextEdit;
import binnie.core.gui.controls.listbox.ControlListBox;
import binnie.core.gui.controls.listbox.ControlTextOption;
import binnie.core.gui.controls.page.ControlPage;
import binnie.core.gui.controls.page.ControlPages;
import binnie.core.gui.controls.tab.ControlTab;
import binnie.core.gui.controls.tab.ControlTabBar;
import binnie.core.gui.events.EventHandler;
import binnie.core.gui.events.EventTextEdit;
import binnie.core.gui.events.EventValueChanged;
import binnie.core.gui.geometry.Area;
import binnie.core.gui.geometry.CraftGUIUtil;
import binnie.core.gui.geometry.Point;
import binnie.core.gui.geometry.Position;
import binnie.core.gui.minecraft.MinecraftGUI;
import binnie.core.gui.minecraft.Window;
import binnie.core.gui.minecraft.control.ControlHelp;
import binnie.core.gui.window.Panel;
import binnie.core.util.I18N;
public abstract class WindowAbstractDatabase extends Window {
@@ -201,7 +201,7 @@ public abstract class WindowAbstractDatabase extends Window {
@Override
public String getName() {
return I18N.localise("binniecore.gui.database.mode." + this.name().toLowerCase());
return I18N.localise(DatabaseConstants.MODE_KEY + "." + this.name().toLowerCase());
}
}
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.gui.database;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,6 +1,6 @@
package binnie.core.craftgui.events;
package binnie.core.gui.events;
import binnie.core.craftgui.IWidget;
import binnie.core.gui.IWidget;
public class Event {
IWidget origin;
Loaded 100 of 296 files, more files were not shown because too many files have changed in this diff. Show more