From b044244dc696e16ccac0f2645236b86193036314 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 9 Apr 2017 01:58:51 +0200 Subject: [PATCH] Move craftgui to binnie core --- .../java/binnie/botany/core/BotanyGUI.java | 2 +- .../botany/craftgui/ControlColourDisplay.java | 14 ++-- .../botany/craftgui/ControlColourMixBox.java | 4 +- .../botany/craftgui/ControlColourMixItem.java | 4 +- .../craftgui/ControlColourMixSymbol.java | 20 +++--- .../botany/craftgui/ControlColourOption.java | 12 ++-- .../binnie/botany/craftgui/PageColourMix.java | 10 +-- .../craftgui/PageColourMixResultant.java | 10 +-- .../craftgui/PageSpeciesFlowerGenome.java | 20 +++--- .../craftgui/WindowBotanistDatabase.java | 28 ++++---- src/main/java/binnie/core/BinnieCore.java | 3 +- .../core => core/craftgui}/Attribute.java | 2 +- .../java/binnie/core/craftgui/CraftGUI.java | 9 +++ .../core => core/craftgui}/ITooltip.java | 2 +- .../core => core/craftgui}/ITooltipHelp.java | 2 +- .../craftgui}/ITopLevelWidget.java | 6 +- .../core => core/craftgui}/IWidget.java | 10 +-- .../craftgui}/IWidgetAttribute.java | 2 +- .../core => core/craftgui}/RenderStage.java | 2 +- .../core => core/craftgui}/Tooltip.java | 2 +- .../craftgui}/TopLevelWidget.java | 11 +-- .../core => core/craftgui}/Widget.java | 12 ++-- .../craftgui}/WindowFieldKit.java | 31 ++++---- .../craftgui}/WindowGenesis.java | 33 +++++---- .../craftgui/controls/ControlCheckbox.java | 26 +++---- .../craftgui/controls/ControlText.java | 16 ++--- .../controls/ControlTextCentered.java | 10 +-- .../craftgui/controls/ControlTextEdit.java | 24 +++---- .../craftgui/controls/IControlSelection.java | 2 +- .../controls/IControlSelectionOption.java | 2 +- .../controls/button/ControlButton.java | 22 +++--- .../controls/button/ControlEnumButton.java | 11 +-- .../controls/button/ControlToggleButton.java | 8 +-- .../controls/button/package-info.java | 9 +++ .../craftgui/controls/core/Control.java | 20 +++--- .../controls/core/IControlIndexed.java | 2 +- .../craftgui/controls/core/IControlValue.java | 6 +- .../controls/core/IControlValues.java | 2 +- .../craftgui/controls/core}/package-info.java | 2 +- .../controls/listbox/ControlList.java | 12 ++-- .../controls/listbox/ControlListBox.java | 10 +-- .../controls/listbox/ControlOption.java | 14 ++-- .../controls/listbox/ControlTextOption.java | 10 +-- .../controls/listbox/package-info.java | 9 +++ .../craftgui/controls}/package-info.java | 2 +- .../craftgui/controls/page/ControlPage.java | 8 +-- .../craftgui/controls/page/ControlPages.java | 12 ++-- .../craftgui/controls/page/package-info.java | 9 +++ .../controls/scroll/ControlScroll.java | 6 +- .../controls/scroll/ControlScrollBar.java | 16 ++--- .../scroll/ControlScrollableContent.java | 14 ++-- .../controls/scroll/IControlScrollable.java | 4 +- .../controls/scroll/package-info.java | 9 +++ .../craftgui/controls/tab/ControlTab.java | 34 ++++----- .../craftgui/controls/tab/ControlTabBar.java | 15 ++-- .../craftgui/controls/tab}/package-info.java | 2 +- .../craftgui}/database/ControlBranchBox.java | 6 +- .../database/ControlBranchBoxOption.java | 6 +- .../database/ControlBreedingProgress.java | 22 +++--- .../ControlDatabaseIndividualDisplay.java | 17 ++--- .../database/ControlItemStackOption.java | 16 ++--- .../database/ControlMutationBox.java | 8 +-- .../database/ControlMutationItem.java | 8 +-- .../database/ControlMutationSymbol.java | 24 +++---- .../craftgui}/database/ControlSpeciesBox.java | 9 +-- .../database/ControlSpeciesBoxOption.java | 14 ++-- .../craftgui}/database/DatabaseTab.java | 6 +- .../database/EnumDiscoveryState.java | 2 +- .../craftgui}/database/IDatabaseMode.java | 2 +- .../craftgui}/database/PageAbstract.java | 6 +- .../craftgui}/database/PageBranch.java | 4 +- .../database/PageBranchOverview.java | 10 +-- .../craftgui}/database/PageBranchSpecies.java | 10 +-- .../craftgui}/database/PageBreeder.java | 11 +-- .../craftgui}/database/PageBreederStats.java | 10 +-- .../craftgui}/database/PageSpecies.java | 4 +- .../database/PageSpeciesClassification.java | 8 +-- .../database/PageSpeciesMutations.java | 8 +-- .../database/PageSpeciesOverview.java | 16 ++--- .../database/PageSpeciesResultant.java | 8 +-- .../database/WindowAbstractDatabase.java | 41 +++++------ .../craftgui/database}/package-info.java | 2 +- .../{ => core}/craftgui/events/Event.java | 4 +- .../craftgui/events/EventButtonClicked.java | 4 +- .../craftgui/events/EventCycleChanged.java | 4 +- .../craftgui/events/EventHandler.java | 4 +- .../{ => core}/craftgui/events/EventKey.java | 4 +- .../craftgui/events/EventMouse.java | 4 +- .../craftgui/events/EventTextEdit.java | 4 +- .../events/EventToggleButtonClicked.java | 4 +- .../craftgui/events/EventValueChanged.java | 6 +- .../craftgui/events/EventValuesChanged.java | 4 +- .../craftgui/events/EventWidget.java | 4 +- .../craftgui/events}/package-info.java | 2 +- .../core => core/craftgui}/geometry/Area.java | 2 +- .../craftgui}/geometry/Border.java | 2 +- .../craftgui}/geometry/CraftGUIUtil.java | 8 +-- .../craftgui}/geometry/Point.java | 2 +- .../craftgui}/geometry/Position.java | 2 +- .../craftgui}/geometry/TextJustification.java | 2 +- .../core/craftgui/geometry/package-info.java | 9 +++ .../craftgui/minecraft/ContainerCraftGUI.java | 7 +- .../craftgui/minecraft/CustomSlot.java | 2 +- .../{ => core}/craftgui/minecraft/Dialog.java | 20 +++--- .../craftgui/minecraft/EnumColor.java | 2 +- .../craftgui/minecraft/GUIIcon.java | 2 +- .../craftgui/minecraft/GuiCraftGUI.java | 14 ++-- .../minecraft/IMachineInformation.java | 2 +- .../craftgui/minecraft/IMinecraftTooltip.java | 4 +- .../minecraft/IWindowAffectsShiftClick.java | 2 +- .../craftgui/minecraft/InventoryType.java | 2 +- .../craftgui/minecraft/ListMap.java | 2 +- .../craftgui/minecraft/MinecraftGUI.java | 4 +- .../craftgui/minecraft/MinecraftTooltip.java | 4 +- .../craftgui/minecraft/ModuleCraftGUI.java | 2 +- .../{ => core}/craftgui/minecraft/Window.java | 47 ++++++------ .../craftgui/minecraft/WindowInventory.java | 2 +- .../minecraft/control/ControlEnergyBar.java | 28 ++++---- .../minecraft/control/ControlErrorState.java | 24 +++---- .../minecraft/control/ControlHelp.java | 16 ++--- .../minecraft/control/ControlIconDisplay.java | 10 +-- .../minecraft/control/ControlImage.java | 12 ++-- .../minecraft/control/ControlInfo.java | 16 ++--- .../minecraft/control/ControlItemDisplay.java | 18 ++--- .../minecraft/control/ControlLiquidTank.java | 30 ++++---- .../control/ControlMachineProgress.java | 8 +-- .../control/ControlPlayerInventory.java | 8 +-- .../minecraft/control/ControlPowerSystem.java | 16 ++--- .../minecraft/control/ControlProgress.java | 10 +-- .../control/ControlProgressBase.java | 12 ++-- .../minecraft/control/ControlSlide.java | 26 +++---- .../minecraft/control/ControlSlot.java | 28 ++++---- .../minecraft/control/ControlSlotArray.java | 8 +-- .../minecraft/control/ControlSlotBase.java | 26 +++---- .../minecraft/control/ControlSlotCharge.java | 16 ++--- .../minecraft/control/ControlTabIcon.java | 8 +-- .../minecraft/control/ControlUser.java | 16 ++--- .../minecraft/control/EnumHighlighting.java | 6 +- .../minecraft/control/package-info.java | 9 +++ .../core/craftgui/minecraft/package-info.java | 9 +++ .../minecraft/render/MinecraftTexture.java | 4 +- .../minecraft/render/RenderCommand.java | 6 +- .../minecraft/render/package-info.java | 9 +++ .../core => core/craftgui}/package-info.java | 2 +- .../craftgui}/renderer/RenderUtil.java | 9 +-- .../craftgui}/renderer/TextureRenderer.java | 16 ++--- .../craftgui}/renderer/TextureType.java | 2 +- .../core/craftgui/renderer/package-info.java | 9 +++ .../craftgui/resource/IStyleSheet.java | 2 +- .../craftgui/resource/StyleSheet.java | 2 +- .../craftgui/resource/StyleSheetManager.java | 4 +- .../craftgui/resource/StyleSheetPunnett.java | 8 +-- .../{ => core}/craftgui/resource/Texture.java | 8 +-- .../minecraft/CraftGUIResourceManager.java | 11 +-- .../resource/minecraft/CraftGUITexture.java | 2 +- .../minecraft/CraftGUITextureSheet.java | 4 +- .../resource/minecraft/PaddedTexture.java | 8 +-- .../minecraft/ParsedTextureSheet.java | 2 +- .../resource/minecraft/StandardTexture.java | 8 +-- .../resource/minecraft/package-info.java | 9 +++ .../core/craftgui/resource/package-info.java | 9 +++ .../{ => core}/craftgui/window/Panel.java | 14 ++-- .../craftgui/window}/package-info.java | 2 +- .../java/binnie/core/gui/BinnieCoreGUI.java | 6 +- .../binnie/core/gui/BinnieGUIHandler.java | 2 +- .../java/binnie/core/gui/IBinnieGUID.java | 2 +- .../core/machines/storage/CompartmentTab.java | 2 +- .../storage/ControlColourSelector.java | 16 ++--- .../machines/storage/WindowCompartment.java | 72 +++++++++---------- .../core/machines/storage/WindowTest.java | 2 +- .../core/network/BinnieCorePacketID.java | 2 +- .../binnie/core/proxy/BinnieProxyClient.java | 3 +- .../controls/scroll/package-info.java | 9 --- .../craftgui/controls/tab/package-info.java | 9 --- .../java/binnie/craftgui/core/CraftGUI.java | 9 --- .../craftgui/core/geometry/package-info.java | 9 --- .../craftgui/core/renderer/package-info.java | 9 --- .../binnie/craftgui/events/package-info.java | 9 --- .../minecraft/control/package-info.java | 9 --- .../craftgui/minecraft/package-info.java | 9 --- .../minecraft/render/package-info.java | 9 --- .../craftgui/mod/database/package-info.java | 9 --- .../resource/minecraft/package-info.java | 9 --- .../craftgui/resource/package-info.java | 9 --- .../binnie/craftgui/window/package-info.java | 9 --- .../apiary/machine/AlvearyFrame.java | 2 +- .../apiary/machine/AlvearyHatchery.java | 2 +- .../apiary/machine/AlvearyLighting.java | 2 +- .../apiary/machine/AlvearyMutator.java | 2 +- .../apiary/machine/AlvearyRainShield.java | 2 +- .../apiary/machine/AlvearyStimulator.java | 2 +- .../apiary/machine/AlvearyTransmission.java | 2 +- .../binnie/extrabees/core/ExtraBeeGUID.java | 2 +- .../extrabees/gui/WindowAlvearyFrame.java | 6 +- .../extrabees/gui/WindowAlvearyHatchery.java | 6 +- .../gui/WindowAlvearyIndustrialFrame.java | 6 +- .../extrabees/gui/WindowAlvearyMutator.java | 14 ++-- .../gui/WindowAlvearyStimulator.java | 10 +-- .../extrabees/gui/database/ControlBiomes.java | 16 ++--- .../gui/database/ControlClimateBar.java | 18 ++--- .../gui/database/ControlProductsBox.java | 4 +- .../gui/database/ControlProductsItem.java | 14 ++-- .../gui/database/PageSpeciesClimate.java | 8 +-- .../gui/database/PageSpeciesGenome.java | 14 ++-- .../gui/database/PageSpeciesProducts.java | 10 +-- .../gui/database/WindowApiaristDatabase.java | 20 +++--- .../gui/punnett/ControlChromosome.java | 16 ++--- .../extrabees/gui/punnett/ControlPunnett.java | 12 ++-- .../gui/punnett/WindowPunnettSquare.java | 14 ++-- .../extratrees/core/ExtraTreesGUID.java | 2 +- .../brewery/DistilleryRecipeCategory.java | 12 ++-- .../brewery/DistilleryRecipeWrapper.java | 4 +- .../binnie/extratrees/kitchen/BottleRack.java | 2 +- .../kitchen/craftgui/ControlDropDownMenu.java | 8 +-- .../craftgui/ControlDropdownButton.java | 8 +-- .../kitchen/craftgui/ControlFluidDisplay.java | 16 ++--- .../kitchen/craftgui/ControlSlotFluid.java | 22 +++--- .../craftgui/ControlSlotGlassware.java | 6 +- .../kitchen/craftgui/ControlTankSlot.java | 8 +-- .../kitchen/craftgui/WindowBottleRack.java | 4 +- .../binnie/extratrees/machines/Designer.java | 2 +- .../binnie/extratrees/machines/Infuser.java | 2 +- .../machines/brewery/BreweryMachine.java | 2 +- .../craftgui/ControlBlockIconDisplay.java | 8 +-- .../craftgui/ControlBreweryProgress.java | 20 +++--- .../craftgui/ControlDistilleryProgress.java | 22 +++--- .../craftgui/ControlFruitPressProgress.java | 22 +++--- .../craftgui/ControlLumbermillProgress.java | 20 +++--- .../machines/craftgui/ControlRecipeSlot.java | 8 +-- .../machines/craftgui/ControlTileSelect.java | 28 ++++---- .../craftgui/DialogBreweryRecipe.java | 4 +- .../machines/craftgui/PageFruit.java | 18 ++--- .../machines/craftgui/PagePlanksOverview.java | 22 +++--- .../machines/craftgui/PagePlanksTrees.java | 18 ++--- .../machines/craftgui/PageSpeciesImage.java | 16 ++--- .../craftgui/PageSpeciesTreeGenome.java | 20 +++--- .../machines/craftgui/PageWood.java | 18 ++--- .../craftgui/WindowArboristDatabase.java | 30 ++++---- .../machines/craftgui/WindowBrewery.java | 16 ++--- .../machines/craftgui/WindowDistillery.java | 12 ++-- .../craftgui/WindowLepidopteristDatabase.java | 20 +++--- .../machines/craftgui/WindowLumbermill.java | 14 ++-- .../machines/craftgui/WindowPress.java | 16 ++--- .../machines/craftgui/WindowSetSquare.java | 2 +- .../machines/craftgui/WindowWoodworker.java | 28 ++++---- .../distillery/DistilleryMachine.java | 2 +- .../fruitpress/FruitPressMachine.java | 2 +- .../lumbermill/LumbermillMachine.java | 2 +- .../binnie/genetics/core/GeneticsGUI.java | 2 +- .../genetics/gui/AnalystPageBehaviour.java | 12 ++-- .../genetics/gui/AnalystPageBiology.java | 10 +-- .../genetics/gui/AnalystPageDatabase.java | 32 ++++----- .../genetics/gui/AnalystPageDescription.java | 14 ++-- .../genetics/gui/AnalystPageGenome.java | 16 ++--- .../genetics/gui/AnalystPageKaryogram.java | 6 +- .../genetics/gui/AnalystPageMutations.java | 22 +++--- .../genetics/gui/AnalystPageProduce.java | 8 +-- .../gui/ControlAnalystChromosome.java | 18 ++--- .../genetics/gui/ControlAnalystPage.java | 6 +- .../binnie/genetics/gui/ControlBiome.java | 12 ++-- .../genetics/gui/ControlChromoPicker.java | 20 +++--- .../genetics/gui/ControlChromosome.java | 15 ++-- .../genetics/gui/ControlGenesisOption.java | 10 +-- .../gui/ControlIndividualDisplay.java | 8 +-- .../genetics/gui/ControlToleranceBar.java | 16 ++--- .../binnie/genetics/gui/ControlTooltip.java | 8 +-- .../binnie/genetics/gui/WindowAnalyst.java | 48 ++++++------- .../genetics/gui/bee/AnalystPageProducts.java | 16 ++--- .../gui/butterfly/AnalystPageSpecimen.java | 6 +- .../gui/flower/AnalystPageAppearance.java | 12 ++-- .../genetics/gui/flower/AnalystPageSoil.java | 12 ++-- .../genetics/gui/tree/AnalystPageClimate.java | 12 ++-- .../genetics/gui/tree/AnalystPageFruit.java | 10 +-- .../genetics/gui/tree/AnalystPageGrowth.java | 6 +- .../genetics/gui/tree/AnalystPageWood.java | 12 ++-- .../acclimatiser/PackageAcclimatiser.java | 2 +- .../acclimatiser/WindowAcclimatiser.java | 16 ++--- .../machine/analyser/PackageAnalyser.java | 2 +- .../machine/analyser/WindowAnalyser.java | 28 ++++---- .../machine/craftgui/ControlGene.java | 20 +++--- .../machine/craftgui/ControlGeneScroll.java | 12 ++-- .../craftgui/ControlProcessTemporary.java | 10 +-- .../machine/craftgui/WindowGeneBank.java | 30 ++++---- .../machine/craftgui/WindowGeneProject.java | 2 +- .../craftgui/WindowGenomeAssembler.java | 2 +- .../machine/craftgui/WindowMachine.java | 3 +- .../machine/genepool/PackageGenepool.java | 2 +- .../machine/genepool/WindowGenepool.java | 26 +++---- .../machine/incubator/PackageIncubator.java | 2 +- .../machine/incubator/WindowIncubator.java | 24 +++---- .../machine/inoculator/PackageInoculator.java | 2 +- .../machine/inoculator/WindowInoculator.java | 28 ++++---- .../machine/isolator/PackageIsolator.java | 2 +- .../machine/isolator/WindowIsolator.java | 26 +++---- .../polymeriser/PackagePolymeriser.java | 2 +- .../polymeriser/WindowPolymeriser.java | 26 +++---- .../sequencer/ControlSequencerProgress.java | 16 ++--- .../machine/sequencer/PackageSequencer.java | 2 +- .../machine/sequencer/WindowSequencer.java | 30 ++++---- .../splicer/ControlSplicerProgress.java | 8 +-- .../machine/splicer/PackageSplicer.java | 2 +- .../machine/splicer/WindowSplicer.java | 24 +++---- 302 files changed, 1608 insertions(+), 1604 deletions(-) rename src/main/java/binnie/{craftgui/core => core/craftgui}/Attribute.java (80%) create mode 100644 src/main/java/binnie/core/craftgui/CraftGUI.java rename src/main/java/binnie/{craftgui/core => core/craftgui}/ITooltip.java (69%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/ITooltipHelp.java (71%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/ITopLevelWidget.java (87%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/IWidget.java (91%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/IWidgetAttribute.java (56%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/RenderStage.java (70%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/Tooltip.java (98%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/TopLevelWidget.java (96%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/Widget.java (97%) rename src/main/java/binnie/{craftgui/binniecore => core/craftgui}/WindowFieldKit.java (91%) rename src/main/java/binnie/{craftgui/binniecore => core/craftgui}/WindowGenesis.java (90%) rename src/main/java/binnie/{ => core}/craftgui/controls/ControlCheckbox.java (73%) rename src/main/java/binnie/{ => core}/craftgui/controls/ControlText.java (74%) rename src/main/java/binnie/{ => core}/craftgui/controls/ControlTextCentered.java (54%) rename src/main/java/binnie/{ => core}/craftgui/controls/ControlTextEdit.java (83%) rename src/main/java/binnie/{ => core}/craftgui/controls/IControlSelection.java (80%) rename src/main/java/binnie/{ => core}/craftgui/controls/IControlSelectionOption.java (62%) rename src/main/java/binnie/{ => core}/craftgui/controls/button/ControlButton.java (76%) rename src/main/java/binnie/{ => core}/craftgui/controls/button/ControlEnumButton.java (85%) rename src/main/java/binnie/{ => core}/craftgui/controls/button/ControlToggleButton.java (66%) create mode 100644 src/main/java/binnie/core/craftgui/controls/button/package-info.java rename src/main/java/binnie/{ => core}/craftgui/controls/core/Control.java (81%) rename src/main/java/binnie/{ => core}/craftgui/controls/core/IControlIndexed.java (66%) rename src/main/java/binnie/{ => core}/craftgui/controls/core/IControlValue.java (66%) rename src/main/java/binnie/{ => core}/craftgui/controls/core/IControlValues.java (78%) rename src/main/java/binnie/{craftgui/controls/button => core/craftgui/controls/core}/package-info.java (84%) rename src/main/java/binnie/{ => core}/craftgui/controls/listbox/ControlList.java (91%) rename src/main/java/binnie/{ => core}/craftgui/controls/listbox/ControlListBox.java (87%) rename src/main/java/binnie/{ => core}/craftgui/controls/listbox/ControlOption.java (79%) rename src/main/java/binnie/{ => core}/craftgui/controls/listbox/ControlTextOption.java (77%) create mode 100644 src/main/java/binnie/core/craftgui/controls/listbox/package-info.java rename src/main/java/binnie/{craftgui/controls/page => core/craftgui/controls}/package-info.java (85%) rename src/main/java/binnie/{ => core}/craftgui/controls/page/ControlPage.java (77%) rename src/main/java/binnie/{ => core}/craftgui/controls/page/ControlPages.java (77%) create mode 100644 src/main/java/binnie/core/craftgui/controls/page/package-info.java rename src/main/java/binnie/{ => core}/craftgui/controls/scroll/ControlScroll.java (76%) rename src/main/java/binnie/{ => core}/craftgui/controls/scroll/ControlScrollBar.java (88%) rename src/main/java/binnie/{ => core}/craftgui/controls/scroll/ControlScrollableContent.java (92%) rename src/main/java/binnie/{ => core}/craftgui/controls/scroll/IControlScrollable.java (73%) create mode 100644 src/main/java/binnie/core/craftgui/controls/scroll/package-info.java rename src/main/java/binnie/{ => core}/craftgui/controls/tab/ControlTab.java (77%) rename src/main/java/binnie/{ => core}/craftgui/controls/tab/ControlTabBar.java (86%) rename src/main/java/binnie/{craftgui/controls/listbox => core/craftgui/controls/tab}/package-info.java (84%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/ControlBranchBox.java (75%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/ControlBranchBoxOption.java (69%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/ControlBreedingProgress.java (65%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/ControlDatabaseIndividualDisplay.java (90%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/ControlItemStackOption.java (73%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/ControlMutationBox.java (90%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/ControlMutationItem.java (91%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/ControlMutationSymbol.java (80%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/ControlSpeciesBox.java (88%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/ControlSpeciesBoxOption.java (82%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/DatabaseTab.java (84%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/EnumDiscoveryState.java (68%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/IDatabaseMode.java (58%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/PageAbstract.java (67%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/PageBranch.java (73%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/PageBranchOverview.java (90%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/PageBranchSpecies.java (83%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/PageBreeder.java (88%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/PageBreederStats.java (72%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/PageSpecies.java (73%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/PageSpeciesClassification.java (88%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/PageSpeciesMutations.java (79%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/PageSpeciesOverview.java (89%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/PageSpeciesResultant.java (79%) rename src/main/java/binnie/{craftgui/mod => core/craftgui}/database/WindowAbstractDatabase.java (89%) rename src/main/java/binnie/{craftgui/controls/core => core/craftgui/database}/package-info.java (85%) rename src/main/java/binnie/{ => core}/craftgui/events/Event.java (77%) rename src/main/java/binnie/{ => core}/craftgui/events/EventButtonClicked.java (78%) rename src/main/java/binnie/{ => core}/craftgui/events/EventCycleChanged.java (75%) rename src/main/java/binnie/{ => core}/craftgui/events/EventHandler.java (93%) rename src/main/java/binnie/{ => core}/craftgui/events/EventKey.java (92%) rename src/main/java/binnie/{ => core}/craftgui/events/EventMouse.java (96%) rename src/main/java/binnie/{ => core}/craftgui/events/EventTextEdit.java (79%) rename src/main/java/binnie/{ => core}/craftgui/events/EventToggleButtonClicked.java (77%) rename src/main/java/binnie/{ => core}/craftgui/events/EventValueChanged.java (85%) rename src/main/java/binnie/{ => core}/craftgui/events/EventValuesChanged.java (76%) rename src/main/java/binnie/{ => core}/craftgui/events/EventWidget.java (98%) rename src/main/java/binnie/{craftgui/binniecore => core/craftgui/events}/package-info.java (86%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/geometry/Area.java (98%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/geometry/Border.java (97%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/geometry/CraftGUIUtil.java (91%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/geometry/Point.java (96%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/geometry/Position.java (93%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/geometry/TextJustification.java (93%) create mode 100644 src/main/java/binnie/core/craftgui/geometry/package-info.java rename src/main/java/binnie/{ => core}/craftgui/minecraft/ContainerCraftGUI.java (99%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/CustomSlot.java (97%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/Dialog.java (73%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/EnumColor.java (95%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/GUIIcon.java (95%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/GuiCraftGUI.java (96%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/IMachineInformation.java (62%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/IMinecraftTooltip.java (56%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/IWindowAffectsShiftClick.java (79%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/InventoryType.java (59%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/ListMap.java (98%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/MinecraftGUI.java (64%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/MinecraftTooltip.java (94%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/ModuleCraftGUI.java (87%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/Window.java (88%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/WindowInventory.java (98%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlEnergyBar.java (87%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlErrorState.java (83%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlHelp.java (70%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlIconDisplay.java (84%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlImage.java (64%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlInfo.java (67%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlItemDisplay.java (86%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlLiquidTank.java (90%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlMachineProgress.java (59%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlPlayerInventory.java (92%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlPowerSystem.java (70%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlProgress.java (81%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlProgressBase.java (89%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlSlide.java (86%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlSlot.java (91%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlSlotArray.java (91%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlSlotBase.java (75%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlSlotCharge.java (74%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlTabIcon.java (85%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/ControlUser.java (71%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/control/EnumHighlighting.java (76%) create mode 100644 src/main/java/binnie/core/craftgui/minecraft/control/package-info.java create mode 100644 src/main/java/binnie/core/craftgui/minecraft/package-info.java rename src/main/java/binnie/{ => core}/craftgui/minecraft/render/MinecraftTexture.java (68%) rename src/main/java/binnie/{ => core}/craftgui/minecraft/render/RenderCommand.java (57%) create mode 100644 src/main/java/binnie/core/craftgui/minecraft/render/package-info.java rename src/main/java/binnie/{craftgui/core => core/craftgui}/package-info.java (88%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/renderer/RenderUtil.java (97%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/renderer/TextureRenderer.java (95%) rename src/main/java/binnie/{craftgui/core => core/craftgui}/renderer/TextureType.java (55%) create mode 100644 src/main/java/binnie/core/craftgui/renderer/package-info.java rename src/main/java/binnie/{ => core}/craftgui/resource/IStyleSheet.java (83%) rename src/main/java/binnie/{ => core}/craftgui/resource/StyleSheet.java (92%) rename src/main/java/binnie/{ => core}/craftgui/resource/StyleSheetManager.java (89%) rename src/main/java/binnie/{ => core}/craftgui/resource/StyleSheetPunnett.java (79%) rename src/main/java/binnie/{ => core}/craftgui/resource/Texture.java (94%) rename src/main/java/binnie/{ => core}/craftgui/resource/minecraft/CraftGUIResourceManager.java (95%) rename src/main/java/binnie/{ => core}/craftgui/resource/minecraft/CraftGUITexture.java (96%) rename src/main/java/binnie/{ => core}/craftgui/resource/minecraft/CraftGUITextureSheet.java (89%) rename src/main/java/binnie/{ => core}/craftgui/resource/minecraft/PaddedTexture.java (70%) rename src/main/java/binnie/{ => core}/craftgui/resource/minecraft/ParsedTextureSheet.java (94%) rename src/main/java/binnie/{ => core}/craftgui/resource/minecraft/StandardTexture.java (79%) create mode 100644 src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java create mode 100644 src/main/java/binnie/core/craftgui/resource/package-info.java rename src/main/java/binnie/{ => core}/craftgui/window/Panel.java (81%) rename src/main/java/binnie/{craftgui/controls => core/craftgui/window}/package-info.java (86%) delete mode 100644 src/main/java/binnie/craftgui/controls/scroll/package-info.java delete mode 100644 src/main/java/binnie/craftgui/controls/tab/package-info.java delete mode 100644 src/main/java/binnie/craftgui/core/CraftGUI.java delete mode 100644 src/main/java/binnie/craftgui/core/geometry/package-info.java delete mode 100644 src/main/java/binnie/craftgui/core/renderer/package-info.java delete mode 100644 src/main/java/binnie/craftgui/events/package-info.java delete mode 100644 src/main/java/binnie/craftgui/minecraft/control/package-info.java delete mode 100644 src/main/java/binnie/craftgui/minecraft/package-info.java delete mode 100644 src/main/java/binnie/craftgui/minecraft/render/package-info.java delete mode 100644 src/main/java/binnie/craftgui/mod/database/package-info.java delete mode 100644 src/main/java/binnie/craftgui/resource/minecraft/package-info.java delete mode 100644 src/main/java/binnie/craftgui/resource/package-info.java delete mode 100644 src/main/java/binnie/craftgui/window/package-info.java diff --git a/src/main/java/binnie/botany/core/BotanyGUI.java b/src/main/java/binnie/botany/core/BotanyGUI.java index 3bffcfec..e2476726 100644 --- a/src/main/java/binnie/botany/core/BotanyGUI.java +++ b/src/main/java/binnie/botany/core/BotanyGUI.java @@ -1,8 +1,8 @@ package binnie.botany.core; import binnie.botany.craftgui.WindowBotanistDatabase; +import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; -import binnie.craftgui.minecraft.Window; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java b/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java index bdc5f473..0437a9ec 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java @@ -1,13 +1,13 @@ package binnie.botany.craftgui; import binnie.botany.api.IFlowerColour; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.renderer.RenderUtil; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.renderer.RenderUtil; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixBox.java b/src/main/java/binnie/botany/craftgui/ControlColourMixBox.java index 2addc372..16553e99 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixBox.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixBox.java @@ -1,8 +1,8 @@ package binnie.botany.craftgui; import binnie.botany.api.IColourMix; -import binnie.craftgui.controls.listbox.ControlListBox; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.listbox.ControlListBox; public class ControlColourMixBox extends ControlListBox { private int index; diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixItem.java b/src/main/java/binnie/botany/craftgui/ControlColourMixItem.java index 9bc93def..7de5d12d 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixItem.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixItem.java @@ -1,8 +1,8 @@ package binnie.botany.craftgui; import binnie.botany.api.IColourMix; -import binnie.craftgui.controls.listbox.ControlList; -import binnie.craftgui.controls.listbox.ControlOption; +import binnie.core.craftgui.controls.listbox.ControlList; +import binnie.core.craftgui.controls.listbox.ControlOption; public class ControlColourMixItem extends ControlOption { private final ControlColourDisplay itemWidget1; diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index a7691eea..e0c6fee7 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -1,16 +1,16 @@ package binnie.botany.craftgui; import binnie.botany.api.IColourMix; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.CraftGUITextureSheet; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/botany/craftgui/ControlColourOption.java b/src/main/java/binnie/botany/craftgui/ControlColourOption.java index e9177d81..256cf04c 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourOption.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourOption.java @@ -1,12 +1,12 @@ package binnie.botany.craftgui; import binnie.botany.api.IFlowerColour; -import binnie.craftgui.controls.listbox.ControlList; -import binnie.craftgui.controls.listbox.ControlTextOption; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.Point; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.controls.listbox.ControlList; +import binnie.core.craftgui.controls.listbox.ControlTextOption; +import binnie.core.craftgui.geometry.CraftGUIUtil; +import binnie.core.craftgui.geometry.Point; public class ControlColourOption extends ControlTextOption { ControlColourDisplay controlBee; diff --git a/src/main/java/binnie/botany/craftgui/PageColourMix.java b/src/main/java/binnie/botany/craftgui/PageColourMix.java index d37f2d17..b13ec9ed 100644 --- a/src/main/java/binnie/botany/craftgui/PageColourMix.java +++ b/src/main/java/binnie/botany/craftgui/PageColourMix.java @@ -3,11 +3,11 @@ package binnie.botany.craftgui; import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColour; import binnie.botany.core.BotanyCore; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageAbstract; +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 java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/botany/craftgui/PageColourMixResultant.java b/src/main/java/binnie/botany/craftgui/PageColourMixResultant.java index 2f289286..82ac65c2 100644 --- a/src/main/java/binnie/botany/craftgui/PageColourMixResultant.java +++ b/src/main/java/binnie/botany/craftgui/PageColourMixResultant.java @@ -3,11 +3,11 @@ package binnie.botany.craftgui; import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColour; import binnie.botany.core.BotanyCore; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageAbstract; +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 java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index eb6bd5e2..6586d84f 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -7,16 +7,16 @@ import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.api.IFlower; import binnie.botany.api.IFlowerGenome; import binnie.botany.core.BotanyCore; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.scroll.ControlScrollableContent; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.control.ControlItemDisplay; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageSpecies; +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 forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index cd988192..c79b9c61 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -5,20 +5,20 @@ import binnie.botany.Botany; import binnie.botany.api.IFlowerColour; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.AbstractMod; -import binnie.craftgui.controls.listbox.ControlListBox; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.IDatabaseMode; -import binnie.craftgui.mod.database.PageBranchOverview; -import binnie.craftgui.mod.database.PageBranchSpecies; -import binnie.craftgui.mod.database.PageBreeder; -import binnie.craftgui.mod.database.PageSpeciesClassification; -import binnie.craftgui.mod.database.PageSpeciesMutations; -import binnie.craftgui.mod.database.PageSpeciesOverview; -import binnie.craftgui.mod.database.PageSpeciesResultant; -import binnie.craftgui.mod.database.WindowAbstractDatabase; +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 net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index fdd358fa..9b009e63 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -3,6 +3,7 @@ package binnie.core; import binnie.Binnie; import binnie.Constants; import binnie.core.block.TileEntityMetadata; +import binnie.core.craftgui.minecraft.ModuleCraftGUI; import binnie.core.gui.BinnieCoreGUI; import binnie.core.gui.BinnieGUIHandler; import binnie.core.gui.IBinnieGUID; @@ -22,7 +23,7 @@ import binnie.core.network.IPacketID; import binnie.core.proxy.BinnieProxy; import binnie.core.proxy.IBinnieProxy; import binnie.core.triggers.ModuleTrigger; -import binnie.craftgui.minecraft.ModuleCraftGUI; + import com.google.common.base.Preconditions; import forestry.api.core.ForestryEvent; import forestry.plugins.PluginManager; diff --git a/src/main/java/binnie/craftgui/core/Attribute.java b/src/main/java/binnie/core/craftgui/Attribute.java similarity index 80% rename from src/main/java/binnie/craftgui/core/Attribute.java rename to src/main/java/binnie/core/craftgui/Attribute.java index b8ec38ab..0ca159af 100644 --- a/src/main/java/binnie/craftgui/core/Attribute.java +++ b/src/main/java/binnie/core/craftgui/Attribute.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core; +package binnie.core.craftgui; public enum Attribute implements IWidgetAttribute { MouseOver, diff --git a/src/main/java/binnie/core/craftgui/CraftGUI.java b/src/main/java/binnie/core/craftgui/CraftGUI.java new file mode 100644 index 00000000..a9c9e450 --- /dev/null +++ b/src/main/java/binnie/core/craftgui/CraftGUI.java @@ -0,0 +1,9 @@ +package binnie.core.craftgui; + +import binnie.core.craftgui.renderer.TextureRenderer; +import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; + +public class CraftGUI { + public static CraftGUIResourceManager resourceManager; + public static final TextureRenderer render = new TextureRenderer(); +} diff --git a/src/main/java/binnie/craftgui/core/ITooltip.java b/src/main/java/binnie/core/craftgui/ITooltip.java similarity index 69% rename from src/main/java/binnie/craftgui/core/ITooltip.java rename to src/main/java/binnie/core/craftgui/ITooltip.java index d1e8c98d..e165d135 100644 --- a/src/main/java/binnie/craftgui/core/ITooltip.java +++ b/src/main/java/binnie/core/craftgui/ITooltip.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core; +package binnie.core.craftgui; public interface ITooltip { void getTooltip(final Tooltip p0); diff --git a/src/main/java/binnie/craftgui/core/ITooltipHelp.java b/src/main/java/binnie/core/craftgui/ITooltipHelp.java similarity index 71% rename from src/main/java/binnie/craftgui/core/ITooltipHelp.java rename to src/main/java/binnie/core/craftgui/ITooltipHelp.java index 7278adbf..af030267 100644 --- a/src/main/java/binnie/craftgui/core/ITooltipHelp.java +++ b/src/main/java/binnie/core/craftgui/ITooltipHelp.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core; +package binnie.core.craftgui; public interface ITooltipHelp { void getHelpTooltip(final Tooltip p0); diff --git a/src/main/java/binnie/craftgui/core/ITopLevelWidget.java b/src/main/java/binnie/core/craftgui/ITopLevelWidget.java similarity index 87% rename from src/main/java/binnie/craftgui/core/ITopLevelWidget.java rename to src/main/java/binnie/core/craftgui/ITopLevelWidget.java index 3130ba24..d42373f8 100644 --- a/src/main/java/binnie/craftgui/core/ITopLevelWidget.java +++ b/src/main/java/binnie/core/craftgui/ITopLevelWidget.java @@ -1,9 +1,9 @@ -package binnie.craftgui.core; - -import binnie.craftgui.core.geometry.Point; +package binnie.core.craftgui; import javax.annotation.Nullable; +import binnie.core.craftgui.geometry.Point; + public interface ITopLevelWidget extends IWidget { void setMousePosition(final int p0, final int p1); diff --git a/src/main/java/binnie/craftgui/core/IWidget.java b/src/main/java/binnie/core/craftgui/IWidget.java similarity index 91% rename from src/main/java/binnie/craftgui/core/IWidget.java rename to src/main/java/binnie/core/craftgui/IWidget.java index ee103fa4..bee5fb8c 100644 --- a/src/main/java/binnie/craftgui/core/IWidget.java +++ b/src/main/java/binnie/core/craftgui/IWidget.java @@ -1,9 +1,9 @@ -package binnie.craftgui.core; +package binnie.core.craftgui; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.events.Event; -import binnie.craftgui.events.EventHandler; +import binnie.core.craftgui.events.Event; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/core/IWidgetAttribute.java b/src/main/java/binnie/core/craftgui/IWidgetAttribute.java similarity index 56% rename from src/main/java/binnie/craftgui/core/IWidgetAttribute.java rename to src/main/java/binnie/core/craftgui/IWidgetAttribute.java index 161914ad..6728a111 100644 --- a/src/main/java/binnie/craftgui/core/IWidgetAttribute.java +++ b/src/main/java/binnie/core/craftgui/IWidgetAttribute.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core; +package binnie.core.craftgui; public interface IWidgetAttribute { } diff --git a/src/main/java/binnie/craftgui/core/RenderStage.java b/src/main/java/binnie/core/craftgui/RenderStage.java similarity index 70% rename from src/main/java/binnie/craftgui/core/RenderStage.java rename to src/main/java/binnie/core/craftgui/RenderStage.java index c709554e..92eee4df 100644 --- a/src/main/java/binnie/craftgui/core/RenderStage.java +++ b/src/main/java/binnie/core/craftgui/RenderStage.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core; +package binnie.core.craftgui; public enum RenderStage { PreChildren, diff --git a/src/main/java/binnie/craftgui/core/Tooltip.java b/src/main/java/binnie/core/craftgui/Tooltip.java similarity index 98% rename from src/main/java/binnie/craftgui/core/Tooltip.java rename to src/main/java/binnie/core/craftgui/Tooltip.java index 20333d94..251b8b53 100644 --- a/src/main/java/binnie/craftgui/core/Tooltip.java +++ b/src/main/java/binnie/core/craftgui/Tooltip.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core; +package binnie.core.craftgui; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/binnie/craftgui/core/TopLevelWidget.java b/src/main/java/binnie/core/craftgui/TopLevelWidget.java similarity index 96% rename from src/main/java/binnie/craftgui/core/TopLevelWidget.java rename to src/main/java/binnie/core/craftgui/TopLevelWidget.java index 6558310e..32b45b9d 100644 --- a/src/main/java/binnie/craftgui/core/TopLevelWidget.java +++ b/src/main/java/binnie/core/craftgui/TopLevelWidget.java @@ -1,9 +1,10 @@ -package binnie.craftgui.core; +package binnie.core.craftgui; + +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.events.EventWidget; import org.lwjgl.input.Mouse; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/craftgui/core/Widget.java b/src/main/java/binnie/core/craftgui/Widget.java similarity index 97% rename from src/main/java/binnie/craftgui/core/Widget.java rename to src/main/java/binnie/core/craftgui/Widget.java index 5f699ed6..3e7230aa 100644 --- a/src/main/java/binnie/craftgui/core/Widget.java +++ b/src/main/java/binnie/core/craftgui/Widget.java @@ -1,10 +1,10 @@ -package binnie.craftgui.core; +package binnie.core.craftgui; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.events.Event; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventWidget; +import binnie.core.craftgui.events.Event; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java similarity index 91% rename from src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java rename to src/main/java/binnie/core/craftgui/WindowFieldKit.java index ff5b6e3e..6b1df282 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -1,24 +1,23 @@ -package binnie.craftgui.binniecore; +package binnie.core.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +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.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.InventoryType; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlImage; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.resource.StyleSheetPunnett; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.machines.inventory.SlotValidator; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventValueChanged; -import binnie.craftgui.minecraft.InventoryType; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlImage; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.resource.StyleSheetPunnett; -import binnie.craftgui.resource.minecraft.StandardTexture; import binnie.extrabees.core.ExtraBeeTexture; import binnie.genetics.gui.ControlChromosome; import binnie.genetics.machine.analyser.Analyser; diff --git a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java b/src/main/java/binnie/core/craftgui/WindowGenesis.java similarity index 90% rename from src/main/java/binnie/craftgui/binniecore/WindowGenesis.java rename to src/main/java/binnie/core/craftgui/WindowGenesis.java index 9ab1a525..c5eef0ff 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java +++ b/src/main/java/binnie/core/craftgui/WindowGenesis.java @@ -1,26 +1,25 @@ -package binnie.craftgui.binniecore; +package binnie.core.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import binnie.core.craftgui.controls.listbox.ControlListBox; +import binnie.core.craftgui.controls.listbox.ControlTextOption; +import binnie.core.craftgui.controls.tab.ControlTab; +import binnie.core.craftgui.controls.tab.ControlTabBar; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlTabIcon; +import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; -import binnie.craftgui.controls.listbox.ControlListBox; -import binnie.craftgui.controls.listbox.ControlTextOption; -import binnie.craftgui.controls.tab.ControlTab; -import binnie.craftgui.controls.tab.ControlTabBar; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.events.EventValueChanged; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlItemDisplay; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlTabIcon; -import binnie.craftgui.window.Panel; import binnie.genetics.gui.ControlGenesisOption; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; diff --git a/src/main/java/binnie/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java similarity index 73% rename from src/main/java/binnie/craftgui/controls/ControlCheckbox.java rename to src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java index 0d444917..07679be5 100644 --- a/src/main/java/binnie/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java @@ -1,17 +1,17 @@ -package binnie.craftgui.controls; +package binnie.core.craftgui.controls; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.events.EventValueChanged; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/controls/ControlText.java b/src/main/java/binnie/core/craftgui/controls/ControlText.java similarity index 74% rename from src/main/java/binnie/craftgui/controls/ControlText.java rename to src/main/java/binnie/core/craftgui/controls/ControlText.java index 1c1480fa..3aeefb2f 100644 --- a/src/main/java/binnie/craftgui/controls/ControlText.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlText.java @@ -1,12 +1,12 @@ -package binnie.craftgui.controls; +package binnie.core.craftgui.controls; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.core.renderer.RenderUtil; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.renderer.RenderUtil; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/controls/ControlTextCentered.java b/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java similarity index 54% rename from src/main/java/binnie/craftgui/controls/ControlTextCentered.java rename to src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java index e6cc32b3..0df47912 100644 --- a/src/main/java/binnie/craftgui/controls/ControlTextCentered.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java @@ -1,9 +1,9 @@ -package binnie.craftgui.controls; +package binnie.core.craftgui.controls; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; public class ControlTextCentered extends ControlText { public ControlTextCentered(final IWidget parent, final int y, final String text) { diff --git a/src/main/java/binnie/craftgui/controls/ControlTextEdit.java b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java similarity index 83% rename from src/main/java/binnie/craftgui/controls/ControlTextEdit.java rename to src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java index 8df1b6bb..01c0d2fd 100644 --- a/src/main/java/binnie/craftgui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java @@ -1,16 +1,16 @@ -package binnie.craftgui.controls; +package binnie.core.craftgui.controls; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventKey; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.events.EventTextEdit; -import binnie.craftgui.events.EventWidget; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventKey; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventTextEdit; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.client.gui.GuiTextField; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/controls/IControlSelection.java b/src/main/java/binnie/core/craftgui/controls/IControlSelection.java similarity index 80% rename from src/main/java/binnie/craftgui/controls/IControlSelection.java rename to src/main/java/binnie/core/craftgui/controls/IControlSelection.java index e8d69d01..d06c9fdd 100644 --- a/src/main/java/binnie/craftgui/controls/IControlSelection.java +++ b/src/main/java/binnie/core/craftgui/controls/IControlSelection.java @@ -1,4 +1,4 @@ -package binnie.craftgui.controls; +package binnie.core.craftgui.controls; public interface IControlSelection { T getSelectedValue(); diff --git a/src/main/java/binnie/craftgui/controls/IControlSelectionOption.java b/src/main/java/binnie/core/craftgui/controls/IControlSelectionOption.java similarity index 62% rename from src/main/java/binnie/craftgui/controls/IControlSelectionOption.java rename to src/main/java/binnie/core/craftgui/controls/IControlSelectionOption.java index cb38a9a5..7a22ade5 100644 --- a/src/main/java/binnie/craftgui/controls/IControlSelectionOption.java +++ b/src/main/java/binnie/core/craftgui/controls/IControlSelectionOption.java @@ -1,4 +1,4 @@ -package binnie.craftgui.controls; +package binnie.core.craftgui.controls; public interface IControlSelectionOption { T getValue(); diff --git a/src/main/java/binnie/craftgui/controls/button/ControlButton.java b/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java similarity index 76% rename from src/main/java/binnie/craftgui/controls/button/ControlButton.java rename to src/main/java/binnie/core/craftgui/controls/button/ControlButton.java index dcf7fcc6..d4840505 100644 --- a/src/main/java/binnie/craftgui/controls/button/ControlButton.java +++ b/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java @@ -1,15 +1,15 @@ -package binnie.craftgui.controls.button; +package binnie.core.craftgui.controls.button; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.events.EventButtonClicked; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.events.EventButtonClicked; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java b/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java similarity index 85% rename from src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java rename to src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java index 44729785..fc1e1500 100644 --- a/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java +++ b/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java @@ -1,9 +1,10 @@ -package binnie.craftgui.controls.button; +package binnie.core.craftgui.controls.button; + +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventValueChanged; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.events.EventValueChanged; import com.google.common.base.Preconditions; import java.util.ArrayList; diff --git a/src/main/java/binnie/craftgui/controls/button/ControlToggleButton.java b/src/main/java/binnie/core/craftgui/controls/button/ControlToggleButton.java similarity index 66% rename from src/main/java/binnie/craftgui/controls/button/ControlToggleButton.java rename to src/main/java/binnie/core/craftgui/controls/button/ControlToggleButton.java index 2e43ec21..001d6058 100644 --- a/src/main/java/binnie/craftgui/controls/button/ControlToggleButton.java +++ b/src/main/java/binnie/core/craftgui/controls/button/ControlToggleButton.java @@ -1,8 +1,8 @@ -package binnie.craftgui.controls.button; +package binnie.core.craftgui.controls.button; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.events.EventToggleButtonClicked; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventToggleButtonClicked; public class ControlToggleButton extends ControlButton { boolean toggled; diff --git a/src/main/java/binnie/core/craftgui/controls/button/package-info.java b/src/main/java/binnie/core/craftgui/controls/button/package-info.java new file mode 100644 index 00000000..0075f383 --- /dev/null +++ b/src/main/java/binnie/core/craftgui/controls/button/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.craftgui.controls.button; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/core/Control.java b/src/main/java/binnie/core/craftgui/controls/core/Control.java similarity index 81% rename from src/main/java/binnie/craftgui/controls/core/Control.java rename to src/main/java/binnie/core/craftgui/controls/core/Control.java index cbb13d4a..45f7d03b 100644 --- a/src/main/java/binnie/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/core/craftgui/controls/core/Control.java @@ -1,14 +1,14 @@ -package binnie.craftgui.controls.core; +package binnie.core.craftgui.controls.core; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.ITooltipHelp; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.Widget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.minecraft.Window; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.ITooltipHelp; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.Widget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.Window; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/controls/core/IControlIndexed.java b/src/main/java/binnie/core/craftgui/controls/core/IControlIndexed.java similarity index 66% rename from src/main/java/binnie/craftgui/controls/core/IControlIndexed.java rename to src/main/java/binnie/core/craftgui/controls/core/IControlIndexed.java index 9ca657ce..a5a9568c 100644 --- a/src/main/java/binnie/craftgui/controls/core/IControlIndexed.java +++ b/src/main/java/binnie/core/craftgui/controls/core/IControlIndexed.java @@ -1,4 +1,4 @@ -package binnie.craftgui.controls.core; +package binnie.core.craftgui.controls.core; public interface IControlIndexed { int getIndex(); diff --git a/src/main/java/binnie/craftgui/controls/core/IControlValue.java b/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java similarity index 66% rename from src/main/java/binnie/craftgui/controls/core/IControlValue.java rename to src/main/java/binnie/core/craftgui/controls/core/IControlValue.java index 7fcac715..6669e1b4 100644 --- a/src/main/java/binnie/craftgui/controls/core/IControlValue.java +++ b/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java @@ -1,9 +1,9 @@ -package binnie.craftgui.controls.core; - -import binnie.craftgui.core.IWidget; +package binnie.core.craftgui.controls.core; import javax.annotation.Nullable; +import binnie.core.craftgui.IWidget; + public interface IControlValue extends IWidget { @Nullable T getValue(); diff --git a/src/main/java/binnie/craftgui/controls/core/IControlValues.java b/src/main/java/binnie/core/craftgui/controls/core/IControlValues.java similarity index 78% rename from src/main/java/binnie/craftgui/controls/core/IControlValues.java rename to src/main/java/binnie/core/craftgui/controls/core/IControlValues.java index 01c29041..2e36c0c6 100644 --- a/src/main/java/binnie/craftgui/controls/core/IControlValues.java +++ b/src/main/java/binnie/core/craftgui/controls/core/IControlValues.java @@ -1,4 +1,4 @@ -package binnie.craftgui.controls.core; +package binnie.core.craftgui.controls.core; import java.util.Collection; diff --git a/src/main/java/binnie/craftgui/controls/button/package-info.java b/src/main/java/binnie/core/craftgui/controls/core/package-info.java similarity index 84% rename from src/main/java/binnie/craftgui/controls/button/package-info.java rename to src/main/java/binnie/core/craftgui/controls/core/package-info.java index 94544ed2..68863256 100644 --- a/src/main/java/binnie/craftgui/controls/button/package-info.java +++ b/src/main/java/binnie/core/craftgui/controls/core/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.craftgui.controls.button; +package binnie.core.craftgui.controls.core; import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlList.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java similarity index 91% rename from src/main/java/binnie/craftgui/controls/listbox/ControlList.java rename to src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java index 316c4822..6930e72d 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlList.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java @@ -1,11 +1,11 @@ -package binnie.craftgui.controls.listbox; +package binnie.core.craftgui.controls.listbox; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.craftgui.geometry.Point; import binnie.core.util.IValidator; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.events.EventValueChanged; import javax.annotation.Nullable; import java.util.Collection; diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java similarity index 87% rename from src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java rename to src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java index 2cc4999b..8f6abc3e 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java @@ -1,10 +1,10 @@ -package binnie.craftgui.controls.listbox; +package binnie.core.craftgui.controls.listbox; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.controls.scroll.ControlScrollableContent; +import binnie.core.craftgui.events.EventKey; import binnie.core.util.IValidator; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.controls.scroll.ControlScrollableContent; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.events.EventKey; import java.util.Collection; diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java similarity index 79% rename from src/main/java/binnie/craftgui/controls/listbox/ControlOption.java rename to src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java index 73c3a16d..a5c18260 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java @@ -1,11 +1,11 @@ -package binnie.craftgui.controls.listbox; +package binnie.core.craftgui.controls.listbox; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlTextOption.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java similarity index 77% rename from src/main/java/binnie/craftgui/controls/listbox/ControlTextOption.java rename to src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java index a680ddf4..16df62d0 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlTextOption.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java @@ -1,9 +1,9 @@ -package binnie.craftgui.controls.listbox; +package binnie.core.craftgui.controls.listbox; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.geometry.TextJustification; public class ControlTextOption extends ControlOption { protected ControlText textWidget; diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/package-info.java b/src/main/java/binnie/core/craftgui/controls/listbox/package-info.java new file mode 100644 index 00000000..e907e22a --- /dev/null +++ b/src/main/java/binnie/core/craftgui/controls/listbox/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.craftgui.controls.listbox; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/page/package-info.java b/src/main/java/binnie/core/craftgui/controls/package-info.java similarity index 85% rename from src/main/java/binnie/craftgui/controls/page/package-info.java rename to src/main/java/binnie/core/craftgui/controls/package-info.java index 6afcd725..19d4d1df 100644 --- a/src/main/java/binnie/craftgui/controls/page/package-info.java +++ b/src/main/java/binnie/core/craftgui/controls/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.craftgui.controls.page; +package binnie.core.craftgui.controls; import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/binnie/craftgui/controls/page/ControlPage.java b/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java similarity index 77% rename from src/main/java/binnie/craftgui/controls/page/ControlPage.java rename to src/main/java/binnie/core/craftgui/controls/page/ControlPage.java index 0f9af6d8..64809f6f 100644 --- a/src/main/java/binnie/craftgui/controls/page/ControlPage.java +++ b/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java @@ -1,8 +1,8 @@ -package binnie.craftgui.controls.page; +package binnie.core.craftgui.controls.page; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; public class ControlPage extends Control implements IControlValue { private T value; diff --git a/src/main/java/binnie/craftgui/controls/page/ControlPages.java b/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java similarity index 77% rename from src/main/java/binnie/craftgui/controls/page/ControlPages.java rename to src/main/java/binnie/core/craftgui/controls/page/ControlPages.java index 5a78daa5..0ac8f1a8 100644 --- a/src/main/java/binnie/craftgui/controls/page/ControlPages.java +++ b/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java @@ -1,10 +1,10 @@ -package binnie.craftgui.controls.page; +package binnie.core.craftgui.controls.page; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.controls.core.IControlValues; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.events.EventValueChanged; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.controls.core.IControlValues; +import binnie.core.craftgui.events.EventValueChanged; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/binnie/core/craftgui/controls/page/package-info.java b/src/main/java/binnie/core/craftgui/controls/page/package-info.java new file mode 100644 index 00000000..53a3184c --- /dev/null +++ b/src/main/java/binnie/core/craftgui/controls/page/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.craftgui.controls.page; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/scroll/ControlScroll.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java similarity index 76% rename from src/main/java/binnie/craftgui/controls/scroll/ControlScroll.java rename to src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java index 01adbacf..4ca37469 100644 --- a/src/main/java/binnie/craftgui/controls/scroll/ControlScroll.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java @@ -1,7 +1,7 @@ -package binnie.craftgui.controls.scroll; +package binnie.core.craftgui.controls.scroll; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; public class ControlScroll extends Control { private IControlScrollable scrollWidget; diff --git a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollBar.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java similarity index 88% rename from src/main/java/binnie/craftgui/controls/scroll/ControlScrollBar.java rename to src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java index 3abf17a4..cc656bdf 100644 --- a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollBar.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java @@ -1,12 +1,12 @@ -package binnie.craftgui.controls.scroll; +package binnie.core.craftgui.controls.scroll; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollableContent.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java similarity index 92% rename from src/main/java/binnie/craftgui/controls/scroll/ControlScrollableContent.java rename to src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java index 20e7905f..851592b8 100644 --- a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollableContent.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java @@ -1,11 +1,11 @@ -package binnie.craftgui.controls.scroll; +package binnie.core.craftgui.controls.scroll; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.events.EventWidget; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/craftgui/controls/scroll/IControlScrollable.java b/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java similarity index 73% rename from src/main/java/binnie/craftgui/controls/scroll/IControlScrollable.java rename to src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java index 89d2c807..3a5878a8 100644 --- a/src/main/java/binnie/craftgui/controls/scroll/IControlScrollable.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java @@ -1,6 +1,6 @@ -package binnie.craftgui.controls.scroll; +package binnie.core.craftgui.controls.scroll; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; public interface IControlScrollable extends IWidget { float getPercentageShown(); diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/package-info.java b/src/main/java/binnie/core/craftgui/controls/scroll/package-info.java new file mode 100644 index 00000000..a7fe2fcc --- /dev/null +++ b/src/main/java/binnie/core/craftgui/controls/scroll/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.craftgui.controls.scroll; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/tab/ControlTab.java b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java similarity index 77% rename from src/main/java/binnie/craftgui/controls/tab/ControlTab.java rename to src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java index ae5d605c..8002fc7e 100644 --- a/src/main/java/binnie/craftgui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java @@ -1,21 +1,21 @@ -package binnie.craftgui.controls.tab; +package binnie.core.craftgui.controls.tab; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.events.EventValueChanged; -import binnie.craftgui.minecraft.control.ControlItemDisplay; -import binnie.craftgui.minecraft.control.ControlTabIcon; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.craftgui.minecraft.control.ControlTabIcon; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java b/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java similarity index 86% rename from src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java rename to src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java index 343f7e9d..ed8b532f 100644 --- a/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java @@ -1,11 +1,12 @@ -package binnie.craftgui.controls.tab; +package binnie.core.craftgui.controls.tab; + +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.craftgui.geometry.Position; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventValueChanged; import com.google.common.collect.Iterables; import java.util.Collection; diff --git a/src/main/java/binnie/craftgui/controls/listbox/package-info.java b/src/main/java/binnie/core/craftgui/controls/tab/package-info.java similarity index 84% rename from src/main/java/binnie/craftgui/controls/listbox/package-info.java rename to src/main/java/binnie/core/craftgui/controls/tab/package-info.java index feeb2d1b..e067d135 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/package-info.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.craftgui.controls.listbox; +package binnie.core.craftgui.controls.tab; import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlBranchBox.java b/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java similarity index 75% rename from src/main/java/binnie/craftgui/mod/database/ControlBranchBox.java rename to src/main/java/binnie/core/craftgui/database/ControlBranchBox.java index 291594a9..ceccf8f8 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlBranchBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java @@ -1,7 +1,7 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; -import binnie.craftgui.controls.listbox.ControlListBox; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.listbox.ControlListBox; import forestry.api.genetics.IClassification; class ControlBranchBox extends ControlListBox { diff --git a/src/main/java/binnie/craftgui/mod/database/ControlBranchBoxOption.java b/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java similarity index 69% rename from src/main/java/binnie/craftgui/mod/database/ControlBranchBoxOption.java rename to src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java index dc04264e..7f59516b 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlBranchBoxOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java @@ -1,7 +1,7 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; -import binnie.craftgui.controls.listbox.ControlList; -import binnie.craftgui.controls.listbox.ControlTextOption; +import binnie.core.craftgui.controls.listbox.ControlList; +import binnie.core.craftgui.controls.listbox.ControlTextOption; import forestry.api.genetics.IClassification; class ControlBranchBoxOption extends ControlTextOption { diff --git a/src/main/java/binnie/craftgui/mod/database/ControlBreedingProgress.java b/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java similarity index 65% rename from src/main/java/binnie/craftgui/mod/database/ControlBreedingProgress.java rename to src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java index d36130e8..11c3a49c 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlBreedingProgress.java +++ b/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java @@ -1,16 +1,16 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.CraftGUITexture; -import binnie.craftgui.resource.minecraft.CraftGUITextureSheet; -import binnie.craftgui.resource.minecraft.StandardTexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java similarity index 90% rename from src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java rename to src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java index 6ffae883..83ba5e38 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java @@ -1,14 +1,15 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; import binnie.Binnie; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlItemDisplay; + import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlItemStackOption.java b/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java similarity index 73% rename from src/main/java/binnie/craftgui/mod/database/ControlItemStackOption.java rename to src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java index 2113773f..c53a1fab 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlItemStackOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java @@ -1,12 +1,12 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; -import binnie.craftgui.controls.listbox.ControlList; -import binnie.craftgui.controls.listbox.ControlTextOption; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.controls.listbox.ControlList; +import binnie.core.craftgui.controls.listbox.ControlTextOption; +import binnie.core.craftgui.geometry.CraftGUIUtil; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlMutationBox.java b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java similarity index 90% rename from src/main/java/binnie/craftgui/mod/database/ControlMutationBox.java rename to src/main/java/binnie/core/craftgui/database/ControlMutationBox.java index 894d33e8..eee76006 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlMutationBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java @@ -1,9 +1,9 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.listbox.ControlListBox; +import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.controls.listbox.ControlListBox; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.minecraft.Window; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlMutationItem.java b/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java similarity index 91% rename from src/main/java/binnie/craftgui/mod/database/ControlMutationItem.java rename to src/main/java/binnie/core/craftgui/database/ControlMutationItem.java index 3fdc22c2..093fa127 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlMutationItem.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java @@ -1,9 +1,9 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; +import binnie.core.craftgui.controls.listbox.ControlList; +import binnie.core.craftgui.controls.listbox.ControlOption; +import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.controls.listbox.ControlList; -import binnie.craftgui.controls.listbox.ControlOption; -import binnie.craftgui.minecraft.Window; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java similarity index 80% rename from src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java rename to src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java index 4f1277e7..530b8d01 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java @@ -1,17 +1,17 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.CraftGUITextureSheet; -import binnie.craftgui.resource.minecraft.StandardTexture; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java similarity index 88% rename from src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java rename to src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java index 2c2739e0..4c3cd296 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java @@ -1,8 +1,9 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; + +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.listbox.ControlListBox; +import binnie.core.craftgui.minecraft.Window; -import binnie.craftgui.controls.listbox.ControlListBox; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.minecraft.Window; import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBoxOption.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java similarity index 82% rename from src/main/java/binnie/craftgui/mod/database/ControlSpeciesBoxOption.java rename to src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java index e184c902..8eace00d 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBoxOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java @@ -1,11 +1,11 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; -import binnie.craftgui.controls.listbox.ControlList; -import binnie.craftgui.controls.listbox.ControlTextOption; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.Point; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.controls.listbox.ControlList; +import binnie.core.craftgui.controls.listbox.ControlTextOption; +import binnie.core.craftgui.geometry.CraftGUIUtil; +import binnie.core.craftgui.geometry.Point; import forestry.api.genetics.IAlleleSpecies; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/mod/database/DatabaseTab.java b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java similarity index 84% rename from src/main/java/binnie/craftgui/mod/database/DatabaseTab.java rename to src/main/java/binnie/core/craftgui/database/DatabaseTab.java index 1da4cf96..cb0b6ae5 100644 --- a/src/main/java/binnie/craftgui/mod/database/DatabaseTab.java +++ b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java @@ -1,9 +1,9 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; import binnie.Binnie; import binnie.core.AbstractMod; -import binnie.craftgui.core.ITooltipHelp; -import binnie.craftgui.core.Tooltip; +import binnie.core.craftgui.ITooltipHelp; +import binnie.core.craftgui.Tooltip; public class DatabaseTab implements ITooltipHelp { private AbstractMod mod; diff --git a/src/main/java/binnie/craftgui/mod/database/EnumDiscoveryState.java b/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java similarity index 68% rename from src/main/java/binnie/craftgui/mod/database/EnumDiscoveryState.java rename to src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java index edd152b3..fafae0c3 100644 --- a/src/main/java/binnie/craftgui/mod/database/EnumDiscoveryState.java +++ b/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java @@ -1,4 +1,4 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; public enum EnumDiscoveryState { Show, diff --git a/src/main/java/binnie/craftgui/mod/database/IDatabaseMode.java b/src/main/java/binnie/core/craftgui/database/IDatabaseMode.java similarity index 58% rename from src/main/java/binnie/craftgui/mod/database/IDatabaseMode.java rename to src/main/java/binnie/core/craftgui/database/IDatabaseMode.java index 3bd32df7..4276d69e 100644 --- a/src/main/java/binnie/craftgui/mod/database/IDatabaseMode.java +++ b/src/main/java/binnie/core/craftgui/database/IDatabaseMode.java @@ -1,4 +1,4 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; public interface IDatabaseMode { String getName(); diff --git a/src/main/java/binnie/craftgui/mod/database/PageAbstract.java b/src/main/java/binnie/core/craftgui/database/PageAbstract.java similarity index 67% rename from src/main/java/binnie/craftgui/mod/database/PageAbstract.java rename to src/main/java/binnie/core/craftgui/database/PageAbstract.java index 7ea5401e..ad9dd9da 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageAbstract.java +++ b/src/main/java/binnie/core/craftgui/database/PageAbstract.java @@ -1,7 +1,7 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; -import binnie.craftgui.controls.page.ControlPage; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.page.ControlPage; public abstract class PageAbstract extends ControlPage { public PageAbstract(final IWidget parent, final DatabaseTab tab) { diff --git a/src/main/java/binnie/craftgui/mod/database/PageBranch.java b/src/main/java/binnie/core/craftgui/database/PageBranch.java similarity index 73% rename from src/main/java/binnie/craftgui/mod/database/PageBranch.java rename to src/main/java/binnie/core/craftgui/database/PageBranch.java index 94eababb..56401a56 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBranch.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranch.java @@ -1,6 +1,6 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; import forestry.api.genetics.IClassification; abstract class PageBranch extends PageAbstract { diff --git a/src/main/java/binnie/craftgui/mod/database/PageBranchOverview.java b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java similarity index 90% rename from src/main/java/binnie/craftgui/mod/database/PageBranchOverview.java rename to src/main/java/binnie/core/craftgui/database/PageBranchOverview.java index c42ebaa2..a60861e7 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBranchOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java @@ -1,10 +1,10 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; import binnie.Binnie; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.renderer.RenderUtil; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.renderer.RenderUtil; import forestry.api.genetics.IClassification; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/binnie/craftgui/mod/database/PageBranchSpecies.java b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java similarity index 83% rename from src/main/java/binnie/craftgui/mod/database/PageBranchSpecies.java rename to src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java index 51757c5d..6ce5c482 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBranchSpecies.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java @@ -1,10 +1,10 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; import binnie.Binnie; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.events.EventValueChanged; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.events.EventValueChanged; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; diff --git a/src/main/java/binnie/craftgui/mod/database/PageBreeder.java b/src/main/java/binnie/core/craftgui/database/PageBreeder.java similarity index 88% rename from src/main/java/binnie/craftgui/mod/database/PageBreeder.java rename to src/main/java/binnie/core/craftgui/database/PageBreeder.java index 609c5223..a698c019 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBreeder.java +++ b/src/main/java/binnie/core/craftgui/database/PageBreeder.java @@ -1,11 +1,12 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; import binnie.Binnie; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.controls.page.ControlPage; +import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.controls.page.ControlPage; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.minecraft.Window; + import com.mojang.authlib.GameProfile; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/binnie/craftgui/mod/database/PageBreederStats.java b/src/main/java/binnie/core/craftgui/database/PageBreederStats.java similarity index 72% rename from src/main/java/binnie/craftgui/mod/database/PageBreederStats.java rename to src/main/java/binnie/core/craftgui/database/PageBreederStats.java index 747e81b2..eb8701c4 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBreederStats.java +++ b/src/main/java/binnie/core/craftgui/database/PageBreederStats.java @@ -1,11 +1,11 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; import binnie.Binnie; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.controls.core.Control; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.IWidget; import net.minecraft.util.text.TextFormatting; public class PageBreederStats extends Control { diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpecies.java b/src/main/java/binnie/core/craftgui/database/PageSpecies.java similarity index 73% rename from src/main/java/binnie/craftgui/mod/database/PageSpecies.java rename to src/main/java/binnie/core/craftgui/database/PageSpecies.java index 172279a7..58c76c6d 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpecies.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpecies.java @@ -1,6 +1,6 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; import forestry.api.genetics.IAlleleSpecies; public abstract class PageSpecies extends PageAbstract { diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpeciesClassification.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java similarity index 88% rename from src/main/java/binnie/craftgui/mod/database/PageSpeciesClassification.java rename to src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java index 5b2787f8..a75ee8f9 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpeciesClassification.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java @@ -1,8 +1,8 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpeciesMutations.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java similarity index 79% rename from src/main/java/binnie/craftgui/mod/database/PageSpeciesMutations.java rename to src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java index eb882fc1..455e1e55 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpeciesMutations.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java @@ -1,9 +1,9 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; import binnie.Binnie; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesMutations extends PageSpecies { diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java similarity index 89% rename from src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java rename to src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java index 56f58835..ec7c3282 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java @@ -1,13 +1,13 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; import binnie.Binnie; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpeciesResultant.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java similarity index 79% rename from src/main/java/binnie/craftgui/mod/database/PageSpeciesResultant.java rename to src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java index 092eaf27..9e4d18f3 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpeciesResultant.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java @@ -1,9 +1,9 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; import binnie.Binnie; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesResultant extends PageSpecies { diff --git a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java similarity index 89% rename from src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java rename to src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java index a19d11b2..21b9a2b9 100644 --- a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java @@ -1,27 +1,28 @@ -package binnie.craftgui.mod.database; +package binnie.core.craftgui.database; import binnie.core.BinnieCore; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextEdit; +import binnie.core.craftgui.controls.listbox.ControlListBox; +import binnie.core.craftgui.controls.listbox.ControlTextOption; +import binnie.core.craftgui.controls.page.ControlPage; +import binnie.core.craftgui.controls.page.ControlPages; +import binnie.core.craftgui.controls.tab.ControlTab; +import binnie.core.craftgui.controls.tab.ControlTabBar; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventTextEdit; +import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.CraftGUIUtil; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlHelp; +import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; import binnie.core.util.IValidator; -import binnie.craftgui.controls.ControlTextEdit; -import binnie.craftgui.controls.listbox.ControlListBox; -import binnie.craftgui.controls.listbox.ControlTextOption; -import binnie.craftgui.controls.page.ControlPage; -import binnie.craftgui.controls.page.ControlPages; -import binnie.craftgui.controls.tab.ControlTab; -import binnie.craftgui.controls.tab.ControlTabBar; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventTextEdit; -import binnie.craftgui.events.EventValueChanged; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlHelp; -import binnie.craftgui.window.Panel; + import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; diff --git a/src/main/java/binnie/craftgui/controls/core/package-info.java b/src/main/java/binnie/core/craftgui/database/package-info.java similarity index 85% rename from src/main/java/binnie/craftgui/controls/core/package-info.java rename to src/main/java/binnie/core/craftgui/database/package-info.java index f620f9de..85232368 100644 --- a/src/main/java/binnie/craftgui/controls/core/package-info.java +++ b/src/main/java/binnie/core/craftgui/database/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.craftgui.controls.core; +package binnie.core.craftgui.database; import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/binnie/craftgui/events/Event.java b/src/main/java/binnie/core/craftgui/events/Event.java similarity index 77% rename from src/main/java/binnie/craftgui/events/Event.java rename to src/main/java/binnie/core/craftgui/events/Event.java index 54ced82f..31b9edca 100644 --- a/src/main/java/binnie/craftgui/events/Event.java +++ b/src/main/java/binnie/core/craftgui/events/Event.java @@ -1,6 +1,6 @@ -package binnie.craftgui.events; +package binnie.core.craftgui.events; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; public class Event { IWidget origin; diff --git a/src/main/java/binnie/craftgui/events/EventButtonClicked.java b/src/main/java/binnie/core/craftgui/events/EventButtonClicked.java similarity index 78% rename from src/main/java/binnie/craftgui/events/EventButtonClicked.java rename to src/main/java/binnie/core/craftgui/events/EventButtonClicked.java index d7f665e5..70d77d19 100644 --- a/src/main/java/binnie/craftgui/events/EventButtonClicked.java +++ b/src/main/java/binnie/core/craftgui/events/EventButtonClicked.java @@ -1,6 +1,6 @@ -package binnie.craftgui.events; +package binnie.core.craftgui.events; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; public class EventButtonClicked extends Event { public EventButtonClicked(final IWidget origin) { diff --git a/src/main/java/binnie/craftgui/events/EventCycleChanged.java b/src/main/java/binnie/core/craftgui/events/EventCycleChanged.java similarity index 75% rename from src/main/java/binnie/craftgui/events/EventCycleChanged.java rename to src/main/java/binnie/core/craftgui/events/EventCycleChanged.java index 8a72b9f1..385ac000 100644 --- a/src/main/java/binnie/craftgui/events/EventCycleChanged.java +++ b/src/main/java/binnie/core/craftgui/events/EventCycleChanged.java @@ -1,6 +1,6 @@ -package binnie.craftgui.events; +package binnie.core.craftgui.events; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; public class EventCycleChanged extends Event { public int value; diff --git a/src/main/java/binnie/craftgui/events/EventHandler.java b/src/main/java/binnie/core/craftgui/events/EventHandler.java similarity index 93% rename from src/main/java/binnie/craftgui/events/EventHandler.java rename to src/main/java/binnie/core/craftgui/events/EventHandler.java index 34ce1290..0d45eb4f 100644 --- a/src/main/java/binnie/craftgui/events/EventHandler.java +++ b/src/main/java/binnie/core/craftgui/events/EventHandler.java @@ -1,6 +1,6 @@ -package binnie.craftgui.events; +package binnie.core.craftgui.events; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; public abstract class EventHandler { Class eventClass; diff --git a/src/main/java/binnie/craftgui/events/EventKey.java b/src/main/java/binnie/core/craftgui/events/EventKey.java similarity index 92% rename from src/main/java/binnie/craftgui/events/EventKey.java rename to src/main/java/binnie/core/craftgui/events/EventKey.java index 6294162d..360752fa 100644 --- a/src/main/java/binnie/craftgui/events/EventKey.java +++ b/src/main/java/binnie/core/craftgui/events/EventKey.java @@ -1,6 +1,6 @@ -package binnie.craftgui.events; +package binnie.core.craftgui.events; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; public abstract class EventKey extends Event { char character; diff --git a/src/main/java/binnie/craftgui/events/EventMouse.java b/src/main/java/binnie/core/craftgui/events/EventMouse.java similarity index 96% rename from src/main/java/binnie/craftgui/events/EventMouse.java rename to src/main/java/binnie/core/craftgui/events/EventMouse.java index fe067dc4..bc121e65 100644 --- a/src/main/java/binnie/craftgui/events/EventMouse.java +++ b/src/main/java/binnie/core/craftgui/events/EventMouse.java @@ -1,6 +1,6 @@ -package binnie.craftgui.events; +package binnie.core.craftgui.events; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; public abstract class EventMouse extends Event { public EventMouse(final IWidget origin) { diff --git a/src/main/java/binnie/craftgui/events/EventTextEdit.java b/src/main/java/binnie/core/craftgui/events/EventTextEdit.java similarity index 79% rename from src/main/java/binnie/craftgui/events/EventTextEdit.java rename to src/main/java/binnie/core/craftgui/events/EventTextEdit.java index f79f9366..8106bff6 100644 --- a/src/main/java/binnie/craftgui/events/EventTextEdit.java +++ b/src/main/java/binnie/core/craftgui/events/EventTextEdit.java @@ -1,6 +1,6 @@ -package binnie.craftgui.events; +package binnie.core.craftgui.events; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; public class EventTextEdit extends EventValueChanged { public EventTextEdit(final IWidget origin, final String text) { diff --git a/src/main/java/binnie/craftgui/events/EventToggleButtonClicked.java b/src/main/java/binnie/core/craftgui/events/EventToggleButtonClicked.java similarity index 77% rename from src/main/java/binnie/craftgui/events/EventToggleButtonClicked.java rename to src/main/java/binnie/core/craftgui/events/EventToggleButtonClicked.java index d911f28b..2233b99a 100644 --- a/src/main/java/binnie/craftgui/events/EventToggleButtonClicked.java +++ b/src/main/java/binnie/core/craftgui/events/EventToggleButtonClicked.java @@ -1,6 +1,6 @@ -package binnie.craftgui.events; +package binnie.core.craftgui.events; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; public class EventToggleButtonClicked extends Event { boolean toggled; diff --git a/src/main/java/binnie/craftgui/events/EventValueChanged.java b/src/main/java/binnie/core/craftgui/events/EventValueChanged.java similarity index 85% rename from src/main/java/binnie/craftgui/events/EventValueChanged.java rename to src/main/java/binnie/core/craftgui/events/EventValueChanged.java index 10c48d02..8a4c2979 100644 --- a/src/main/java/binnie/craftgui/events/EventValueChanged.java +++ b/src/main/java/binnie/core/craftgui/events/EventValueChanged.java @@ -1,9 +1,9 @@ -package binnie.craftgui.events; - -import binnie.craftgui.core.IWidget; +package binnie.core.craftgui.events; import javax.annotation.Nullable; +import binnie.core.craftgui.IWidget; + public class EventValueChanged extends Event { @Nullable public T value; diff --git a/src/main/java/binnie/craftgui/events/EventValuesChanged.java b/src/main/java/binnie/core/craftgui/events/EventValuesChanged.java similarity index 76% rename from src/main/java/binnie/craftgui/events/EventValuesChanged.java rename to src/main/java/binnie/core/craftgui/events/EventValuesChanged.java index efbc2ae0..8125f6de 100644 --- a/src/main/java/binnie/craftgui/events/EventValuesChanged.java +++ b/src/main/java/binnie/core/craftgui/events/EventValuesChanged.java @@ -1,6 +1,6 @@ -package binnie.craftgui.events; +package binnie.core.craftgui.events; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; public class EventValuesChanged extends Event { public T[] values; diff --git a/src/main/java/binnie/craftgui/events/EventWidget.java b/src/main/java/binnie/core/craftgui/events/EventWidget.java similarity index 98% rename from src/main/java/binnie/craftgui/events/EventWidget.java rename to src/main/java/binnie/core/craftgui/events/EventWidget.java index e999bf3b..40f957ce 100644 --- a/src/main/java/binnie/craftgui/events/EventWidget.java +++ b/src/main/java/binnie/core/craftgui/events/EventWidget.java @@ -1,6 +1,6 @@ -package binnie.craftgui.events; +package binnie.core.craftgui.events; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; public class EventWidget extends Event { public EventWidget(final IWidget origin) { diff --git a/src/main/java/binnie/craftgui/binniecore/package-info.java b/src/main/java/binnie/core/craftgui/events/package-info.java similarity index 86% rename from src/main/java/binnie/craftgui/binniecore/package-info.java rename to src/main/java/binnie/core/craftgui/events/package-info.java index 65e7ee0e..2ffe8613 100644 --- a/src/main/java/binnie/craftgui/binniecore/package-info.java +++ b/src/main/java/binnie/core/craftgui/events/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.craftgui.binniecore; +package binnie.core.craftgui.events; import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/binnie/craftgui/core/geometry/Area.java b/src/main/java/binnie/core/craftgui/geometry/Area.java similarity index 98% rename from src/main/java/binnie/craftgui/core/geometry/Area.java rename to src/main/java/binnie/core/craftgui/geometry/Area.java index f6ad77a2..d5f40be1 100644 --- a/src/main/java/binnie/craftgui/core/geometry/Area.java +++ b/src/main/java/binnie/core/craftgui/geometry/Area.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core.geometry; +package binnie.core.craftgui.geometry; public class Area { private Point pos; diff --git a/src/main/java/binnie/craftgui/core/geometry/Border.java b/src/main/java/binnie/core/craftgui/geometry/Border.java similarity index 97% rename from src/main/java/binnie/craftgui/core/geometry/Border.java rename to src/main/java/binnie/core/craftgui/geometry/Border.java index ca23383c..c198065f 100644 --- a/src/main/java/binnie/craftgui/core/geometry/Border.java +++ b/src/main/java/binnie/core/craftgui/geometry/Border.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core.geometry; +package binnie.core.craftgui.geometry; public class Border { public static final Border ZERO = new Border(0); diff --git a/src/main/java/binnie/craftgui/core/geometry/CraftGUIUtil.java b/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java similarity index 91% rename from src/main/java/binnie/craftgui/core/geometry/CraftGUIUtil.java rename to src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java index d1f4eb9a..f9cf8aad 100644 --- a/src/main/java/binnie/craftgui/core/geometry/CraftGUIUtil.java +++ b/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java @@ -1,8 +1,8 @@ -package binnie.craftgui.core.geometry; +package binnie.core.craftgui.geometry; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.events.EventValueChanged; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.events.EventValueChanged; public class CraftGUIUtil { public static void alignToWidget(final IWidget target, final IWidget relativeTo) { diff --git a/src/main/java/binnie/craftgui/core/geometry/Point.java b/src/main/java/binnie/core/craftgui/geometry/Point.java similarity index 96% rename from src/main/java/binnie/craftgui/core/geometry/Point.java rename to src/main/java/binnie/core/craftgui/geometry/Point.java index a297ec08..1fb39be1 100644 --- a/src/main/java/binnie/craftgui/core/geometry/Point.java +++ b/src/main/java/binnie/core/craftgui/geometry/Point.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core.geometry; +package binnie.core.craftgui.geometry; public class Point { public static final Point ZERO = new Point(0, 0); diff --git a/src/main/java/binnie/craftgui/core/geometry/Position.java b/src/main/java/binnie/core/craftgui/geometry/Position.java similarity index 93% rename from src/main/java/binnie/craftgui/core/geometry/Position.java rename to src/main/java/binnie/core/craftgui/geometry/Position.java index ba04a85a..559faa06 100644 --- a/src/main/java/binnie/craftgui/core/geometry/Position.java +++ b/src/main/java/binnie/core/craftgui/geometry/Position.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core.geometry; +package binnie.core.craftgui.geometry; public enum Position { Top(0, -1), diff --git a/src/main/java/binnie/craftgui/core/geometry/TextJustification.java b/src/main/java/binnie/core/craftgui/geometry/TextJustification.java similarity index 93% rename from src/main/java/binnie/craftgui/core/geometry/TextJustification.java rename to src/main/java/binnie/core/craftgui/geometry/TextJustification.java index 8d5fc567..9464869e 100644 --- a/src/main/java/binnie/craftgui/core/geometry/TextJustification.java +++ b/src/main/java/binnie/core/craftgui/geometry/TextJustification.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core.geometry; +package binnie.core.craftgui.geometry; public enum TextJustification { TopLeft(0.0f, 0.0f), diff --git a/src/main/java/binnie/core/craftgui/geometry/package-info.java b/src/main/java/binnie/core/craftgui/geometry/package-info.java new file mode 100644 index 00000000..b9e65f97 --- /dev/null +++ b/src/main/java/binnie/core/craftgui/geometry/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.craftgui.geometry; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java similarity index 99% rename from src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java rename to src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java index 1667304c..5db0d52b 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java @@ -1,6 +1,8 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; import binnie.core.BinnieCore; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.EnumHighlighting; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.network.INetwork; @@ -14,8 +16,7 @@ import binnie.core.machines.power.ProcessInfo; import binnie.core.machines.power.TankInfo; import binnie.core.machines.transfer.TransferRequest; import binnie.core.network.packet.MessageContainerUpdate; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.EnumHighlighting; + import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/binnie/craftgui/minecraft/CustomSlot.java b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java similarity index 97% rename from src/main/java/binnie/craftgui/minecraft/CustomSlot.java rename to src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java index 9530374d..710f31ea 100644 --- a/src/main/java/binnie/craftgui/minecraft/CustomSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java @@ -1,4 +1,4 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IInventorySlots; diff --git a/src/main/java/binnie/craftgui/minecraft/Dialog.java b/src/main/java/binnie/core/craftgui/minecraft/Dialog.java similarity index 73% rename from src/main/java/binnie/craftgui/minecraft/Dialog.java rename to src/main/java/binnie/core/craftgui/minecraft/Dialog.java index 16c7989c..70ec9870 100644 --- a/src/main/java/binnie/craftgui/minecraft/Dialog.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Dialog.java @@ -1,14 +1,14 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/EnumColor.java b/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java similarity index 95% rename from src/main/java/binnie/craftgui/minecraft/EnumColor.java rename to src/main/java/binnie/core/craftgui/minecraft/EnumColor.java index 0b55dbff..2261dbe2 100644 --- a/src/main/java/binnie/craftgui/minecraft/EnumColor.java +++ b/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java @@ -1,4 +1,4 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; public enum EnumColor { Black("Black", 0, '0'), diff --git a/src/main/java/binnie/craftgui/minecraft/GUIIcon.java b/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java similarity index 95% rename from src/main/java/binnie/craftgui/minecraft/GUIIcon.java rename to src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java index 37d0a2a0..6a84c30b 100644 --- a/src/main/java/binnie/craftgui/minecraft/GUIIcon.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java @@ -1,4 +1,4 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; import binnie.Binnie; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java similarity index 96% rename from src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java rename to src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java index bd2a8d0e..131f461e 100644 --- a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java @@ -1,11 +1,11 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventKey; -import binnie.craftgui.events.EventMouse; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.events.EventKey; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.renderer.RenderUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/binnie/craftgui/minecraft/IMachineInformation.java b/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java similarity index 62% rename from src/main/java/binnie/craftgui/minecraft/IMachineInformation.java rename to src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java index 46eb10f6..f0670ca8 100644 --- a/src/main/java/binnie/craftgui/minecraft/IMachineInformation.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java @@ -1,4 +1,4 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; public interface IMachineInformation { String getInformation(); diff --git a/src/main/java/binnie/craftgui/minecraft/IMinecraftTooltip.java b/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java similarity index 56% rename from src/main/java/binnie/craftgui/minecraft/IMinecraftTooltip.java rename to src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java index 4f20d79e..dce2940b 100644 --- a/src/main/java/binnie/craftgui/minecraft/IMinecraftTooltip.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java @@ -1,6 +1,6 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; -import binnie.craftgui.core.ITooltip; +import binnie.core.craftgui.ITooltip; public interface IMinecraftTooltip extends ITooltip { void getTooltip(final MinecraftTooltip p0); diff --git a/src/main/java/binnie/craftgui/minecraft/IWindowAffectsShiftClick.java b/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java similarity index 79% rename from src/main/java/binnie/craftgui/minecraft/IWindowAffectsShiftClick.java rename to src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java index 29d71549..29c00371 100644 --- a/src/main/java/binnie/craftgui/minecraft/IWindowAffectsShiftClick.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java @@ -1,4 +1,4 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; import binnie.core.machines.transfer.TransferRequest; diff --git a/src/main/java/binnie/craftgui/minecraft/InventoryType.java b/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java similarity index 59% rename from src/main/java/binnie/craftgui/minecraft/InventoryType.java rename to src/main/java/binnie/core/craftgui/minecraft/InventoryType.java index ad34024e..4203f517 100644 --- a/src/main/java/binnie/craftgui/minecraft/InventoryType.java +++ b/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java @@ -1,4 +1,4 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; public enum InventoryType { Player, diff --git a/src/main/java/binnie/craftgui/minecraft/ListMap.java b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java similarity index 98% rename from src/main/java/binnie/craftgui/minecraft/ListMap.java rename to src/main/java/binnie/core/craftgui/minecraft/ListMap.java index 9326d076..6529f66b 100644 --- a/src/main/java/binnie/craftgui/minecraft/ListMap.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java @@ -1,4 +1,4 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; import javax.annotation.Nullable; import java.util.Collection; diff --git a/src/main/java/binnie/craftgui/minecraft/MinecraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java similarity index 64% rename from src/main/java/binnie/craftgui/minecraft/MinecraftGUI.java rename to src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java index 93ef635e..64363013 100644 --- a/src/main/java/binnie/craftgui/minecraft/MinecraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java @@ -1,6 +1,6 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; -import binnie.craftgui.window.Panel; +import binnie.core.craftgui.window.Panel; public class MinecraftGUI { public enum PanelType implements Panel.IPanelType { diff --git a/src/main/java/binnie/craftgui/minecraft/MinecraftTooltip.java b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java similarity index 94% rename from src/main/java/binnie/craftgui/minecraft/MinecraftTooltip.java rename to src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java index 9ec88377..70774c44 100644 --- a/src/main/java/binnie/craftgui/minecraft/MinecraftTooltip.java +++ b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java @@ -1,6 +1,6 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; -import binnie.craftgui.core.Tooltip; +import binnie.core.craftgui.Tooltip; import net.minecraft.util.text.TextFormatting; public class MinecraftTooltip extends Tooltip { diff --git a/src/main/java/binnie/craftgui/minecraft/ModuleCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java similarity index 87% rename from src/main/java/binnie/craftgui/minecraft/ModuleCraftGUI.java rename to src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java index d4510931..d6d72af2 100644 --- a/src/main/java/binnie/craftgui/minecraft/ModuleCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java @@ -1,4 +1,4 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; import binnie.core.IInitializable; diff --git a/src/main/java/binnie/craftgui/minecraft/Window.java b/src/main/java/binnie/core/craftgui/minecraft/Window.java similarity index 88% rename from src/main/java/binnie/craftgui/minecraft/Window.java rename to src/main/java/binnie/core/craftgui/minecraft/Window.java index 3ae4f7ac..16370adb 100644 --- a/src/main/java/binnie/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Window.java @@ -1,8 +1,30 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.ITooltipHelp; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.TopLevelWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.control.ControlHelp; +import binnie.core.craftgui.minecraft.control.ControlInfo; +import binnie.core.craftgui.minecraft.control.ControlPowerSystem; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlUser; +import binnie.core.craftgui.minecraft.control.EnumHighlighting; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.StyleSheetManager; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IInventoryMachine; import binnie.core.machines.network.INetwork; @@ -11,28 +33,7 @@ import binnie.core.network.packet.MessageCraftGUI; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.ITooltipHelp; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.TopLevelWidget; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventWidget; -import binnie.craftgui.minecraft.control.ControlHelp; -import binnie.craftgui.minecraft.control.ControlInfo; -import binnie.craftgui.minecraft.control.ControlPowerSystem; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlUser; -import binnie.craftgui.minecraft.control.EnumHighlighting; -import binnie.craftgui.resource.StyleSheetManager; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.CraftGUITexture; -import binnie.craftgui.resource.minecraft.StandardTexture; + import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java similarity index 98% rename from src/main/java/binnie/craftgui/minecraft/WindowInventory.java rename to src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java index 6bb9a1ef..cf333a40 100644 --- a/src/main/java/binnie/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java @@ -1,4 +1,4 @@ -package binnie.craftgui.minecraft; +package binnie.core.craftgui.minecraft; import binnie.core.machines.inventory.SlotValidator; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java similarity index 87% rename from src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java index 614633cc..760ee0c1 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java @@ -1,22 +1,22 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.MinecraftTooltip; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.power.IPoweredMachine; import binnie.core.machines.power.IProcess; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.minecraft.MinecraftTooltip; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java similarity index 83% rename from src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java index 962d8427..236842de 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java @@ -1,17 +1,17 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.CustomSlot; +import binnie.core.craftgui.minecraft.MinecraftTooltip; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.power.ErrorState; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.minecraft.CustomSlot; -import binnie.craftgui.minecraft.MinecraftTooltip; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlHelp.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java similarity index 70% rename from src/main/java/binnie/craftgui/minecraft/control/ControlHelp.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java index b83e2c94..7595eaeb 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlHelp.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java @@ -1,12 +1,12 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java similarity index 84% rename from src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java index 3a69a48b..7c173986 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java @@ -1,11 +1,11 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; import binnie.core.BinnieCore; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.resource.BinnieSprite; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlImage.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java similarity index 64% rename from src/main/java/binnie/craftgui/minecraft/control/ControlImage.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java index 8c4d611e..09187991 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlImage.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java @@ -1,10 +1,10 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.resource.Texture; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.resource.Texture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlInfo.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java similarity index 67% rename from src/main/java/binnie/craftgui/minecraft/control/ControlInfo.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java index 6356ff32..879b0bc2 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlInfo.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java @@ -1,12 +1,12 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java similarity index 86% rename from src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java index f44556b8..f2f74659 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java @@ -1,13 +1,13 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.minecraft.Window; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.renderer.RenderUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java similarity index 90% rename from src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java index c7f4d90d..75b68b51 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java @@ -1,25 +1,25 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; import binnie.core.BinnieCore; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.GuiCraftGUI; +import binnie.core.craftgui.minecraft.MinecraftTooltip; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.Machine; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.power.ITankMachine; import binnie.core.machines.power.TankInfo; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.GuiCraftGUI; -import binnie.craftgui.minecraft.MinecraftTooltip; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlMachineProgress.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlMachineProgress.java similarity index 59% rename from src/main/java/binnie/craftgui/minecraft/control/ControlMachineProgress.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlMachineProgress.java index ba414c39..faa9e164 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlMachineProgress.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlMachineProgress.java @@ -1,8 +1,8 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.resource.Texture; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.resource.Texture; public class ControlMachineProgress extends ControlProgress { public ControlMachineProgress(final IWidget parent, final int x, final int y, final Texture base, final Texture progress, final Position dir) { diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java similarity index 92% rename from src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java index ef62c948..eee39af0 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java @@ -1,8 +1,8 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.minecraft.InventoryType; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.minecraft.InventoryType; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlPowerSystem.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java similarity index 70% rename from src/main/java/binnie/craftgui/minecraft/control/ControlPowerSystem.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java index d812ea72..5d1a1924 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlPowerSystem.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java @@ -1,13 +1,13 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.power.PowerSystem; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlProgress.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java similarity index 81% rename from src/main/java/binnie/craftgui/minecraft/control/ControlProgress.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java index e16559f5..9e036537 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlProgress.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java @@ -1,9 +1,9 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.resource.Texture; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.resource.Texture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlProgressBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java similarity index 89% rename from src/main/java/binnie/craftgui/minecraft/control/ControlProgressBase.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java index abafd40c..30fed5d6 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlProgressBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java @@ -1,13 +1,13 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.minecraft.Window; import binnie.core.machines.Machine; import binnie.core.machines.power.IProcess; import binnie.core.machines.power.ProcessInfo; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.minecraft.Window; public class ControlProgressBase extends Control { protected float progress; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlide.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java similarity index 86% rename from src/main/java/binnie/craftgui/minecraft/control/ControlSlide.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java index 5eb7e37c..bf78b956 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlide.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java @@ -1,17 +1,17 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Border; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Border; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java similarity index 91% rename from src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java index ff92c415..58d8a31a 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java @@ -1,21 +1,21 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.CustomSlot; +import binnie.core.craftgui.minecraft.GuiCraftGUI; +import binnie.core.craftgui.minecraft.InventoryType; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.WindowInventory; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.SlotValidator; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.CustomSlot; -import binnie.craftgui.minecraft.GuiCraftGUI; -import binnie.craftgui.minecraft.InventoryType; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.WindowInventory; -import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.multiplayer.PlayerControllerMP; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java similarity index 91% rename from src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java index 2fee5dae..4a1c0d68 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java @@ -1,8 +1,8 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.minecraft.InventoryType; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.minecraft.InventoryType; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java similarity index 75% rename from src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java index e4506507..4ccbff91 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java @@ -1,17 +1,17 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventWidget; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotCharge.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java similarity index 74% rename from src/main/java/binnie/craftgui/minecraft/control/ControlSlotCharge.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java index 5d7cb638..9a472993 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotCharge.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java @@ -1,14 +1,14 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IChargedSlots; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java similarity index 85% rename from src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java index 011f537c..1d3b6c78 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java @@ -1,9 +1,9 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; +import binnie.core.craftgui.controls.tab.ControlTab; +import binnie.core.craftgui.controls.tab.ControlTabBar; +import binnie.core.craftgui.geometry.Point; import binnie.core.genetics.IItemStackRepresentitive; -import binnie.craftgui.controls.tab.ControlTab; -import binnie.craftgui.controls.tab.ControlTabBar; -import binnie.craftgui.core.geometry.Point; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java similarity index 71% rename from src/main/java/binnie/craftgui/minecraft/control/ControlUser.java rename to src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java index 7011705e..bab3f7a6 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java @@ -1,12 +1,12 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/control/EnumHighlighting.java b/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java similarity index 76% rename from src/main/java/binnie/craftgui/minecraft/control/EnumHighlighting.java rename to src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java index 4ae8919b..8b6881de 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/EnumHighlighting.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java @@ -1,7 +1,7 @@ -package binnie.craftgui.minecraft.control; +package binnie.core.craftgui.minecraft.control; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.minecraft.MinecraftTooltip; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.minecraft.MinecraftTooltip; public enum EnumHighlighting { Error, diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/package-info.java b/src/main/java/binnie/core/craftgui/minecraft/control/package-info.java new file mode 100644 index 00000000..3b2a01ef --- /dev/null +++ b/src/main/java/binnie/core/craftgui/minecraft/control/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.craftgui.minecraft.control; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/minecraft/package-info.java b/src/main/java/binnie/core/craftgui/minecraft/package-info.java new file mode 100644 index 00000000..bc44d7b5 --- /dev/null +++ b/src/main/java/binnie/core/craftgui/minecraft/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.craftgui.minecraft; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/minecraft/render/MinecraftTexture.java b/src/main/java/binnie/core/craftgui/minecraft/render/MinecraftTexture.java similarity index 68% rename from src/main/java/binnie/craftgui/minecraft/render/MinecraftTexture.java rename to src/main/java/binnie/core/craftgui/minecraft/render/MinecraftTexture.java index ff73a1d8..de45a1bc 100644 --- a/src/main/java/binnie/craftgui/minecraft/render/MinecraftTexture.java +++ b/src/main/java/binnie/core/craftgui/minecraft/render/MinecraftTexture.java @@ -1,7 +1,7 @@ -package binnie.craftgui.minecraft.render; +package binnie.core.craftgui.minecraft.render; +import binnie.core.craftgui.geometry.Area; import binnie.core.resource.IBinnieTexture; -import binnie.craftgui.core.geometry.Area; public class MinecraftTexture { Area textureArea; diff --git a/src/main/java/binnie/craftgui/minecraft/render/RenderCommand.java b/src/main/java/binnie/core/craftgui/minecraft/render/RenderCommand.java similarity index 57% rename from src/main/java/binnie/craftgui/minecraft/render/RenderCommand.java rename to src/main/java/binnie/core/craftgui/minecraft/render/RenderCommand.java index 75a035fd..244b2d9c 100644 --- a/src/main/java/binnie/craftgui/minecraft/render/RenderCommand.java +++ b/src/main/java/binnie/core/craftgui/minecraft/render/RenderCommand.java @@ -1,7 +1,7 @@ -package binnie.craftgui.minecraft.render; +package binnie.core.craftgui.minecraft.render; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.minecraft.GuiCraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.minecraft.GuiCraftGUI; public abstract class RenderCommand { IWidget widget; diff --git a/src/main/java/binnie/core/craftgui/minecraft/render/package-info.java b/src/main/java/binnie/core/craftgui/minecraft/render/package-info.java new file mode 100644 index 00000000..5ed67910 --- /dev/null +++ b/src/main/java/binnie/core/craftgui/minecraft/render/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.craftgui.minecraft.render; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/core/package-info.java b/src/main/java/binnie/core/craftgui/package-info.java similarity index 88% rename from src/main/java/binnie/craftgui/core/package-info.java rename to src/main/java/binnie/core/craftgui/package-info.java index d0bedb03..5c0e6344 100644 --- a/src/main/java/binnie/craftgui/core/package-info.java +++ b/src/main/java/binnie/core/craftgui/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.craftgui.core; +package binnie.core.craftgui; import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java b/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java similarity index 97% rename from src/main/java/binnie/craftgui/core/renderer/RenderUtil.java rename to src/main/java/binnie/core/craftgui/renderer/RenderUtil.java index bfd3ed88..53efcdcc 100644 --- a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java +++ b/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java @@ -1,9 +1,10 @@ -package binnie.craftgui.core.renderer; +package binnie.core.craftgui.renderer; import binnie.core.BinnieCore; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; + import com.google.common.base.Preconditions; import forestry.api.core.ForestryAPI; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/craftgui/core/renderer/TextureRenderer.java b/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java similarity index 95% rename from src/main/java/binnie/craftgui/core/renderer/TextureRenderer.java rename to src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java index dfbea8bf..4ba20c90 100644 --- a/src/main/java/binnie/craftgui/core/renderer/TextureRenderer.java +++ b/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java @@ -1,13 +1,13 @@ -package binnie.craftgui.core.renderer; +package binnie.core.craftgui.renderer; import binnie.core.BinnieCore; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Border; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.resource.IStyleSheet; -import binnie.craftgui.resource.Texture; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Border; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.resource.IStyleSheet; +import binnie.core.craftgui.resource.Texture; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/binnie/craftgui/core/renderer/TextureType.java b/src/main/java/binnie/core/craftgui/renderer/TextureType.java similarity index 55% rename from src/main/java/binnie/craftgui/core/renderer/TextureType.java rename to src/main/java/binnie/core/craftgui/renderer/TextureType.java index 661c82a6..ed4cd5d7 100644 --- a/src/main/java/binnie/craftgui/core/renderer/TextureType.java +++ b/src/main/java/binnie/core/craftgui/renderer/TextureType.java @@ -1,4 +1,4 @@ -package binnie.craftgui.core.renderer; +package binnie.core.craftgui.renderer; public enum TextureType { Stretched, diff --git a/src/main/java/binnie/core/craftgui/renderer/package-info.java b/src/main/java/binnie/core/craftgui/renderer/package-info.java new file mode 100644 index 00000000..c7d39b20 --- /dev/null +++ b/src/main/java/binnie/core/craftgui/renderer/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.craftgui.renderer; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/resource/IStyleSheet.java b/src/main/java/binnie/core/craftgui/resource/IStyleSheet.java similarity index 83% rename from src/main/java/binnie/craftgui/resource/IStyleSheet.java rename to src/main/java/binnie/core/craftgui/resource/IStyleSheet.java index eac71ef9..15a6a395 100644 --- a/src/main/java/binnie/craftgui/resource/IStyleSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/IStyleSheet.java @@ -1,4 +1,4 @@ -package binnie.craftgui.resource; +package binnie.core.craftgui.resource; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/resource/StyleSheet.java b/src/main/java/binnie/core/craftgui/resource/StyleSheet.java similarity index 92% rename from src/main/java/binnie/craftgui/resource/StyleSheet.java rename to src/main/java/binnie/core/craftgui/resource/StyleSheet.java index e2e4966a..7a29b8e4 100644 --- a/src/main/java/binnie/craftgui/resource/StyleSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/StyleSheet.java @@ -1,4 +1,4 @@ -package binnie.craftgui.resource; +package binnie.core.craftgui.resource; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/resource/StyleSheetManager.java b/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java similarity index 89% rename from src/main/java/binnie/craftgui/resource/StyleSheetManager.java rename to src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java index 7756fb43..e1a0e7c1 100644 --- a/src/main/java/binnie/craftgui/resource/StyleSheetManager.java +++ b/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java @@ -1,6 +1,6 @@ -package binnie.craftgui.resource; +package binnie.core.craftgui.resource; -import binnie.craftgui.core.CraftGUI; +import binnie.core.craftgui.CraftGUI; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/resource/StyleSheetPunnett.java b/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java similarity index 79% rename from src/main/java/binnie/craftgui/resource/StyleSheetPunnett.java rename to src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java index c31d48ed..c5b0bf38 100644 --- a/src/main/java/binnie/craftgui/resource/StyleSheetPunnett.java +++ b/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java @@ -1,8 +1,8 @@ -package binnie.craftgui.resource; +package binnie.core.craftgui.resource; -import binnie.craftgui.resource.minecraft.CraftGUITexture; -import binnie.craftgui.resource.minecraft.PaddedTexture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.resource.minecraft.PaddedTexture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.extrabees.core.ExtraBeeTexture; import binnie.extrabees.gui.punnett.ExtraBeeGUITexture; diff --git a/src/main/java/binnie/craftgui/resource/Texture.java b/src/main/java/binnie/core/craftgui/resource/Texture.java similarity index 94% rename from src/main/java/binnie/craftgui/resource/Texture.java rename to src/main/java/binnie/core/craftgui/resource/Texture.java index 94f8b707..b3c40e37 100644 --- a/src/main/java/binnie/craftgui/resource/Texture.java +++ b/src/main/java/binnie/core/craftgui/resource/Texture.java @@ -1,10 +1,10 @@ -package binnie.craftgui.resource; +package binnie.core.craftgui.resource; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Border; +import binnie.core.craftgui.geometry.Position; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Border; -import binnie.craftgui.core.geometry.Position; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java similarity index 95% rename from src/main/java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java rename to src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java index 84a56716..41d93614 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java @@ -1,10 +1,11 @@ -package binnie.craftgui.resource.minecraft; +package binnie.core.craftgui.resource.minecraft; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Border; +import binnie.core.craftgui.resource.Texture; import binnie.core.resource.IBinnieTexture; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Border; -import binnie.craftgui.resource.Texture; + import com.google.common.base.Charsets; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITexture.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java similarity index 96% rename from src/main/java/binnie/craftgui/resource/minecraft/CraftGUITexture.java rename to src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java index 4303fe4e..5f05d41f 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITexture.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java @@ -1,4 +1,4 @@ -package binnie.craftgui.resource.minecraft; +package binnie.core.craftgui.resource.minecraft; public enum CraftGUITexture { Window("window"), diff --git a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java similarity index 89% rename from src/main/java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java rename to src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java index cef3636e..65274f02 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java @@ -1,8 +1,8 @@ -package binnie.craftgui.resource.minecraft; +package binnie.core.craftgui.resource.minecraft; +import binnie.core.craftgui.CraftGUI; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; -import binnie.craftgui.core.CraftGUI; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/resource/minecraft/PaddedTexture.java b/src/main/java/binnie/core/craftgui/resource/minecraft/PaddedTexture.java similarity index 70% rename from src/main/java/binnie/craftgui/resource/minecraft/PaddedTexture.java rename to src/main/java/binnie/core/craftgui/resource/minecraft/PaddedTexture.java index bdd2927d..69ef2754 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/PaddedTexture.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/PaddedTexture.java @@ -1,9 +1,9 @@ -package binnie.craftgui.resource.minecraft; +package binnie.core.craftgui.resource.minecraft; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Border; +import binnie.core.craftgui.resource.Texture; import binnie.core.resource.IBinnieTexture; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Border; -import binnie.craftgui.resource.Texture; public class PaddedTexture extends Texture { public PaddedTexture(final int u, final int v, final int w, final int h, final int offset, final IBinnieTexture textureFile, final int leftPadding, final int rightPadding, final int topPadding, final int bottomPadding) { diff --git a/src/main/java/binnie/craftgui/resource/minecraft/ParsedTextureSheet.java b/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java similarity index 94% rename from src/main/java/binnie/craftgui/resource/minecraft/ParsedTextureSheet.java rename to src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java index a5cc5eed..1677e8bb 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/ParsedTextureSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java @@ -1,4 +1,4 @@ -package binnie.craftgui.resource.minecraft; +package binnie.core.craftgui.resource.minecraft; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; diff --git a/src/main/java/binnie/craftgui/resource/minecraft/StandardTexture.java b/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java similarity index 79% rename from src/main/java/binnie/craftgui/resource/minecraft/StandardTexture.java rename to src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java index 6021d32d..6bdc7743 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/StandardTexture.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java @@ -1,10 +1,10 @@ -package binnie.craftgui.resource.minecraft; +package binnie.core.craftgui.resource.minecraft; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Border; +import binnie.core.craftgui.resource.Texture; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Border; -import binnie.craftgui.resource.Texture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java b/src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java new file mode 100644 index 00000000..9109369b --- /dev/null +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.craftgui.resource.minecraft; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/resource/package-info.java b/src/main/java/binnie/core/craftgui/resource/package-info.java new file mode 100644 index 00000000..806c524c --- /dev/null +++ b/src/main/java/binnie/core/craftgui/resource/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.craftgui.resource; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/window/Panel.java b/src/main/java/binnie/core/craftgui/window/Panel.java similarity index 81% rename from src/main/java/binnie/craftgui/window/Panel.java rename to src/main/java/binnie/core/craftgui/window/Panel.java index dd7899d8..89f120b6 100644 --- a/src/main/java/binnie/craftgui/window/Panel.java +++ b/src/main/java/binnie/core/craftgui/window/Panel.java @@ -1,11 +1,11 @@ -package binnie.craftgui.window; +package binnie.core.craftgui.window; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/controls/package-info.java b/src/main/java/binnie/core/craftgui/window/package-info.java similarity index 86% rename from src/main/java/binnie/craftgui/controls/package-info.java rename to src/main/java/binnie/core/craftgui/window/package-info.java index f6e9ac76..0396a574 100644 --- a/src/main/java/binnie/craftgui/controls/package-info.java +++ b/src/main/java/binnie/core/craftgui/window/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.craftgui.controls; +package binnie.core.craftgui.window; import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/binnie/core/gui/BinnieCoreGUI.java b/src/main/java/binnie/core/gui/BinnieCoreGUI.java index e63b6761..616b1f76 100644 --- a/src/main/java/binnie/core/gui/BinnieCoreGUI.java +++ b/src/main/java/binnie/core/gui/BinnieCoreGUI.java @@ -1,9 +1,9 @@ package binnie.core.gui; +import binnie.core.craftgui.WindowFieldKit; +import binnie.core.craftgui.WindowGenesis; +import binnie.core.craftgui.minecraft.Window; import binnie.core.machines.storage.WindowCompartment; -import binnie.craftgui.binniecore.WindowFieldKit; -import binnie.craftgui.binniecore.WindowGenesis; -import binnie.craftgui.minecraft.Window; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/core/gui/BinnieGUIHandler.java b/src/main/java/binnie/core/gui/BinnieGUIHandler.java index 7bdca2e1..4ec9fca6 100644 --- a/src/main/java/binnie/core/gui/BinnieGUIHandler.java +++ b/src/main/java/binnie/core/gui/BinnieGUIHandler.java @@ -2,7 +2,7 @@ package binnie.core.gui; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import binnie.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.Window; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; diff --git a/src/main/java/binnie/core/gui/IBinnieGUID.java b/src/main/java/binnie/core/gui/IBinnieGUID.java index b00873d7..973ca580 100644 --- a/src/main/java/binnie/core/gui/IBinnieGUID.java +++ b/src/main/java/binnie/core/gui/IBinnieGUID.java @@ -1,7 +1,7 @@ package binnie.core.gui; +import binnie.core.craftgui.minecraft.Window; import binnie.core.network.IOrdinaled; -import binnie.craftgui.minecraft.Window; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/core/machines/storage/CompartmentTab.java b/src/main/java/binnie/core/machines/storage/CompartmentTab.java index 595a8e37..ae8c3fe5 100644 --- a/src/main/java/binnie/core/machines/storage/CompartmentTab.java +++ b/src/main/java/binnie/core/machines/storage/CompartmentTab.java @@ -1,6 +1,6 @@ package binnie.core.machines.storage; -import binnie.craftgui.minecraft.EnumColor; +import binnie.core.craftgui.minecraft.EnumColor; import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; import net.minecraft.init.Items; diff --git a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java index eed9bde1..0b6aaed1 100644 --- a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java +++ b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java @@ -1,13 +1,13 @@ package binnie.core.machines.storage; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.minecraft.EnumColor; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.minecraft.EnumColor; +import binnie.core.craftgui.renderer.RenderUtil; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index cf5a96a9..d0bbf91f 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -2,44 +2,44 @@ package binnie.core.machines.storage; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlCheckbox; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextEdit; +import binnie.core.craftgui.controls.button.ControlButton; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.page.ControlPage; +import binnie.core.craftgui.controls.page.ControlPages; +import binnie.core.craftgui.controls.scroll.ControlScrollableContent; +import binnie.core.craftgui.controls.tab.ControlTab; +import binnie.core.craftgui.controls.tab.ControlTabBar; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventTextEdit; +import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.craftgui.geometry.Border; +import binnie.core.craftgui.geometry.CraftGUIUtil; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.Dialog; +import binnie.core.craftgui.minecraft.EnumColor; +import binnie.core.craftgui.minecraft.IWindowAffectsShiftClick; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlide; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.ControlTabIcon; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.window.Panel; import binnie.core.machines.Machine; import binnie.core.machines.transfer.TransferRequest; -import binnie.craftgui.controls.ControlCheckbox; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextEdit; -import binnie.craftgui.controls.button.ControlButton; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.page.ControlPage; -import binnie.craftgui.controls.page.ControlPages; -import binnie.craftgui.controls.scroll.ControlScrollableContent; -import binnie.craftgui.controls.tab.ControlTab; -import binnie.craftgui.controls.tab.ControlTabBar; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.Border; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.events.EventTextEdit; -import binnie.craftgui.events.EventValueChanged; -import binnie.craftgui.minecraft.Dialog; -import binnie.craftgui.minecraft.EnumColor; -import binnie.craftgui.minecraft.IWindowAffectsShiftClick; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlItemDisplay; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlide; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlSlotArray; -import binnie.craftgui.minecraft.control.ControlTabIcon; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.CraftGUITexture; -import binnie.craftgui.window.Panel; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/core/machines/storage/WindowTest.java b/src/main/java/binnie/core/machines/storage/WindowTest.java index c20aa1d5..da653b5d 100644 --- a/src/main/java/binnie/core/machines/storage/WindowTest.java +++ b/src/main/java/binnie/core/machines/storage/WindowTest.java @@ -2,7 +2,7 @@ package binnie.core.machines.storage; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import binnie.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.Window; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/src/main/java/binnie/core/network/BinnieCorePacketID.java index ccf7788b..705cd59b 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -2,6 +2,7 @@ package binnie.core.network; import binnie.core.BinnieCore; import binnie.core.block.TileEntityMetadata; +import binnie.core.craftgui.minecraft.ContainerCraftGUI; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.network.INetwork; @@ -10,7 +11,6 @@ import binnie.core.network.packet.MessageCraftGUI; import binnie.core.network.packet.MessageMetadata; import binnie.core.network.packet.MessageTileNBT; import binnie.core.network.packet.MessageUpdate; -import binnie.craftgui.minecraft.ContainerCraftGUI; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index ef62715d..7f8c985b 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -1,9 +1,10 @@ package binnie.core.proxy; import binnie.Constants; +import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; import binnie.core.models.ModelManager; import binnie.core.resource.BinnieResource; -import binnie.craftgui.resource.minecraft.CraftGUIResourceManager; + import com.google.common.base.Throwables; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/craftgui/controls/scroll/package-info.java b/src/main/java/binnie/craftgui/controls/scroll/package-info.java deleted file mode 100644 index 5f47e4e0..00000000 --- a/src/main/java/binnie/craftgui/controls/scroll/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.controls.scroll; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/controls/tab/package-info.java b/src/main/java/binnie/craftgui/controls/tab/package-info.java deleted file mode 100644 index 0d1f838f..00000000 --- a/src/main/java/binnie/craftgui/controls/tab/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.controls.tab; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/core/CraftGUI.java b/src/main/java/binnie/craftgui/core/CraftGUI.java deleted file mode 100644 index 9f7e580b..00000000 --- a/src/main/java/binnie/craftgui/core/CraftGUI.java +++ /dev/null @@ -1,9 +0,0 @@ -package binnie.craftgui.core; - -import binnie.craftgui.core.renderer.TextureRenderer; -import binnie.craftgui.resource.minecraft.CraftGUIResourceManager; - -public class CraftGUI { - public static CraftGUIResourceManager resourceManager; - public static final TextureRenderer render = new TextureRenderer(); -} diff --git a/src/main/java/binnie/craftgui/core/geometry/package-info.java b/src/main/java/binnie/craftgui/core/geometry/package-info.java deleted file mode 100644 index c08d0395..00000000 --- a/src/main/java/binnie/craftgui/core/geometry/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.core.geometry; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/core/renderer/package-info.java b/src/main/java/binnie/craftgui/core/renderer/package-info.java deleted file mode 100644 index fb60176f..00000000 --- a/src/main/java/binnie/craftgui/core/renderer/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.core.renderer; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/events/package-info.java b/src/main/java/binnie/craftgui/events/package-info.java deleted file mode 100644 index 3d40f0c5..00000000 --- a/src/main/java/binnie/craftgui/events/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.events; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/minecraft/control/package-info.java b/src/main/java/binnie/craftgui/minecraft/control/package-info.java deleted file mode 100644 index 28684393..00000000 --- a/src/main/java/binnie/craftgui/minecraft/control/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.minecraft.control; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/minecraft/package-info.java b/src/main/java/binnie/craftgui/minecraft/package-info.java deleted file mode 100644 index a0d3fef3..00000000 --- a/src/main/java/binnie/craftgui/minecraft/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.minecraft; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/minecraft/render/package-info.java b/src/main/java/binnie/craftgui/minecraft/render/package-info.java deleted file mode 100644 index 54793595..00000000 --- a/src/main/java/binnie/craftgui/minecraft/render/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.minecraft.render; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/mod/database/package-info.java b/src/main/java/binnie/craftgui/mod/database/package-info.java deleted file mode 100644 index b16276b6..00000000 --- a/src/main/java/binnie/craftgui/mod/database/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.mod.database; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/resource/minecraft/package-info.java b/src/main/java/binnie/craftgui/resource/minecraft/package-info.java deleted file mode 100644 index ed4730b5..00000000 --- a/src/main/java/binnie/craftgui/resource/minecraft/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.resource.minecraft; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/resource/package-info.java b/src/main/java/binnie/craftgui/resource/package-info.java deleted file mode 100644 index 813ab962..00000000 --- a/src/main/java/binnie/craftgui/resource/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.resource; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/craftgui/window/package-info.java b/src/main/java/binnie/craftgui/window/package-info.java deleted file mode 100644 index 7979ef14..00000000 --- a/src/main/java/binnie/craftgui/window/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.craftgui.window; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java index 7bbde562..e51ebf48 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java @@ -1,10 +1,10 @@ package binnie.extrabees.apiary.machine; import binnie.Binnie; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.SlotValidator; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.ComponentExtraBeeGUI; import binnie.extrabees.apiary.TileExtraBeeAlveary; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java index 472b4670..869441f6 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java @@ -1,12 +1,12 @@ package binnie.extrabees.apiary.machine; import binnie.Binnie; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.transfer.TransferRequest; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.ComponentExtraBeeGUI; import binnie.extrabees.apiary.TileExtraBeeAlveary; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java index 77412f2c..a8905353 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java @@ -1,7 +1,7 @@ package binnie.extrabees.apiary.machine; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.core.ExtraBeeTexture; import forestry.api.apiculture.IBeeListener; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java index 778ef952..398f8ec3 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java @@ -1,9 +1,9 @@ package binnie.extrabees.apiary.machine; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.SlotValidator; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.ComponentExtraBeeGUI; import binnie.extrabees.apiary.ModuleApiary; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java index bd8281a5..fcd9cdcc 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java @@ -1,7 +1,7 @@ package binnie.extrabees.apiary.machine; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.core.ExtraBeeTexture; import forestry.api.apiculture.IBeeListener; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java index 83961484..992f11fb 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java @@ -2,6 +2,7 @@ package binnie.extrabees.apiary.machine; import binnie.core.Mods; import binnie.core.circuits.BinnieCircuit; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.genetics.BeeModifierLogic; import binnie.core.genetics.EnumBeeBooleanModifier; import binnie.core.genetics.EnumBeeModifier; @@ -9,7 +10,6 @@ import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.ComponentExtraBeeGUI; import binnie.extrabees.core.ExtraBeeGUID; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java index a323c5cf..d7f8eade 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java @@ -1,9 +1,9 @@ package binnie.extrabees.apiary.machine; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.TileExtraBeeAlveary; import binnie.extrabees.core.ExtraBeeTexture; diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java b/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java index af5e10c0..d939b03e 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java @@ -1,7 +1,7 @@ package binnie.extrabees.core; +import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; -import binnie.craftgui.minecraft.Window; import binnie.extrabees.gui.WindowAlvearyFrame; import binnie.extrabees.gui.WindowAlvearyHatchery; import binnie.extrabees.gui.WindowAlvearyMutator; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java index 29977d78..c8a8df5e 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java @@ -1,9 +1,9 @@ package binnie.extrabees.gui; import binnie.core.AbstractMod; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.extrabees.ExtraBees; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java index e3ca5fe5..9f009dc0 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java @@ -1,9 +1,9 @@ package binnie.extrabees.gui; import binnie.core.AbstractMod; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.AlvearyHatchery; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java index a0eacb67..169ed375 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java @@ -1,9 +1,9 @@ package binnie.extrabees.gui; import binnie.core.AbstractMod; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.extrabees.ExtraBees; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java index 19a4160b..3d188215 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java @@ -1,13 +1,13 @@ package binnie.extrabees.gui; import binnie.core.AbstractMod; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlItemDisplay; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.AlvearyMutator; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java index 175ec670..5ae9e67f 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java @@ -1,11 +1,11 @@ package binnie.extrabees.gui; import binnie.core.AbstractMod; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.AlvearyStimulator; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java index 3503e598..e39bcff4 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java @@ -1,14 +1,14 @@ package binnie.extrabees.gui.database; import binnie.Binnie; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; diff --git a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java index 401e2db6..fa1b4697 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java @@ -1,15 +1,15 @@ package binnie.extrabees.gui.database; import binnie.Binnie; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.core.EnumHumidity; diff --git a/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java b/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java index 2eaaf1fa..f15ca2b6 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java @@ -2,8 +2,8 @@ package binnie.extrabees.gui.database; import binnie.Binnie; import binnie.core.BinnieCore; -import binnie.craftgui.controls.listbox.ControlListBox; -import binnie.craftgui.core.IWidget; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.listbox.ControlListBox; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.genetics.IAllele; diff --git a/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java b/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java index 258cfa77..ae5c815b 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java @@ -1,12 +1,12 @@ package binnie.extrabees.gui.database; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.controls.listbox.ControlList; -import binnie.craftgui.controls.listbox.ControlOption; -import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.controls.listbox.ControlList; +import binnie.core.craftgui.controls.listbox.ControlOption; +import binnie.core.craftgui.geometry.CraftGUIUtil; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import java.text.DecimalFormat; diff --git a/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java b/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java index c8db0c54..cbda0298 100644 --- a/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java +++ b/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java @@ -1,9 +1,9 @@ package binnie.extrabees.gui.database; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageSpecies; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.database.DatabaseTab; +import binnie.core.craftgui.database.PageSpecies; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IAlleleSpecies; diff --git a/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java b/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java index 471d24a0..57c960d6 100644 --- a/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java +++ b/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java @@ -1,13 +1,13 @@ package binnie.extrabees.gui.database; import binnie.Binnie; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageSpecies; +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 forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.genetics.IAllele; diff --git a/src/main/java/binnie/extrabees/gui/database/PageSpeciesProducts.java b/src/main/java/binnie/extrabees/gui/database/PageSpeciesProducts.java index b56cfa75..099d1c0d 100644 --- a/src/main/java/binnie/extrabees/gui/database/PageSpeciesProducts.java +++ b/src/main/java/binnie/extrabees/gui/database/PageSpeciesProducts.java @@ -1,10 +1,10 @@ package binnie.extrabees.gui.database; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageSpecies; +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 forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IAlleleSpecies; diff --git a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java b/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java index c2616010..1a36838b 100644 --- a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java +++ b/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java @@ -2,16 +2,16 @@ package binnie.extrabees.gui.database; import binnie.Binnie; import binnie.core.AbstractMod; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageBranchOverview; -import binnie.craftgui.mod.database.PageBranchSpecies; -import binnie.craftgui.mod.database.PageBreeder; -import binnie.craftgui.mod.database.PageSpeciesClassification; -import binnie.craftgui.mod.database.PageSpeciesMutations; -import binnie.craftgui.mod.database.PageSpeciesOverview; -import binnie.craftgui.mod.database.PageSpeciesResultant; -import binnie.craftgui.mod.database.WindowAbstractDatabase; +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.extrabees.ExtraBees; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java b/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java index 50ca0fd9..85dcd953 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java +++ b/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java @@ -1,13 +1,13 @@ package binnie.extrabees.gui.punnett; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.renderer.RenderUtil; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.renderer.RenderUtil; import forestry.api.genetics.IChromosomeType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extrabees/gui/punnett/ControlPunnett.java b/src/main/java/binnie/extrabees/gui/punnett/ControlPunnett.java index d0dc6c7b..06e01776 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/ControlPunnett.java +++ b/src/main/java/binnie/extrabees/gui/punnett/ControlPunnett.java @@ -1,11 +1,11 @@ package binnie.extrabees.gui.punnett; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.core.renderer.RenderUtil; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.renderer.RenderUtil; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; diff --git a/src/main/java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java b/src/main/java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java index 1bfeed5e..a56aed18 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java +++ b/src/main/java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java @@ -1,13 +1,13 @@ package binnie.extrabees.gui.punnett; import binnie.core.AbstractMod; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.resource.StyleSheet; -import binnie.craftgui.resource.minecraft.CraftGUITexture; -import binnie.craftgui.resource.minecraft.PaddedTexture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.resource.StyleSheet; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.resource.minecraft.PaddedTexture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.extrabees.ExtraBees; import binnie.extrabees.core.ExtraBeeTexture; import forestry.api.genetics.ISpeciesRoot; diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java index ec6d1cab..5fdc17c4 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java @@ -1,7 +1,7 @@ package binnie.extratrees.core; +import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; -import binnie.craftgui.minecraft.Window; import binnie.extratrees.kitchen.craftgui.WindowBottleRack; import binnie.extratrees.machines.craftgui.WindowArboristDatabase; import binnie.extratrees.machines.craftgui.WindowBrewery; diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java index f86ba72a..e763f279 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java @@ -1,11 +1,11 @@ package binnie.extratrees.integration.jei.distillery.brewery; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; import binnie.extratrees.integration.jei.RecipeUids; diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java index c5cb6437..337b9932 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java @@ -1,7 +1,7 @@ package binnie.extratrees.integration.jei.distillery.brewery; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.geometry.Point; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.geometry.Point; import binnie.extratrees.machines.craftgui.ControlDistilleryProgress; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; diff --git a/src/main/java/binnie/extratrees/kitchen/BottleRack.java b/src/main/java/binnie/extratrees/kitchen/BottleRack.java index 1a0b322f..433aa648 100644 --- a/src/main/java/binnie/extratrees/kitchen/BottleRack.java +++ b/src/main/java/binnie/extratrees/kitchen/BottleRack.java @@ -1,8 +1,8 @@ package binnie.extratrees.kitchen; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java index 1fbbc240..3fc468d8 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java @@ -1,9 +1,9 @@ package binnie.extratrees.kitchen.craftgui; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.window.Panel; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.window.Panel; public class ControlDropDownMenu extends Panel { public boolean stayOpenOnChildClick; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropdownButton.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropdownButton.java index c73e8e3f..77c0ec48 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropdownButton.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropdownButton.java @@ -1,9 +1,9 @@ package binnie.extratrees.kitchen.craftgui; -import binnie.craftgui.controls.button.ControlButton; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.Window; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.button.ControlButton; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.minecraft.Window; public abstract class ControlDropdownButton extends ControlButton { public ControlDropdownButton(final IWidget parent, final int x, final int y, final int width, final int height, final String text) { diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java index f013a824..3f2daa3c 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java @@ -1,13 +1,13 @@ package binnie.extratrees.kitchen.craftgui; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.minecraft.Window; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.renderer.RenderUtil; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index 10647b63..bd1e9983 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -1,16 +1,16 @@ package binnie.extratrees.kitchen.craftgui; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventWidget; -import binnie.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java index 399e185e..10843782 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java @@ -1,8 +1,8 @@ package binnie.extratrees.kitchen.craftgui; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.minecraft.control.ControlSlotBase; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.minecraft.control.ControlSlotBase; import binnie.extratrees.alcohol.Glassware; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java index 815f3944..ab553d84 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java @@ -1,9 +1,9 @@ package binnie.extratrees.kitchen.craftgui; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.Window; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.minecraft.Window; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java b/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java index 965b1d56..1886a89a 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java @@ -1,9 +1,9 @@ package binnie.extratrees.kitchen.craftgui; import binnie.core.AbstractMod; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.machines.Machine; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; import binnie.extratrees.ExtraTrees; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/binnie/extratrees/machines/Designer.java b/src/main/java/binnie/extratrees/machines/Designer.java index e1f4cf4f..0df35411 100644 --- a/src/main/java/binnie/extratrees/machines/Designer.java +++ b/src/main/java/binnie/extratrees/machines/Designer.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.component.ComponentRecipe; import binnie.core.machines.component.IComponentRecipe; @@ -7,7 +8,6 @@ import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.network.INetwork; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IErrorStateSource; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; diff --git a/src/main/java/binnie/extratrees/machines/Infuser.java b/src/main/java/binnie/extratrees/machines/Infuser.java index 7f5d4616..bde786f6 100644 --- a/src/main/java/binnie/extratrees/machines/Infuser.java +++ b/src/main/java/binnie/extratrees/machines/Infuser.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; @@ -11,7 +12,6 @@ import binnie.core.machines.power.ComponentPowerReceptor; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java index 84b18c77..8222f6cc 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.brewery; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; @@ -8,7 +9,6 @@ import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java index f7b938a4..7e87f4a6 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java @@ -1,9 +1,9 @@ package binnie.extratrees.machines.craftgui; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.renderer.RenderUtil; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java index 165414d3..c1f74a11 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java @@ -1,17 +1,17 @@ package binnie.extratrees.machines.craftgui; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlProgressBase; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.machines.Machine; import binnie.core.util.ItemStackSet; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlProgressBase; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.brewery.BreweryLogic; import binnie.extratrees.machines.brewery.BreweryRecipes; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java index f4037b8b..db47b575 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java @@ -1,17 +1,17 @@ package binnie.extratrees.machines.craftgui; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlProgressBase; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.machines.Machine; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlProgressBase; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.distillery.DistilleryLogic; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java index d7b78936..bbe3a7c5 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java @@ -1,16 +1,16 @@ package binnie.extratrees.machines.craftgui; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.ContainerCraftGUI; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlProgressBase; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.ContainerCraftGUI; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlProgressBase; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.fruitpress.FruitPressMachine; import binnie.extratrees.machines.fruitpress.FruitPressRecipes; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java index 46abcfff..ac288e39 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java @@ -1,15 +1,15 @@ package binnie.extratrees.machines.craftgui; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlProgressBase; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; -import binnie.craftgui.window.Panel; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlProgressBase; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.window.Panel; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.lumbermill.LumbermillMachine; import binnie.extratrees.machines.lumbermill.LumbermillRecipes; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java index 0c246cae..7bae9fdb 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java @@ -1,12 +1,12 @@ package binnie.extratrees.machines.craftgui; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlSlotBase; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.component.IComponentRecipe; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlSlotBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java index 29b3f3ea..77f6b8e0 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java @@ -2,21 +2,21 @@ package binnie.extratrees.machines.craftgui; import binnie.Binnie; import binnie.core.BinnieCore; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.controls.scroll.IControlScrollable; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.TileEntityMachine; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.controls.scroll.IControlScrollable; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.resource.minecraft.CraftGUITexture; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignCategory; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/DialogBreweryRecipe.java b/src/main/java/binnie/extratrees/machines/craftgui/DialogBreweryRecipe.java index d173557f..57fec3ba 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/DialogBreweryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/DialogBreweryRecipe.java @@ -1,7 +1,7 @@ package binnie.extratrees.machines.craftgui; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.minecraft.Dialog; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.minecraft.Dialog; public class DialogBreweryRecipe extends Dialog { public DialogBreweryRecipe(final IWidget parent, final int w, final int h) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java index ef3221e4..edc4b855 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java @@ -1,15 +1,15 @@ package binnie.extratrees.machines.craftgui; +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.craftgui.controls.ControlText; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.mod.database.ControlSpeciesBox; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageAbstract; -import binnie.craftgui.mod.database.WindowAbstractDatabase; import binnie.extratrees.ExtraTrees; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java index 2b5ea6f4..3615fc89 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java @@ -1,17 +1,17 @@ package binnie.extratrees.machines.craftgui; import binnie.core.BinnieCore; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlItemDisplay; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageAbstract; -import binnie.craftgui.mod.database.WindowAbstractDatabase; +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; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.DoorType; import binnie.extratrees.block.IPlankType; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java index 66fe320b..01a3a512 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java @@ -1,15 +1,15 @@ package binnie.extratrees.machines.craftgui; +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.craftgui.controls.ControlText; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.mod.database.ControlSpeciesBox; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageAbstract; -import binnie.craftgui.mod.database.WindowAbstractDatabase; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java index 1a6dd7df..db96bc59 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java @@ -1,13 +1,13 @@ package binnie.extratrees.machines.craftgui; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.mod.database.ControlDatabaseIndividualDisplay; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.EnumDiscoveryState; -import binnie.craftgui.mod.database.PageSpecies; -import binnie.craftgui.window.Panel; +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 forestry.api.genetics.IAlleleSpecies; public class PageSpeciesImage extends PageSpecies { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java index 890d394f..4eb15a1b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java @@ -2,17 +2,17 @@ package binnie.extratrees.machines.craftgui; import binnie.Binnie; import binnie.core.BinnieCore; +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.craftgui.controls.ControlText; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.scroll.ControlScrollableContent; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.control.ControlItemDisplay; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageSpecies; import binnie.extratrees.ExtraTrees; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpecies; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java b/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java index b036929e..b06c4509 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java @@ -1,15 +1,15 @@ package binnie.extratrees.machines.craftgui; +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.craftgui.controls.ControlText; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.mod.database.ControlSpeciesBox; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageAbstract; -import binnie.craftgui.mod.database.WindowAbstractDatabase; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java index 12a01fdf..f9bd273e 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java @@ -2,22 +2,22 @@ package binnie.extratrees.machines.craftgui; 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; -import binnie.craftgui.controls.listbox.ControlListBox; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.mod.database.ControlItemStackOption; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.IDatabaseMode; -import binnie.craftgui.mod.database.PageBranchOverview; -import binnie.craftgui.mod.database.PageBranchSpecies; -import binnie.craftgui.mod.database.PageBreeder; -import binnie.craftgui.mod.database.PageSpeciesClassification; -import binnie.craftgui.mod.database.PageSpeciesMutations; -import binnie.craftgui.mod.database.PageSpeciesOverview; -import binnie.craftgui.mod.database.PageSpeciesResultant; -import binnie.craftgui.mod.database.WindowAbstractDatabase; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.WoodManager; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java index 46a3f18a..a245a8ed 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java @@ -1,15 +1,15 @@ package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.machines.Machine; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlLiquidTank; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlSlotArray; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.brewery.BreweryMachine; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java index d6e990b5..db6bf1df 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java @@ -1,13 +1,13 @@ package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.machines.Machine; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlLiquidTank; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.distillery.DistilleryMachine; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java index 9cd9f908..35ff502b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java @@ -2,16 +2,16 @@ package binnie.extratrees.machines.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.mod.database.DatabaseTab; -import binnie.craftgui.mod.database.PageBranchOverview; -import binnie.craftgui.mod.database.PageBranchSpecies; -import binnie.craftgui.mod.database.PageBreeder; -import binnie.craftgui.mod.database.PageSpeciesClassification; -import binnie.craftgui.mod.database.PageSpeciesMutations; -import binnie.craftgui.mod.database.PageSpeciesOverview; -import binnie.craftgui.mod.database.PageSpeciesResultant; -import binnie.craftgui.mod.database.WindowAbstractDatabase; +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 net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java index 0e024df1..e260d890 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java @@ -1,14 +1,14 @@ package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlLiquidTank; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.lumbermill.LumbermillMachine; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java index 99473a07..de0a7760 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java @@ -1,16 +1,16 @@ package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.InventoryType; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; import binnie.core.machines.power.ErrorState; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.InventoryType; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlLiquidTank; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.fruitpress.FruitPressLogic; import binnie.extratrees.machines.fruitpress.FruitPressMachine; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java index b336b705..e1aa918e 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java @@ -1,7 +1,7 @@ package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; -import binnie.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.Window; import binnie.extratrees.ExtraTrees; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java index a45e19cc..6e18aeb9 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java @@ -2,21 +2,21 @@ package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextEdit; +import binnie.core.craftgui.controls.scroll.ControlScrollableContent; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventTextEdit; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.window.Panel; import binnie.core.machines.Machine; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextEdit; -import binnie.craftgui.controls.scroll.ControlScrollableContent; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventTextEdit; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.window.Panel; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.Designer; import binnie.extratrees.machines.DesignerType; diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java index f2eb6a55..7fc93daf 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.distillery; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; @@ -7,7 +8,6 @@ import binnie.core.machines.inventory.ComponentTankContainer; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java index 7091f5d1..77eabb22 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.fruitpress; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; @@ -7,7 +8,6 @@ import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.ComponentTankContainer; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java index c87c1c89..25d9fc49 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java @@ -1,5 +1,6 @@ package binnie.extratrees.machines.lumbermill; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; @@ -8,7 +9,6 @@ import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.inventory.TankValidator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; diff --git a/src/main/java/binnie/genetics/core/GeneticsGUI.java b/src/main/java/binnie/genetics/core/GeneticsGUI.java index 1f74b506..89f5d582 100644 --- a/src/main/java/binnie/genetics/core/GeneticsGUI.java +++ b/src/main/java/binnie/genetics/core/GeneticsGUI.java @@ -1,7 +1,7 @@ package binnie.genetics.core; +import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; -import binnie.craftgui.minecraft.Window; import binnie.genetics.gui.WindowAnalyst; import binnie.genetics.machine.acclimatiser.WindowAcclimatiser; import binnie.genetics.machine.analyser.WindowAnalyser; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java index 0a362f4e..dd3b2c16 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java @@ -2,12 +2,12 @@ package binnie.genetics.gui; import binnie.Binnie; import binnie.core.BinnieCore; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.TextJustification; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.TextJustification; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBee; import forestry.api.genetics.IIndividual; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java index 828b26d0..440fa69d 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java @@ -2,11 +2,11 @@ package binnie.genetics.gui; import binnie.Binnie; import binnie.botany.api.IFlower; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; import binnie.genetics.Genetics; import binnie.genetics.item.ModuleItems; import forestry.api.apiculture.IBee; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java index a77246bd..7857b23e 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java @@ -1,22 +1,22 @@ package binnie.genetics.gui; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.controls.ControlTextEdit; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.listbox.ControlListBox; +import binnie.core.craftgui.controls.scroll.ControlScrollBar; +import binnie.core.craftgui.controls.scroll.ControlScrollableContent; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.controls.ControlTextEdit; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.listbox.ControlListBox; -import binnie.craftgui.controls.scroll.ControlScrollBar; -import binnie.craftgui.controls.scroll.ControlScrollableContent; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.resource.minecraft.CraftGUITexture; -import binnie.craftgui.window.Panel; import binnie.genetics.Genetics; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAlleleSpecies; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java index 1d528a72..d3810366 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java @@ -1,12 +1,12 @@ package binnie.genetics.gui; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; import binnie.genetics.Genetics; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java index b616147f..3e9ef545 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java @@ -1,15 +1,15 @@ package binnie.genetics.gui; import binnie.Binnie; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; import binnie.genetics.Genetics; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java index fa04487e..b6a983c1 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java @@ -1,10 +1,10 @@ package binnie.genetics.gui; import binnie.Binnie; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; import binnie.genetics.Genetics; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IChromosomeType; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java index 4bcdc638..2f854bf0 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java @@ -2,20 +2,20 @@ package binnie.genetics.gui; import binnie.Binnie; import binnie.core.Mods; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.EnumColor; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; import binnie.core.resource.BinnieSprite; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.minecraft.EnumColor; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.extrabees.ExtraBees; import binnie.extrabees.genetics.ExtraBeesSpecies; import binnie.genetics.Genetics; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java index 6de826c9..b35eeca5 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java @@ -1,11 +1,11 @@ package binnie.genetics.gui; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.util.UniqueFluidStackSet; import binnie.core.util.UniqueItemStackSet; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.extratrees.machines.brewery.BreweryRecipes; import binnie.extratrees.machines.distillery.DistilleryRecipes; import binnie.extratrees.machines.fruitpress.FruitPressRecipes; diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java index 02db4d7e..0299b930 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java @@ -1,17 +1,17 @@ package binnie.genetics.gui; import binnie.Binnie; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.genetics.BreedingSystem; import binnie.core.texture.BinnieCoreTexture; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java index b3218051..737a2a58 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java @@ -1,8 +1,8 @@ package binnie.genetics.gui; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Area; import java.text.DecimalFormat; diff --git a/src/main/java/binnie/genetics/gui/ControlBiome.java b/src/main/java/binnie/genetics/gui/ControlBiome.java index 5ab58fb9..eb583116 100644 --- a/src/main/java/binnie/genetics/gui/ControlBiome.java +++ b/src/main/java/binnie/genetics/gui/ControlBiome.java @@ -1,11 +1,11 @@ package binnie.genetics.gui; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.renderer.RenderUtil; import forestry.api.core.ForestryAPI; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java index cc21ef72..dbf7c1f2 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java @@ -1,16 +1,16 @@ package binnie.genetics.gui; import binnie.Binnie; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.events.EventValueChanged; -import binnie.craftgui.events.EventWidget; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.extrabees.core.ExtraBeeTexture; import forestry.api.genetics.IChromosomeType; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/genetics/gui/ControlChromosome.java b/src/main/java/binnie/genetics/gui/ControlChromosome.java index f9d23f37..e189a66a 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlChromosome.java @@ -2,14 +2,15 @@ package binnie.genetics.gui; import binnie.Binnie; import binnie.botany.api.EnumFlowerChromosome; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.texture.BinnieCoreTexture; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; + import com.google.common.base.Preconditions; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.arboriculture.EnumTreeChromosome; diff --git a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java index a91b633b..b021a676 100644 --- a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java +++ b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java @@ -1,11 +1,11 @@ package binnie.genetics.gui; +import binnie.core.craftgui.controls.listbox.ControlList; +import binnie.core.craftgui.controls.listbox.ControlOption; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.genetics.Gene; -import binnie.craftgui.controls.listbox.ControlList; -import binnie.craftgui.controls.listbox.ControlOption; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.core.renderer.RenderUtil; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java b/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java index 8c572df1..3515a79b 100644 --- a/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java +++ b/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java @@ -1,11 +1,11 @@ package binnie.genetics.gui; import binnie.Binnie; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.minecraft.control.ControlItemDisplay; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java index c469d58a..2dfeb694 100644 --- a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java +++ b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java @@ -1,14 +1,14 @@ package binnie.genetics.gui; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Border; +import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.genetics.Tolerance; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Border; -import binnie.craftgui.core.renderer.RenderUtil; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/binnie/genetics/gui/ControlTooltip.java b/src/main/java/binnie/genetics/gui/ControlTooltip.java index 26445ac2..87099cd0 100644 --- a/src/main/java/binnie/genetics/gui/ControlTooltip.java +++ b/src/main/java/binnie/genetics/gui/ControlTooltip.java @@ -1,9 +1,9 @@ package binnie.genetics.gui; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; public class ControlTooltip extends Control implements ITooltip { public ControlTooltip(final IWidget parent, final int x, final int y, final int w, final int h) { diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index 11e57a33..36a38d0d 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -3,32 +3,32 @@ package binnie.genetics.gui; import binnie.Binnie; import binnie.botany.api.IFlower; import binnie.core.AbstractMod; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.Widget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.scroll.ControlScrollBar; +import binnie.core.craftgui.controls.scroll.ControlScrollableContent; +import binnie.core.craftgui.events.EventKey; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.InventoryType; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.WindowInventory; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlide; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; import binnie.core.machines.inventory.SlotValidator; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.scroll.ControlScrollBar; -import binnie.craftgui.controls.scroll.ControlScrollableContent; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.Widget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventKey; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.InventoryType; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.WindowInventory; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlide; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.resource.minecraft.CraftGUITexture; -import binnie.craftgui.window.Panel; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.gui.bee.AnalystPageProducts; diff --git a/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java index c87a9f1e..33e2dd76 100644 --- a/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java @@ -2,15 +2,15 @@ package binnie.genetics.gui.bee; import binnie.Binnie; import binnie.core.BinnieCore; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.CraftGUIUtil; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.util.UniqueItemStackSet; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.extratrees.kitchen.craftgui.ControlFluidDisplay; import binnie.genetics.Genetics; import binnie.genetics.gui.AnalystPageProduce; diff --git a/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java b/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java index 014d5867..36e9cad4 100644 --- a/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java +++ b/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java @@ -1,8 +1,8 @@ package binnie.genetics.gui.butterfly; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; import binnie.genetics.Genetics; import binnie.genetics.gui.ControlAnalystPage; import binnie.genetics.gui.ControlIndividualDisplay; diff --git a/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java index 4a2220b4..07e5fff9 100644 --- a/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java +++ b/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java @@ -6,12 +6,12 @@ import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerType; import binnie.botany.craftgui.ControlColourDisplay; import binnie.botany.flower.FlowerSpriteManager; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.renderer.RenderUtil; import binnie.genetics.Genetics; import binnie.genetics.gui.ControlAnalystPage; import forestry.api.genetics.IAlleleSpecies; diff --git a/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java index 0d9cff4f..b1b6891f 100644 --- a/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java @@ -5,13 +5,13 @@ import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.IFlower; import binnie.botany.gardening.BlockSoil; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.Tolerance; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.genetics.Genetics; import binnie.genetics.gui.ControlAnalystPage; import binnie.genetics.gui.ControlToleranceBar; diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java index e209c12c..8a821bed 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java @@ -2,13 +2,13 @@ package binnie.genetics.gui.tree; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.IFlower; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.TextJustification; import binnie.core.genetics.Tolerance; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.TextJustification; import binnie.genetics.Genetics; import binnie.genetics.gui.ControlAnalystPage; import binnie.genetics.gui.ControlBiome; diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java index a4822454..31a2b832 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java @@ -1,12 +1,12 @@ package binnie.genetics.gui.tree; import binnie.Binnie; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.util.UniqueItemStackSet; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.genetics.Genetics; import binnie.genetics.gui.AnalystPageProduce; diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java index 431f6f98..fdddcee1 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java @@ -1,9 +1,9 @@ package binnie.genetics.gui.tree; import binnie.Binnie; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; import binnie.genetics.Genetics; import binnie.genetics.gui.ControlAnalystPage; import forestry.api.arboriculture.EnumTreeChromosome; diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java index a39fed0f..ef7d398f 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java @@ -1,12 +1,12 @@ package binnie.genetics.gui.tree; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.util.UniqueItemStackSet; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.minecraft.control.ControlIconDisplay; -import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.genetics.Genetics; import binnie.genetics.gui.AnalystPageProduce; import binnie.genetics.item.ModuleItems; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java index 38f62b20..26e0a8b2 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.acclimatiser; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; @@ -7,7 +8,6 @@ import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.ComponentGeneticGUI; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java index b4bf9844..876cd1d7 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java @@ -1,14 +1,14 @@ package binnie.genetics.machine.acclimatiser; import binnie.core.AbstractMod; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlSlotArray; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.extrabees.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; diff --git a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java index 1f479801..1295e82a 100644 --- a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.analyser; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; @@ -8,7 +9,6 @@ import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.item.GeneticsItems; diff --git a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java index 72b6decf..d9a96cd2 100644 --- a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java @@ -1,20 +1,20 @@ package binnie.genetics.machine.analyser; import binnie.core.AbstractMod; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.GUIIcon; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlIconDisplay; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlProgress; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlSlotArray; -import binnie.craftgui.minecraft.control.ControlSlotCharge; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; -import binnie.craftgui.window.Panel; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.GUIIcon; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlProgress; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.ControlSlotCharge; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.window.Panel; import binnie.extrabees.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index 6b582ce0..2486fa98 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -1,17 +1,17 @@ package binnie.genetics.machine.craftgui; import binnie.Binnie; +import binnie.core.craftgui.Attribute; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.genetics.BreedingSystem; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.Attribute; -import binnie.craftgui.core.ITooltip; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.events.EventMouse; -import binnie.craftgui.minecraft.Window; import binnie.genetics.api.IGene; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.genetics.Engineering; diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java index 6ba81186..f48d707d 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java @@ -1,14 +1,14 @@ package binnie.genetics.machine.craftgui; import binnie.Binnie; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.core.Control; -import binnie.craftgui.controls.core.IControlValue; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.minecraft.Window; import binnie.genetics.genetics.GeneTracker; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java b/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java index 6055c6db..91a9d6cf 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java @@ -1,10 +1,10 @@ package binnie.genetics.machine.craftgui; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.minecraft.control.ControlMachineProgress; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.minecraft.control.ControlMachineProgress; +import binnie.core.craftgui.renderer.RenderUtil; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java index 9ad68187..1de4a3cc 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java @@ -2,23 +2,23 @@ package binnie.genetics.machine.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextEdit; +import binnie.core.craftgui.controls.scroll.ControlScrollableContent; +import binnie.core.craftgui.controls.tab.ControlTab; +import binnie.core.craftgui.controls.tab.ControlTabBar; +import binnie.core.craftgui.events.EventHandler; +import binnie.core.craftgui.events.EventTextEdit; +import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.craftgui.geometry.Point; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlTabIcon; +import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.controls.ControlTextEdit; -import binnie.craftgui.controls.scroll.ControlScrollableContent; -import binnie.craftgui.controls.tab.ControlTab; -import binnie.craftgui.controls.tab.ControlTabBar; -import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.Point; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.events.EventHandler; -import binnie.craftgui.events.EventTextEdit; -import binnie.craftgui.events.EventValueChanged; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlTabIcon; -import binnie.craftgui.window.Panel; import binnie.genetics.Genetics; import binnie.genetics.genetics.Engineering; import binnie.genetics.genetics.GeneTracker; diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java index b1aa0afa..2b03d0f9 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java @@ -1,7 +1,7 @@ package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; -import binnie.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.Window; import binnie.genetics.Genetics; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java index 21d65561..762156cd 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java @@ -1,7 +1,7 @@ package binnie.genetics.machine.craftgui; import binnie.core.AbstractMod; -import binnie.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.Window; import binnie.genetics.Genetics; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java b/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java index 9c17aea0..0d91b28b 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java @@ -1,6 +1,5 @@ package binnie.genetics.machine.craftgui; -import binnie.craftgui.minecraft.Window; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; @@ -8,6 +7,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; +import binnie.core.craftgui.minecraft.Window; + public abstract class WindowMachine extends Window { public WindowMachine(final int width, final int height, final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { super(width, height, player, inventory, side); diff --git a/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java b/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java index a2dcee0f..60696222 100644 --- a/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.genepool; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; @@ -11,7 +12,6 @@ import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.inventory.TankValidator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.item.GeneticsItems; diff --git a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java index ea7a63e1..ebacbde9 100644 --- a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java @@ -1,19 +1,19 @@ package binnie.genetics.machine.genepool; import binnie.core.AbstractMod; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.GUIIcon; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlIconDisplay; -import binnie.craftgui.minecraft.control.ControlLiquidTank; -import binnie.craftgui.minecraft.control.ControlMachineProgress; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlSlotArray; -import binnie.craftgui.minecraft.control.ControlSlotCharge; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.GUIIcon; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlMachineProgress; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.ControlSlotCharge; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.extrabees.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; diff --git a/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java b/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java index efe70570..f6c46f25 100644 --- a/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java @@ -1,12 +1,12 @@ package binnie.genetics.machine.incubator; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentTankContainer; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.ComponentGeneticGUI; diff --git a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java b/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java index a080d37c..d1a4f88f 100644 --- a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java @@ -1,18 +1,18 @@ package binnie.genetics.machine.incubator; import binnie.core.AbstractMod; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.GUIIcon; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlIconDisplay; -import binnie.craftgui.minecraft.control.ControlLiquidTank; -import binnie.craftgui.minecraft.control.ControlMachineProgress; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlSlotArray; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.GUIIcon; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlMachineProgress; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; diff --git a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java index 5484e296..605df4f0 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.inoculator; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; @@ -11,7 +12,6 @@ import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.Validator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.genetics.api.IItemSerum; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java index 0f4910c4..a5e23e5b 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java @@ -1,20 +1,20 @@ package binnie.genetics.machine.inoculator; import binnie.core.AbstractMod; -import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.GUIIcon; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlIconDisplay; -import binnie.craftgui.minecraft.control.ControlLiquidTank; -import binnie.craftgui.minecraft.control.ControlMachineProgress; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlSlotArray; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.geometry.CraftGUIUtil; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.GUIIcon; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlMachineProgress; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; diff --git a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java index 9d680eb5..e2c54ea3 100644 --- a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.isolator; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; @@ -10,7 +11,6 @@ import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.TankValidator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.item.GeneticsItems; diff --git a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java index 13176475..1ab7e6b9 100644 --- a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java @@ -1,19 +1,19 @@ package binnie.genetics.machine.isolator; import binnie.core.AbstractMod; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.GUIIcon; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlIconDisplay; -import binnie.craftgui.minecraft.control.ControlLiquidTank; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlProgress; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlSlotArray; -import binnie.craftgui.minecraft.control.ControlSlotCharge; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.GUIIcon; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlProgress; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.ControlSlotCharge; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.extrabees.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java index aa4b2187..95383aaa 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.polymeriser; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; @@ -10,7 +11,6 @@ import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.Validator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.item.GeneticLiquid; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java index ce770c48..a13d5f54 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java @@ -1,19 +1,19 @@ package binnie.genetics.machine.polymeriser; import binnie.core.AbstractMod; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.minecraft.GUIIcon; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlIconDisplay; -import binnie.craftgui.minecraft.control.ControlLiquidTank; -import binnie.craftgui.minecraft.control.ControlMachineProgress; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlSlotArray; -import binnie.craftgui.minecraft.control.ControlSlotCharge; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.GUIIcon; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlMachineProgress; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.ControlSlotCharge; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; diff --git a/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java b/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java index b6f52ba1..354c4273 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java +++ b/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java @@ -1,16 +1,16 @@ package binnie.genetics.machine.sequencer; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlProgressBase; +import binnie.core.craftgui.window.Panel; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.MinecraftGUI; -import binnie.craftgui.minecraft.Window; -import binnie.craftgui.minecraft.control.ControlProgressBase; -import binnie.craftgui.window.Panel; import net.minecraft.item.ItemStack; import java.util.Random; diff --git a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java index 99b4a13a..ea6715e7 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java @@ -1,6 +1,7 @@ package binnie.genetics.machine.sequencer; import binnie.Binnie; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; @@ -9,7 +10,6 @@ import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java index 0d0cf912..499162a4 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java @@ -1,21 +1,21 @@ package binnie.genetics.machine.sequencer; import binnie.core.AbstractMod; -import binnie.craftgui.controls.ControlText; -import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.GUIIcon; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlIconDisplay; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlSlotArray; -import binnie.craftgui.minecraft.control.ControlSlotCharge; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.geometry.CraftGUIUtil; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.GUIIcon; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.ControlSlotCharge; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.extrabees.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; diff --git a/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java b/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java index 17251bb6..414ff51a 100644 --- a/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java +++ b/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java @@ -1,9 +1,9 @@ package binnie.genetics.machine.splicer; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.Area; -import binnie.craftgui.core.renderer.RenderUtil; -import binnie.craftgui.minecraft.control.ControlProgressBase; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.geometry.Area; +import binnie.core.craftgui.minecraft.control.ControlProgressBase; +import binnie.core.craftgui.renderer.RenderUtil; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java index 44d48109..bcb18576 100644 --- a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.splicer; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; @@ -9,7 +10,6 @@ import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.craftgui.minecraft.IMachineInformation; import binnie.genetics.Genetics; import binnie.genetics.api.IItemSerum; import binnie.genetics.core.GeneticsGUI; diff --git a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java index 33ffaf05..2c1c4c5f 100644 --- a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java @@ -1,18 +1,18 @@ package binnie.genetics.machine.splicer; import binnie.core.AbstractMod; -import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.core.geometry.TextJustification; -import binnie.craftgui.minecraft.GUIIcon; -import binnie.craftgui.minecraft.control.ControlEnergyBar; -import binnie.craftgui.minecraft.control.ControlErrorState; -import binnie.craftgui.minecraft.control.ControlIconDisplay; -import binnie.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.craftgui.minecraft.control.ControlSlot; -import binnie.craftgui.minecraft.control.ControlSlotArray; -import binnie.craftgui.resource.Texture; -import binnie.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.geometry.CraftGUIUtil; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.GUIIcon; +import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlIconDisplay; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine;