Clean Up and Move some classes

This commit is contained in:
Nedelosk committed 2017-07-30 22:31:16 +02:00
1 parent 705581b9ac
commit dcdf4b1cac
81 files changed
+205 -179

No files matched your search

@@ -9,9 +9,9 @@ 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.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageAbstract;
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;
@@ -9,9 +9,9 @@ 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.craftgui.database.DatabaseTab;
import binnie.core.craftgui.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;
@@ -17,13 +17,13 @@ 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.database.DatabaseTab;
import binnie.core.craftgui.database.PageSpecies;
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;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageSpecies;
public class PageSpeciesFlowerGenome extends PageSpecies {
public PageSpeciesFlowerGenome(IWidget parent, DatabaseTab tab) {
@@ -16,19 +16,19 @@ 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.database.DatabaseTab;
import binnie.core.craftgui.database.IDatabaseMode;
import binnie.core.craftgui.database.PageBranchOverview;
import binnie.core.craftgui.database.PageBranchSpecies;
import binnie.core.craftgui.database.PageBreeder;
import binnie.core.craftgui.database.PageSpeciesClassification;
import binnie.core.craftgui.database.PageSpeciesMutations;
import binnie.core.craftgui.database.PageSpeciesOverview;
import binnie.core.craftgui.database.PageSpeciesResultant;
import binnie.core.craftgui.database.WindowAbstractDatabase;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.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;
@@ -31,6 +31,7 @@ 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;
@@ -43,7 +44,6 @@ import binnie.core.craftgui.resource.StyleSheetPunnett;
import binnie.core.craftgui.resource.minecraft.StandardTexture;
import binnie.core.machines.inventory.SlotValidator;
import binnie.core.util.I18N;
import binnie.genetics.gui.ControlChromosome;
import binnie.genetics.machine.analyser.Analyser;
public class WindowFieldKit extends Window {
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.core.craftgui.fieldkit;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.core.craftgui.fieldkit;
import com.google.common.base.Preconditions;
@@ -11,15 +11,15 @@ import forestry.api.genetics.IAlleleSpecies;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.database.ControlSpeciesBox;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageAbstract;
import binnie.core.craftgui.database.WindowAbstractDatabase;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.genetics.TreeBreedingSystem;
import binnie.core.util.I18N;
import binnie.genetics.gui.database.ControlSpeciesBox;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageAbstract;
import binnie.genetics.gui.database.WindowAbstractDatabase;
@SideOnly(Side.CLIENT)
public class PageFruit extends PageAbstract<ItemStack> {
@@ -8,9 +8,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageAbstract;
import binnie.core.craftgui.database.WindowAbstractDatabase;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.geometry.TextJustification;
@@ -20,6 +17,9 @@ import binnie.core.util.I18N;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.WoodManager;
import binnie.extratrees.block.decor.FenceType;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageAbstract;
import binnie.genetics.gui.database.WindowAbstractDatabase;
@SideOnly(Side.CLIENT)
public class PagePlanksOverview extends PageAbstract<ItemStack> {
@@ -11,14 +11,14 @@ import forestry.api.genetics.IAlleleSpecies;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.database.ControlSpeciesBox;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageAbstract;
import binnie.core.craftgui.database.WindowAbstractDatabase;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.genetics.TreeBreedingSystem;
import binnie.genetics.gui.database.ControlSpeciesBox;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageAbstract;
import binnie.genetics.gui.database.WindowAbstractDatabase;
@SideOnly(Side.CLIENT)
public class PagePlanksTrees extends PageAbstract<ItemStack> {
@@ -4,12 +4,12 @@ import forestry.api.genetics.IAlleleSpecies;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.database.ControlDatabaseIndividualDisplay;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.EnumDiscoveryState;
import binnie.core.craftgui.database.PageSpecies;
import binnie.core.craftgui.minecraft.MinecraftGUI;
import binnie.core.craftgui.window.Panel;
import binnie.genetics.gui.database.ControlDatabaseIndividualDisplay;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.EnumDiscoveryState;
import binnie.genetics.gui.database.PageSpecies;
public class PageSpeciesImage extends PageSpecies {
ControlDatabaseIndividualDisplay display;
@@ -27,14 +27,14 @@ 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.database.DatabaseTab;
import binnie.core.craftgui.database.PageSpecies;
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.genetics.BreedingSystem;
import binnie.core.util.I18N;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageSpecies;
@SideOnly(Side.CLIENT)
public class PageSpeciesTreeGenome extends PageSpecies {
@@ -11,14 +11,14 @@ import forestry.api.genetics.IAlleleSpecies;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.database.ControlSpeciesBox;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageAbstract;
import binnie.core.craftgui.database.WindowAbstractDatabase;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.genetics.TreeBreedingSystem;
import binnie.genetics.gui.database.ControlSpeciesBox;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageAbstract;
import binnie.genetics.gui.database.WindowAbstractDatabase;
@SideOnly(Side.CLIENT)
public class PageWood extends PageAbstract<ItemStack> {
@@ -12,17 +12,6 @@ import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.listbox.ControlListBox;
import binnie.core.craftgui.database.ControlItemStackOption;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.IDatabaseMode;
import binnie.core.craftgui.database.PageBranchOverview;
import binnie.core.craftgui.database.PageBranchSpecies;
import binnie.core.craftgui.database.PageBreeder;
import binnie.core.craftgui.database.PageSpeciesClassification;
import binnie.core.craftgui.database.PageSpeciesMutations;
import binnie.core.craftgui.database.PageSpeciesOverview;
import binnie.core.craftgui.database.PageSpeciesResultant;
import binnie.core.craftgui.database.WindowAbstractDatabase;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.genetics.TreeBreedingSystem;
@@ -30,6 +19,17 @@ import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.block.WoodManager;
import binnie.genetics.gui.database.ControlItemStackOption;
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 WindowArboristDatabase extends WindowAbstractDatabase {
ControlListBox<ItemStack> selectionBoxFruit;
@@ -7,17 +7,17 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageBranchOverview;
import binnie.core.craftgui.database.PageBranchSpecies;
import binnie.core.craftgui.database.PageBreeder;
import binnie.core.craftgui.database.PageSpeciesClassification;
import binnie.core.craftgui.database.PageSpeciesMutations;
import binnie.core.craftgui.database.PageSpeciesOverview;
import binnie.core.craftgui.database.PageSpeciesResultant;
import binnie.core.craftgui.database.WindowAbstractDatabase;
import binnie.core.craftgui.minecraft.Window;
import binnie.extratrees.ExtraTrees;
import binnie.genetics.gui.database.DatabaseTab;
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 WindowLepidopteristDatabase extends WindowAbstractDatabase {
public WindowLepidopteristDatabase(final EntityPlayer player, final Side side, final boolean nei) {
@@ -13,7 +13,7 @@ import net.minecraftforge.fml.relauncher.Side;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.gui.IBinnieGUID;
import binnie.genetics.gui.WindowAnalyst;
import binnie.genetics.gui.bee.database.WindowApiaristDatabase;
import binnie.genetics.gui.database.bee.WindowApiaristDatabase;
import binnie.genetics.gui.punnett.WindowPunnettSquare;
import binnie.genetics.machine.acclimatiser.WindowAcclimatiser;
import binnie.genetics.machine.analyser.WindowAnalyser;
@@ -50,14 +50,23 @@ import binnie.core.genetics.BreedingSystem;
import binnie.core.machines.inventory.SlotValidator;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsGUI;
import binnie.genetics.gui.bee.AnalystPageProducts;
import binnie.genetics.gui.butterfly.AnalystPageSpecimen;
import binnie.genetics.gui.flower.AnalystPageAppearance;
import binnie.genetics.gui.flower.AnalystPageSoil;
import binnie.genetics.gui.tree.AnalystPageClimate;
import binnie.genetics.gui.tree.AnalystPageFruit;
import binnie.genetics.gui.tree.AnalystPageGrowth;
import binnie.genetics.gui.tree.AnalystPageWood;
import binnie.genetics.gui.analyst.AnalystPageBehaviour;
import binnie.genetics.gui.analyst.AnalystPageBiology;
import binnie.genetics.gui.analyst.AnalystPageDatabase;
import binnie.genetics.gui.analyst.AnalystPageDescription;
import binnie.genetics.gui.analyst.AnalystPageGenome;
import binnie.genetics.gui.analyst.AnalystPageKaryogram;
import binnie.genetics.gui.analyst.AnalystPageMutations;
import binnie.genetics.gui.analyst.ControlAnalystPage;
import binnie.genetics.gui.analyst.ControlTooltip;
import binnie.genetics.gui.analyst.bee.AnalystPageProducts;
import binnie.genetics.gui.analyst.butterfly.AnalystPageSpecimen;
import binnie.genetics.gui.analyst.flower.AnalystPageAppearance;
import binnie.genetics.gui.analyst.flower.AnalystPageSoil;
import binnie.genetics.gui.analyst.tree.AnalystPageClimate;
import binnie.genetics.gui.analyst.tree.AnalystPageFruit;
import binnie.genetics.gui.analyst.tree.AnalystPageGrowth;
import binnie.genetics.gui.analyst.tree.AnalystPageWood;
import binnie.genetics.item.GeneticsItems;
import binnie.genetics.machine.ModuleMachine;
import binnie.genetics.machine.analyser.Analyser;
@@ -0,0 +1,6 @@
package binnie.genetics.gui.analyst;
public class AnalystConstants {
public static final String KEY = "genetics.gui.analyst";
public static final String PRODUCTS_KEY = KEY + ".products";
}
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import net.minecraft.util.math.Vec3i;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import java.text.DecimalFormat;
import java.util.Locale;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,6 +31,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.craftgui.window.Panel;
import binnie.core.genetics.BreedingSystem;
import binnie.core.util.I18N;
import binnie.genetics.gui.WindowAnalyst;
public class AnalystPageDatabase extends ControlAnalystPage {
private final ControlScrollableContent scroll;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import java.util.Objects;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.text.TextFormatting;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import net.minecraft.util.text.TextFormatting;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import java.util.Collection;
import java.util.List;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import java.util.ArrayList;
import java.util.Collection;
@@ -28,7 +28,7 @@ import binnie.core.util.UniqueItemStackSet;
import binnie.extratrees.machines.brewery.BreweryRecipes;
import binnie.extratrees.machines.distillery.DistilleryRecipes;
import binnie.extratrees.machines.fruitpress.FruitPressRecipes;
import binnie.genetics.gui.bee.AnalystPageProducts;
import binnie.genetics.gui.analyst.bee.AnalystPageProducts;
public abstract class AnalystPageProduce extends ControlAnalystPage {
public AnalystPageProduce(IWidget parent, Area area) {
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import java.text.DecimalFormat;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.world.biome.Biome;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import net.minecraft.item.ItemStack;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import java.util.EnumSet;
@@ -1,4 +1,4 @@
package binnie.genetics.gui;
package binnie.genetics.gui.analyst;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.IWidget;
@@ -1,4 +1,4 @@
package binnie.genetics.gui.bee;
package binnie.genetics.gui.analyst.bee;
import javax.annotation.Nullable;
import java.util.ArrayList;
@@ -36,7 +36,8 @@ import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.util.I18N;
import binnie.core.util.UniqueItemStackSet;
import binnie.extratrees.kitchen.craftgui.ControlFluidDisplay;
import binnie.genetics.gui.AnalystPageProduce;
import binnie.genetics.gui.analyst.AnalystConstants;
import binnie.genetics.gui.analyst.AnalystPageProduce;
public class AnalystPageProducts extends AnalystPageProduce {
public AnalystPageProducts(IWidget parent, Area area, IBee ind) {
@@ -50,7 +51,7 @@ public class AnalystPageProducts extends AnalystPageProduce {
new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor());
y += 12;
new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise("genetics.gui.analyst.produces.rate") + ": " + Binnie.GENETICS.beeBreedingSystem.getAlleleName(EnumBeeChromosome.SPEED, ind.getGenome().getActiveAllele(EnumBeeChromosome.SPEED))).setColor(getColor());
new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.PRODUCTS_KEY + ".rate") + ": " + Binnie.GENETICS.beeBreedingSystem.getAlleleName(EnumBeeChromosome.SPEED, ind.getGenome().getActiveAllele(EnumBeeChromosome.SPEED))).setColor(getColor());
y += 20;
Collection<ItemStack> refinedProducts = new UniqueItemStackSet();
@@ -61,7 +62,7 @@ public class AnalystPageProducts extends AnalystPageProduce {
products.putAll(genome.getSecondary().getProductChances());
if (!products.isEmpty()) {
new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.products.natural")).setColor(getColor());
new ControlTextCentered(this, y, I18N.localise(AnalystConstants.PRODUCTS_KEY + ".natural")).setColor(getColor());
y += 12;
for (Map.Entry<ItemStack, Float> entry : products.entrySet()) {
if (!productList.add(entry.getKey())) {
@@ -76,7 +77,7 @@ public class AnalystPageProducts extends AnalystPageProduce {
products = genome.getPrimary().getSpecialtyChances();
if (!products.isEmpty()) {
new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.products.specialty")).setColor(getColor());
new ControlTextCentered(this, y, I18N.localise(AnalystConstants.PRODUCTS_KEY + ".specialty")).setColor(getColor());
y += 12;
for (Map.Entry<ItemStack, Float> entry : products.entrySet()) {
refinedProducts.addAll(getAllProducts(entry.getKey()));
@@ -86,7 +87,7 @@ public class AnalystPageProducts extends AnalystPageProduce {
y += 12;
}
new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.products.refined")).setColor(getColor());
new ControlTextCentered(this, y, I18N.localise(AnalystConstants.PRODUCTS_KEY + ".refined")).setColor(getColor());
y += 12;
Collection<ItemStack> level2Products = new UniqueItemStackSet();
@@ -102,8 +103,8 @@ public class AnalystPageProducts extends AnalystPageProduce {
refinedProducts.addAll(level2Products);
Collection<FluidStack> allFluids = new ArrayList<>();
for (ItemStack stack2 : refinedProducts) {
for (FluidStack addition : getAllFluids(stack2)) {
for (ItemStack itemStack : refinedProducts) {
for (FluidStack addition : getAllFluids(itemStack)) {
boolean alreadyIn = false;
for (FluidStack existing : allFluids) {
if (existing.isFluidEqual(addition)) {
@@ -131,15 +132,15 @@ public class AnalystPageProducts extends AnalystPageProduce {
dx += 18;
}
for (FluidStack soilStack2 : allFluids) {
for (FluidStack fluidStack : allFluids) {
if (dx >= 18 * maxBiomePerLine) {
dx = 0;
dy += 18;
}
ItemStack container = getContainer(soilStack2);
ItemStack container = getContainer(fluidStack);
if (container == null) {
ControlFluidDisplay display2 = new ControlFluidDisplay(this, biomeListX + dx, y + dy);
display2.setFluidStack(soilStack2);
display2.setFluidStack(fluidStack);
display2.setTooltip();
} else {
ControlItemDisplay display3 = new ControlItemDisplay(this, biomeListX + dx, y + dy);
@@ -175,7 +176,7 @@ public class AnalystPageProducts extends AnalystPageProduce {
super.getTooltip(tooltip);
Collection<ItemStack> products = getCentrifuge(key);
if (!products.isEmpty()) {
tooltip.add(I18N.localise("genetics.gui.analyst.products.centrifuges") + ": ");
tooltip.add(I18N.localise(AnalystConstants.PRODUCTS_KEY + ".centrifuges") + ": ");
for (ItemStack prod : products) {
NBTTagCompound nbt = new NBTTagCompound();
prod.writeToNBT(nbt);
@@ -184,7 +185,7 @@ public class AnalystPageProducts extends AnalystPageProduce {
}
Collection<ItemStack> liquids = getSqueezer(key);
if (!liquids.isEmpty()) {
tooltip.add(I18N.localise("genetics.gui.analyst.products.squeezes") + ": ");
tooltip.add(I18N.localise(AnalystConstants.PRODUCTS_KEY + ".squeezes") + ": ");
for (ItemStack prod2 : liquids) {
NBTTagCompound nbt2 = new NBTTagCompound();
prod2.writeToNBT(nbt2);
@@ -200,11 +201,11 @@ public class AnalystPageProducts extends AnalystPageProduce {
CraftGUIUtil.moveWidget(textWidget, new Point(12, 0));
item.setItemStack(key);
int time = (int) (PluginApiculture.ticksPerBeeWorkCycle * 100.0 / (speed * value));
textWidget.setValue(I18N.localise("genetics.gui.analyst.products.every") + " " + getTimeString(time));
textWidget.setValue(I18N.localise(AnalystConstants.PRODUCTS_KEY + ".every") + " " + getTimeString(time));
}
@Override
public String getTitle() {
return I18N.localise("genetics.gui.analyst.produces.title");
return I18N.localise(AnalystConstants.PRODUCTS_KEY + ".title");
}
}
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.genetics.gui.butterfly;
package binnie.genetics.gui.analyst.bee;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -1,4 +1,4 @@
package binnie.genetics.gui.butterfly;
package binnie.genetics.gui.analyst.butterfly;
import net.minecraft.util.text.TextFormatting;
@@ -8,8 +8,8 @@ import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.geometry.Area;
import binnie.core.util.I18N;
import binnie.genetics.gui.ControlAnalystPage;
import binnie.genetics.gui.ControlIndividualDisplay;
import binnie.genetics.gui.analyst.ControlAnalystPage;
import binnie.genetics.gui.analyst.ControlIndividualDisplay;
public class AnalystPageSpecimen extends ControlAnalystPage {
public AnalystPageSpecimen(IWidget parent, Area area, IButterfly ind) {
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.genetics.gui.analyst.butterfly;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,4 +1,4 @@
package binnie.genetics.gui.flower;
package binnie.genetics.gui.analyst.flower;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.text.TextFormatting;
@@ -20,7 +20,7 @@ import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.minecraft.control.ControlIconDisplay;
import binnie.core.craftgui.renderer.RenderUtil;
import binnie.core.util.I18N;
import binnie.genetics.gui.ControlAnalystPage;
import binnie.genetics.gui.analyst.ControlAnalystPage;
public class AnalystPageAppearance extends ControlAnalystPage {
public AnalystPageAppearance(IWidget parent, Area area, IFlower flower) {
@@ -1,4 +1,4 @@
package binnie.genetics.gui.flower;
package binnie.genetics.gui.analyst.flower;
import java.util.ArrayList;
import java.util.EnumSet;
@@ -22,8 +22,8 @@ import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.genetics.Tolerance;
import binnie.core.util.I18N;
import binnie.genetics.gui.ControlAnalystPage;
import binnie.genetics.gui.ControlToleranceBar;
import binnie.genetics.gui.analyst.ControlAnalystPage;
import binnie.genetics.gui.analyst.ControlToleranceBar;
public class AnalystPageSoil extends ControlAnalystPage {
public AnalystPageSoil(IWidget parent, Area area, IFlower flower) {
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.genetics.gui.analyst.flower;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.genetics.gui.bee;
package binnie.genetics.gui.analyst;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -1,4 +1,4 @@
package binnie.genetics.gui.tree;
package binnie.genetics.gui.analyst.tree;
import java.util.ArrayList;
import java.util.List;
@@ -27,9 +27,9 @@ import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.genetics.Tolerance;
import binnie.core.util.I18N;
import binnie.genetics.gui.ControlAnalystPage;
import binnie.genetics.gui.ControlBiome;
import binnie.genetics.gui.ControlToleranceBar;
import binnie.genetics.gui.analyst.ControlAnalystPage;
import binnie.genetics.gui.analyst.ControlBiome;
import binnie.genetics.gui.analyst.ControlToleranceBar;
public class AnalystPageClimate extends ControlAnalystPage {
public AnalystPageClimate(IWidget parent, Area area, IIndividual ind) {
@@ -1,4 +1,4 @@
package binnie.genetics.gui.tree;
package binnie.genetics.gui.analyst.tree;
import com.google.common.base.Throwables;
@@ -27,7 +27,7 @@ import binnie.core.craftgui.geometry.Point;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.util.I18N;
import binnie.core.util.UniqueItemStackSet;
import binnie.genetics.gui.AnalystPageProduce;
import binnie.genetics.gui.analyst.AnalystPageProduce;
public class AnalystPageFruit extends AnalystPageProduce {
public AnalystPageFruit(IWidget parent, Area area, ITree ind) {
@@ -1,4 +1,4 @@
package binnie.genetics.gui.tree;
package binnie.genetics.gui.analyst.tree;
import net.minecraft.util.text.TextFormatting;
@@ -12,7 +12,7 @@ import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.geometry.Area;
import binnie.core.util.I18N;
import binnie.genetics.gui.ControlAnalystPage;
import binnie.genetics.gui.analyst.ControlAnalystPage;
public class AnalystPageGrowth extends ControlAnalystPage {
public AnalystPageGrowth(IWidget parent, Area area, IIndividual ind) {
@@ -1,4 +1,4 @@
package binnie.genetics.gui.tree;
package binnie.genetics.gui.analyst.tree;
import java.util.Collection;
@@ -22,7 +22,7 @@ import binnie.core.craftgui.minecraft.control.ControlIconDisplay;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.util.I18N;
import binnie.core.util.UniqueItemStackSet;
import binnie.genetics.gui.AnalystPageProduce;
import binnie.genetics.gui.analyst.AnalystPageProduce;
import binnie.genetics.item.ModuleItems;
@SideOnly(Side.CLIENT)
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.core.craftgui.database;
package binnie.genetics.gui.analyst.tree;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import forestry.api.genetics.IClassification;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import forestry.api.genetics.IClassification;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import javax.annotation.Nullable;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import net.minecraft.item.ItemStack;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import java.util.List;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IMutation;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import java.util.ArrayList;
import java.util.Collection;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import binnie.core.AbstractMod;
import binnie.core.craftgui.ITooltipHelp;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
public enum EnumDiscoveryState {
Show,
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
public interface IDatabaseMode {
String getName();
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.page.ControlPage;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import forestry.api.genetics.IClassification;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import java.util.ArrayList;
import java.util.List;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import net.minecraft.util.text.TextFormatting;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import net.minecraft.util.text.TextFormatting;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import forestry.api.genetics.IAlleleSpecies;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import forestry.api.genetics.IAlleleSpecies;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import java.util.Objects;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import forestry.api.genetics.IAlleleSpecies;
@@ -1,4 +1,4 @@
package binnie.core.craftgui.database;
package binnie.genetics.gui.database;
import javax.annotation.Nullable;
import java.util.Collection;
@@ -1,4 +1,4 @@
package binnie.genetics.gui.bee.database;
package binnie.genetics.gui.database.bee;
import java.util.ArrayList;
import java.util.List;
@@ -1,4 +1,4 @@
package binnie.genetics.gui.bee.database;
package binnie.genetics.gui.database.bee;
import java.util.ArrayList;
import java.util.List;
@@ -1,4 +1,4 @@
package binnie.genetics.gui.bee.database;
package binnie.genetics.gui.database.bee;
import java.util.ArrayList;
import java.util.List;
@@ -1,4 +1,4 @@
package binnie.genetics.gui.bee.database;
package binnie.genetics.gui.database.bee;
import java.text.DecimalFormat;
@@ -1,12 +1,12 @@
package binnie.genetics.gui.bee.database;
package binnie.genetics.gui.database.bee;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.genetics.IAlleleSpecies;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageSpecies;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageSpecies;
public class PageSpeciesClimate extends PageSpecies {
ControlClimateBar tempBar;
@@ -1,4 +1,4 @@
package binnie.genetics.gui.bee.database;
package binnie.genetics.gui.database.bee;
import net.minecraft.util.math.Vec3i;
@@ -13,12 +13,12 @@ import binnie.Binnie;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageSpecies;
import binnie.core.craftgui.geometry.Area;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.util.I18N;
import binnie.genetics.genetics.AlleleHelper;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageSpecies;
public class PageSpeciesGenome extends PageSpecies {
static final String PRE_FIX = "genetics.gui.database.tab.species.genome.extrabees.";
@@ -1,4 +1,4 @@
package binnie.genetics.gui.bee.database;
package binnie.genetics.gui.database.bee;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.genetics.IAlleleSpecies;
@@ -6,8 +6,8 @@ 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.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageSpecies;
import binnie.genetics.gui.database.DatabaseTab;
import binnie.genetics.gui.database.PageSpecies;
public class PageSpeciesProducts extends PageSpecies {
ControlText title;
@@ -1,4 +1,4 @@
package binnie.genetics.gui.bee.database;
package binnie.genetics.gui.database.bee;
import net.minecraft.entity.player.EntityPlayer;
@@ -7,17 +7,17 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.craftgui.database.DatabaseTab;
import binnie.core.craftgui.database.PageBranchOverview;
import binnie.core.craftgui.database.PageBranchSpecies;
import binnie.core.craftgui.database.PageBreeder;
import binnie.core.craftgui.database.PageSpeciesClassification;
import binnie.core.craftgui.database.PageSpeciesMutations;
import binnie.core.craftgui.database.PageSpeciesOverview;
import binnie.core.craftgui.database.PageSpeciesResultant;
import binnie.core.craftgui.database.WindowAbstractDatabase;
import binnie.core.craftgui.minecraft.Window;
import binnie.genetics.Genetics;
import binnie.genetics.gui.database.DatabaseTab;
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 WindowApiaristDatabase extends WindowAbstractDatabase {
public WindowApiaristDatabase(EntityPlayer player, Side side, boolean nei) {
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.genetics.gui.bee.database;
package binnie.genetics.gui.database.bee;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.genetics.gui.tree;
package binnie.genetics.gui.database;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -1,9 +0,0 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.genetics.gui.flower;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;