diff --git a/src/main/java/binnie/botany/craftgui/PageColorMix.java b/src/main/java/binnie/botany/craftgui/PageColorMix.java index f5d156ee..8dab3a82 100644 --- a/src/main/java/binnie/botany/craftgui/PageColorMix.java +++ b/src/main/java/binnie/botany/craftgui/PageColorMix.java @@ -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 { ControlText pageSpeciesFurther_Title; diff --git a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java b/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java index bffce1ce..987e8ca1 100644 --- a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java +++ b/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java @@ -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 { ControlText pageSpeciesFurther_Title; diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index 00ca7955..196796e6 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -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) { diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index 17c45635..6fd8d195 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -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 selectionBoxColors; diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index d69e226f..a85dd1ac 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -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 { diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/core/craftgui/fieldkit/ControlChromoPicker.java similarity index 98% rename from src/main/java/binnie/genetics/gui/ControlChromoPicker.java rename to src/main/java/binnie/core/craftgui/fieldkit/ControlChromoPicker.java index a5a45729..d6e17fed 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/core/craftgui/fieldkit/ControlChromoPicker.java @@ -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; diff --git a/src/main/java/binnie/genetics/gui/ControlChromosome.java b/src/main/java/binnie/core/craftgui/fieldkit/ControlChromosome.java similarity index 99% rename from src/main/java/binnie/genetics/gui/ControlChromosome.java rename to src/main/java/binnie/core/craftgui/fieldkit/ControlChromosome.java index 397a16eb..eda53e7b 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromosome.java +++ b/src/main/java/binnie/core/craftgui/fieldkit/ControlChromosome.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.core.craftgui.fieldkit; import com.google.common.base.Preconditions; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java index b757446d..e5308cf2 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java @@ -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 { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java index f78d68ac..fb5cb52d 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java @@ -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 { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java index 23eb2f6d..8d6f24ce 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java @@ -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 { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java index 41efd20c..29e12f39 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java @@ -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; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java index 1031e9af..5ed142ab 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java @@ -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 { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java b/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java index 6486e7ae..ef2232bc 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java @@ -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 { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java index 37965129..7eaf99f3 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java @@ -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 selectionBoxFruit; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java index 76c060f1..7c48cf19 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java @@ -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) { diff --git a/src/main/java/binnie/genetics/core/GeneticsGUI.java b/src/main/java/binnie/genetics/core/GeneticsGUI.java index a3eca6f5..8ffdfa98 100644 --- a/src/main/java/binnie/genetics/core/GeneticsGUI.java +++ b/src/main/java/binnie/genetics/core/GeneticsGUI.java @@ -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; diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index 91f3d989..84ad377a 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -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; diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystConstants.java b/src/main/java/binnie/genetics/gui/analyst/AnalystConstants.java new file mode 100644 index 00000000..a21048fa --- /dev/null +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystConstants.java @@ -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"; +} diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java similarity index 98% rename from src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java rename to src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java index 6205e133..8c13cbec 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.analyst; import net.minecraft.util.math.Vec3i; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java similarity index 99% rename from src/main/java/binnie/genetics/gui/AnalystPageBiology.java rename to src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java index d6d9dce8..63dda628 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.analyst; import java.text.DecimalFormat; import java.util.Locale; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java similarity index 99% rename from src/main/java/binnie/genetics/gui/AnalystPageDatabase.java rename to src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java index 8fa6b81a..a450344e 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java @@ -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; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java similarity index 98% rename from src/main/java/binnie/genetics/gui/AnalystPageDescription.java rename to src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java index 3e646200..92d75f73 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.analyst; import java.util.Objects; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java similarity index 98% rename from src/main/java/binnie/genetics/gui/AnalystPageGenome.java rename to src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java index c2f77493..ebbaafac 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java @@ -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; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java similarity index 97% rename from src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java rename to src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java index b3299422..711bbfdd 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.analyst; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java similarity index 99% rename from src/main/java/binnie/genetics/gui/AnalystPageMutations.java rename to src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java index bb344dc1..9ab20b03 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.analyst; import java.util.Collection; import java.util.List; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java similarity index 98% rename from src/main/java/binnie/genetics/gui/AnalystPageProduce.java rename to src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java index 586e8061..64fdaeab 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java @@ -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) { diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java similarity index 98% rename from src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java rename to src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java index dad0933e..77aac9d4 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java @@ -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; diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java similarity index 95% rename from src/main/java/binnie/genetics/gui/ControlAnalystPage.java rename to src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java index a32b6dbf..7e87945a 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.analyst; import java.text.DecimalFormat; diff --git a/src/main/java/binnie/genetics/gui/ControlBiome.java b/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java similarity index 98% rename from src/main/java/binnie/genetics/gui/ControlBiome.java rename to src/main/java/binnie/genetics/gui/analyst/ControlBiome.java index 1d48472e..19654734 100644 --- a/src/main/java/binnie/genetics/gui/ControlBiome.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java @@ -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; diff --git a/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java b/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java similarity index 96% rename from src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java rename to src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java index 9e92a75b..3a1d594a 100644 --- a/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.analyst; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java b/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java similarity index 98% rename from src/main/java/binnie/genetics/gui/ControlToleranceBar.java rename to src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java index 3cfbd843..fd992165 100644 --- a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.analyst; import java.util.EnumSet; diff --git a/src/main/java/binnie/genetics/gui/ControlTooltip.java b/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java similarity index 91% rename from src/main/java/binnie/genetics/gui/ControlTooltip.java rename to src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java index 1be24c7f..dc99daab 100644 --- a/src/main/java/binnie/genetics/gui/ControlTooltip.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.analyst; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; diff --git a/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java similarity index 82% rename from src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java rename to src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java index 3b0d9ce3..d36a435c 100644 --- a/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java @@ -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 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 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 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 level2Products = new UniqueItemStackSet(); @@ -102,8 +103,8 @@ public class AnalystPageProducts extends AnalystPageProduce { refinedProducts.addAll(level2Products); Collection 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 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 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"); } } diff --git a/src/main/java/binnie/genetics/gui/butterfly/package-info.java b/src/main/java/binnie/genetics/gui/analyst/bee/package-info.java similarity index 85% rename from src/main/java/binnie/genetics/gui/butterfly/package-info.java rename to src/main/java/binnie/genetics/gui/analyst/bee/package-info.java index 1715c532..d2e631ee 100644 --- a/src/main/java/binnie/genetics/gui/butterfly/package-info.java +++ b/src/main/java/binnie/genetics/gui/analyst/bee/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.genetics.gui.butterfly; +package binnie.genetics.gui.analyst.bee; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java b/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java similarity index 83% rename from src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java rename to src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java index 85012856..0bbde17f 100644 --- a/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java +++ b/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java @@ -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) { diff --git a/src/main/java/binnie/genetics/gui/analyst/butterfly/package-info.java b/src/main/java/binnie/genetics/gui/analyst/butterfly/package-info.java new file mode 100644 index 00000000..9b1cec4d --- /dev/null +++ b/src/main/java/binnie/genetics/gui/analyst/butterfly/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java similarity index 96% rename from src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java rename to src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java index 7a3dc9c5..d842c350 100644 --- a/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java +++ b/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java @@ -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) { diff --git a/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java similarity index 97% rename from src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java rename to src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java index 24c942b4..7bc9c9fd 100644 --- a/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java @@ -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) { diff --git a/src/main/java/binnie/genetics/gui/analyst/flower/package-info.java b/src/main/java/binnie/genetics/gui/analyst/flower/package-info.java new file mode 100644 index 00000000..2894b5ff --- /dev/null +++ b/src/main/java/binnie/genetics/gui/analyst/flower/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/bee/package-info.java b/src/main/java/binnie/genetics/gui/analyst/package-info.java similarity index 86% rename from src/main/java/binnie/genetics/gui/bee/package-info.java rename to src/main/java/binnie/genetics/gui/analyst/package-info.java index 0e0582f0..d8b125a9 100644 --- a/src/main/java/binnie/genetics/gui/bee/package-info.java +++ b/src/main/java/binnie/genetics/gui/analyst/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.genetics.gui.bee; +package binnie.genetics.gui.analyst; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java similarity index 96% rename from src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java rename to src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java index 20abd1d0..d9e2ea11 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java @@ -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) { diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java similarity index 98% rename from src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java rename to src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java index 0755c7c5..f1f578be 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java @@ -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) { diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java similarity index 94% rename from src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java rename to src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java index 04cd9277..ba61edb8 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java +++ b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java @@ -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) { diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java similarity index 96% rename from src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java rename to src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java index c7eb6830..5c2ed443 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java +++ b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java @@ -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) diff --git a/src/main/java/binnie/core/craftgui/database/package-info.java b/src/main/java/binnie/genetics/gui/analyst/tree/package-info.java similarity index 85% rename from src/main/java/binnie/core/craftgui/database/package-info.java rename to src/main/java/binnie/genetics/gui/analyst/tree/package-info.java index f3bed8b5..291b810f 100644 --- a/src/main/java/binnie/core/craftgui/database/package-info.java +++ b/src/main/java/binnie/genetics/gui/analyst/tree/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.core.craftgui.database; +package binnie.genetics.gui.analyst.tree; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java b/src/main/java/binnie/genetics/gui/database/ControlBranchBox.java similarity index 93% rename from src/main/java/binnie/core/craftgui/database/ControlBranchBox.java rename to src/main/java/binnie/genetics/gui/database/ControlBranchBox.java index 6c3ff68f..500d727c 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java +++ b/src/main/java/binnie/genetics/gui/database/ControlBranchBox.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import forestry.api.genetics.IClassification; diff --git a/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java b/src/main/java/binnie/genetics/gui/database/ControlBranchBoxOption.java similarity index 92% rename from src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java rename to src/main/java/binnie/genetics/gui/database/ControlBranchBoxOption.java index 66efb04c..ab028aaf 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java +++ b/src/main/java/binnie/genetics/gui/database/ControlBranchBoxOption.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import forestry.api.genetics.IClassification; diff --git a/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java b/src/main/java/binnie/genetics/gui/database/ControlBreedingProgress.java similarity index 97% rename from src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java rename to src/main/java/binnie/genetics/gui/database/ControlBreedingProgress.java index 22bb8eae..547c7c6d 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java +++ b/src/main/java/binnie/genetics/gui/database/ControlBreedingProgress.java @@ -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; diff --git a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/genetics/gui/database/ControlDatabaseIndividualDisplay.java similarity index 99% rename from src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java rename to src/main/java/binnie/genetics/gui/database/ControlDatabaseIndividualDisplay.java index 85857aae..e890129f 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/genetics/gui/database/ControlDatabaseIndividualDisplay.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java b/src/main/java/binnie/genetics/gui/database/ControlItemStackOption.java similarity index 97% rename from src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java rename to src/main/java/binnie/genetics/gui/database/ControlItemStackOption.java index 7b14cfb5..750863c7 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java +++ b/src/main/java/binnie/genetics/gui/database/ControlItemStackOption.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java b/src/main/java/binnie/genetics/gui/database/ControlMutationBox.java similarity index 97% rename from src/main/java/binnie/core/craftgui/database/ControlMutationBox.java rename to src/main/java/binnie/genetics/gui/database/ControlMutationBox.java index 0c529892..5b86c90f 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java +++ b/src/main/java/binnie/genetics/gui/database/ControlMutationBox.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import java.util.List; diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java b/src/main/java/binnie/genetics/gui/database/ControlMutationItem.java similarity index 98% rename from src/main/java/binnie/core/craftgui/database/ControlMutationItem.java rename to src/main/java/binnie/genetics/gui/database/ControlMutationItem.java index 25ee789b..fb5b7c2a 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java +++ b/src/main/java/binnie/genetics/gui/database/ControlMutationItem.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java b/src/main/java/binnie/genetics/gui/database/ControlMutationSymbol.java similarity index 98% rename from src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java rename to src/main/java/binnie/genetics/gui/database/ControlMutationSymbol.java index 34e17199..df250c9c 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/genetics/gui/database/ControlMutationSymbol.java @@ -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; diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java b/src/main/java/binnie/genetics/gui/database/ControlSpeciesBox.java similarity index 97% rename from src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java rename to src/main/java/binnie/genetics/gui/database/ControlSpeciesBox.java index 5eab60d9..c7540754 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/genetics/gui/database/ControlSpeciesBox.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java b/src/main/java/binnie/genetics/gui/database/ControlSpeciesBoxOption.java similarity index 97% rename from src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java rename to src/main/java/binnie/genetics/gui/database/ControlSpeciesBoxOption.java index f81bc4a3..90de8c2c 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java +++ b/src/main/java/binnie/genetics/gui/database/ControlSpeciesBoxOption.java @@ -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; diff --git a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java b/src/main/java/binnie/genetics/gui/database/DatabaseTab.java similarity index 94% rename from src/main/java/binnie/core/craftgui/database/DatabaseTab.java rename to src/main/java/binnie/genetics/gui/database/DatabaseTab.java index 6b984532..4be2286a 100644 --- a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java +++ b/src/main/java/binnie/genetics/gui/database/DatabaseTab.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import binnie.core.AbstractMod; import binnie.core.craftgui.ITooltipHelp; diff --git a/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java b/src/main/java/binnie/genetics/gui/database/EnumDiscoveryState.java similarity index 68% rename from src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java rename to src/main/java/binnie/genetics/gui/database/EnumDiscoveryState.java index 68d038d4..c8532a88 100644 --- a/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java +++ b/src/main/java/binnie/genetics/gui/database/EnumDiscoveryState.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; public enum EnumDiscoveryState { Show, diff --git a/src/main/java/binnie/core/craftgui/database/IDatabaseMode.java b/src/main/java/binnie/genetics/gui/database/IDatabaseMode.java similarity index 58% rename from src/main/java/binnie/core/craftgui/database/IDatabaseMode.java rename to src/main/java/binnie/genetics/gui/database/IDatabaseMode.java index 4276d69e..d85b1e42 100644 --- a/src/main/java/binnie/core/craftgui/database/IDatabaseMode.java +++ b/src/main/java/binnie/genetics/gui/database/IDatabaseMode.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; public interface IDatabaseMode { String getName(); diff --git a/src/main/java/binnie/core/craftgui/database/PageAbstract.java b/src/main/java/binnie/genetics/gui/database/PageAbstract.java similarity index 90% rename from src/main/java/binnie/core/craftgui/database/PageAbstract.java rename to src/main/java/binnie/genetics/gui/database/PageAbstract.java index ad9dd9da..dcccfe8f 100644 --- a/src/main/java/binnie/core/craftgui/database/PageAbstract.java +++ b/src/main/java/binnie/genetics/gui/database/PageAbstract.java @@ -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; diff --git a/src/main/java/binnie/core/craftgui/database/PageBranch.java b/src/main/java/binnie/genetics/gui/database/PageBranch.java similarity index 86% rename from src/main/java/binnie/core/craftgui/database/PageBranch.java rename to src/main/java/binnie/genetics/gui/database/PageBranch.java index c3d0107f..f652bee6 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranch.java +++ b/src/main/java/binnie/genetics/gui/database/PageBranch.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import forestry.api.genetics.IClassification; diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java b/src/main/java/binnie/genetics/gui/database/PageBranchOverview.java similarity index 98% rename from src/main/java/binnie/core/craftgui/database/PageBranchOverview.java rename to src/main/java/binnie/genetics/gui/database/PageBranchOverview.java index 1c39182c..ceb9c92f 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java +++ b/src/main/java/binnie/genetics/gui/database/PageBranchOverview.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java b/src/main/java/binnie/genetics/gui/database/PageBranchSpecies.java similarity index 97% rename from src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java rename to src/main/java/binnie/genetics/gui/database/PageBranchSpecies.java index b93058b9..ae27a6f5 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java +++ b/src/main/java/binnie/genetics/gui/database/PageBranchSpecies.java @@ -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; diff --git a/src/main/java/binnie/core/craftgui/database/PageBreeder.java b/src/main/java/binnie/genetics/gui/database/PageBreeder.java similarity index 98% rename from src/main/java/binnie/core/craftgui/database/PageBreeder.java rename to src/main/java/binnie/genetics/gui/database/PageBreeder.java index 6d247d57..16adfee8 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBreeder.java +++ b/src/main/java/binnie/genetics/gui/database/PageBreeder.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/binnie/core/craftgui/database/PageBreederStats.java b/src/main/java/binnie/genetics/gui/database/PageBreederStats.java similarity index 95% rename from src/main/java/binnie/core/craftgui/database/PageBreederStats.java rename to src/main/java/binnie/genetics/gui/database/PageBreederStats.java index f2c23a3f..61c792e0 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBreederStats.java +++ b/src/main/java/binnie/genetics/gui/database/PageBreederStats.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/binnie/core/craftgui/database/PageSpecies.java b/src/main/java/binnie/genetics/gui/database/PageSpecies.java similarity index 86% rename from src/main/java/binnie/core/craftgui/database/PageSpecies.java rename to src/main/java/binnie/genetics/gui/database/PageSpecies.java index ac28d711..6c47aadf 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpecies.java +++ b/src/main/java/binnie/genetics/gui/database/PageSpecies.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import forestry.api.genetics.IAlleleSpecies; diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java b/src/main/java/binnie/genetics/gui/database/PageSpeciesClassification.java similarity index 97% rename from src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java rename to src/main/java/binnie/genetics/gui/database/PageSpeciesClassification.java index 00ca592f..cc0fce51 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java +++ b/src/main/java/binnie/genetics/gui/database/PageSpeciesClassification.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java b/src/main/java/binnie/genetics/gui/database/PageSpeciesMutations.java similarity index 95% rename from src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java rename to src/main/java/binnie/genetics/gui/database/PageSpeciesMutations.java index 3a605e7e..f4bb80b7 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java +++ b/src/main/java/binnie/genetics/gui/database/PageSpeciesMutations.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import forestry.api.genetics.IAlleleSpecies; diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java b/src/main/java/binnie/genetics/gui/database/PageSpeciesOverview.java similarity index 98% rename from src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java rename to src/main/java/binnie/genetics/gui/database/PageSpeciesOverview.java index 836a398b..223c7026 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/genetics/gui/database/PageSpeciesOverview.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import java.util.Objects; diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java b/src/main/java/binnie/genetics/gui/database/PageSpeciesResultant.java similarity index 95% rename from src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java rename to src/main/java/binnie/genetics/gui/database/PageSpeciesResultant.java index 0b74eb54..ac59fcc6 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java +++ b/src/main/java/binnie/genetics/gui/database/PageSpeciesResultant.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import forestry.api.genetics.IAlleleSpecies; diff --git a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java b/src/main/java/binnie/genetics/gui/database/WindowAbstractDatabase.java similarity index 99% rename from src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java rename to src/main/java/binnie/genetics/gui/database/WindowAbstractDatabase.java index 186408b4..4edff320 100644 --- a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/genetics/gui/database/WindowAbstractDatabase.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.database; +package binnie.genetics.gui.database; import javax.annotation.Nullable; import java.util.Collection; diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java b/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java similarity index 97% rename from src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java rename to src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java index 265e678e..ccce1ccf 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java +++ b/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.bee.database; +package binnie.genetics.gui.database.bee; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java b/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java similarity index 98% rename from src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java rename to src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java index bdc38517..02163597 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java +++ b/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.bee.database; +package binnie.genetics.gui.database.bee; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java b/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java similarity index 98% rename from src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java rename to src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java index 7b23684c..431f6901 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java +++ b/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.bee.database; +package binnie.genetics.gui.database.bee; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsItem.java b/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java similarity index 96% rename from src/main/java/binnie/genetics/gui/bee/database/ControlProductsItem.java rename to src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java index 132b82e3..6c8db3d5 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsItem.java +++ b/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.bee.database; +package binnie.genetics.gui.database.bee; import java.text.DecimalFormat; diff --git a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesClimate.java b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java similarity index 86% rename from src/main/java/binnie/genetics/gui/bee/database/PageSpeciesClimate.java rename to src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java index 1bc62c6a..e6a0b94a 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesClimate.java +++ b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java @@ -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; diff --git a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesGenome.java b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java similarity index 98% rename from src/main/java/binnie/genetics/gui/bee/database/PageSpeciesGenome.java rename to src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java index e299a66f..1fdd8fbd 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesGenome.java +++ b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java @@ -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."; diff --git a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesProducts.java b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java similarity index 87% rename from src/main/java/binnie/genetics/gui/bee/database/PageSpeciesProducts.java rename to src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java index 7366195b..1bf643b4 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesProducts.java +++ b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java @@ -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; diff --git a/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java b/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java similarity index 81% rename from src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java rename to src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java index 9f19bbe7..44a08563 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java +++ b/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java @@ -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) { diff --git a/src/main/java/binnie/genetics/gui/bee/database/package-info.java b/src/main/java/binnie/genetics/gui/database/bee/package-info.java similarity index 85% rename from src/main/java/binnie/genetics/gui/bee/database/package-info.java rename to src/main/java/binnie/genetics/gui/database/bee/package-info.java index 7933355d..d19de907 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/package-info.java +++ b/src/main/java/binnie/genetics/gui/database/bee/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.genetics.gui.bee.database; +package binnie.genetics.gui.database.bee; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/genetics/gui/tree/package-info.java b/src/main/java/binnie/genetics/gui/database/package-info.java similarity index 86% rename from src/main/java/binnie/genetics/gui/tree/package-info.java rename to src/main/java/binnie/genetics/gui/database/package-info.java index ec7684fc..3fd8083b 100644 --- a/src/main/java/binnie/genetics/gui/tree/package-info.java +++ b/src/main/java/binnie/genetics/gui/database/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.genetics.gui.tree; +package binnie.genetics.gui.database; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/genetics/gui/flower/package-info.java b/src/main/java/binnie/genetics/gui/flower/package-info.java deleted file mode 100644 index d13057d6..00000000 --- a/src/main/java/binnie/genetics/gui/flower/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.genetics.gui.flower; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file