From 21aa0c43a699bec0a2a79d80b7cae9fe4ad80245 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 31 Jul 2017 12:09:46 +0200 Subject: [PATCH] Clean Up Gui --- .../java/binnie/botany/core/BotanyGUI.java | 4 +- .../binnie/botany/craftgui/PageColorMix.java | 36 ---------- .../botany/genetics/FlowerAlyzerPlugin.java | 4 +- .../database}/ControlColorDisplay.java | 16 ++--- .../database}/ControlColorMixBox.java | 6 +- .../database}/ControlColorMixItem.java | 6 +- .../database}/ControlColorMixSymbol.java | 25 +++---- .../database}/ControlColorOption.java | 14 ++-- .../botany/gui/database/PageColorMix.java | 37 ++++++++++ .../database}/PageColorMixResultant.java | 15 ++-- .../database}/PageSpeciesFlowerGenome.java | 46 ++++++------ .../database}/WindowBotanistDatabase.java | 33 ++++----- .../gui/database}/package-info.java | 2 +- src/main/java/binnie/core/BinnieCore.java | 2 +- .../controls/button/package-info.java | 9 --- .../controls/listbox/package-info.java | 9 --- .../craftgui/controls/page/package-info.java | 9 --- .../controls/scroll/package-info.java | 9 --- .../minecraft/control/package-info.java | 9 --- .../core/craftgui/minecraft/package-info.java | 9 --- .../minecraft/render/package-info.java | 9 --- .../core/craftgui/renderer/package-info.java | 9 --- .../resource/minecraft/package-info.java | 9 --- .../core/craftgui/resource/package-info.java | 9 --- .../core/{craftgui => gui}/Attribute.java | 2 +- .../java/binnie/core/gui/BinnieCoreGUI.java | 4 +- .../binnie/core/gui/BinnieGUIHandler.java | 2 +- .../core/{craftgui => gui}/CraftGUI.java | 6 +- .../java/binnie/core/gui/IBinnieGUID.java | 2 +- .../core/{craftgui => gui}/ITooltip.java | 2 +- .../core/{craftgui => gui}/ITooltipHelp.java | 2 +- .../{craftgui => gui}/ITopLevelWidget.java | 4 +- .../core/{craftgui => gui}/IWidget.java | 10 +-- .../{craftgui => gui}/IWidgetAttribute.java | 2 +- .../core/{craftgui => gui}/RenderStage.java | 2 +- .../core/{craftgui => gui}/Tooltip.java | 2 +- .../{craftgui => gui}/TopLevelWidget.java | 10 +-- .../binnie/core/{craftgui => gui}/Widget.java | 12 ++-- .../{craftgui => gui}/WindowFieldKit.java | 32 ++++----- .../core/{craftgui => gui}/WindowGenesis.java | 32 ++++----- .../controls/ControlCheckbox.java | 26 +++---- .../controls/ControlText.java | 16 ++--- .../controls/ControlTextCentered.java | 10 +-- .../controls/ControlTextEdit.java | 24 +++---- .../controls/IControlSelection.java | 2 +- .../controls/IControlSelectionOption.java | 2 +- .../controls/button/ControlButton.java | 22 +++--- .../controls/button/ControlEnumButton.java | 10 +-- .../controls/button/ControlToggleButton.java | 8 +-- .../gui/controls/button/package-info.java | 9 +++ .../controls/core/Control.java | 20 +++--- .../controls/core/IControlIndexed.java | 2 +- .../controls/core/IControlValue.java | 4 +- .../controls/core/IControlValues.java | 2 +- .../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 +-- .../gui/controls/listbox/package-info.java | 9 +++ .../events => gui/controls}/package-info.java | 2 +- .../controls/page/ControlPage.java | 8 +-- .../controls/page/ControlPages.java | 12 ++-- .../controls/page}/package-info.java | 2 +- .../controls/scroll/ControlScroll.java | 6 +- .../controls/scroll/ControlScrollBar.java | 22 +++--- .../scroll/ControlScrollableContent.java | 14 ++-- .../controls/scroll/IControlScrollable.java | 4 +- .../gui/controls/scroll/package-info.java | 9 +++ .../controls/tab/ControlTab.java | 34 ++++----- .../controls/tab/ControlTabBar.java | 14 ++-- .../core/gui/controls/tab/package-info.java | 9 +++ .../gui/database/ControlBranchBox.java | 6 +- .../gui/database/ControlBranchBoxOption.java | 6 +- .../gui/database/ControlBreedingProgress.java | 22 +++--- .../ControlDatabaseIndividualDisplay.java | 25 +++---- .../gui/database/ControlItemStackOption.java | 16 ++--- .../gui/database/ControlMutationBox.java | 8 +-- .../gui/database/ControlMutationItem.java | 8 +-- .../gui/database/ControlMutationSymbol.java | 27 +++---- .../gui/database/ControlSpeciesBox.java | 8 +-- .../gui/database/ControlSpeciesBoxOption.java | 16 ++--- .../core/gui/database/DatabaseConstants.java | 33 +++++++++ .../gui/database/DatabaseTab.java | 6 +- .../gui/database/EnumDiscoveryState.java | 2 +- .../gui/database/IDatabaseMode.java | 2 +- .../gui/database/PageAbstract.java | 6 +- .../gui/database/PageBranch.java | 4 +- .../gui/database/PageBranchOverview.java | 18 ++--- .../gui/database/PageBranchSpecies.java | 12 ++-- .../gui/database/PageBreeder.java | 18 ++--- .../gui/database/PageBreederStats.java | 12 ++-- .../gui/database/PageSpecies.java | 4 +- .../database/PageSpeciesClassification.java | 8 +-- .../gui/database/PageSpeciesMutations.java | 10 +-- .../gui/database/PageSpeciesOverview.java | 22 +++--- .../gui/database/PageSpeciesResultant.java | 10 +-- .../gui/database/WindowAbstractDatabase.java | 42 +++++------ .../core/gui/database/package-info.java | 9 +++ .../core/{craftgui => gui}/events/Event.java | 4 +- .../events/EventButtonClicked.java | 4 +- .../events/EventCycleChanged.java | 4 +- .../events/EventHandler.java | 4 +- .../{craftgui => gui}/events/EventKey.java | 4 +- .../{craftgui => gui}/events/EventMouse.java | 4 +- .../events/EventTextEdit.java | 4 +- .../events/EventToggleButtonClicked.java | 4 +- .../events/EventValueChanged.java | 4 +- .../events/EventValuesChanged.java | 4 +- .../{craftgui => gui}/events/EventWidget.java | 4 +- .../gui/events}/package-info.java | 2 +- .../fieldkit/ControlChromoPicker.java | 22 +++--- .../fieldkit/ControlChromosome.java | 16 ++--- .../core/{craftgui => gui}/geometry/Area.java | 2 +- .../{craftgui => gui}/geometry/Border.java | 2 +- .../geometry/CraftGUIUtil.java | 8 +-- .../{craftgui => gui}/geometry/Point.java | 2 +- .../{craftgui => gui}/geometry/Position.java | 2 +- .../geometry/TextJustification.java | 2 +- .../core/gui/geometry/package-info.java | 9 +++ .../minecraft/ContainerCraftGUI.java | 6 +- .../minecraft/CustomSlot.java | 2 +- .../{craftgui => gui}/minecraft/Dialog.java | 20 +++--- .../minecraft/EnumColor.java | 2 +- .../{craftgui => gui}/minecraft/GUIIcon.java | 2 +- .../minecraft/GuiCraftGUI.java | 14 ++-- .../minecraft/IMachineInformation.java | 2 +- .../minecraft/IMinecraftTooltip.java | 4 +- .../minecraft/IWindowAffectsShiftClick.java | 2 +- .../minecraft/InventoryType.java | 2 +- .../minecraft/MinecraftGUI.java | 4 +- .../minecraft/MinecraftTooltip.java | 4 +- .../minecraft/ModuleCraftGUI.java | 2 +- .../{craftgui => gui}/minecraft/Window.java | 46 ++++++------ .../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 | 2 +- .../core/gui/minecraft/package-info.java | 9 +++ .../minecraft/render/MinecraftTexture.java | 4 +- .../minecraft/render/RenderCommand.java | 6 +- .../gui/minecraft/render/package-info.java | 9 +++ .../renderer/RenderUtil.java | 8 +-- .../renderer/TextureRenderer.java | 16 ++--- .../renderer/TextureType.java | 2 +- .../core/gui/renderer/package-info.java | 9 +++ .../resource/IStyleSheet.java | 2 +- .../resource/StyleSheet.java | 2 +- .../resource/StyleSheetManager.java | 4 +- .../resource/StyleSheetPunnett.java | 8 +-- .../{craftgui => gui}/resource/Texture.java | 8 +-- .../minecraft/CraftGUIResourceManager.java | 10 +-- .../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 | 2 +- .../core/gui/resource/package-info.java | 9 +++ .../core/{craftgui => gui}/window/Panel.java | 14 ++-- .../binnie/core/gui/window/package-info.java | 9 +++ .../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 | 2 +- .../extratrees/core/ExtraTreesGUID.java | 18 ++--- .../craftgui => gui/database}/PageFruit.java | 20 +++--- .../database}/PagePlanksOverview.java | 24 +++---- .../database}/PagePlanksTrees.java | 20 +++--- .../database}/PageSpeciesImage.java | 18 ++--- .../database}/PageSpeciesTreeGenome.java | 28 ++++---- .../craftgui => gui/database}/PageWood.java | 20 +++--- .../database}/WindowArboristDatabase.java | 32 ++++----- .../extratrees/gui/database/package-info.java | 9 +++ .../machines}/ControlBlockIconDisplay.java | 10 +-- .../machines}/ControlBreweryProgress.java | 22 +++--- .../machines}/ControlDistilleryProgress.java | 24 +++---- .../machines}/ControlFruitPressProgress.java | 24 +++---- .../machines}/ControlLumbermillProgress.java | 22 +++--- .../machines}/ControlRecipeSlot.java | 10 +-- .../machines}/ControlTileSelect.java | 30 ++++---- .../machines}/DialogBreweryRecipe.java | 6 +- .../machines}/WindowBrewery.java | 18 ++--- .../machines}/WindowDistillery.java | 14 ++-- .../WindowLepidopteristDatabase.java | 23 +++--- .../machines}/WindowLumbermill.java | 16 ++--- .../machines}/WindowPress.java | 18 ++--- .../machines}/WindowSetSquare.java | 4 +- .../machines}/WindowWoodworker.java | 30 ++++---- .../extratrees/gui/machines/package-info.java | 9 +++ .../gui}/package-info.java | 2 +- .../brewery/DistilleryRecipeCategory.java | 12 ++-- .../brewery/DistilleryRecipeWrapper.java | 6 +- .../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 +- .../machines/craftgui/package-info.java | 9 --- .../distillery/DistilleryMachine.java | 2 +- .../fruitpress/FruitPressMachine.java | 2 +- .../lumbermill/LumbermillMachine.java | 2 +- .../binnie/genetics/core/GeneticsGUI.java | 2 +- .../genetics/gui/ControlGenesisOption.java | 10 +-- .../binnie/genetics/gui/WindowAnalyst.java | 48 ++++++------- .../gui/analyst/AnalystPageBehaviour.java | 12 ++-- .../gui/analyst/AnalystPageBiology.java | 10 +-- .../gui/analyst/AnalystPageDatabase.java | 32 ++++----- .../gui/analyst/AnalystPageDescription.java | 14 ++-- .../gui/analyst/AnalystPageGenome.java | 16 ++--- .../gui/analyst/AnalystPageKaryogram.java | 6 +- .../gui/analyst/AnalystPageMutations.java | 22 +++--- .../gui/analyst/AnalystPageProduce.java | 8 +-- .../gui/analyst/ControlAnalystChromosome.java | 18 ++--- .../gui/analyst/ControlAnalystPage.java | 6 +- .../genetics/gui/analyst/ControlBiome.java | 12 ++-- .../gui/analyst/ControlIndividualDisplay.java | 8 +-- .../gui/analyst/ControlToleranceBar.java | 16 ++--- .../genetics/gui/analyst/ControlTooltip.java | 8 +-- .../gui/analyst/bee/AnalystPageProducts.java | 16 ++--- .../butterfly/AnalystPageSpecimen.java | 6 +- .../analyst/flower/AnalystPageAppearance.java | 14 ++-- .../gui/analyst/flower/AnalystPageSoil.java | 12 ++-- .../gui/analyst/tree/AnalystPageClimate.java | 12 ++-- .../gui/analyst/tree/AnalystPageFruit.java | 10 +-- .../gui/analyst/tree/AnalystPageGrowth.java | 6 +- .../gui/analyst/tree/AnalystPageWood.java | 12 ++-- .../gui/database/bee/ControlBiomes.java | 16 ++--- .../gui/database/bee/ControlClimateBar.java | 18 ++--- .../gui/database/bee/ControlProductsBox.java | 4 +- .../gui/database/bee/ControlProductsItem.java | 22 +++--- .../gui/database/bee/PageSpeciesClimate.java | 8 +-- .../gui/database/bee/PageSpeciesGenome.java | 52 +++++++------- .../gui/database/bee/PageSpeciesProducts.java | 16 +++-- .../database/bee/WindowApiaristDatabase.java | 20 +++--- .../genetics/gui/database/package-info.java | 9 --- .../gui/punnett/ControlChromosome.java | 16 ++--- .../genetics/gui/punnett/ControlPunnett.java | 12 ++-- .../gui/punnett/WindowPunnettSquare.java | 14 ++-- .../acclimatiser/PackageAcclimatiser.java | 2 +- .../acclimatiser/WindowAcclimatiser.java | 18 ++--- .../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 | 2 +- .../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 +++---- .../assets/binniecore/lang/en_US.lang | 20 +++++- .../resources/assets/botany/lang/en_US.lang | 9 +-- .../resources/assets/genetics/lang/en_US.lang | 6 ++ 296 files changed, 1792 insertions(+), 1712 deletions(-) delete mode 100644 src/main/java/binnie/botany/craftgui/PageColorMix.java rename src/main/java/binnie/botany/{craftgui => gui/database}/ControlColorDisplay.java (73%) rename src/main/java/binnie/botany/{craftgui => gui/database}/ControlColorMixBox.java (78%) rename src/main/java/binnie/botany/{craftgui => gui/database}/ControlColorMixItem.java (85%) rename src/main/java/binnie/botany/{craftgui => gui/database}/ControlColorMixSymbol.java (67%) rename src/main/java/binnie/botany/{craftgui => gui/database}/ControlColorOption.java (75%) create mode 100644 src/main/java/binnie/botany/gui/database/PageColorMix.java rename src/main/java/binnie/botany/{craftgui => gui/database}/PageColorMixResultant.java (70%) rename src/main/java/binnie/botany/{craftgui => gui/database}/PageSpeciesFlowerGenome.java (68%) rename src/main/java/binnie/botany/{craftgui => gui/database}/WindowBotanistDatabase.java (78%) rename src/main/java/binnie/{core/craftgui/window => botany/gui/database}/package-info.java (86%) delete mode 100644 src/main/java/binnie/core/craftgui/controls/button/package-info.java delete mode 100644 src/main/java/binnie/core/craftgui/controls/listbox/package-info.java delete mode 100644 src/main/java/binnie/core/craftgui/controls/page/package-info.java delete mode 100644 src/main/java/binnie/core/craftgui/controls/scroll/package-info.java delete mode 100644 src/main/java/binnie/core/craftgui/minecraft/control/package-info.java delete mode 100644 src/main/java/binnie/core/craftgui/minecraft/package-info.java delete mode 100644 src/main/java/binnie/core/craftgui/minecraft/render/package-info.java delete mode 100644 src/main/java/binnie/core/craftgui/renderer/package-info.java delete mode 100644 src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java delete mode 100644 src/main/java/binnie/core/craftgui/resource/package-info.java rename src/main/java/binnie/core/{craftgui => gui}/Attribute.java (80%) rename src/main/java/binnie/core/{craftgui => gui}/CraftGUI.java (63%) rename src/main/java/binnie/core/{craftgui => gui}/ITooltip.java (69%) rename src/main/java/binnie/core/{craftgui => gui}/ITooltipHelp.java (71%) rename src/main/java/binnie/core/{craftgui => gui}/ITopLevelWidget.java (87%) rename src/main/java/binnie/core/{craftgui => gui}/IWidget.java (91%) rename src/main/java/binnie/core/{craftgui => gui}/IWidgetAttribute.java (56%) rename src/main/java/binnie/core/{craftgui => gui}/RenderStage.java (70%) rename src/main/java/binnie/core/{craftgui => gui}/Tooltip.java (98%) rename src/main/java/binnie/core/{craftgui => gui}/TopLevelWidget.java (96%) rename src/main/java/binnie/core/{craftgui => gui}/Widget.java (97%) rename src/main/java/binnie/core/{craftgui => gui}/WindowFieldKit.java (91%) rename src/main/java/binnie/core/{craftgui => gui}/WindowGenesis.java (90%) rename src/main/java/binnie/core/{craftgui => gui}/controls/ControlCheckbox.java (73%) rename src/main/java/binnie/core/{craftgui => gui}/controls/ControlText.java (74%) rename src/main/java/binnie/core/{craftgui => gui}/controls/ControlTextCentered.java (54%) rename src/main/java/binnie/core/{craftgui => gui}/controls/ControlTextEdit.java (83%) rename src/main/java/binnie/core/{craftgui => gui}/controls/IControlSelection.java (80%) rename src/main/java/binnie/core/{craftgui => gui}/controls/IControlSelectionOption.java (62%) rename src/main/java/binnie/core/{craftgui => gui}/controls/button/ControlButton.java (76%) rename src/main/java/binnie/core/{craftgui => gui}/controls/button/ControlEnumButton.java (85%) rename src/main/java/binnie/core/{craftgui => gui}/controls/button/ControlToggleButton.java (66%) create mode 100644 src/main/java/binnie/core/gui/controls/button/package-info.java rename src/main/java/binnie/core/{craftgui => gui}/controls/core/Control.java (81%) rename src/main/java/binnie/core/{craftgui => gui}/controls/core/IControlIndexed.java (66%) rename src/main/java/binnie/core/{craftgui => gui}/controls/core/IControlValue.java (66%) rename src/main/java/binnie/core/{craftgui => gui}/controls/core/IControlValues.java (78%) rename src/main/java/binnie/core/{craftgui/geometry => gui/controls/core}/package-info.java (85%) rename src/main/java/binnie/core/{craftgui => gui}/controls/listbox/ControlList.java (91%) rename src/main/java/binnie/core/{craftgui => gui}/controls/listbox/ControlListBox.java (87%) rename src/main/java/binnie/core/{craftgui => gui}/controls/listbox/ControlOption.java (79%) rename src/main/java/binnie/core/{craftgui => gui}/controls/listbox/ControlTextOption.java (77%) create mode 100644 src/main/java/binnie/core/gui/controls/listbox/package-info.java rename src/main/java/binnie/core/{craftgui/events => gui/controls}/package-info.java (86%) rename src/main/java/binnie/core/{craftgui => gui}/controls/page/ControlPage.java (77%) rename src/main/java/binnie/core/{craftgui => gui}/controls/page/ControlPages.java (77%) rename src/main/java/binnie/core/{craftgui/controls => gui/controls/page}/package-info.java (85%) rename src/main/java/binnie/core/{craftgui => gui}/controls/scroll/ControlScroll.java (76%) rename src/main/java/binnie/core/{craftgui => gui}/controls/scroll/ControlScrollBar.java (80%) rename src/main/java/binnie/core/{craftgui => gui}/controls/scroll/ControlScrollableContent.java (92%) rename src/main/java/binnie/core/{craftgui => gui}/controls/scroll/IControlScrollable.java (73%) create mode 100644 src/main/java/binnie/core/gui/controls/scroll/package-info.java rename src/main/java/binnie/core/{craftgui => gui}/controls/tab/ControlTab.java (77%) rename src/main/java/binnie/core/{craftgui => gui}/controls/tab/ControlTabBar.java (86%) create mode 100644 src/main/java/binnie/core/gui/controls/tab/package-info.java rename src/main/java/binnie/{genetics => core}/gui/database/ControlBranchBox.java (75%) rename src/main/java/binnie/{genetics => core}/gui/database/ControlBranchBoxOption.java (69%) rename src/main/java/binnie/{genetics => core}/gui/database/ControlBreedingProgress.java (65%) rename src/main/java/binnie/{genetics => core}/gui/database/ControlDatabaseIndividualDisplay.java (85%) rename src/main/java/binnie/{genetics => core}/gui/database/ControlItemStackOption.java (73%) rename src/main/java/binnie/{genetics => core}/gui/database/ControlMutationBox.java (90%) rename src/main/java/binnie/{genetics => core}/gui/database/ControlMutationItem.java (91%) rename src/main/java/binnie/{genetics => core}/gui/database/ControlMutationSymbol.java (78%) rename src/main/java/binnie/{genetics => core}/gui/database/ControlSpeciesBox.java (89%) rename src/main/java/binnie/{genetics => core}/gui/database/ControlSpeciesBoxOption.java (78%) create mode 100644 src/main/java/binnie/core/gui/database/DatabaseConstants.java rename src/main/java/binnie/{genetics => core}/gui/database/DatabaseTab.java (84%) rename src/main/java/binnie/{genetics => core}/gui/database/EnumDiscoveryState.java (69%) rename src/main/java/binnie/{genetics => core}/gui/database/IDatabaseMode.java (59%) rename src/main/java/binnie/{genetics => core}/gui/database/PageAbstract.java (67%) rename src/main/java/binnie/{genetics => core}/gui/database/PageBranch.java (73%) rename src/main/java/binnie/{genetics => core}/gui/database/PageBranchOverview.java (72%) rename src/main/java/binnie/{genetics => core}/gui/database/PageBranchSpecies.java (80%) rename src/main/java/binnie/{genetics => core}/gui/database/PageBreeder.java (68%) rename src/main/java/binnie/{genetics => core}/gui/database/PageBreederStats.java (59%) rename src/main/java/binnie/{genetics => core}/gui/database/PageSpecies.java (74%) rename src/main/java/binnie/{genetics => core}/gui/database/PageSpeciesClassification.java (88%) rename src/main/java/binnie/{genetics => core}/gui/database/PageSpeciesMutations.java (63%) rename src/main/java/binnie/{genetics => core}/gui/database/PageSpeciesOverview.java (80%) rename src/main/java/binnie/{genetics => core}/gui/database/PageSpeciesResultant.java (72%) rename src/main/java/binnie/{genetics => core}/gui/database/WindowAbstractDatabase.java (89%) create mode 100644 src/main/java/binnie/core/gui/database/package-info.java rename src/main/java/binnie/core/{craftgui => gui}/events/Event.java (77%) rename src/main/java/binnie/core/{craftgui => gui}/events/EventButtonClicked.java (78%) rename src/main/java/binnie/core/{craftgui => gui}/events/EventCycleChanged.java (75%) rename src/main/java/binnie/core/{craftgui => gui}/events/EventHandler.java (93%) rename src/main/java/binnie/core/{craftgui => gui}/events/EventKey.java (92%) rename src/main/java/binnie/core/{craftgui => gui}/events/EventMouse.java (96%) rename src/main/java/binnie/core/{craftgui => gui}/events/EventTextEdit.java (79%) rename src/main/java/binnie/core/{craftgui => gui}/events/EventToggleButtonClicked.java (77%) rename src/main/java/binnie/core/{craftgui => gui}/events/EventValueChanged.java (85%) rename src/main/java/binnie/core/{craftgui => gui}/events/EventValuesChanged.java (76%) rename src/main/java/binnie/core/{craftgui => gui}/events/EventWidget.java (98%) rename src/main/java/binnie/{botany/craftgui => core/gui/events}/package-info.java (88%) rename src/main/java/binnie/core/{craftgui => gui}/fieldkit/ControlChromoPicker.java (75%) rename src/main/java/binnie/core/{craftgui => gui}/fieldkit/ControlChromosome.java (94%) rename src/main/java/binnie/core/{craftgui => gui}/geometry/Area.java (98%) rename src/main/java/binnie/core/{craftgui => gui}/geometry/Border.java (97%) rename src/main/java/binnie/core/{craftgui => gui}/geometry/CraftGUIUtil.java (91%) rename src/main/java/binnie/core/{craftgui => gui}/geometry/Point.java (96%) rename src/main/java/binnie/core/{craftgui => gui}/geometry/Position.java (93%) rename src/main/java/binnie/core/{craftgui => gui}/geometry/TextJustification.java (93%) create mode 100644 src/main/java/binnie/core/gui/geometry/package-info.java rename src/main/java/binnie/core/{craftgui => gui}/minecraft/ContainerCraftGUI.java (99%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/CustomSlot.java (97%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/Dialog.java (74%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/EnumColor.java (95%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/GUIIcon.java (95%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/GuiCraftGUI.java (96%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/IMachineInformation.java (62%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/IMinecraftTooltip.java (56%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/IWindowAffectsShiftClick.java (79%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/InventoryType.java (59%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/MinecraftGUI.java (64%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/MinecraftTooltip.java (94%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/ModuleCraftGUI.java (87%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/Window.java (88%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/WindowInventory.java (98%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlEnergyBar.java (87%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlErrorState.java (83%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlHelp.java (70%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlIconDisplay.java (84%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlImage.java (64%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlInfo.java (67%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlItemDisplay.java (86%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlLiquidTank.java (90%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlMachineProgress.java (59%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlPlayerInventory.java (92%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlPowerSystem.java (70%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlProgress.java (81%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlProgressBase.java (89%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlSlide.java (86%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlSlot.java (91%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlSlotArray.java (91%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlSlotBase.java (78%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlSlotCharge.java (74%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlTabIcon.java (85%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/ControlUser.java (71%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/control/EnumHighlighting.java (76%) rename src/main/java/binnie/core/{craftgui/controls/tab => gui/minecraft/control}/package-info.java (84%) create mode 100644 src/main/java/binnie/core/gui/minecraft/package-info.java rename src/main/java/binnie/core/{craftgui => gui}/minecraft/render/MinecraftTexture.java (68%) rename src/main/java/binnie/core/{craftgui => gui}/minecraft/render/RenderCommand.java (57%) create mode 100644 src/main/java/binnie/core/gui/minecraft/render/package-info.java rename src/main/java/binnie/core/{craftgui => gui}/renderer/RenderUtil.java (97%) rename src/main/java/binnie/core/{craftgui => gui}/renderer/TextureRenderer.java (95%) rename src/main/java/binnie/core/{craftgui => gui}/renderer/TextureType.java (55%) create mode 100644 src/main/java/binnie/core/gui/renderer/package-info.java rename src/main/java/binnie/core/{craftgui => gui}/resource/IStyleSheet.java (83%) rename src/main/java/binnie/core/{craftgui => gui}/resource/StyleSheet.java (92%) rename src/main/java/binnie/core/{craftgui => gui}/resource/StyleSheetManager.java (89%) rename src/main/java/binnie/core/{craftgui => gui}/resource/StyleSheetPunnett.java (79%) rename src/main/java/binnie/core/{craftgui => gui}/resource/Texture.java (94%) rename src/main/java/binnie/core/{craftgui => gui}/resource/minecraft/CraftGUIResourceManager.java (95%) rename src/main/java/binnie/core/{craftgui => gui}/resource/minecraft/CraftGUITexture.java (96%) rename src/main/java/binnie/core/{craftgui => gui}/resource/minecraft/CraftGUITextureSheet.java (89%) rename src/main/java/binnie/core/{craftgui => gui}/resource/minecraft/PaddedTexture.java (70%) rename src/main/java/binnie/core/{craftgui => gui}/resource/minecraft/ParsedTextureSheet.java (94%) rename src/main/java/binnie/core/{craftgui => gui}/resource/minecraft/StandardTexture.java (79%) rename src/main/java/binnie/core/{craftgui/controls/core => gui/resource/minecraft}/package-info.java (84%) create mode 100644 src/main/java/binnie/core/gui/resource/package-info.java rename src/main/java/binnie/core/{craftgui => gui}/window/Panel.java (81%) create mode 100644 src/main/java/binnie/core/gui/window/package-info.java rename src/main/java/binnie/extratrees/{machines/craftgui => gui/database}/PageFruit.java (74%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/database}/PagePlanksOverview.java (82%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/database}/PagePlanksTrees.java (67%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/database}/PageSpeciesImage.java (57%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/database}/PageSpeciesTreeGenome.java (90%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/database}/PageWood.java (67%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/database}/WindowArboristDatabase.java (85%) create mode 100644 src/main/java/binnie/extratrees/gui/database/package-info.java rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/ControlBlockIconDisplay.java (71%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/ControlBreweryProgress.java (84%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/ControlDistilleryProgress.java (83%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/ControlFruitPressProgress.java (81%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/ControlLumbermillProgress.java (84%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/ControlRecipeSlot.java (83%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/ControlTileSelect.java (87%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/DialogBreweryRecipe.java (65%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/WindowBrewery.java (77%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/WindowDistillery.java (82%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/WindowLepidopteristDatabase.java (76%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/WindowLumbermill.java (77%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/WindowPress.java (82%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/WindowSetSquare.java (90%) rename src/main/java/binnie/extratrees/{machines/craftgui => gui/machines}/WindowWoodworker.java (76%) create mode 100644 src/main/java/binnie/extratrees/gui/machines/package-info.java rename src/main/java/binnie/{core/craftgui => extratrees/gui}/package-info.java (88%) delete mode 100644 src/main/java/binnie/extratrees/machines/craftgui/package-info.java delete mode 100644 src/main/java/binnie/genetics/gui/database/package-info.java diff --git a/src/main/java/binnie/botany/core/BotanyGUI.java b/src/main/java/binnie/botany/core/BotanyGUI.java index e56dd489..666d7051 100644 --- a/src/main/java/binnie/botany/core/BotanyGUI.java +++ b/src/main/java/binnie/botany/core/BotanyGUI.java @@ -8,9 +8,9 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; -import binnie.botany.craftgui.WindowBotanistDatabase; -import binnie.core.craftgui.minecraft.Window; +import binnie.botany.gui.database.WindowBotanistDatabase; import binnie.core.gui.IBinnieGUID; +import binnie.core.gui.minecraft.Window; public enum BotanyGUI implements IBinnieGUID { DATABASE, diff --git a/src/main/java/binnie/botany/craftgui/PageColorMix.java b/src/main/java/binnie/botany/craftgui/PageColorMix.java deleted file mode 100644 index 8dab3a82..00000000 --- a/src/main/java/binnie/botany/craftgui/PageColorMix.java +++ /dev/null @@ -1,36 +0,0 @@ -package binnie.botany.craftgui; - -import java.util.ArrayList; -import java.util.List; - -import binnie.botany.api.IColorMix; -import binnie.botany.api.IFlowerColor; -import binnie.botany.core.BotanyCore; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.core.util.I18N; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageAbstract; - -public class PageColorMix extends PageAbstract { - ControlText pageSpeciesFurther_Title; - ControlColorMixBox pageSpeciesFurther_List; - - public PageColorMix(IWidget parent, DatabaseTab tab) { - super(parent, tab); - pageSpeciesFurther_Title = new ControlTextCentered(this, 8, I18N.localise("botany.gui.controls.page.color_further.title")); - pageSpeciesFurther_List = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.FURTHER); - } - - @Override - public void onValueChanged(IFlowerColor colour) { - List mixes = new ArrayList<>(); - for (IColorMix mix : BotanyCore.getFlowerRoot().getColorMixes(false)) { - if (mix.getColorFirst() == colour || mix.getColorSecond() == colour) { - mixes.add(mix); - } - } - pageSpeciesFurther_List.setOptions(mixes); - } -} diff --git a/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java b/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java index e27a82a7..c3a907b8 100644 --- a/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java +++ b/src/main/java/binnie/botany/genetics/FlowerAlyzerPlugin.java @@ -22,8 +22,8 @@ import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.FlowerManager; import binnie.botany.api.IFlower; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.renderer.RenderUtil; import binnie.core.util.I18N; // TODO write flower alyzer plugin diff --git a/src/main/java/binnie/botany/craftgui/ControlColorDisplay.java b/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java similarity index 73% rename from src/main/java/binnie/botany/craftgui/ControlColorDisplay.java rename to src/main/java/binnie/botany/gui/database/ControlColorDisplay.java index 279548bf..af75f6ba 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorDisplay.java +++ b/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java @@ -1,16 +1,16 @@ -package binnie.botany.craftgui; +package binnie.botany.gui.database; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.botany.api.IFlowerColor; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.gui.Attribute; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.renderer.RenderUtil; public class ControlColorDisplay extends Control implements IControlValue, ITooltip { private IFlowerColor value; diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java b/src/main/java/binnie/botany/gui/database/ControlColorMixBox.java similarity index 78% rename from src/main/java/binnie/botany/craftgui/ControlColorMixBox.java rename to src/main/java/binnie/botany/gui/database/ControlColorMixBox.java index d6001961..48ae9d7c 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java +++ b/src/main/java/binnie/botany/gui/database/ControlColorMixBox.java @@ -1,8 +1,8 @@ -package binnie.botany.craftgui; +package binnie.botany.gui.database; import binnie.botany.api.IColorMix; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.listbox.ControlListBox; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.listbox.ControlListBox; public class ControlColorMixBox extends ControlListBox { private int index; diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java b/src/main/java/binnie/botany/gui/database/ControlColorMixItem.java similarity index 85% rename from src/main/java/binnie/botany/craftgui/ControlColorMixItem.java rename to src/main/java/binnie/botany/gui/database/ControlColorMixItem.java index 687cd28e..3ab16fef 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java +++ b/src/main/java/binnie/botany/gui/database/ControlColorMixItem.java @@ -1,8 +1,8 @@ -package binnie.botany.craftgui; +package binnie.botany.gui.database; import binnie.botany.api.IColorMix; -import binnie.core.craftgui.controls.listbox.ControlList; -import binnie.core.craftgui.controls.listbox.ControlOption; +import binnie.core.gui.controls.listbox.ControlList; +import binnie.core.gui.controls.listbox.ControlOption; public class ControlColorMixItem extends ControlOption { private final ControlColorDisplay itemWidget1; diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixSymbol.java b/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java similarity index 67% rename from src/main/java/binnie/botany/craftgui/ControlColorMixSymbol.java rename to src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java index 45db8929..fec54391 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixSymbol.java +++ b/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java @@ -1,19 +1,20 @@ -package binnie.botany.craftgui; +package binnie.botany.gui.database; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.botany.api.IColorMix; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.resource.Texture; -import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet; -import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.database.DatabaseConstants; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.CraftGUITextureSheet; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; public class ControlColorMixSymbol extends Control implements ITooltip { @@ -49,7 +50,7 @@ public class ControlColorMixSymbol extends Control implements ITooltip { public void getTooltip(Tooltip tooltip) { if (type == 1) { float chance = value.getChance(); - tooltip.add(I18N.localise("botany.gui.controls.color_mix_symbol.chance", chance)); + tooltip.add(I18N.localise(DatabaseConstants.BOTANY_CONTROL_KEY + ".color_mix_symbol.chance", chance)); } } } diff --git a/src/main/java/binnie/botany/craftgui/ControlColorOption.java b/src/main/java/binnie/botany/gui/database/ControlColorOption.java similarity index 75% rename from src/main/java/binnie/botany/craftgui/ControlColorOption.java rename to src/main/java/binnie/botany/gui/database/ControlColorOption.java index a43dfbc5..807e531e 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorOption.java +++ b/src/main/java/binnie/botany/gui/database/ControlColorOption.java @@ -1,15 +1,15 @@ -package binnie.botany.craftgui; +package binnie.botany.gui.database; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.botany.api.IFlowerColor; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.controls.listbox.ControlList; -import binnie.core.craftgui.controls.listbox.ControlTextOption; -import binnie.core.craftgui.geometry.CraftGUIUtil; -import binnie.core.craftgui.geometry.Point; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.controls.listbox.ControlList; +import binnie.core.gui.controls.listbox.ControlTextOption; +import binnie.core.gui.geometry.CraftGUIUtil; +import binnie.core.gui.geometry.Point; @SideOnly(Side.CLIENT) public class ControlColorOption extends ControlTextOption { diff --git a/src/main/java/binnie/botany/gui/database/PageColorMix.java b/src/main/java/binnie/botany/gui/database/PageColorMix.java new file mode 100644 index 00000000..5358f929 --- /dev/null +++ b/src/main/java/binnie/botany/gui/database/PageColorMix.java @@ -0,0 +1,37 @@ +package binnie.botany.gui.database; + +import java.util.ArrayList; +import java.util.List; + +import binnie.botany.api.IColorMix; +import binnie.botany.api.IFlowerColor; +import binnie.botany.core.BotanyCore; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.database.DatabaseConstants; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageAbstract; +import binnie.core.util.I18N; + +public class PageColorMix extends PageAbstract { + ControlText title; + ControlColorMixBox list; + + public PageColorMix(IWidget parent, DatabaseTab tab) { + super(parent, tab); + title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.BOTANY_PAGES_KEY + ".color_further.title")); + list = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.FURTHER); + } + + @Override + public void onValueChanged(IFlowerColor colour) { + List mixes = new ArrayList<>(); + for (IColorMix mix : BotanyCore.getFlowerRoot().getColorMixes(false)) { + if (mix.getColorFirst() == colour || mix.getColorSecond() == colour) { + mixes.add(mix); + } + } + list.setOptions(mixes); + } +} diff --git a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java b/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java similarity index 70% rename from src/main/java/binnie/botany/craftgui/PageColorMixResultant.java rename to src/main/java/binnie/botany/gui/database/PageColorMixResultant.java index 987e8ca1..37e775ed 100644 --- a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java +++ b/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java @@ -1,4 +1,4 @@ -package binnie.botany.craftgui; +package binnie.botany.gui.database; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,13 @@ import java.util.List; import binnie.botany.api.IColorMix; import binnie.botany.api.IFlowerColor; import binnie.botany.core.BotanyCore; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.database.DatabaseConstants; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageAbstract; import binnie.core.util.I18N; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageAbstract; public class PageColorMixResultant extends PageAbstract { ControlText pageSpeciesFurther_Title; @@ -19,7 +20,7 @@ public class PageColorMixResultant extends PageAbstract { public PageColorMixResultant(IWidget parent, DatabaseTab tab) { super(parent, tab); - pageSpeciesFurther_Title = new ControlTextCentered(this, 8, I18N.localise("botany.gui.controls.page.species_further.title")); + pageSpeciesFurther_Title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.BOTANY_PAGES_KEY + ".species_further.title")); pageSpeciesFurther_List = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.RESULTANT); } diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java similarity index 68% rename from src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java rename to src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java index c398b0d3..06cb6e3f 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java @@ -1,4 +1,4 @@ -package binnie.botany.craftgui; +package binnie.botany.gui.database; import net.minecraft.item.ItemStack; @@ -13,29 +13,31 @@ import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.api.IFlower; import binnie.botany.api.IFlowerGenome; import binnie.botany.core.BotanyCore; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.controls.scroll.ControlScrollableContent; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.scroll.ControlScrollableContent; +import binnie.core.gui.database.DatabaseConstants; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageSpecies; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageSpecies; public class PageSpeciesFlowerGenome extends PageSpecies { public PageSpeciesFlowerGenome(IWidget parent, DatabaseTab tab) { super(parent, tab); } - public static String tolerated(boolean t) { + //TODO: unused ? + /*public static String tolerated(boolean t) { if (t) { return "Tolerated"; } return "Not Tolerated"; - } + }*/ @Override public void onValueChanged(IAlleleSpecies species) { @@ -50,7 +52,7 @@ public class PageSpeciesFlowerGenome extends PageSpecies { IAlleleFlowerSpecies treeSpecies = genome.getPrimary(); int w = 144; int h = 176; - new ControlText(this, new Area(0, 4, w, 16), I18N.localise("botany.gui.database.tab.genome"), TextJustification.MIDDLE_CENTER); + new ControlText(this, new Area(0, 4, w, 16), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".title"), TextJustification.MIDDLE_CENTER); ControlScrollableContent scrollable = new ControlScrollableContent(this, 4, 20, w - 8, h - 8 - 16, 12); Control contents = new Control(scrollable, 0, 0, w - 8 - 12, h - 8 - 16); int tw = w - 8 - 12; @@ -59,29 +61,29 @@ public class PageSpeciesFlowerGenome extends PageSpecies { int y = 0; int th = 14; int th2 = 18; - new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.temp"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + DatabaseConstants.BOTANY_GENOME_KEY + ".temp"), TextJustification.MIDDLE_RIGHT); new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.moist"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".moist"), TextJustification.MIDDLE_RIGHT); new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getMoisture().getLocalisedName(false), TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.ph"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".ph"), TextJustification.MIDDLE_RIGHT); new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getPH().getLocalisedName(false), TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.fertility"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".fertility"), TextJustification.MIDDLE_RIGHT); new ControlText(contents, new Area(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFT); y += th; float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f; String lifespanValue = String.format("%.2f", lifespan); - new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.lifespan"), TextJustification.MIDDLE_RIGHT); - new ControlText(contents, new Area(w2, y, w3, th), I18N.localise("botany.gui.database.tab.genome.lifespan.value", lifespanValue), TextJustification.MIDDLE_LEFT); + new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".lifespan"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new Area(w2, y, w3, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".lifespan.value", lifespanValue), TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new Area(0, y, w2, th), I18N.localise("botany.gui.database.tab.genome.nectar"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".nectar"), TextJustification.MIDDLE_RIGHT); new ControlText(contents, new Area(w2, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getAlleleName(), TextJustification.MIDDLE_LEFT); y += th; @@ -102,7 +104,7 @@ public class PageSpeciesFlowerGenome extends PageSpecies { } int numOfLines = 1 + (tot - 1) / 3; - new ControlText(contents, new Area(0, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), I18N.localise("botany.gui.database.tab.genome.varieties"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new Area(0, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".varieties"), TextJustification.MIDDLE_RIGHT); y += th; contents.setSize(new Point(contents.size().x(), y)); scrollable.setScrollableContent(contents); diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java similarity index 78% rename from src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java rename to src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java index 6fd8d195..4b32a5ea 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java @@ -1,4 +1,4 @@ -package binnie.botany.craftgui; +package binnie.botany.gui.database; import java.util.Arrays; import java.util.List; @@ -14,21 +14,22 @@ import binnie.botany.Botany; import binnie.botany.api.IFlowerColor; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.AbstractMod; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.listbox.ControlListBox; +import binnie.core.gui.database.DatabaseConstants; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.IDatabaseMode; +import binnie.core.gui.database.PageBranchOverview; +import binnie.core.gui.database.PageBranchSpecies; +import binnie.core.gui.database.PageBreeder; +import binnie.core.gui.database.PageSpeciesClassification; +import binnie.core.gui.database.PageSpeciesMutations; +import binnie.core.gui.database.PageSpeciesOverview; +import binnie.core.gui.database.PageSpeciesResultant; +import binnie.core.gui.database.WindowAbstractDatabase; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.minecraft.Window; import binnie.core.util.I18N; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.IDatabaseMode; -import binnie.genetics.gui.database.PageBranchOverview; -import binnie.genetics.gui.database.PageBranchSpecies; -import binnie.genetics.gui.database.PageBreeder; -import binnie.genetics.gui.database.PageSpeciesClassification; -import binnie.genetics.gui.database.PageSpeciesMutations; -import binnie.genetics.gui.database.PageSpeciesOverview; -import binnie.genetics.gui.database.PageSpeciesResultant; -import binnie.genetics.gui.database.WindowAbstractDatabase; public class WindowBotanistDatabase extends WindowAbstractDatabase { private ControlListBox selectionBoxColors; @@ -72,7 +73,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { @Override public String getName() { - return I18N.localise("botany.gui.database.tab." + name().toLowerCase()); + return I18N.localise(DatabaseConstants.BOTANY_TAB_KEY + "." + name().toLowerCase()); } } diff --git a/src/main/java/binnie/core/craftgui/window/package-info.java b/src/main/java/binnie/botany/gui/database/package-info.java similarity index 86% rename from src/main/java/binnie/core/craftgui/window/package-info.java rename to src/main/java/binnie/botany/gui/database/package-info.java index 7d967598..b4b6332e 100644 --- a/src/main/java/binnie/core/craftgui/window/package-info.java +++ b/src/main/java/binnie/botany/gui/database/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.core.craftgui.window; +package binnie.botany.gui.database; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index d9858445..f2ec633a 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -30,10 +30,10 @@ import forestry.plugins.PluginManager; import binnie.Binnie; import binnie.Constants; import binnie.core.block.TileEntityMetadata; -import binnie.core.craftgui.minecraft.ModuleCraftGUI; import binnie.core.gui.BinnieCoreGUI; import binnie.core.gui.BinnieGUIHandler; import binnie.core.gui.IBinnieGUID; +import binnie.core.gui.minecraft.ModuleCraftGUI; import binnie.core.integration.extrabees.ExtraBeesIntegration; import binnie.core.item.ItemFieldKit; import binnie.core.item.ItemGenesis; 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 deleted file mode 100644 index 7d074098..00000000 --- a/src/main/java/binnie/core/craftgui/controls/button/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.craftgui.controls.button; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file 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 deleted file mode 100644 index e0b8674d..00000000 --- a/src/main/java/binnie/core/craftgui/controls/listbox/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.craftgui.controls.listbox; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file 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 deleted file mode 100644 index 876efc86..00000000 --- a/src/main/java/binnie/core/craftgui/controls/page/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.craftgui.controls.page; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file 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 deleted file mode 100644 index a6d4d984..00000000 --- a/src/main/java/binnie/core/craftgui/controls/scroll/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.craftgui.controls.scroll; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file 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 deleted file mode 100644 index f9cdd8bb..00000000 --- a/src/main/java/binnie/core/craftgui/minecraft/control/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.craftgui.minecraft.control; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ 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 deleted file mode 100644 index b3bf6802..00000000 --- a/src/main/java/binnie/core/craftgui/minecraft/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.craftgui.minecraft; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/minecraft/render/package-info.java b/src/main/java/binnie/core/craftgui/minecraft/render/package-info.java deleted file mode 100644 index 362ab967..00000000 --- a/src/main/java/binnie/core/craftgui/minecraft/render/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.craftgui.minecraft.render; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/renderer/package-info.java b/src/main/java/binnie/core/craftgui/renderer/package-info.java deleted file mode 100644 index eb8e3536..00000000 --- a/src/main/java/binnie/core/craftgui/renderer/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.craftgui.renderer; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java b/src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java deleted file mode 100644 index b5c0a914..00000000 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.craftgui.resource.minecraft; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ 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 deleted file mode 100644 index 27700f54..00000000 --- a/src/main/java/binnie/core/craftgui/resource/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.craftgui.resource; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/Attribute.java b/src/main/java/binnie/core/gui/Attribute.java similarity index 80% rename from src/main/java/binnie/core/craftgui/Attribute.java rename to src/main/java/binnie/core/gui/Attribute.java index 3b1bb0fc..eca9bfe7 100644 --- a/src/main/java/binnie/core/craftgui/Attribute.java +++ b/src/main/java/binnie/core/gui/Attribute.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui; +package binnie.core.gui; public enum Attribute implements IWidgetAttribute { MouseOver, diff --git a/src/main/java/binnie/core/gui/BinnieCoreGUI.java b/src/main/java/binnie/core/gui/BinnieCoreGUI.java index dcb04bf0..42f89746 100644 --- a/src/main/java/binnie/core/gui/BinnieCoreGUI.java +++ b/src/main/java/binnie/core/gui/BinnieCoreGUI.java @@ -10,9 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; -import binnie.core.craftgui.WindowFieldKit; -import binnie.core.craftgui.WindowGenesis; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.minecraft.Window; import binnie.core.machines.storage.WindowCompartment; public enum BinnieCoreGUI implements IBinnieGUID { diff --git a/src/main/java/binnie/core/gui/BinnieGUIHandler.java b/src/main/java/binnie/core/gui/BinnieGUIHandler.java index 7b2c0111..9e1e1c1c 100644 --- a/src/main/java/binnie/core/gui/BinnieGUIHandler.java +++ b/src/main/java/binnie/core/gui/BinnieGUIHandler.java @@ -11,7 +11,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.minecraft.Window; public final class BinnieGUIHandler implements IGuiHandler { private AbstractMod mod; diff --git a/src/main/java/binnie/core/craftgui/CraftGUI.java b/src/main/java/binnie/core/gui/CraftGUI.java similarity index 63% rename from src/main/java/binnie/core/craftgui/CraftGUI.java rename to src/main/java/binnie/core/gui/CraftGUI.java index 570b36c7..98ac283a 100644 --- a/src/main/java/binnie/core/craftgui/CraftGUI.java +++ b/src/main/java/binnie/core/gui/CraftGUI.java @@ -1,10 +1,10 @@ -package binnie.core.craftgui; +package binnie.core.gui; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.renderer.TextureRenderer; -import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; +import binnie.core.gui.renderer.TextureRenderer; +import binnie.core.gui.resource.minecraft.CraftGUIResourceManager; @SideOnly(Side.CLIENT) public class CraftGUI { diff --git a/src/main/java/binnie/core/gui/IBinnieGUID.java b/src/main/java/binnie/core/gui/IBinnieGUID.java index 464bfc8c..d5fb5836 100644 --- a/src/main/java/binnie/core/gui/IBinnieGUID.java +++ b/src/main/java/binnie/core/gui/IBinnieGUID.java @@ -7,7 +7,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.minecraft.Window; import binnie.core.network.IOrdinaled; public interface IBinnieGUID extends IOrdinaled { diff --git a/src/main/java/binnie/core/craftgui/ITooltip.java b/src/main/java/binnie/core/gui/ITooltip.java similarity index 69% rename from src/main/java/binnie/core/craftgui/ITooltip.java rename to src/main/java/binnie/core/gui/ITooltip.java index e165d135..67fc2d65 100644 --- a/src/main/java/binnie/core/craftgui/ITooltip.java +++ b/src/main/java/binnie/core/gui/ITooltip.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui; +package binnie.core.gui; public interface ITooltip { void getTooltip(final Tooltip p0); diff --git a/src/main/java/binnie/core/craftgui/ITooltipHelp.java b/src/main/java/binnie/core/gui/ITooltipHelp.java similarity index 71% rename from src/main/java/binnie/core/craftgui/ITooltipHelp.java rename to src/main/java/binnie/core/gui/ITooltipHelp.java index af030267..1e4cc685 100644 --- a/src/main/java/binnie/core/craftgui/ITooltipHelp.java +++ b/src/main/java/binnie/core/gui/ITooltipHelp.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui; +package binnie.core.gui; public interface ITooltipHelp { void getHelpTooltip(final Tooltip p0); diff --git a/src/main/java/binnie/core/craftgui/ITopLevelWidget.java b/src/main/java/binnie/core/gui/ITopLevelWidget.java similarity index 87% rename from src/main/java/binnie/core/craftgui/ITopLevelWidget.java rename to src/main/java/binnie/core/gui/ITopLevelWidget.java index d42373f8..6c228335 100644 --- a/src/main/java/binnie/core/craftgui/ITopLevelWidget.java +++ b/src/main/java/binnie/core/gui/ITopLevelWidget.java @@ -1,8 +1,8 @@ -package binnie.core.craftgui; +package binnie.core.gui; import javax.annotation.Nullable; -import binnie.core.craftgui.geometry.Point; +import binnie.core.gui.geometry.Point; public interface ITopLevelWidget extends IWidget { void setMousePosition(final int p0, final int p1); diff --git a/src/main/java/binnie/core/craftgui/IWidget.java b/src/main/java/binnie/core/gui/IWidget.java similarity index 91% rename from src/main/java/binnie/core/craftgui/IWidget.java rename to src/main/java/binnie/core/gui/IWidget.java index 8063fa58..4078ac88 100644 --- a/src/main/java/binnie/core/craftgui/IWidget.java +++ b/src/main/java/binnie/core/gui/IWidget.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui; +package binnie.core.gui; import javax.annotation.Nullable; import java.util.List; @@ -6,10 +6,10 @@ import java.util.List; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.events.Event; -import binnie.core.craftgui.events.EventHandler; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; +import binnie.core.gui.events.Event; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; public interface IWidget { @Nullable diff --git a/src/main/java/binnie/core/craftgui/IWidgetAttribute.java b/src/main/java/binnie/core/gui/IWidgetAttribute.java similarity index 56% rename from src/main/java/binnie/core/craftgui/IWidgetAttribute.java rename to src/main/java/binnie/core/gui/IWidgetAttribute.java index 6728a111..c31077eb 100644 --- a/src/main/java/binnie/core/craftgui/IWidgetAttribute.java +++ b/src/main/java/binnie/core/gui/IWidgetAttribute.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui; +package binnie.core.gui; public interface IWidgetAttribute { } diff --git a/src/main/java/binnie/core/craftgui/RenderStage.java b/src/main/java/binnie/core/gui/RenderStage.java similarity index 70% rename from src/main/java/binnie/core/craftgui/RenderStage.java rename to src/main/java/binnie/core/gui/RenderStage.java index 66432c25..3f760b4f 100644 --- a/src/main/java/binnie/core/craftgui/RenderStage.java +++ b/src/main/java/binnie/core/gui/RenderStage.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui; +package binnie.core.gui; public enum RenderStage { PreChildren, diff --git a/src/main/java/binnie/core/craftgui/Tooltip.java b/src/main/java/binnie/core/gui/Tooltip.java similarity index 98% rename from src/main/java/binnie/core/craftgui/Tooltip.java rename to src/main/java/binnie/core/gui/Tooltip.java index d49b9ab9..91aa57fa 100644 --- a/src/main/java/binnie/core/craftgui/Tooltip.java +++ b/src/main/java/binnie/core/gui/Tooltip.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui; +package binnie.core.gui; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/core/craftgui/TopLevelWidget.java b/src/main/java/binnie/core/gui/TopLevelWidget.java similarity index 96% rename from src/main/java/binnie/core/craftgui/TopLevelWidget.java rename to src/main/java/binnie/core/gui/TopLevelWidget.java index 163c0248..cea730c4 100644 --- a/src/main/java/binnie/core/craftgui/TopLevelWidget.java +++ b/src/main/java/binnie/core/gui/TopLevelWidget.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui; +package binnie.core.gui; import javax.annotation.Nullable; import java.util.ArrayDeque; @@ -10,10 +10,10 @@ import java.util.ListIterator; import org.lwjgl.input.Mouse; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventWidget; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.events.EventWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { protected Point mousePosition; diff --git a/src/main/java/binnie/core/craftgui/Widget.java b/src/main/java/binnie/core/gui/Widget.java similarity index 97% rename from src/main/java/binnie/core/craftgui/Widget.java rename to src/main/java/binnie/core/gui/Widget.java index 64db8703..4e05ca19 100644 --- a/src/main/java/binnie/core/craftgui/Widget.java +++ b/src/main/java/binnie/core/gui/Widget.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui; +package binnie.core.gui; import javax.annotation.Nullable; import java.util.ArrayList; @@ -8,11 +8,11 @@ import java.util.List; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.events.Event; -import binnie.core.craftgui.events.EventHandler; -import binnie.core.craftgui.events.EventWidget; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; +import binnie.core.gui.events.Event; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; public class Widget implements IWidget { @Nullable diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/gui/WindowFieldKit.java similarity index 91% rename from src/main/java/binnie/core/craftgui/WindowFieldKit.java rename to src/main/java/binnie/core/gui/WindowFieldKit.java index a85dd1ac..5cef6955 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/gui/WindowFieldKit.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui; +package binnie.core.gui; import javax.annotation.Nullable; import java.util.ArrayList; @@ -27,21 +27,21 @@ import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.ExtraBeeTexture; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.events.EventHandler; -import binnie.core.craftgui.events.EventValueChanged; -import binnie.core.craftgui.fieldkit.ControlChromosome; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.minecraft.InventoryType; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlImage; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.resource.StyleSheetPunnett; -import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventValueChanged; +import binnie.core.gui.fieldkit.ControlChromosome; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.InventoryType; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlImage; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.resource.StyleSheetPunnett; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.genetics.machine.analyser.Analyser; diff --git a/src/main/java/binnie/core/craftgui/WindowGenesis.java b/src/main/java/binnie/core/gui/WindowGenesis.java similarity index 90% rename from src/main/java/binnie/core/craftgui/WindowGenesis.java rename to src/main/java/binnie/core/gui/WindowGenesis.java index 3447b431..4b05ef6c 100644 --- a/src/main/java/binnie/core/craftgui/WindowGenesis.java +++ b/src/main/java/binnie/core/gui/WindowGenesis.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui; +package binnie.core.gui; import javax.annotation.Nullable; import java.util.ArrayList; @@ -23,23 +23,23 @@ import forestry.api.genetics.ISpeciesType; import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.controls.listbox.ControlTextOption; -import binnie.core.craftgui.controls.tab.ControlTab; -import binnie.core.craftgui.controls.tab.ControlTabBar; -import binnie.core.craftgui.events.EventHandler; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventValueChanged; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Position; -import binnie.core.craftgui.minecraft.MinecraftGUI; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlTabIcon; -import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; +import binnie.core.gui.controls.listbox.ControlListBox; +import binnie.core.gui.controls.listbox.ControlTextOption; +import binnie.core.gui.controls.tab.ControlTab; +import binnie.core.gui.controls.tab.ControlTabBar; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.events.EventValueChanged; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlItemDisplay; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlTabIcon; +import binnie.core.gui.window.Panel; import binnie.genetics.gui.ControlGenesisOption; public class WindowGenesis extends Window { diff --git a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/core/gui/controls/ControlCheckbox.java similarity index 73% rename from src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java rename to src/main/java/binnie/core/gui/controls/ControlCheckbox.java index d302c190..c1477db2 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/core/gui/controls/ControlCheckbox.java @@ -1,20 +1,20 @@ -package binnie.core.craftgui.controls; +package binnie.core.gui.controls; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.events.EventHandler; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventValueChanged; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.events.EventValueChanged; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlCheckbox extends Control implements IControlValue { private boolean value; diff --git a/src/main/java/binnie/core/craftgui/controls/ControlText.java b/src/main/java/binnie/core/gui/controls/ControlText.java similarity index 74% rename from src/main/java/binnie/core/craftgui/controls/ControlText.java rename to src/main/java/binnie/core/gui/controls/ControlText.java index 781c8fa3..caaf46f6 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlText.java +++ b/src/main/java/binnie/core/gui/controls/ControlText.java @@ -1,15 +1,15 @@ -package binnie.core.craftgui.controls; +package binnie.core.gui.controls; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.renderer.RenderUtil; public class ControlText extends Control implements IControlValue { private String text; diff --git a/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java b/src/main/java/binnie/core/gui/controls/ControlTextCentered.java similarity index 54% rename from src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java rename to src/main/java/binnie/core/gui/controls/ControlTextCentered.java index 4255f9b6..21d7d669 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java +++ b/src/main/java/binnie/core/gui/controls/ControlTextCentered.java @@ -1,9 +1,9 @@ -package binnie.core.craftgui.controls; +package binnie.core.gui.controls; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.gui.IWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; public class ControlTextCentered extends ControlText { public ControlTextCentered(final IWidget parent, final int y, final String text) { diff --git a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java b/src/main/java/binnie/core/gui/controls/ControlTextEdit.java similarity index 83% rename from src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java rename to src/main/java/binnie/core/gui/controls/ControlTextEdit.java index da50d8f8..6a3f9b6f 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/core/gui/controls/ControlTextEdit.java @@ -1,21 +1,21 @@ -package binnie.core.craftgui.controls; +package binnie.core.gui.controls; import net.minecraft.client.gui.GuiTextField; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.events.EventHandler; -import binnie.core.craftgui.events.EventKey; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventTextEdit; -import binnie.core.craftgui.events.EventWidget; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventKey; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.events.EventTextEdit; +import binnie.core.gui.events.EventWidget; +import binnie.core.gui.resource.minecraft.CraftGUITexture; @SideOnly(Side.CLIENT) public class ControlTextEdit extends Control implements IControlValue { diff --git a/src/main/java/binnie/core/craftgui/controls/IControlSelection.java b/src/main/java/binnie/core/gui/controls/IControlSelection.java similarity index 80% rename from src/main/java/binnie/core/craftgui/controls/IControlSelection.java rename to src/main/java/binnie/core/gui/controls/IControlSelection.java index d06c9fdd..c866a3cb 100644 --- a/src/main/java/binnie/core/craftgui/controls/IControlSelection.java +++ b/src/main/java/binnie/core/gui/controls/IControlSelection.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.controls; +package binnie.core.gui.controls; public interface IControlSelection { T getSelectedValue(); diff --git a/src/main/java/binnie/core/craftgui/controls/IControlSelectionOption.java b/src/main/java/binnie/core/gui/controls/IControlSelectionOption.java similarity index 62% rename from src/main/java/binnie/core/craftgui/controls/IControlSelectionOption.java rename to src/main/java/binnie/core/gui/controls/IControlSelectionOption.java index 7a22ade5..dcae935a 100644 --- a/src/main/java/binnie/core/craftgui/controls/IControlSelectionOption.java +++ b/src/main/java/binnie/core/gui/controls/IControlSelectionOption.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.controls; +package binnie.core.gui.controls; public interface IControlSelectionOption { T getValue(); diff --git a/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java b/src/main/java/binnie/core/gui/controls/button/ControlButton.java similarity index 76% rename from src/main/java/binnie/core/craftgui/controls/button/ControlButton.java rename to src/main/java/binnie/core/gui/controls/button/ControlButton.java index 1784405d..0ae3247a 100644 --- a/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java +++ b/src/main/java/binnie/core/gui/controls/button/ControlButton.java @@ -1,20 +1,20 @@ -package binnie.core.craftgui.controls.button; +package binnie.core.gui.controls.button; import javax.annotation.Nullable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.events.EventButtonClicked; -import binnie.core.craftgui.events.EventHandler; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.events.EventButtonClicked; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlButton extends Control { @Nullable diff --git a/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java b/src/main/java/binnie/core/gui/controls/button/ControlEnumButton.java similarity index 85% rename from src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java rename to src/main/java/binnie/core/gui/controls/button/ControlEnumButton.java index 1f11b779..4a563be0 100644 --- a/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java +++ b/src/main/java/binnie/core/gui/controls/button/ControlEnumButton.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.controls.button; +package binnie.core.gui.controls.button; import com.google.common.base.Preconditions; @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.events.EventValueChanged; public class ControlEnumButton extends ControlButton implements IControlValue { public static final String eventEnumChanged = "eventEnumButtonChanged"; diff --git a/src/main/java/binnie/core/craftgui/controls/button/ControlToggleButton.java b/src/main/java/binnie/core/gui/controls/button/ControlToggleButton.java similarity index 66% rename from src/main/java/binnie/core/craftgui/controls/button/ControlToggleButton.java rename to src/main/java/binnie/core/gui/controls/button/ControlToggleButton.java index 26b380ee..923f9d91 100644 --- a/src/main/java/binnie/core/craftgui/controls/button/ControlToggleButton.java +++ b/src/main/java/binnie/core/gui/controls/button/ControlToggleButton.java @@ -1,8 +1,8 @@ -package binnie.core.craftgui.controls.button; +package binnie.core.gui.controls.button; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventToggleButtonClicked; +import binnie.core.gui.IWidget; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.events.EventToggleButtonClicked; public class ControlToggleButton extends ControlButton { boolean toggled; diff --git a/src/main/java/binnie/core/gui/controls/button/package-info.java b/src/main/java/binnie/core/gui/controls/button/package-info.java new file mode 100644 index 00000000..2795534a --- /dev/null +++ b/src/main/java/binnie/core/gui/controls/button/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.controls.button; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/controls/core/Control.java b/src/main/java/binnie/core/gui/controls/core/Control.java similarity index 81% rename from src/main/java/binnie/core/craftgui/controls/core/Control.java rename to src/main/java/binnie/core/gui/controls/core/Control.java index da7de380..664c5b5f 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/core/gui/controls/core/Control.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.controls.core; +package binnie.core.gui.controls.core; import javax.annotation.Nonnull; import java.util.ArrayList; @@ -7,15 +7,15 @@ import java.util.List; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.ITooltipHelp; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.Widget; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.Attribute; +import binnie.core.gui.ITooltip; +import binnie.core.gui.ITooltipHelp; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.Widget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.Window; public class Control extends Widget implements ITooltipHelp, ITooltip { public int extraLevel; diff --git a/src/main/java/binnie/core/craftgui/controls/core/IControlIndexed.java b/src/main/java/binnie/core/gui/controls/core/IControlIndexed.java similarity index 66% rename from src/main/java/binnie/core/craftgui/controls/core/IControlIndexed.java rename to src/main/java/binnie/core/gui/controls/core/IControlIndexed.java index a5a9568c..1351ef76 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/IControlIndexed.java +++ b/src/main/java/binnie/core/gui/controls/core/IControlIndexed.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.controls.core; +package binnie.core.gui.controls.core; public interface IControlIndexed { int getIndex(); diff --git a/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java b/src/main/java/binnie/core/gui/controls/core/IControlValue.java similarity index 66% rename from src/main/java/binnie/core/craftgui/controls/core/IControlValue.java rename to src/main/java/binnie/core/gui/controls/core/IControlValue.java index 6669e1b4..9087fbac 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java +++ b/src/main/java/binnie/core/gui/controls/core/IControlValue.java @@ -1,8 +1,8 @@ -package binnie.core.craftgui.controls.core; +package binnie.core.gui.controls.core; import javax.annotation.Nullable; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public interface IControlValue extends IWidget { @Nullable diff --git a/src/main/java/binnie/core/craftgui/controls/core/IControlValues.java b/src/main/java/binnie/core/gui/controls/core/IControlValues.java similarity index 78% rename from src/main/java/binnie/core/craftgui/controls/core/IControlValues.java rename to src/main/java/binnie/core/gui/controls/core/IControlValues.java index 2e36c0c6..6a217dca 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/IControlValues.java +++ b/src/main/java/binnie/core/gui/controls/core/IControlValues.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.controls.core; +package binnie.core.gui.controls.core; import java.util.Collection; diff --git a/src/main/java/binnie/core/craftgui/geometry/package-info.java b/src/main/java/binnie/core/gui/controls/core/package-info.java similarity index 85% rename from src/main/java/binnie/core/craftgui/geometry/package-info.java rename to src/main/java/binnie/core/gui/controls/core/package-info.java index 6649fdd6..fb02f726 100644 --- a/src/main/java/binnie/core/craftgui/geometry/package-info.java +++ b/src/main/java/binnie/core/gui/controls/core/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.core.craftgui.geometry; +package binnie.core.gui.controls.core; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java b/src/main/java/binnie/core/gui/controls/listbox/ControlList.java similarity index 91% rename from src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java rename to src/main/java/binnie/core/gui/controls/listbox/ControlList.java index 717d2748..35603218 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java +++ b/src/main/java/binnie/core/gui/controls/listbox/ControlList.java @@ -1,15 +1,15 @@ -package binnie.core.craftgui.controls.listbox; +package binnie.core.gui.controls.listbox; import javax.annotation.Nullable; import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.events.EventValueChanged; -import binnie.core.craftgui.geometry.Point; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.events.EventValueChanged; +import binnie.core.gui.geometry.Point; import binnie.core.util.IValidator; public class ControlList extends Control implements IControlValue { diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java b/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java similarity index 87% rename from src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java rename to src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java index 99cb2966..76d7105f 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java +++ b/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java @@ -1,11 +1,11 @@ -package binnie.core.craftgui.controls.listbox; +package binnie.core.gui.controls.listbox; import java.util.Collection; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.controls.scroll.ControlScrollableContent; -import binnie.core.craftgui.events.EventKey; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.controls.scroll.ControlScrollableContent; +import binnie.core.gui.events.EventKey; import binnie.core.util.IValidator; public class ControlListBox extends ControlScrollableContent> implements IControlValue { diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java b/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java similarity index 79% rename from src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java rename to src/main/java/binnie/core/gui/controls/listbox/ControlOption.java index 10adc033..920957bc 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java @@ -1,14 +1,14 @@ -package binnie.core.craftgui.controls.listbox; +package binnie.core.gui.controls.listbox; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlOption extends Control implements IControlValue { private T value; diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java b/src/main/java/binnie/core/gui/controls/listbox/ControlTextOption.java similarity index 77% rename from src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java rename to src/main/java/binnie/core/gui/controls/listbox/ControlTextOption.java index ad677498..cd9f1e06 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java +++ b/src/main/java/binnie/core/gui/controls/listbox/ControlTextOption.java @@ -1,9 +1,9 @@ -package binnie.core.craftgui.controls.listbox; +package binnie.core.gui.controls.listbox; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.events.EventHandler; -import binnie.core.craftgui.events.EventWidget; -import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventWidget; +import binnie.core.gui.geometry.TextJustification; public class ControlTextOption extends ControlOption { protected ControlText textWidget; diff --git a/src/main/java/binnie/core/gui/controls/listbox/package-info.java b/src/main/java/binnie/core/gui/controls/listbox/package-info.java new file mode 100644 index 00000000..ecabcc77 --- /dev/null +++ b/src/main/java/binnie/core/gui/controls/listbox/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.controls.listbox; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/events/package-info.java b/src/main/java/binnie/core/gui/controls/package-info.java similarity index 86% rename from src/main/java/binnie/core/craftgui/events/package-info.java rename to src/main/java/binnie/core/gui/controls/package-info.java index 3e67d746..78795fa6 100644 --- a/src/main/java/binnie/core/craftgui/events/package-info.java +++ b/src/main/java/binnie/core/gui/controls/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.core.craftgui.events; +package binnie.core.gui.controls; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java b/src/main/java/binnie/core/gui/controls/page/ControlPage.java similarity index 77% rename from src/main/java/binnie/core/craftgui/controls/page/ControlPage.java rename to src/main/java/binnie/core/gui/controls/page/ControlPage.java index 64809f6f..d2739037 100644 --- a/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java +++ b/src/main/java/binnie/core/gui/controls/page/ControlPage.java @@ -1,8 +1,8 @@ -package binnie.core.craftgui.controls.page; +package binnie.core.gui.controls.page; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; public class ControlPage extends Control implements IControlValue { private T value; diff --git a/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java b/src/main/java/binnie/core/gui/controls/page/ControlPages.java similarity index 77% rename from src/main/java/binnie/core/craftgui/controls/page/ControlPages.java rename to src/main/java/binnie/core/gui/controls/page/ControlPages.java index b50c681b..3e1d67e4 100644 --- a/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java +++ b/src/main/java/binnie/core/gui/controls/page/ControlPages.java @@ -1,14 +1,14 @@ -package binnie.core.craftgui.controls.page; +package binnie.core.gui.controls.page; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.controls.core.IControlValues; -import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.controls.core.IControlValues; +import binnie.core.gui.events.EventValueChanged; public class ControlPages extends Control implements IControlValues, IControlValue { T value; diff --git a/src/main/java/binnie/core/craftgui/controls/package-info.java b/src/main/java/binnie/core/gui/controls/page/package-info.java similarity index 85% rename from src/main/java/binnie/core/craftgui/controls/package-info.java rename to src/main/java/binnie/core/gui/controls/page/package-info.java index 2b80cca7..e6bdfbb2 100644 --- a/src/main/java/binnie/core/craftgui/controls/package-info.java +++ b/src/main/java/binnie/core/gui/controls/page/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.core.craftgui.controls; +package binnie.core.gui.controls.page; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java b/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java similarity index 76% rename from src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java rename to src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java index 4ca37469..f2ac3a6d 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java +++ b/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java @@ -1,7 +1,7 @@ -package binnie.core.craftgui.controls.scroll; +package binnie.core.gui.controls.scroll; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; public class ControlScroll extends Control { private IControlScrollable scrollWidget; diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java b/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java similarity index 80% rename from src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java rename to src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java index 103b0fa9..f2adf5b8 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java +++ b/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java @@ -1,15 +1,15 @@ -package binnie.core.craftgui.controls.scroll; +package binnie.core.gui.controls.scroll; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlScrollBar extends Control { protected final IControlScrollable scrollable; @@ -35,13 +35,13 @@ public class ControlScrollBar extends Control { final float percentageIndex = ControlScrollBar.this.scrollable.getPercentageIndex(); final float minPercent = (1.0f - shownPercentage) * percentageIndex; final float maxPercent = minPercent + shownPercentage; - float clickedPercentage = (float)ControlScrollBar.this.getRelativeMousePosition().y() / (float) (ControlScrollBar.this.height() - 2.0f); + float clickedPercentage = (float)ControlScrollBar.this.getRelativeMousePosition().y() / (ControlScrollBar.this.height() - 2.0f); clickedPercentage = Math.max(Math.min(clickedPercentage, 1.0f), 0.0f); if (clickedPercentage > maxPercent) { - ControlScrollBar.this.scrollable.setPercentageIndex((float) (clickedPercentage - shownPercentage) / (float) (1.0f - shownPercentage)); + ControlScrollBar.this.scrollable.setPercentageIndex((clickedPercentage - shownPercentage) / (1.0f - shownPercentage)); } if (clickedPercentage < minPercent) { - ControlScrollBar.this.scrollable.setPercentageIndex(clickedPercentage / (float) (1.0f - shownPercentage)); + ControlScrollBar.this.scrollable.setPercentageIndex(clickedPercentage / (1.0f - shownPercentage)); } } }); diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java b/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java similarity index 92% rename from src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java rename to src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java index 316ea07a..473d67af 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java +++ b/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java @@ -1,13 +1,13 @@ -package binnie.core.craftgui.controls.scroll; +package binnie.core.gui.controls.scroll; import javax.annotation.Nullable; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventWidget; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.events.EventWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; public class ControlScrollableContent extends Control implements IControlScrollable { @Nullable diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java b/src/main/java/binnie/core/gui/controls/scroll/IControlScrollable.java similarity index 73% rename from src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java rename to src/main/java/binnie/core/gui/controls/scroll/IControlScrollable.java index 7a7f7d98..83998596 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java +++ b/src/main/java/binnie/core/gui/controls/scroll/IControlScrollable.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.controls.scroll; +package binnie.core.gui.controls.scroll; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public interface IControlScrollable extends IWidget { float getPercentageShown(); diff --git a/src/main/java/binnie/core/gui/controls/scroll/package-info.java b/src/main/java/binnie/core/gui/controls/scroll/package-info.java new file mode 100644 index 00000000..d8bab42f --- /dev/null +++ b/src/main/java/binnie/core/gui/controls/scroll/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.controls.scroll; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java b/src/main/java/binnie/core/gui/controls/tab/ControlTab.java similarity index 77% rename from src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java rename to src/main/java/binnie/core/gui/controls/tab/ControlTab.java index ed147ec4..45f0643b 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/core/gui/controls/tab/ControlTab.java @@ -1,24 +1,24 @@ -package binnie.core.craftgui.controls.tab; +package binnie.core.gui.controls.tab; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventValueChanged; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.Position; -import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import binnie.core.craftgui.minecraft.control.ControlTabIcon; -import binnie.core.craftgui.renderer.RenderUtil; -import binnie.core.craftgui.resource.Texture; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.events.EventValueChanged; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.minecraft.control.ControlItemDisplay; +import binnie.core.gui.minecraft.control.ControlTabIcon; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlTab extends Control implements ITooltip, IControlValue { protected T value; diff --git a/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java b/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java similarity index 86% rename from src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java rename to src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java index bcd9bd2f..80d8db7a 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java +++ b/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java @@ -1,15 +1,15 @@ -package binnie.core.craftgui.controls.tab; +package binnie.core.gui.controls.tab; import com.google.common.collect.Iterables; import java.util.Collection; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.events.EventHandler; -import binnie.core.craftgui.events.EventValueChanged; -import binnie.core.craftgui.geometry.Position; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventValueChanged; +import binnie.core.gui.geometry.Position; public class ControlTabBar extends Control implements IControlValue { private T value; diff --git a/src/main/java/binnie/core/gui/controls/tab/package-info.java b/src/main/java/binnie/core/gui/controls/tab/package-info.java new file mode 100644 index 00000000..84496b37 --- /dev/null +++ b/src/main/java/binnie/core/gui/controls/tab/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.controls.tab; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/database/ControlBranchBox.java b/src/main/java/binnie/core/gui/database/ControlBranchBox.java similarity index 75% rename from src/main/java/binnie/genetics/gui/database/ControlBranchBox.java rename to src/main/java/binnie/core/gui/database/ControlBranchBox.java index 500d727c..23d47840 100644 --- a/src/main/java/binnie/genetics/gui/database/ControlBranchBox.java +++ b/src/main/java/binnie/core/gui/database/ControlBranchBox.java @@ -1,9 +1,9 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import forestry.api.genetics.IClassification; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.listbox.ControlListBox; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.listbox.ControlListBox; class ControlBranchBox extends ControlListBox { public ControlBranchBox(final IWidget parent, final int x, final int y, final int width, final int height) { diff --git a/src/main/java/binnie/genetics/gui/database/ControlBranchBoxOption.java b/src/main/java/binnie/core/gui/database/ControlBranchBoxOption.java similarity index 69% rename from src/main/java/binnie/genetics/gui/database/ControlBranchBoxOption.java rename to src/main/java/binnie/core/gui/database/ControlBranchBoxOption.java index ab028aaf..c100a09a 100644 --- a/src/main/java/binnie/genetics/gui/database/ControlBranchBoxOption.java +++ b/src/main/java/binnie/core/gui/database/ControlBranchBoxOption.java @@ -1,9 +1,9 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import forestry.api.genetics.IClassification; -import binnie.core.craftgui.controls.listbox.ControlList; -import binnie.core.craftgui.controls.listbox.ControlTextOption; +import binnie.core.gui.controls.listbox.ControlList; +import binnie.core.gui.controls.listbox.ControlTextOption; class ControlBranchBoxOption extends ControlTextOption { public ControlBranchBoxOption(final ControlList controlList, final IClassification option, final int y) { diff --git a/src/main/java/binnie/genetics/gui/database/ControlBreedingProgress.java b/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java similarity index 65% rename from src/main/java/binnie/genetics/gui/database/ControlBreedingProgress.java rename to src/main/java/binnie/core/gui/database/ControlBreedingProgress.java index 547c7c6d..185e7bbc 100644 --- a/src/main/java/binnie/genetics/gui/database/ControlBreedingProgress.java +++ b/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java @@ -1,19 +1,19 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.renderer.RenderUtil; -import binnie.core.craftgui.resource.Texture; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet; -import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.genetics.BreedingSystem; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.minecraft.CraftGUITextureSheet; +import binnie.core.gui.resource.minecraft.StandardTexture; class ControlBreedingProgress extends Control { private static Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2); diff --git a/src/main/java/binnie/genetics/gui/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java similarity index 85% rename from src/main/java/binnie/genetics/gui/database/ControlDatabaseIndividualDisplay.java rename to src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java index e456c7f5..a9823066 100644 --- a/src/main/java/binnie/genetics/gui/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/core/gui/database/ControlDatabaseIndividualDisplay.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import javax.annotation.Nullable; @@ -15,16 +15,17 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import binnie.Binnie; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.genetics.BreedingSystem; +import binnie.core.gui.Attribute; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlItemDisplay; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.util.I18N; public class ControlDatabaseIndividualDisplay extends ControlItemDisplay implements ITooltip { EnumDiscoveryState discovered; @@ -108,11 +109,11 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme break; } case Discovered: { - tooltip.add("Discovered Species"); + tooltip.add(I18N.localise(DatabaseConstants.DISCOVERED_KEY + ".discovered")); break; } case Undiscovered: { - tooltip.add("Undiscovered Species"); + tooltip.add(I18N.localise(DatabaseConstants.DISCOVERED_KEY + ".undiscovered")); break; } } diff --git a/src/main/java/binnie/genetics/gui/database/ControlItemStackOption.java b/src/main/java/binnie/core/gui/database/ControlItemStackOption.java similarity index 73% rename from src/main/java/binnie/genetics/gui/database/ControlItemStackOption.java rename to src/main/java/binnie/core/gui/database/ControlItemStackOption.java index 750863c7..6f0621af 100644 --- a/src/main/java/binnie/genetics/gui/database/ControlItemStackOption.java +++ b/src/main/java/binnie/core/gui/database/ControlItemStackOption.java @@ -1,17 +1,17 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.controls.listbox.ControlList; -import binnie.core.craftgui.controls.listbox.ControlTextOption; -import binnie.core.craftgui.geometry.CraftGUIUtil; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.controls.listbox.ControlList; +import binnie.core.gui.controls.listbox.ControlTextOption; +import binnie.core.gui.geometry.CraftGUIUtil; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.control.ControlItemDisplay; @SideOnly(Side.CLIENT) public class ControlItemStackOption extends ControlTextOption { diff --git a/src/main/java/binnie/genetics/gui/database/ControlMutationBox.java b/src/main/java/binnie/core/gui/database/ControlMutationBox.java similarity index 90% rename from src/main/java/binnie/genetics/gui/database/ControlMutationBox.java rename to src/main/java/binnie/core/gui/database/ControlMutationBox.java index 5b86c90f..61e44817 100644 --- a/src/main/java/binnie/genetics/gui/database/ControlMutationBox.java +++ b/src/main/java/binnie/core/gui/database/ControlMutationBox.java @@ -1,14 +1,14 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import java.util.List; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.listbox.ControlListBox; +import binnie.core.gui.minecraft.Window; class ControlMutationBox extends ControlListBox { private int index; diff --git a/src/main/java/binnie/genetics/gui/database/ControlMutationItem.java b/src/main/java/binnie/core/gui/database/ControlMutationItem.java similarity index 91% rename from src/main/java/binnie/genetics/gui/database/ControlMutationItem.java rename to src/main/java/binnie/core/gui/database/ControlMutationItem.java index fb5b7c2a..e627595b 100644 --- a/src/main/java/binnie/genetics/gui/database/ControlMutationItem.java +++ b/src/main/java/binnie/core/gui/database/ControlMutationItem.java @@ -1,12 +1,12 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.craftgui.controls.listbox.ControlList; -import binnie.core.craftgui.controls.listbox.ControlOption; -import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; +import binnie.core.gui.controls.listbox.ControlList; +import binnie.core.gui.controls.listbox.ControlOption; +import binnie.core.gui.minecraft.Window; class ControlMutationItem extends ControlOption { private ControlDatabaseIndividualDisplay itemWidget1; diff --git a/src/main/java/binnie/genetics/gui/database/ControlMutationSymbol.java b/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java similarity index 78% rename from src/main/java/binnie/genetics/gui/database/ControlMutationSymbol.java rename to src/main/java/binnie/core/gui/database/ControlMutationSymbol.java index df250c9c..b1aa97df 100644 --- a/src/main/java/binnie/genetics/gui/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -6,18 +6,19 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.resource.Texture; -import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet; -import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.genetics.BreedingSystem; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.CraftGUITextureSheet; +import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.util.I18N; class ControlMutationSymbol extends Control implements ITooltip { private static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); @@ -63,7 +64,7 @@ class ControlMutationSymbol extends Control implements ITooltip { final IAlleleSpecies species2 = this.value.getAllele1(); final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); final float chance = system.getChance(this.value, Window.get(this).getPlayer(), species1, species2); - tooltip.add("Current Chance - " + chance + "%"); + tooltip.add(I18N.localise(DatabaseConstants.CONTROL_KEY+ ".chance", chance)); for (final String string : this.value.getSpecialConditions()) { tooltip.add(string); } diff --git a/src/main/java/binnie/genetics/gui/database/ControlSpeciesBox.java b/src/main/java/binnie/core/gui/database/ControlSpeciesBox.java similarity index 89% rename from src/main/java/binnie/genetics/gui/database/ControlSpeciesBox.java rename to src/main/java/binnie/core/gui/database/ControlSpeciesBox.java index c7540754..108be0c2 100644 --- a/src/main/java/binnie/genetics/gui/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/core/gui/database/ControlSpeciesBox.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import java.util.ArrayList; import java.util.Collection; @@ -12,9 +12,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.listbox.ControlListBox; +import binnie.core.gui.minecraft.Window; @SideOnly(Side.CLIENT) public class ControlSpeciesBox extends ControlListBox { diff --git a/src/main/java/binnie/genetics/gui/database/ControlSpeciesBoxOption.java b/src/main/java/binnie/core/gui/database/ControlSpeciesBoxOption.java similarity index 78% rename from src/main/java/binnie/genetics/gui/database/ControlSpeciesBoxOption.java rename to src/main/java/binnie/core/gui/database/ControlSpeciesBoxOption.java index 8a8a88b5..86ab6bac 100644 --- a/src/main/java/binnie/genetics/gui/database/ControlSpeciesBoxOption.java +++ b/src/main/java/binnie/core/gui/database/ControlSpeciesBoxOption.java @@ -1,16 +1,16 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.controls.listbox.ControlList; -import binnie.core.craftgui.controls.listbox.ControlTextOption; -import binnie.core.craftgui.geometry.CraftGUIUtil; -import binnie.core.craftgui.geometry.Point; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.controls.listbox.ControlList; +import binnie.core.gui.controls.listbox.ControlTextOption; +import binnie.core.gui.geometry.CraftGUIUtil; +import binnie.core.gui.geometry.Point; @SideOnly(Side.CLIENT) class ControlSpeciesBoxOption extends ControlTextOption { @@ -23,7 +23,7 @@ class ControlSpeciesBoxOption extends ControlTextOption { if (this.controlBee.discovered == EnumDiscoveryState.Discovered) { this.controlBee.discovered = EnumDiscoveryState.Show; } - this.textWidget.setValue((this.controlBee.discovered == EnumDiscoveryState.Show) ? option.getAlleleName() : "Undiscovered"); + this.textWidget.setValue((this.controlBee.discovered == EnumDiscoveryState.Show) ? option.getAlleleName() : DatabaseConstants.CONTROL_KEY + ".undiscovered"); if (this.controlBee.discovered == EnumDiscoveryState.Show) { this.addAttribute(Attribute.MouseOver); } diff --git a/src/main/java/binnie/core/gui/database/DatabaseConstants.java b/src/main/java/binnie/core/gui/database/DatabaseConstants.java new file mode 100644 index 00000000..bbecb221 --- /dev/null +++ b/src/main/java/binnie/core/gui/database/DatabaseConstants.java @@ -0,0 +1,33 @@ +package binnie.core.gui.database; + +public class DatabaseConstants { + private static final String TAB_PRE_FIX = ".tab"; + private static final String TAB_SPECIES_PRE_FIX = TAB_PRE_FIX + ".species"; + public static final String CONTROL_PRE_FIX = ".control"; + public static final String PRODUCTS_PRE_FIX = ".products"; + public static final String PAGES_PRE_FIX = ".pages"; + + public static final String KEY = "binniecore.gui.database"; + public static final String DISCOVERED_KEY= KEY + ".discovered"; + public static final String MUTATIONS_KEY = KEY + ".mutations"; + public static final String BREEDER_KEY = KEY + ".breeder"; + public static final String SPECIES_KEY = KEY + ".species"; + public static final String BRANCH_KEY = KEY + ".branch"; + public static final String MODE_KEY = KEY + ".mode"; + public static final String CONTROL_KEY = KEY + CONTROL_PRE_FIX; + + public static final String GENETICS_KEY = "genetics.gui.database"; + + public static final String BEE_GENOME_KEY = GENETICS_KEY + TAB_SPECIES_PRE_FIX + ".genome.extrabees"; + public static final String BEE_CONTROL_KEY = GENETICS_KEY + CONTROL_PRE_FIX + ".extrabees"; + public static final String BEE_PRODUCTS_KEY = GENETICS_KEY + PRODUCTS_PRE_FIX + ".extrabees"; + + public static final String BOTANY_KEY = "botany.gui.database"; + public static final String BOTANY_CONTROL_KEY = BOTANY_KEY + CONTROL_PRE_FIX; + public static final String BOTANY_PAGES_KEY = BOTANY_KEY + PAGES_PRE_FIX; + public static final String BOTANY_TAB_KEY = BOTANY_KEY + TAB_PRE_FIX; + public static final String BOTANY_GENOME_KEY = BOTANY_TAB_KEY + ".genome"; + + public static final String TIME_KEY = KEY + ".time"; + +} diff --git a/src/main/java/binnie/genetics/gui/database/DatabaseTab.java b/src/main/java/binnie/core/gui/database/DatabaseTab.java similarity index 84% rename from src/main/java/binnie/genetics/gui/database/DatabaseTab.java rename to src/main/java/binnie/core/gui/database/DatabaseTab.java index 4be2286a..a179d7b5 100644 --- a/src/main/java/binnie/genetics/gui/database/DatabaseTab.java +++ b/src/main/java/binnie/core/gui/database/DatabaseTab.java @@ -1,8 +1,8 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import binnie.core.AbstractMod; -import binnie.core.craftgui.ITooltipHelp; -import binnie.core.craftgui.Tooltip; +import binnie.core.gui.ITooltipHelp; +import binnie.core.gui.Tooltip; import binnie.core.util.I18N; public class DatabaseTab implements ITooltipHelp { diff --git a/src/main/java/binnie/genetics/gui/database/EnumDiscoveryState.java b/src/main/java/binnie/core/gui/database/EnumDiscoveryState.java similarity index 69% rename from src/main/java/binnie/genetics/gui/database/EnumDiscoveryState.java rename to src/main/java/binnie/core/gui/database/EnumDiscoveryState.java index c8532a88..71615a9b 100644 --- a/src/main/java/binnie/genetics/gui/database/EnumDiscoveryState.java +++ b/src/main/java/binnie/core/gui/database/EnumDiscoveryState.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; public enum EnumDiscoveryState { Show, diff --git a/src/main/java/binnie/genetics/gui/database/IDatabaseMode.java b/src/main/java/binnie/core/gui/database/IDatabaseMode.java similarity index 59% rename from src/main/java/binnie/genetics/gui/database/IDatabaseMode.java rename to src/main/java/binnie/core/gui/database/IDatabaseMode.java index d85b1e42..2378d273 100644 --- a/src/main/java/binnie/genetics/gui/database/IDatabaseMode.java +++ b/src/main/java/binnie/core/gui/database/IDatabaseMode.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; public interface IDatabaseMode { String getName(); diff --git a/src/main/java/binnie/genetics/gui/database/PageAbstract.java b/src/main/java/binnie/core/gui/database/PageAbstract.java similarity index 67% rename from src/main/java/binnie/genetics/gui/database/PageAbstract.java rename to src/main/java/binnie/core/gui/database/PageAbstract.java index dcccfe8f..577c9011 100644 --- a/src/main/java/binnie/genetics/gui/database/PageAbstract.java +++ b/src/main/java/binnie/core/gui/database/PageAbstract.java @@ -1,7 +1,7 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.page.ControlPage; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.page.ControlPage; public abstract class PageAbstract extends ControlPage { public PageAbstract(final IWidget parent, final DatabaseTab tab) { diff --git a/src/main/java/binnie/genetics/gui/database/PageBranch.java b/src/main/java/binnie/core/gui/database/PageBranch.java similarity index 73% rename from src/main/java/binnie/genetics/gui/database/PageBranch.java rename to src/main/java/binnie/core/gui/database/PageBranch.java index f652bee6..68e265ab 100644 --- a/src/main/java/binnie/genetics/gui/database/PageBranch.java +++ b/src/main/java/binnie/core/gui/database/PageBranch.java @@ -1,8 +1,8 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import forestry.api.genetics.IClassification; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; abstract class PageBranch extends PageAbstract { public PageBranch(final IWidget parent, final DatabaseTab tab) { diff --git a/src/main/java/binnie/genetics/gui/database/PageBranchOverview.java b/src/main/java/binnie/core/gui/database/PageBranchOverview.java similarity index 72% rename from src/main/java/binnie/genetics/gui/database/PageBranchOverview.java rename to src/main/java/binnie/core/gui/database/PageBranchOverview.java index ceb9c92f..a6a68fb9 100644 --- a/src/main/java/binnie/genetics/gui/database/PageBranchOverview.java +++ b/src/main/java/binnie/core/gui/database/PageBranchOverview.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import java.util.ArrayList; import java.util.List; @@ -11,10 +11,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IClassification; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.renderer.RenderUtil; import binnie.core.util.I18N; @SideOnly(Side.CLIENT) @@ -34,16 +34,16 @@ public class PageBranchOverview extends PageBranch { @Override public void onValueChanged(final IClassification branch) { - this.branchName.setValue(TextFormatting.UNDERLINE + branch.getName() + " " + I18N.localise("binniecore.gui.database.branch.branch")); - this.branchScientific.setValue(TextFormatting.ITALIC + I18N.localise("binniecore.gui.database.branch.apidae") + " " + branch.getScientific()); - this.branchAuthority.setValue(I18N.localise("binniecore.gui.database.discovered") + " " + TextFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority()); + this.branchName.setValue(TextFormatting.UNDERLINE + I18N.localise(DatabaseConstants.BRANCH_KEY + ".name", branch.getName())); + this.branchScientific.setValue(TextFormatting.ITALIC + I18N.localise(DatabaseConstants.BRANCH_KEY + ".apidae", branch.getScientific())); + this.branchAuthority.setValue(I18N.localise(DatabaseConstants.BRANCH_KEY + ".discoveredBy", TextFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority())); for (final IWidget widget : this.branchDescription) { this.deleteChild(widget); } this.branchDescription.clear(); String desc = branch.getDescription(); if (desc == null || Objects.equals(desc, "") || desc.contains("for.")) { - desc = I18N.localise("binniecore.gui.database.no.description"); + desc = I18N.localise(DatabaseConstants.BRANCH_KEY + ".noDesc"); } StringBuilder line = new StringBuilder(); final List descLines = new ArrayList<>(); diff --git a/src/main/java/binnie/genetics/gui/database/PageBranchSpecies.java b/src/main/java/binnie/core/gui/database/PageBranchSpecies.java similarity index 80% rename from src/main/java/binnie/genetics/gui/database/PageBranchSpecies.java rename to src/main/java/binnie/core/gui/database/PageBranchSpecies.java index ae27a6f5..ab56345d 100644 --- a/src/main/java/binnie/genetics/gui/database/PageBranchSpecies.java +++ b/src/main/java/binnie/core/gui/database/PageBranchSpecies.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -6,10 +6,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.events.EventValueChanged; import binnie.core.util.I18N; @SideOnly(Side.CLIENT) @@ -23,7 +23,7 @@ public class PageBranchSpecies extends PageBranch { public PageBranchSpecies(final IWidget parent, final DatabaseTab tab) { super(parent, tab); - this.pageBranchSpecies_title = new ControlTextCentered(this, 8, I18N.localise("binniecore.gui.database.species")); + this.pageBranchSpecies_title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.SPECIES_KEY)); this.addEventHandler(new EventValueChanged.Handler() { @Override public void onEvent(final EventValueChanged event) { diff --git a/src/main/java/binnie/genetics/gui/database/PageBreeder.java b/src/main/java/binnie/core/gui/database/PageBreeder.java similarity index 68% rename from src/main/java/binnie/genetics/gui/database/PageBreeder.java rename to src/main/java/binnie/core/gui/database/PageBreeder.java index 16adfee8..c6a6a055 100644 --- a/src/main/java/binnie/genetics/gui/database/PageBreeder.java +++ b/src/main/java/binnie/core/gui/database/PageBreeder.java @@ -1,14 +1,14 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import net.minecraft.util.text.TextFormatting; import com.mojang.authlib.GameProfile; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.core.craftgui.controls.page.ControlPage; -import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.controls.page.ControlPage; +import binnie.core.gui.minecraft.Window; import binnie.core.util.I18N; public class PageBreeder extends ControlPage { @@ -26,13 +26,13 @@ public class PageBreeder extends ControlPage { } final BreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem(); final String descriptor = system.getDescriptor(); - new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + system.getDescriptor() + " " + I18N.localise("binniecore.gui.database.breeder.profile")); - new ControlTextCentered(this, 75, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + I18N.localise("binniecore.gui.database.species")); + new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + system.getDescriptor() + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".profile")); + new ControlTextCentered(this, 75, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".species")); new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.discoveredSpeciesPercentage); - new ControlTextCentered(this, 115, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " " + I18N.localise("binniecore.gui.database.breeder.branches")); + new ControlTextCentered(this, 115, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".breeder.branches")); new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.discoveredBranchPercentage); if (system.discoveredSecretCount > 0) { - new ControlTextCentered(this, 155, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " " + I18N.localise("binniecore.gui.database.breeder.species.secret")); + new ControlTextCentered(this, 155, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".breeder.species.secret")); } new ControlTextCentered(this, 32, this.player.getName()); new ControlTextCentered(this, 44, TextFormatting.ITALIC + system.getEpitome()); diff --git a/src/main/java/binnie/genetics/gui/database/PageBreederStats.java b/src/main/java/binnie/core/gui/database/PageBreederStats.java similarity index 59% rename from src/main/java/binnie/genetics/gui/database/PageBreederStats.java rename to src/main/java/binnie/core/gui/database/PageBreederStats.java index 61c792e0..ce39f3ed 100644 --- a/src/main/java/binnie/genetics/gui/database/PageBreederStats.java +++ b/src/main/java/binnie/core/gui/database/PageBreederStats.java @@ -1,12 +1,12 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import net.minecraft.util.text.TextFormatting; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.core.craftgui.controls.core.Control; import binnie.core.genetics.BreedingSystem; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.controls.core.Control; import binnie.core.util.I18N; public class PageBreederStats extends Control { @@ -15,7 +15,7 @@ public class PageBreederStats extends Control { public PageBreederStats(final IWidget parent, final int w, final int h, final String player) { super(parent, 0, 0, w, h); this.player = player; - final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + I18N.localise("binniecore.gui.database.breeder.stats")); + final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + I18N.localise(DatabaseConstants.BREEDER_KEY + ".stats")); final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); } } diff --git a/src/main/java/binnie/genetics/gui/database/PageSpecies.java b/src/main/java/binnie/core/gui/database/PageSpecies.java similarity index 74% rename from src/main/java/binnie/genetics/gui/database/PageSpecies.java rename to src/main/java/binnie/core/gui/database/PageSpecies.java index 6c47aadf..db5dc502 100644 --- a/src/main/java/binnie/genetics/gui/database/PageSpecies.java +++ b/src/main/java/binnie/core/gui/database/PageSpecies.java @@ -1,8 +1,8 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public abstract class PageSpecies extends PageAbstract { public PageSpecies(final IWidget parent, final DatabaseTab tab) { diff --git a/src/main/java/binnie/genetics/gui/database/PageSpeciesClassification.java b/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java similarity index 88% rename from src/main/java/binnie/genetics/gui/database/PageSpeciesClassification.java rename to src/main/java/binnie/core/gui/database/PageSpeciesClassification.java index cc0fce51..0f3801b2 100644 --- a/src/main/java/binnie/genetics/gui/database/PageSpeciesClassification.java +++ b/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import java.util.LinkedHashMap; import java.util.Map; @@ -6,9 +6,9 @@ import java.util.Map; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; public class PageSpeciesClassification extends PageSpecies { private Map levels; diff --git a/src/main/java/binnie/genetics/gui/database/PageSpeciesMutations.java b/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java similarity index 63% rename from src/main/java/binnie/genetics/gui/database/PageSpeciesMutations.java rename to src/main/java/binnie/core/gui/database/PageSpeciesMutations.java index f4bb80b7..19852d74 100644 --- a/src/main/java/binnie/genetics/gui/database/PageSpeciesMutations.java +++ b/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java @@ -1,10 +1,10 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; import binnie.core.util.I18N; public class PageSpeciesMutations extends PageSpecies { @@ -13,7 +13,7 @@ public class PageSpeciesMutations extends PageSpecies { public PageSpeciesMutations(final IWidget parent, final DatabaseTab tab) { super(parent, tab); - this.title = new ControlTextCentered(this, 8, I18N.localise("binniecore.gui.database.mutations.further")); + this.title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.MUTATIONS_KEY+ ".further")); this.list = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Further); } diff --git a/src/main/java/binnie/genetics/gui/database/PageSpeciesOverview.java b/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java similarity index 80% rename from src/main/java/binnie/genetics/gui/database/PageSpeciesOverview.java rename to src/main/java/binnie/core/gui/database/PageSpeciesOverview.java index bbfb3080..d9815f25 100644 --- a/src/main/java/binnie/genetics/gui/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import java.util.Objects; @@ -9,13 +9,13 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; import binnie.core.util.I18N; @SideOnly(Side.CLIENT) @@ -49,13 +49,13 @@ public class PageSpeciesOverview extends PageSpecies { final String branchName = species.getBranch().getName(); this.controlName.setValue(TextFormatting.UNDERLINE + species.getAlleleName()); this.controlScientific.setValue(TextFormatting.ITALIC + branchBinomial + " " + species.getBinomial()); - this.controlAuthority.setValue(I18N.localise("binniecore.gui.database.discovered") + ": " + TextFormatting.BOLD + species.getAuthority()); - this.controlComplexity.setValue(I18N.localise("binniecore.gui.database.overview.complexity") + ": " + species.getComplexity()); + this.controlAuthority.setValue(I18N.localise(DatabaseConstants.KEY + ".discovered") + ": " + TextFormatting.BOLD + species.getAuthority()); + this.controlComplexity.setValue(I18N.localise(DatabaseConstants.KEY + ".overview.complexity") + ": " + species.getComplexity()); final String desc = species.getDescription(); StringBuilder descBody = new StringBuilder(TextFormatting.ITALIC.toString()); String descSig = ""; if (desc == null || Objects.equals(desc, "") || desc.contains("for.description") || desc.contains(".desc")) { - descBody.append(I18N.localise("binniecore.gui.database.no.description")); + descBody.append(I18N.localise(DatabaseConstants.KEY + ".no.description")); } else { final String[] descStrings = desc.split("\\|"); descBody.append(descStrings[0]); diff --git a/src/main/java/binnie/genetics/gui/database/PageSpeciesResultant.java b/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java similarity index 72% rename from src/main/java/binnie/genetics/gui/database/PageSpeciesResultant.java rename to src/main/java/binnie/core/gui/database/PageSpeciesResultant.java index ac59fcc6..00277f3d 100644 --- a/src/main/java/binnie/genetics/gui/database/PageSpeciesResultant.java +++ b/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java @@ -1,10 +1,10 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; import binnie.core.util.I18N; public class PageSpeciesResultant extends PageSpecies { @@ -13,7 +13,7 @@ public class PageSpeciesResultant extends PageSpecies { public PageSpeciesResultant(final IWidget parent, final DatabaseTab tab) { super(parent, tab); - this.pageSpeciesResultant_Title = new ControlTextCentered(this, 8, I18N.localise("binniecore.gui.database.mutations.resultant")); + this.pageSpeciesResultant_Title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.MUTATIONS_KEY + ".resultant")); this.pageSpeciesResultant_List = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Resultant); } diff --git a/src/main/java/binnie/genetics/gui/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java similarity index 89% rename from src/main/java/binnie/genetics/gui/database/WindowAbstractDatabase.java rename to src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java index 4edff320..bd5656cf 100644 --- a/src/main/java/binnie/genetics/gui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database; +package binnie.core.gui.database; import javax.annotation.Nullable; import java.util.Collection; @@ -17,26 +17,26 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IClassification; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlTextEdit; -import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.controls.listbox.ControlTextOption; -import binnie.core.craftgui.controls.page.ControlPage; -import binnie.core.craftgui.controls.page.ControlPages; -import binnie.core.craftgui.controls.tab.ControlTab; -import binnie.core.craftgui.controls.tab.ControlTabBar; -import binnie.core.craftgui.events.EventHandler; -import binnie.core.craftgui.events.EventTextEdit; -import binnie.core.craftgui.events.EventValueChanged; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.CraftGUIUtil; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.Position; -import binnie.core.craftgui.minecraft.MinecraftGUI; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlHelp; -import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlTextEdit; +import binnie.core.gui.controls.listbox.ControlListBox; +import binnie.core.gui.controls.listbox.ControlTextOption; +import binnie.core.gui.controls.page.ControlPage; +import binnie.core.gui.controls.page.ControlPages; +import binnie.core.gui.controls.tab.ControlTab; +import binnie.core.gui.controls.tab.ControlTabBar; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventTextEdit; +import binnie.core.gui.events.EventValueChanged; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.CraftGUIUtil; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlHelp; +import binnie.core.gui.window.Panel; import binnie.core.util.I18N; public abstract class WindowAbstractDatabase extends Window { @@ -201,7 +201,7 @@ public abstract class WindowAbstractDatabase extends Window { @Override public String getName() { - return I18N.localise("binniecore.gui.database.mode." + this.name().toLowerCase()); + return I18N.localise(DatabaseConstants.MODE_KEY + "." + this.name().toLowerCase()); } } diff --git a/src/main/java/binnie/core/gui/database/package-info.java b/src/main/java/binnie/core/gui/database/package-info.java new file mode 100644 index 00000000..1188e3ca --- /dev/null +++ b/src/main/java/binnie/core/gui/database/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.database; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/events/Event.java b/src/main/java/binnie/core/gui/events/Event.java similarity index 77% rename from src/main/java/binnie/core/craftgui/events/Event.java rename to src/main/java/binnie/core/gui/events/Event.java index 31b9edca..a22a5827 100644 --- a/src/main/java/binnie/core/craftgui/events/Event.java +++ b/src/main/java/binnie/core/gui/events/Event.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.events; +package binnie.core.gui.events; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public class Event { IWidget origin; diff --git a/src/main/java/binnie/core/craftgui/events/EventButtonClicked.java b/src/main/java/binnie/core/gui/events/EventButtonClicked.java similarity index 78% rename from src/main/java/binnie/core/craftgui/events/EventButtonClicked.java rename to src/main/java/binnie/core/gui/events/EventButtonClicked.java index 70d77d19..43670276 100644 --- a/src/main/java/binnie/core/craftgui/events/EventButtonClicked.java +++ b/src/main/java/binnie/core/gui/events/EventButtonClicked.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.events; +package binnie.core.gui.events; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public class EventButtonClicked extends Event { public EventButtonClicked(final IWidget origin) { diff --git a/src/main/java/binnie/core/craftgui/events/EventCycleChanged.java b/src/main/java/binnie/core/gui/events/EventCycleChanged.java similarity index 75% rename from src/main/java/binnie/core/craftgui/events/EventCycleChanged.java rename to src/main/java/binnie/core/gui/events/EventCycleChanged.java index 385ac000..8d55428c 100644 --- a/src/main/java/binnie/core/craftgui/events/EventCycleChanged.java +++ b/src/main/java/binnie/core/gui/events/EventCycleChanged.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.events; +package binnie.core.gui.events; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public class EventCycleChanged extends Event { public int value; diff --git a/src/main/java/binnie/core/craftgui/events/EventHandler.java b/src/main/java/binnie/core/gui/events/EventHandler.java similarity index 93% rename from src/main/java/binnie/core/craftgui/events/EventHandler.java rename to src/main/java/binnie/core/gui/events/EventHandler.java index 0d45eb4f..4cc64d5c 100644 --- a/src/main/java/binnie/core/craftgui/events/EventHandler.java +++ b/src/main/java/binnie/core/gui/events/EventHandler.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.events; +package binnie.core.gui.events; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public abstract class EventHandler { Class eventClass; diff --git a/src/main/java/binnie/core/craftgui/events/EventKey.java b/src/main/java/binnie/core/gui/events/EventKey.java similarity index 92% rename from src/main/java/binnie/core/craftgui/events/EventKey.java rename to src/main/java/binnie/core/gui/events/EventKey.java index 360752fa..cf7e4223 100644 --- a/src/main/java/binnie/core/craftgui/events/EventKey.java +++ b/src/main/java/binnie/core/gui/events/EventKey.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.events; +package binnie.core.gui.events; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public abstract class EventKey extends Event { char character; diff --git a/src/main/java/binnie/core/craftgui/events/EventMouse.java b/src/main/java/binnie/core/gui/events/EventMouse.java similarity index 96% rename from src/main/java/binnie/core/craftgui/events/EventMouse.java rename to src/main/java/binnie/core/gui/events/EventMouse.java index c5353cf5..c03c6ea5 100644 --- a/src/main/java/binnie/core/craftgui/events/EventMouse.java +++ b/src/main/java/binnie/core/gui/events/EventMouse.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.events; +package binnie.core.gui.events; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public abstract class EventMouse extends Event { public EventMouse(final IWidget origin) { diff --git a/src/main/java/binnie/core/craftgui/events/EventTextEdit.java b/src/main/java/binnie/core/gui/events/EventTextEdit.java similarity index 79% rename from src/main/java/binnie/core/craftgui/events/EventTextEdit.java rename to src/main/java/binnie/core/gui/events/EventTextEdit.java index 8106bff6..ecdf7db8 100644 --- a/src/main/java/binnie/core/craftgui/events/EventTextEdit.java +++ b/src/main/java/binnie/core/gui/events/EventTextEdit.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.events; +package binnie.core.gui.events; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public class EventTextEdit extends EventValueChanged { public EventTextEdit(final IWidget origin, final String text) { diff --git a/src/main/java/binnie/core/craftgui/events/EventToggleButtonClicked.java b/src/main/java/binnie/core/gui/events/EventToggleButtonClicked.java similarity index 77% rename from src/main/java/binnie/core/craftgui/events/EventToggleButtonClicked.java rename to src/main/java/binnie/core/gui/events/EventToggleButtonClicked.java index 2233b99a..51cfab0c 100644 --- a/src/main/java/binnie/core/craftgui/events/EventToggleButtonClicked.java +++ b/src/main/java/binnie/core/gui/events/EventToggleButtonClicked.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.events; +package binnie.core.gui.events; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public class EventToggleButtonClicked extends Event { boolean toggled; diff --git a/src/main/java/binnie/core/craftgui/events/EventValueChanged.java b/src/main/java/binnie/core/gui/events/EventValueChanged.java similarity index 85% rename from src/main/java/binnie/core/craftgui/events/EventValueChanged.java rename to src/main/java/binnie/core/gui/events/EventValueChanged.java index 8a4c2979..7de36294 100644 --- a/src/main/java/binnie/core/craftgui/events/EventValueChanged.java +++ b/src/main/java/binnie/core/gui/events/EventValueChanged.java @@ -1,8 +1,8 @@ -package binnie.core.craftgui.events; +package binnie.core.gui.events; import javax.annotation.Nullable; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public class EventValueChanged extends Event { @Nullable diff --git a/src/main/java/binnie/core/craftgui/events/EventValuesChanged.java b/src/main/java/binnie/core/gui/events/EventValuesChanged.java similarity index 76% rename from src/main/java/binnie/core/craftgui/events/EventValuesChanged.java rename to src/main/java/binnie/core/gui/events/EventValuesChanged.java index 8125f6de..e3352b97 100644 --- a/src/main/java/binnie/core/craftgui/events/EventValuesChanged.java +++ b/src/main/java/binnie/core/gui/events/EventValuesChanged.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.events; +package binnie.core.gui.events; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public class EventValuesChanged extends Event { public T[] values; diff --git a/src/main/java/binnie/core/craftgui/events/EventWidget.java b/src/main/java/binnie/core/gui/events/EventWidget.java similarity index 98% rename from src/main/java/binnie/core/craftgui/events/EventWidget.java rename to src/main/java/binnie/core/gui/events/EventWidget.java index 40f957ce..8dd3e8ed 100644 --- a/src/main/java/binnie/core/craftgui/events/EventWidget.java +++ b/src/main/java/binnie/core/gui/events/EventWidget.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.events; +package binnie.core.gui.events; -import binnie.core.craftgui.IWidget; +import binnie.core.gui.IWidget; public class EventWidget extends Event { public EventWidget(final IWidget origin) { diff --git a/src/main/java/binnie/botany/craftgui/package-info.java b/src/main/java/binnie/core/gui/events/package-info.java similarity index 88% rename from src/main/java/binnie/botany/craftgui/package-info.java rename to src/main/java/binnie/core/gui/events/package-info.java index 768029f8..832b2ca8 100644 --- a/src/main/java/binnie/botany/craftgui/package-info.java +++ b/src/main/java/binnie/core/gui/events/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.botany.craftgui; +package binnie.core.gui.events; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/core/craftgui/fieldkit/ControlChromoPicker.java b/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java similarity index 75% rename from src/main/java/binnie/core/craftgui/fieldkit/ControlChromoPicker.java rename to src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java index d6e17fed..9842319f 100644 --- a/src/main/java/binnie/core/craftgui/fieldkit/ControlChromoPicker.java +++ b/src/main/java/binnie/core/gui/fieldkit/ControlChromoPicker.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.fieldkit; +package binnie.core.gui.fieldkit; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -7,16 +7,16 @@ import forestry.api.genetics.IChromosomeType; import binnie.Binnie; import binnie.core.ExtraBeeTexture; -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.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.events.EventValueChanged; +import binnie.core.gui.events.EventWidget; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; public class ControlChromoPicker extends Control implements ITooltip { Texture Selected; diff --git a/src/main/java/binnie/core/craftgui/fieldkit/ControlChromosome.java b/src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java similarity index 94% rename from src/main/java/binnie/core/craftgui/fieldkit/ControlChromosome.java rename to src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java index eda53e7b..9894c680 100644 --- a/src/main/java/binnie/core/craftgui/fieldkit/ControlChromosome.java +++ b/src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.fieldkit; +package binnie.core.gui.fieldkit; import com.google.common.base.Preconditions; @@ -15,13 +15,13 @@ import forestry.api.lepidopterology.EnumButterflyChromosome; 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.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.texture.BinnieCoreTexture; public class ControlChromosome extends Control implements IControlValue { diff --git a/src/main/java/binnie/core/craftgui/geometry/Area.java b/src/main/java/binnie/core/gui/geometry/Area.java similarity index 98% rename from src/main/java/binnie/core/craftgui/geometry/Area.java rename to src/main/java/binnie/core/gui/geometry/Area.java index 9ec82609..d31a9b80 100644 --- a/src/main/java/binnie/core/craftgui/geometry/Area.java +++ b/src/main/java/binnie/core/gui/geometry/Area.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.geometry; +package binnie.core.gui.geometry; public final class Area { private Point pos; diff --git a/src/main/java/binnie/core/craftgui/geometry/Border.java b/src/main/java/binnie/core/gui/geometry/Border.java similarity index 97% rename from src/main/java/binnie/core/craftgui/geometry/Border.java rename to src/main/java/binnie/core/gui/geometry/Border.java index 56258b2c..776a3a57 100644 --- a/src/main/java/binnie/core/craftgui/geometry/Border.java +++ b/src/main/java/binnie/core/gui/geometry/Border.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.geometry; +package binnie.core.gui.geometry; public class Border { public static final Border ZERO = new Border(0); diff --git a/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java b/src/main/java/binnie/core/gui/geometry/CraftGUIUtil.java similarity index 91% rename from src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java rename to src/main/java/binnie/core/gui/geometry/CraftGUIUtil.java index 11a5a25a..8746dd3c 100644 --- a/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java +++ b/src/main/java/binnie/core/gui/geometry/CraftGUIUtil.java @@ -1,8 +1,8 @@ -package binnie.core.craftgui.geometry; +package binnie.core.gui.geometry; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.events.EventValueChanged; public class CraftGUIUtil { public static void alignToWidget(final IWidget target, final IWidget relativeTo) { diff --git a/src/main/java/binnie/core/craftgui/geometry/Point.java b/src/main/java/binnie/core/gui/geometry/Point.java similarity index 96% rename from src/main/java/binnie/core/craftgui/geometry/Point.java rename to src/main/java/binnie/core/gui/geometry/Point.java index 6ffe25c6..c9e1bd56 100644 --- a/src/main/java/binnie/core/craftgui/geometry/Point.java +++ b/src/main/java/binnie/core/gui/geometry/Point.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.geometry; +package binnie.core.gui.geometry; public class Point { public static final Point ZERO = new Point(0, 0); diff --git a/src/main/java/binnie/core/craftgui/geometry/Position.java b/src/main/java/binnie/core/gui/geometry/Position.java similarity index 93% rename from src/main/java/binnie/core/craftgui/geometry/Position.java rename to src/main/java/binnie/core/gui/geometry/Position.java index 559faa06..2edc1b55 100644 --- a/src/main/java/binnie/core/craftgui/geometry/Position.java +++ b/src/main/java/binnie/core/gui/geometry/Position.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.geometry; +package binnie.core.gui.geometry; public enum Position { Top(0, -1), diff --git a/src/main/java/binnie/core/craftgui/geometry/TextJustification.java b/src/main/java/binnie/core/gui/geometry/TextJustification.java similarity index 93% rename from src/main/java/binnie/core/craftgui/geometry/TextJustification.java rename to src/main/java/binnie/core/gui/geometry/TextJustification.java index 7cc8bb4c..b1ac441d 100644 --- a/src/main/java/binnie/core/craftgui/geometry/TextJustification.java +++ b/src/main/java/binnie/core/gui/geometry/TextJustification.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.geometry; +package binnie.core.gui.geometry; public enum TextJustification { TOP_LEFT(0.0f, 0.0f), diff --git a/src/main/java/binnie/core/gui/geometry/package-info.java b/src/main/java/binnie/core/gui/geometry/package-info.java new file mode 100644 index 00000000..aac3a44f --- /dev/null +++ b/src/main/java/binnie/core/gui/geometry/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.geometry; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java similarity index 99% rename from src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java rename to src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java index 1dc1def3..8a2e4913 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; @@ -27,8 +27,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.BinnieCore; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.EnumHighlighting; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.EnumHighlighting; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.network.INetwork; diff --git a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java b/src/main/java/binnie/core/gui/minecraft/CustomSlot.java similarity index 97% rename from src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java rename to src/main/java/binnie/core/gui/minecraft/CustomSlot.java index 523512b1..dda4903f 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java +++ b/src/main/java/binnie/core/gui/minecraft/CustomSlot.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/core/craftgui/minecraft/Dialog.java b/src/main/java/binnie/core/gui/minecraft/Dialog.java similarity index 74% rename from src/main/java/binnie/core/craftgui/minecraft/Dialog.java rename to src/main/java/binnie/core/gui/minecraft/Dialog.java index 41803004..4ac1fbc1 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Dialog.java +++ b/src/main/java/binnie/core/gui/minecraft/Dialog.java @@ -1,17 +1,17 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.events.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 binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.minecraft.CraftGUITexture; @SideOnly(Side.CLIENT) public abstract class Dialog extends Control { diff --git a/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java b/src/main/java/binnie/core/gui/minecraft/EnumColor.java similarity index 95% rename from src/main/java/binnie/core/craftgui/minecraft/EnumColor.java rename to src/main/java/binnie/core/gui/minecraft/EnumColor.java index 2261dbe2..ae7c05c4 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java +++ b/src/main/java/binnie/core/gui/minecraft/EnumColor.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; public enum EnumColor { Black("Black", 0, '0'), diff --git a/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java b/src/main/java/binnie/core/gui/minecraft/GUIIcon.java similarity index 95% rename from src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java rename to src/main/java/binnie/core/gui/minecraft/GUIIcon.java index 6a84c30b..8a383709 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java +++ b/src/main/java/binnie/core/gui/minecraft/GUIIcon.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; import binnie.Binnie; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java similarity index 96% rename from src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java rename to src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java index f23a4025..35797d04 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; import java.io.IOException; import java.util.ArrayList; @@ -23,12 +23,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -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 binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.events.EventKey; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.renderer.RenderUtil; @SideOnly(Side.CLIENT) public class GuiCraftGUI extends GuiContainer { diff --git a/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java b/src/main/java/binnie/core/gui/minecraft/IMachineInformation.java similarity index 62% rename from src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java rename to src/main/java/binnie/core/gui/minecraft/IMachineInformation.java index f0670ca8..79f7a03c 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java +++ b/src/main/java/binnie/core/gui/minecraft/IMachineInformation.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; public interface IMachineInformation { String getInformation(); diff --git a/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java b/src/main/java/binnie/core/gui/minecraft/IMinecraftTooltip.java similarity index 56% rename from src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java rename to src/main/java/binnie/core/gui/minecraft/IMinecraftTooltip.java index dce2940b..39ceba3d 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java +++ b/src/main/java/binnie/core/gui/minecraft/IMinecraftTooltip.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; -import binnie.core.craftgui.ITooltip; +import binnie.core.gui.ITooltip; public interface IMinecraftTooltip extends ITooltip { void getTooltip(final MinecraftTooltip p0); diff --git a/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java b/src/main/java/binnie/core/gui/minecraft/IWindowAffectsShiftClick.java similarity index 79% rename from src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java rename to src/main/java/binnie/core/gui/minecraft/IWindowAffectsShiftClick.java index 29c00371..ee979b04 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java +++ b/src/main/java/binnie/core/gui/minecraft/IWindowAffectsShiftClick.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; import binnie.core.machines.transfer.TransferRequest; diff --git a/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java b/src/main/java/binnie/core/gui/minecraft/InventoryType.java similarity index 59% rename from src/main/java/binnie/core/craftgui/minecraft/InventoryType.java rename to src/main/java/binnie/core/gui/minecraft/InventoryType.java index 4203f517..eac50eb2 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java +++ b/src/main/java/binnie/core/gui/minecraft/InventoryType.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; public enum InventoryType { Player, diff --git a/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java b/src/main/java/binnie/core/gui/minecraft/MinecraftGUI.java similarity index 64% rename from src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java rename to src/main/java/binnie/core/gui/minecraft/MinecraftGUI.java index d33ffeb8..e269f7f0 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java +++ b/src/main/java/binnie/core/gui/minecraft/MinecraftGUI.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; -import binnie.core.craftgui.window.Panel; +import binnie.core.gui.window.Panel; public class MinecraftGUI { public enum PanelType implements Panel.IPanelType { diff --git a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java b/src/main/java/binnie/core/gui/minecraft/MinecraftTooltip.java similarity index 94% rename from src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java rename to src/main/java/binnie/core/gui/minecraft/MinecraftTooltip.java index 76402ddf..04b83eba 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java +++ b/src/main/java/binnie/core/gui/minecraft/MinecraftTooltip.java @@ -1,8 +1,8 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; import net.minecraft.util.text.TextFormatting; -import binnie.core.craftgui.Tooltip; +import binnie.core.gui.Tooltip; public class MinecraftTooltip extends Tooltip { public static int getOutline(final ITooltipType type) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java b/src/main/java/binnie/core/gui/minecraft/ModuleCraftGUI.java similarity index 87% rename from src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java rename to src/main/java/binnie/core/gui/minecraft/ModuleCraftGUI.java index 7c4b1cb6..b9dd23e4 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java +++ b/src/main/java/binnie/core/gui/minecraft/ModuleCraftGUI.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; import binnie.core.IInitializable; diff --git a/src/main/java/binnie/core/craftgui/minecraft/Window.java b/src/main/java/binnie/core/gui/minecraft/Window.java similarity index 88% rename from src/main/java/binnie/core/craftgui/minecraft/Window.java rename to src/main/java/binnie/core/gui/minecraft/Window.java index c20a3127..e0bd8115 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/core/gui/minecraft/Window.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; import com.google.common.base.Preconditions; @@ -20,28 +20,28 @@ import net.minecraftforge.fml.relauncher.SideOnly; 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.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.ITooltipHelp; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.TopLevelWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.events.EventWidget; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.control.ControlHelp; +import binnie.core.gui.minecraft.control.ControlInfo; +import binnie.core.gui.minecraft.control.ControlPowerSystem; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlUser; +import binnie.core.gui.minecraft.control.EnumHighlighting; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.StyleSheetManager; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IInventoryMachine; import binnie.core.machines.network.INetwork; diff --git a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/core/gui/minecraft/WindowInventory.java similarity index 98% rename from src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java rename to src/main/java/binnie/core/gui/minecraft/WindowInventory.java index 1af9ee66..654bf668 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/core/gui/minecraft/WindowInventory.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft; +package binnie.core.gui.minecraft; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java similarity index 87% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java index b187069f..d11b171f 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import javax.annotation.Nullable; @@ -8,19 +8,19 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.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.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.minecraft.MinecraftTooltip; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.minecraft.CraftGUITexture; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.power.IPoweredMachine; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java similarity index 83% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java index 19f85eb3..544b73b3 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import javax.annotation.Nullable; @@ -7,17 +7,17 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.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.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.CustomSlot; +import binnie.core.gui.minecraft.MinecraftTooltip; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.resource.minecraft.CraftGUITexture; import binnie.core.machines.power.ErrorState; public class ControlErrorState extends Control implements ITooltip { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java b/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java similarity index 70% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java index ce026a87..a63c8ba6 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java @@ -1,15 +1,15 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlHelp extends Control implements ITooltip { public ControlHelp(final IWidget parent, final int x, final int y) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java b/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java similarity index 84% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java index cb634c76..1638f09a 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; @@ -7,10 +7,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; 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.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.renderer.RenderUtil; import binnie.core.resource.BinnieSprite; @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java b/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java similarity index 64% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlImage.java index d7e40e6e..000593a8 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java @@ -1,13 +1,13 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.resource.Texture; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.resource.Texture; public class ControlImage extends Control { private Object key; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java b/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java similarity index 67% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java index 9180ebb7..17e1c599 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java @@ -1,15 +1,15 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlInfo extends Control implements ITooltip { private String info; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java b/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java similarity index 86% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java index e33148da..e57e0a15 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import java.util.List; @@ -9,14 +9,14 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.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 binnie.core.gui.Attribute; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.renderer.RenderUtil; public class ControlItemDisplay extends Control implements ITooltip { public boolean hastooltip; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java similarity index 90% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java index 7aebf2c1..ba90776f 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import javax.annotation.Nullable; import java.util.ArrayList; @@ -17,20 +17,20 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; 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.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.GuiCraftGUI; +import binnie.core.gui.minecraft.MinecraftTooltip; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.minecraft.CraftGUITexture; import binnie.core.machines.Machine; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.TankSlot; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlMachineProgress.java b/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java similarity index 59% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlMachineProgress.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java index faa9e164..f645faac 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlMachineProgress.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java @@ -1,8 +1,8 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.geometry.Position; -import binnie.core.craftgui.resource.Texture; +import binnie.core.gui.IWidget; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.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/core/craftgui/minecraft/control/ControlPlayerInventory.java b/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java similarity index 92% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java index 8eac35d9..5e90a593 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import javax.annotation.Nullable; import java.util.ArrayList; @@ -7,9 +7,9 @@ import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.minecraft.InventoryType; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.minecraft.InventoryType; public class ControlPlayerInventory extends Control { private final List slots; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java b/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java similarity index 70% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java index d343f4a3..41ad5d38 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java @@ -1,15 +1,15 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.resource.minecraft.CraftGUITexture; import binnie.core.machines.power.PowerSystem; public class ControlPowerSystem extends Control implements ITooltip { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java b/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java similarity index 81% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java index 8ae38143..7603087c 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java @@ -1,12 +1,12 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.geometry.Position; -import binnie.core.craftgui.resource.Texture; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.resource.Texture; public class ControlProgress extends ControlProgressBase { private Texture progressBlank; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java b/src/main/java/binnie/core/gui/minecraft/control/ControlProgressBase.java similarity index 89% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlProgressBase.java index 0ac5d4c2..4cc9f9a5 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlProgressBase.java @@ -1,10 +1,10 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.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.gui.Attribute; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.minecraft.Window; import binnie.core.machines.Machine; import binnie.core.machines.power.IProcess; import binnie.core.machines.power.ProcessInfo; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java b/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java similarity index 86% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java index 8cf7fa2f..298d0ec1 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java @@ -1,22 +1,22 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import net.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.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 binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Border; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlSlide extends Control { private Area expanded; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java similarity index 91% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java index b0a185a0..5e021705 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import javax.annotation.Nullable; import java.util.ArrayList; @@ -19,19 +19,19 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.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.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.CustomSlot; +import binnie.core.gui.minecraft.GuiCraftGUI; +import binnie.core.gui.minecraft.InventoryType; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.WindowInventory; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.minecraft.CraftGUITexture; import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.SlotValidator; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java b/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java similarity index 91% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java index 0c124407..6d968817 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import java.util.ArrayList; import java.util.Iterator; @@ -7,9 +7,9 @@ import java.util.List; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.minecraft.InventoryType; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.minecraft.InventoryType; public class ControlSlotArray extends Control implements Iterable { private List slots = new ArrayList<>(); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java similarity index 78% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java index 36a3f4f8..fe218615 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import java.util.List; @@ -8,18 +8,18 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.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 binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.events.EventWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public abstract class ControlSlotBase extends Control implements ITooltip { private ControlItemDisplay itemDisplay; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java b/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java similarity index 74% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java index 0a0baa23..6a6d9ffe 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java @@ -1,15 +1,15 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.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.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.resource.minecraft.CraftGUITexture; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IChargedSlots; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java b/src/main/java/binnie/core/gui/minecraft/control/ControlTabIcon.java similarity index 85% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlTabIcon.java index c30d5023..ab091082 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlTabIcon.java @@ -1,14 +1,14 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -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.core.gui.controls.tab.ControlTab; +import binnie.core.gui.controls.tab.ControlTabBar; +import binnie.core.gui.geometry.Point; public class ControlTabIcon extends ControlTab { private ControlItemDisplay item; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java similarity index 71% rename from src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java rename to src/main/java/binnie/core/gui/minecraft/control/ControlUser.java index dbe6eec6..50483dda 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java @@ -1,17 +1,17 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; import java.util.Objects; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlUser extends Control implements ITooltip { String team; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java b/src/main/java/binnie/core/gui/minecraft/control/EnumHighlighting.java similarity index 76% rename from src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java rename to src/main/java/binnie/core/gui/minecraft/control/EnumHighlighting.java index 8b6881de..26af5dd7 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java +++ b/src/main/java/binnie/core/gui/minecraft/control/EnumHighlighting.java @@ -1,7 +1,7 @@ -package binnie.core.craftgui.minecraft.control; +package binnie.core.gui.minecraft.control; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.minecraft.MinecraftTooltip; +import binnie.core.gui.Tooltip; +import binnie.core.gui.minecraft.MinecraftTooltip; public enum EnumHighlighting { Error, diff --git a/src/main/java/binnie/core/craftgui/controls/tab/package-info.java b/src/main/java/binnie/core/gui/minecraft/control/package-info.java similarity index 84% rename from src/main/java/binnie/core/craftgui/controls/tab/package-info.java rename to src/main/java/binnie/core/gui/minecraft/control/package-info.java index 97e5a599..33085ed1 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/package-info.java +++ b/src/main/java/binnie/core/gui/minecraft/control/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.core.craftgui.controls.tab; +package binnie.core.gui.minecraft.control; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/core/gui/minecraft/package-info.java b/src/main/java/binnie/core/gui/minecraft/package-info.java new file mode 100644 index 00000000..f32a99f3 --- /dev/null +++ b/src/main/java/binnie/core/gui/minecraft/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.minecraft; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/minecraft/render/MinecraftTexture.java b/src/main/java/binnie/core/gui/minecraft/render/MinecraftTexture.java similarity index 68% rename from src/main/java/binnie/core/craftgui/minecraft/render/MinecraftTexture.java rename to src/main/java/binnie/core/gui/minecraft/render/MinecraftTexture.java index de45a1bc..1554d83f 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/render/MinecraftTexture.java +++ b/src/main/java/binnie/core/gui/minecraft/render/MinecraftTexture.java @@ -1,6 +1,6 @@ -package binnie.core.craftgui.minecraft.render; +package binnie.core.gui.minecraft.render; -import binnie.core.craftgui.geometry.Area; +import binnie.core.gui.geometry.Area; import binnie.core.resource.IBinnieTexture; public class MinecraftTexture { diff --git a/src/main/java/binnie/core/craftgui/minecraft/render/RenderCommand.java b/src/main/java/binnie/core/gui/minecraft/render/RenderCommand.java similarity index 57% rename from src/main/java/binnie/core/craftgui/minecraft/render/RenderCommand.java rename to src/main/java/binnie/core/gui/minecraft/render/RenderCommand.java index 244b2d9c..b8dc75e7 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/render/RenderCommand.java +++ b/src/main/java/binnie/core/gui/minecraft/render/RenderCommand.java @@ -1,7 +1,7 @@ -package binnie.core.craftgui.minecraft.render; +package binnie.core.gui.minecraft.render; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.minecraft.GuiCraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.minecraft.GuiCraftGUI; public abstract class RenderCommand { IWidget widget; diff --git a/src/main/java/binnie/core/gui/minecraft/render/package-info.java b/src/main/java/binnie/core/gui/minecraft/render/package-info.java new file mode 100644 index 00000000..12fe3464 --- /dev/null +++ b/src/main/java/binnie/core/gui/minecraft/render/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.minecraft.render; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java b/src/main/java/binnie/core/gui/renderer/RenderUtil.java similarity index 97% rename from src/main/java/binnie/core/craftgui/renderer/RenderUtil.java rename to src/main/java/binnie/core/gui/renderer/RenderUtil.java index dc14d3d4..09b18178 100644 --- a/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java +++ b/src/main/java/binnie/core/gui/renderer/RenderUtil.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.renderer; +package binnie.core.gui.renderer; import com.google.common.base.Preconditions; @@ -26,9 +26,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.ForestryAPI; import binnie.core.BinnieCore; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; @SideOnly(Side.CLIENT) public class RenderUtil { diff --git a/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java b/src/main/java/binnie/core/gui/renderer/TextureRenderer.java similarity index 95% rename from src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java rename to src/main/java/binnie/core/gui/renderer/TextureRenderer.java index 89bd2f04..a5d78d0f 100644 --- a/src/main/java/binnie/core/craftgui/renderer/TextureRenderer.java +++ b/src/main/java/binnie/core/gui/renderer/TextureRenderer.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.renderer; +package binnie.core.gui.renderer; import javax.annotation.Nullable; @@ -13,13 +13,13 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import binnie.core.BinnieCore; -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 binnie.core.gui.IWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Border; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.resource.IStyleSheet; +import binnie.core.gui.resource.Texture; @SideOnly(Side.CLIENT) public class TextureRenderer { diff --git a/src/main/java/binnie/core/craftgui/renderer/TextureType.java b/src/main/java/binnie/core/gui/renderer/TextureType.java similarity index 55% rename from src/main/java/binnie/core/craftgui/renderer/TextureType.java rename to src/main/java/binnie/core/gui/renderer/TextureType.java index a26a1998..eb3c25cf 100644 --- a/src/main/java/binnie/core/craftgui/renderer/TextureType.java +++ b/src/main/java/binnie/core/gui/renderer/TextureType.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.renderer; +package binnie.core.gui.renderer; public enum TextureType { Stretched, diff --git a/src/main/java/binnie/core/gui/renderer/package-info.java b/src/main/java/binnie/core/gui/renderer/package-info.java new file mode 100644 index 00000000..9d69284f --- /dev/null +++ b/src/main/java/binnie/core/gui/renderer/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.renderer; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/resource/IStyleSheet.java b/src/main/java/binnie/core/gui/resource/IStyleSheet.java similarity index 83% rename from src/main/java/binnie/core/craftgui/resource/IStyleSheet.java rename to src/main/java/binnie/core/gui/resource/IStyleSheet.java index 15a6a395..d604e119 100644 --- a/src/main/java/binnie/core/craftgui/resource/IStyleSheet.java +++ b/src/main/java/binnie/core/gui/resource/IStyleSheet.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.resource; +package binnie.core.gui.resource; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/core/craftgui/resource/StyleSheet.java b/src/main/java/binnie/core/gui/resource/StyleSheet.java similarity index 92% rename from src/main/java/binnie/core/craftgui/resource/StyleSheet.java rename to src/main/java/binnie/core/gui/resource/StyleSheet.java index 509bdd75..7577e334 100644 --- a/src/main/java/binnie/core/craftgui/resource/StyleSheet.java +++ b/src/main/java/binnie/core/gui/resource/StyleSheet.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.resource; +package binnie.core.gui.resource; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java b/src/main/java/binnie/core/gui/resource/StyleSheetManager.java similarity index 89% rename from src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java rename to src/main/java/binnie/core/gui/resource/StyleSheetManager.java index 1fd5ba0b..a59a1a1b 100644 --- a/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java +++ b/src/main/java/binnie/core/gui/resource/StyleSheetManager.java @@ -1,9 +1,9 @@ -package binnie.core.craftgui.resource; +package binnie.core.gui.resource; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.CraftGUI; +import binnie.core.gui.CraftGUI; public class StyleSheetManager { static IStyleSheet defaultSS = new DefaultStyleSheet(); diff --git a/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java b/src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java similarity index 79% rename from src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java rename to src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java index 0b980beb..857a5315 100644 --- a/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java +++ b/src/main/java/binnie/core/gui/resource/StyleSheetPunnett.java @@ -1,9 +1,9 @@ -package binnie.core.craftgui.resource; +package binnie.core.gui.resource; import binnie.core.ExtraBeeTexture; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import binnie.core.craftgui.resource.minecraft.PaddedTexture; -import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.minecraft.PaddedTexture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.genetics.gui.punnett.ExtraBeeGUITexture; public class StyleSheetPunnett extends StyleSheet { diff --git a/src/main/java/binnie/core/craftgui/resource/Texture.java b/src/main/java/binnie/core/gui/resource/Texture.java similarity index 94% rename from src/main/java/binnie/core/craftgui/resource/Texture.java rename to src/main/java/binnie/core/gui/resource/Texture.java index a49fb014..ac25f776 100644 --- a/src/main/java/binnie/core/craftgui/resource/Texture.java +++ b/src/main/java/binnie/core/gui/resource/Texture.java @@ -1,11 +1,11 @@ -package binnie.core.craftgui.resource; +package binnie.core.gui.resource; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Border; -import binnie.core.craftgui.geometry.Position; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Border; +import binnie.core.gui.geometry.Position; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java b/src/main/java/binnie/core/gui/resource/minecraft/CraftGUIResourceManager.java similarity index 95% rename from src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java rename to src/main/java/binnie/core/gui/resource/minecraft/CraftGUIResourceManager.java index 7ec67d34..568619ee 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java +++ b/src/main/java/binnie/core/gui/resource/minecraft/CraftGUIResourceManager.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.resource.minecraft; +package binnie.core.gui.resource.minecraft; import com.google.common.base.Charsets; import com.google.gson.JsonElement; @@ -24,10 +24,10 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -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.gui.CraftGUI; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Border; +import binnie.core.gui.resource.Texture; import binnie.core.resource.IBinnieTexture; @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java b/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITexture.java similarity index 96% rename from src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java rename to src/main/java/binnie/core/gui/resource/minecraft/CraftGUITexture.java index 5f05d41f..0e33e134 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java +++ b/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITexture.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.resource.minecraft; +package binnie.core.gui.resource.minecraft; public enum CraftGUITexture { Window("window"), diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java b/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITextureSheet.java similarity index 89% rename from src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java rename to src/main/java/binnie/core/gui/resource/minecraft/CraftGUITextureSheet.java index 7afde46b..c21c30ed 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java +++ b/src/main/java/binnie/core/gui/resource/minecraft/CraftGUITextureSheet.java @@ -1,11 +1,11 @@ -package binnie.core.craftgui.resource.minecraft; +package binnie.core.gui.resource.minecraft; import javax.annotation.Nullable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.CraftGUI; +import binnie.core.gui.CraftGUI; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/PaddedTexture.java b/src/main/java/binnie/core/gui/resource/minecraft/PaddedTexture.java similarity index 70% rename from src/main/java/binnie/core/craftgui/resource/minecraft/PaddedTexture.java rename to src/main/java/binnie/core/gui/resource/minecraft/PaddedTexture.java index 69ef2754..d665a8b4 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/PaddedTexture.java +++ b/src/main/java/binnie/core/gui/resource/minecraft/PaddedTexture.java @@ -1,8 +1,8 @@ -package binnie.core.craftgui.resource.minecraft; +package binnie.core.gui.resource.minecraft; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Border; -import binnie.core.craftgui.resource.Texture; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Border; +import binnie.core.gui.resource.Texture; import binnie.core.resource.IBinnieTexture; public class PaddedTexture extends Texture { diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java b/src/main/java/binnie/core/gui/resource/minecraft/ParsedTextureSheet.java similarity index 94% rename from src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java rename to src/main/java/binnie/core/gui/resource/minecraft/ParsedTextureSheet.java index 3fefde93..cfb3de41 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java +++ b/src/main/java/binnie/core/gui/resource/minecraft/ParsedTextureSheet.java @@ -1,4 +1,4 @@ -package binnie.core.craftgui.resource.minecraft; +package binnie.core.gui.resource.minecraft; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java b/src/main/java/binnie/core/gui/resource/minecraft/StandardTexture.java similarity index 79% rename from src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java rename to src/main/java/binnie/core/gui/resource/minecraft/StandardTexture.java index 04bfc280..01ea73cf 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java +++ b/src/main/java/binnie/core/gui/resource/minecraft/StandardTexture.java @@ -1,11 +1,11 @@ -package binnie.core.craftgui.resource.minecraft; +package binnie.core.gui.resource.minecraft; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Border; -import binnie.core.craftgui.resource.Texture; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Border; +import binnie.core.gui.resource.Texture; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; diff --git a/src/main/java/binnie/core/craftgui/controls/core/package-info.java b/src/main/java/binnie/core/gui/resource/minecraft/package-info.java similarity index 84% rename from src/main/java/binnie/core/craftgui/controls/core/package-info.java rename to src/main/java/binnie/core/gui/resource/minecraft/package-info.java index 1dcda81a..ef03e14c 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/package-info.java +++ b/src/main/java/binnie/core/gui/resource/minecraft/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.core.craftgui.controls.core; +package binnie.core.gui.resource.minecraft; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/core/gui/resource/package-info.java b/src/main/java/binnie/core/gui/resource/package-info.java new file mode 100644 index 00000000..c608efc6 --- /dev/null +++ b/src/main/java/binnie/core/gui/resource/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.resource; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/window/Panel.java b/src/main/java/binnie/core/gui/window/Panel.java similarity index 81% rename from src/main/java/binnie/core/craftgui/window/Panel.java rename to src/main/java/binnie/core/gui/window/Panel.java index 0074bcb3..7a8c54ef 100644 --- a/src/main/java/binnie/core/craftgui/window/Panel.java +++ b/src/main/java/binnie/core/gui/window/Panel.java @@ -1,14 +1,14 @@ -package binnie.core.craftgui.window; +package binnie.core.gui.window; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.minecraft.MinecraftGUI; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class Panel extends Control { IPanelType type; diff --git a/src/main/java/binnie/core/gui/window/package-info.java b/src/main/java/binnie/core/gui/window/package-info.java new file mode 100644 index 00000000..09a19506 --- /dev/null +++ b/src/main/java/binnie/core/gui/window/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.core.gui.window; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/machines/storage/CompartmentTab.java b/src/main/java/binnie/core/machines/storage/CompartmentTab.java index 944f58b8..66662f12 100644 --- a/src/main/java/binnie/core/machines/storage/CompartmentTab.java +++ b/src/main/java/binnie/core/machines/storage/CompartmentTab.java @@ -7,7 +7,7 @@ import net.minecraft.nbt.NBTTagCompound; import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; -import binnie.core.craftgui.minecraft.EnumColor; +import binnie.core.gui.minecraft.EnumColor; class CompartmentTab implements INbtWritable, INbtReadable { private String name; diff --git a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java index f991e171..5607d86f 100644 --- a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java +++ b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java @@ -3,14 +3,14 @@ package binnie.core.machines.storage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.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 binnie.core.gui.Attribute; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.minecraft.EnumColor; +import binnie.core.gui.renderer.RenderUtil; class ControlColourSelector extends Control implements ITooltip, IControlValue { private EnumColor value; diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 6d20f5ba..0c838bc1 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -22,42 +22,42 @@ import net.minecraftforge.fml.relauncher.SideOnly; 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.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlCheckbox; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextEdit; +import binnie.core.gui.controls.button.ControlButton; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.page.ControlPage; +import binnie.core.gui.controls.page.ControlPages; +import binnie.core.gui.controls.scroll.ControlScrollableContent; +import binnie.core.gui.controls.tab.ControlTab; +import binnie.core.gui.controls.tab.ControlTabBar; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.events.EventTextEdit; +import binnie.core.gui.events.EventValueChanged; +import binnie.core.gui.geometry.Border; +import binnie.core.gui.geometry.CraftGUIUtil; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.minecraft.Dialog; +import binnie.core.gui.minecraft.EnumColor; +import binnie.core.gui.minecraft.IWindowAffectsShiftClick; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlItemDisplay; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlide; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlSlotArray; +import binnie.core.gui.minecraft.control.ControlTabIcon; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.window.Panel; import binnie.core.machines.Machine; import binnie.core.machines.transfer.TransferRequest; import binnie.genetics.machine.craftgui.WindowMachine; diff --git a/src/main/java/binnie/core/machines/storage/WindowTest.java b/src/main/java/binnie/core/machines/storage/WindowTest.java index cf528689..8cc7efe1 100644 --- a/src/main/java/binnie/core/machines/storage/WindowTest.java +++ b/src/main/java/binnie/core/machines/storage/WindowTest.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.relauncher.Side; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.minecraft.Window; import binnie.genetics.machine.craftgui.WindowMachine; public class WindowTest extends WindowMachine { diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/src/main/java/binnie/core/network/BinnieCorePacketID.java index 6dc31a1e..354c407f 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.relauncher.Side; import binnie.core.BinnieCore; import binnie.core.block.TileEntityMetadata; -import binnie.core.craftgui.minecraft.ContainerCraftGUI; +import binnie.core.gui.minecraft.ContainerCraftGUI; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.network.INetwork; diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index ba6af794..a6b6cad6 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -29,7 +29,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.Constants; -import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; +import binnie.core.gui.resource.minecraft.CraftGUIResourceManager; import binnie.core.models.ModelManager; import binnie.core.resource.BinnieResource; diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java index 2ca2812e..355ee82a 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java @@ -8,17 +8,17 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; -import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; +import binnie.core.gui.minecraft.Window; +import binnie.extratrees.gui.database.WindowArboristDatabase; +import binnie.extratrees.gui.machines.WindowBrewery; +import binnie.extratrees.gui.machines.WindowDistillery; +import binnie.extratrees.gui.machines.WindowLepidopteristDatabase; +import binnie.extratrees.gui.machines.WindowLumbermill; +import binnie.extratrees.gui.machines.WindowPress; +import binnie.extratrees.gui.machines.WindowSetSquare; +import binnie.extratrees.gui.machines.WindowWoodworker; import binnie.extratrees.kitchen.craftgui.WindowBottleRack; -import binnie.extratrees.machines.craftgui.WindowArboristDatabase; -import binnie.extratrees.machines.craftgui.WindowBrewery; -import binnie.extratrees.machines.craftgui.WindowDistillery; -import binnie.extratrees.machines.craftgui.WindowLepidopteristDatabase; -import binnie.extratrees.machines.craftgui.WindowLumbermill; -import binnie.extratrees.machines.craftgui.WindowPress; -import binnie.extratrees.machines.craftgui.WindowSetSquare; -import binnie.extratrees.machines.craftgui.WindowWoodworker; public enum ExtraTreesGUID implements IBinnieGUID { Database, diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java b/src/main/java/binnie/extratrees/gui/database/PageFruit.java similarity index 74% rename from src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java rename to src/main/java/binnie/extratrees/gui/database/PageFruit.java index e5308cf2..f02aa400 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java +++ b/src/main/java/binnie/extratrees/gui/database/PageFruit.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.database; import java.util.Collection; @@ -9,17 +9,17 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; -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.Window; import binnie.core.genetics.TreeBreedingSystem; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.database.ControlSpeciesBox; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageAbstract; +import binnie.core.gui.database.WindowAbstractDatabase; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.Window; import binnie.core.util.I18N; -import binnie.genetics.gui.database.ControlSpeciesBox; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageAbstract; -import binnie.genetics.gui.database.WindowAbstractDatabase; @SideOnly(Side.CLIENT) public class PageFruit extends PageAbstract { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java b/src/main/java/binnie/extratrees/gui/database/PagePlanksOverview.java similarity index 82% rename from src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java rename to src/main/java/binnie/extratrees/gui/database/PagePlanksOverview.java index fb5cb52d..e06c2611 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/gui/database/PagePlanksOverview.java @@ -1,25 +1,25 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.database; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -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.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageAbstract; +import binnie.core.gui.database.WindowAbstractDatabase; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.FenceType; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageAbstract; -import binnie.genetics.gui.database.WindowAbstractDatabase; @SideOnly(Side.CLIENT) public class PagePlanksOverview extends PageAbstract { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java b/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java similarity index 67% rename from src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java rename to src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java index 8d6f24ce..4e2567ff 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java +++ b/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.database; import java.util.Collection; @@ -9,16 +9,16 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; -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.Window; import binnie.core.genetics.TreeBreedingSystem; -import binnie.genetics.gui.database.ControlSpeciesBox; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageAbstract; -import binnie.genetics.gui.database.WindowAbstractDatabase; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.database.ControlSpeciesBox; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageAbstract; +import binnie.core.gui.database.WindowAbstractDatabase; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.Window; @SideOnly(Side.CLIENT) public class PagePlanksTrees extends PageAbstract { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java b/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java similarity index 57% rename from src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java rename to src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java index 29e12f39..ffe84903 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java +++ b/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java @@ -1,15 +1,15 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.database; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.core.craftgui.minecraft.MinecraftGUI; -import binnie.core.craftgui.window.Panel; -import binnie.genetics.gui.database.ControlDatabaseIndividualDisplay; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.EnumDiscoveryState; -import binnie.genetics.gui.database.PageSpecies; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.database.ControlDatabaseIndividualDisplay; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.EnumDiscoveryState; +import binnie.core.gui.database.PageSpecies; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.window.Panel; public class PageSpeciesImage extends PageSpecies { ControlDatabaseIndividualDisplay display; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java similarity index 90% rename from src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java rename to src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java index 5ed142ab..be28ebaf 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.database; import java.util.ArrayList; import java.util.List; @@ -23,18 +23,19 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; 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.scroll.ControlScrollableContent; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.scroll.ControlScrollableContent; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageSpecies; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageSpecies; +import binnie.extratrees.gui.machines.ControlBlockIconDisplay; @SideOnly(Side.CLIENT) public class PageSpeciesTreeGenome extends PageSpecies { @@ -42,12 +43,13 @@ public class PageSpeciesTreeGenome extends PageSpecies { super(parent, tab); } - public static String tolerated(final boolean t) { + //TODO: unused ? + /*public static String tolerated(final boolean t) { if (t) { return I18N.localise("binniecore.gui.tolerated"); } return I18N.localise("binniecore.gui.nottolerated"); - } + }*/ @Override public void onValueChanged(final IAlleleSpecies species) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java b/src/main/java/binnie/extratrees/gui/database/PageWood.java similarity index 67% rename from src/main/java/binnie/extratrees/machines/craftgui/PageWood.java rename to src/main/java/binnie/extratrees/gui/database/PageWood.java index ef2232bc..6df719c0 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java +++ b/src/main/java/binnie/extratrees/gui/database/PageWood.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.database; import java.util.Collection; @@ -9,16 +9,16 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; -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.Window; import binnie.core.genetics.TreeBreedingSystem; -import binnie.genetics.gui.database.ControlSpeciesBox; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageAbstract; -import binnie.genetics.gui.database.WindowAbstractDatabase; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.database.ControlSpeciesBox; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageAbstract; +import binnie.core.gui.database.WindowAbstractDatabase; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.Window; @SideOnly(Side.CLIENT) public class PageWood extends PageAbstract { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java similarity index 85% rename from src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java rename to src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java index 7eaf99f3..d2c9a057 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.database; import java.util.stream.Collectors; @@ -10,26 +10,26 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.Binnie; import binnie.core.AbstractMod; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.listbox.ControlListBox; +import binnie.core.gui.database.ControlItemStackOption; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.IDatabaseMode; +import binnie.core.gui.database.PageBranchOverview; +import binnie.core.gui.database.PageBranchSpecies; +import binnie.core.gui.database.PageBreeder; +import binnie.core.gui.database.PageSpeciesClassification; +import binnie.core.gui.database.PageSpeciesMutations; +import binnie.core.gui.database.PageSpeciesOverview; +import binnie.core.gui.database.PageSpeciesResultant; +import binnie.core.gui.database.WindowAbstractDatabase; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.minecraft.Window; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.block.WoodManager; -import binnie.genetics.gui.database.ControlItemStackOption; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.IDatabaseMode; -import binnie.genetics.gui.database.PageBranchOverview; -import binnie.genetics.gui.database.PageBranchSpecies; -import binnie.genetics.gui.database.PageBreeder; -import binnie.genetics.gui.database.PageSpeciesClassification; -import binnie.genetics.gui.database.PageSpeciesMutations; -import binnie.genetics.gui.database.PageSpeciesOverview; -import binnie.genetics.gui.database.PageSpeciesResultant; -import binnie.genetics.gui.database.WindowAbstractDatabase; public class WindowArboristDatabase extends WindowAbstractDatabase { ControlListBox selectionBoxFruit; diff --git a/src/main/java/binnie/extratrees/gui/database/package-info.java b/src/main/java/binnie/extratrees/gui/database/package-info.java new file mode 100644 index 00000000..ac5ec109 --- /dev/null +++ b/src/main/java/binnie/extratrees/gui/database/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.gui.database; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java b/src/main/java/binnie/extratrees/gui/machines/ControlBlockIconDisplay.java similarity index 71% rename from src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java rename to src/main/java/binnie/extratrees/gui/machines/ControlBlockIconDisplay.java index 9f6a6254..25d4c387 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java +++ b/src/main/java/binnie/extratrees/gui/machines/ControlBlockIconDisplay.java @@ -1,14 +1,14 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.renderer.RenderUtil; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.renderer.RenderUtil; public class ControlBlockIconDisplay extends Control { TextureAtlasSprite icon; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java b/src/main/java/binnie/extratrees/gui/machines/ControlBreweryProgress.java similarity index 84% rename from src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java rename to src/main/java/binnie/extratrees/gui/machines/ControlBreweryProgress.java index 0a87f2ed..0ba812dc 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java +++ b/src/main/java/binnie/extratrees/gui/machines/ControlBreweryProgress.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import java.util.Collections; @@ -9,16 +9,16 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; -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.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlProgressBase; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.machines.Machine; import binnie.core.util.ItemStackSet; import binnie.extratrees.core.ExtraTreeTexture; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java b/src/main/java/binnie/extratrees/gui/machines/ControlDistilleryProgress.java similarity index 83% rename from src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java rename to src/main/java/binnie/extratrees/gui/machines/ControlDistilleryProgress.java index b8f087f2..c8c66485 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java +++ b/src/main/java/binnie/extratrees/gui/machines/ControlDistilleryProgress.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.nbt.NBTTagCompound; @@ -8,17 +8,17 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.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.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlProgressBase; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.machines.Machine; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.distillery.DistilleryLogic; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/gui/machines/ControlFruitPressProgress.java similarity index 81% rename from src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java rename to src/main/java/binnie/extratrees/gui/machines/ControlFruitPressProgress.java index c9f2d113..77982fec 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/gui/machines/ControlFruitPressProgress.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.inventory.IInventory; @@ -11,17 +11,17 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.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.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.ContainerCraftGUI; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlProgressBase; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.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/gui/machines/ControlLumbermillProgress.java similarity index 84% rename from src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java rename to src/main/java/binnie/extratrees/gui/machines/ControlLumbermillProgress.java index 8520eada..1bcd3586 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java +++ b/src/main/java/binnie/extratrees/gui/machines/ControlLumbermillProgress.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import net.minecraft.block.Block; import net.minecraft.client.renderer.GlStateManager; @@ -10,16 +10,16 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; -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.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlProgressBase; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.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/gui/machines/ControlRecipeSlot.java similarity index 83% rename from src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java rename to src/main/java/binnie/extratrees/gui/machines/ControlRecipeSlot.java index 93651a15..8c2d1c30 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/gui/machines/ControlRecipeSlot.java @@ -1,13 +1,13 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -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.gui.IWidget; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlSlotBase; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.component.IComponentRecipe; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/gui/machines/ControlTileSelect.java similarity index 87% rename from src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java rename to src/main/java/binnie/extratrees/gui/machines/ControlTileSelect.java index da677e4e..6d76a0f6 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/gui/machines/ControlTileSelect.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import java.util.ArrayList; import java.util.HashMap; @@ -13,20 +13,20 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.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.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.controls.scroll.IControlScrollable; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.minecraft.CraftGUITexture; import binnie.core.machines.TileEntityMachine; import binnie.core.util.I18N; import binnie.extratrees.api.CarpentryManager; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/DialogBreweryRecipe.java b/src/main/java/binnie/extratrees/gui/machines/DialogBreweryRecipe.java similarity index 65% rename from src/main/java/binnie/extratrees/machines/craftgui/DialogBreweryRecipe.java rename to src/main/java/binnie/extratrees/gui/machines/DialogBreweryRecipe.java index 57fec3ba..b7ef9508 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/DialogBreweryRecipe.java +++ b/src/main/java/binnie/extratrees/gui/machines/DialogBreweryRecipe.java @@ -1,7 +1,7 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.minecraft.Dialog; +import binnie.core.gui.IWidget; +import binnie.core.gui.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/WindowBrewery.java b/src/main/java/binnie/extratrees/gui/machines/WindowBrewery.java similarity index 77% rename from src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java rename to src/main/java/binnie/extratrees/gui/machines/WindowBrewery.java index 6f62929d..900e4a6c 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java +++ b/src/main/java/binnie/extratrees/gui/machines/WindowBrewery.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import javax.annotation.Nullable; @@ -8,14 +8,14 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; 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.gui.geometry.Position; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlLiquidTank; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlSlotArray; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.brewery.BreweryMachine; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java b/src/main/java/binnie/extratrees/gui/machines/WindowDistillery.java similarity index 82% rename from src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java rename to src/main/java/binnie/extratrees/gui/machines/WindowDistillery.java index 1c06dcf6..201f3aee 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java +++ b/src/main/java/binnie/extratrees/gui/machines/WindowDistillery.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import javax.annotation.Nullable; @@ -9,12 +9,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; 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.gui.geometry.Position; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlLiquidTank; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.distillery.DistilleryLogic; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/gui/machines/WindowLepidopteristDatabase.java similarity index 76% rename from src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java rename to src/main/java/binnie/extratrees/gui/machines/WindowLepidopteristDatabase.java index 7c48cf19..a267252e 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/gui/machines/WindowLepidopteristDatabase.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import net.minecraft.entity.player.EntityPlayer; @@ -7,17 +7,18 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.Binnie; import binnie.core.AbstractMod; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageBranchOverview; +import binnie.core.gui.database.PageBranchSpecies; +import binnie.core.gui.database.PageBreeder; +import binnie.core.gui.database.PageSpeciesClassification; +import binnie.core.gui.database.PageSpeciesMutations; +import binnie.core.gui.database.PageSpeciesOverview; +import binnie.core.gui.database.PageSpeciesResultant; +import binnie.core.gui.database.WindowAbstractDatabase; +import binnie.core.gui.minecraft.Window; import binnie.extratrees.ExtraTrees; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageBranchOverview; -import binnie.genetics.gui.database.PageBranchSpecies; -import binnie.genetics.gui.database.PageBreeder; -import binnie.genetics.gui.database.PageSpeciesClassification; -import binnie.genetics.gui.database.PageSpeciesMutations; -import binnie.genetics.gui.database.PageSpeciesOverview; -import binnie.genetics.gui.database.PageSpeciesResultant; -import binnie.genetics.gui.database.WindowAbstractDatabase; +import binnie.extratrees.gui.database.PageSpeciesImage; public class WindowLepidopteristDatabase extends WindowAbstractDatabase { public WindowLepidopteristDatabase(final EntityPlayer player, final Side side, final boolean nei) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java b/src/main/java/binnie/extratrees/gui/machines/WindowLumbermill.java similarity index 77% rename from src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java rename to src/main/java/binnie/extratrees/gui/machines/WindowLumbermill.java index c2b6a146..3ba7e9d4 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java +++ b/src/main/java/binnie/extratrees/gui/machines/WindowLumbermill.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import javax.annotation.Nullable; @@ -8,13 +8,13 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; 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.gui.geometry.Position; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlLiquidTank; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.lumbermill.LumbermillMachine; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java b/src/main/java/binnie/extratrees/gui/machines/WindowPress.java similarity index 82% rename from src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java rename to src/main/java/binnie/extratrees/gui/machines/WindowPress.java index 619dacca..8a7677b1 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java +++ b/src/main/java/binnie/extratrees/gui/machines/WindowPress.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import javax.annotation.Nullable; @@ -10,14 +10,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; 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.gui.geometry.Position; +import binnie.core.gui.minecraft.InventoryType; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlLiquidTank; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; import binnie.core.machines.power.ErrorState; import binnie.extratrees.ExtraTrees; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java b/src/main/java/binnie/extratrees/gui/machines/WindowSetSquare.java similarity index 90% rename from src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java rename to src/main/java/binnie/extratrees/gui/machines/WindowSetSquare.java index 33b06ca1..ba82d04c 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java +++ b/src/main/java/binnie/extratrees/gui/machines/WindowSetSquare.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import javax.annotation.Nullable; @@ -9,7 +9,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import binnie.core.AbstractMod; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.minecraft.Window; import binnie.extratrees.ExtraTrees; public class WindowSetSquare extends Window { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/gui/machines/WindowWoodworker.java similarity index 76% rename from src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java rename to src/main/java/binnie/extratrees/gui/machines/WindowWoodworker.java index 00febe16..6cf81e7b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/gui/machines/WindowWoodworker.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.craftgui; +package binnie.extratrees.gui.machines; import javax.annotation.Nullable; @@ -9,20 +9,20 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -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.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextEdit; +import binnie.core.gui.controls.scroll.ControlScrollableContent; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventTextEdit; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.window.Panel; import binnie.core.machines.Machine; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; diff --git a/src/main/java/binnie/extratrees/gui/machines/package-info.java b/src/main/java/binnie/extratrees/gui/machines/package-info.java new file mode 100644 index 00000000..ab7b88a9 --- /dev/null +++ b/src/main/java/binnie/extratrees/gui/machines/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.gui.machines; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/craftgui/package-info.java b/src/main/java/binnie/extratrees/gui/package-info.java similarity index 88% rename from src/main/java/binnie/core/craftgui/package-info.java rename to src/main/java/binnie/extratrees/gui/package-info.java index 7b862349..3c1b1a00 100644 --- a/src/main/java/binnie/core/craftgui/package-info.java +++ b/src/main/java/binnie/extratrees/gui/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.core.craftgui; +package binnie.extratrees.gui; import javax.annotation.ParametersAreNonnullByDefault; 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 e57e588e..c88ab096 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 @@ -5,12 +5,12 @@ import net.minecraft.client.Minecraft; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -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.core.gui.CraftGUI; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.extratrees.ExtraTrees; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; 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 4bef75f3..6a385351 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 @@ -7,9 +7,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.geometry.Point; -import binnie.extratrees.machines.craftgui.ControlDistilleryProgress; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.geometry.Point; +import binnie.extratrees.gui.machines.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 433aa648..f2ea189d 100644 --- a/src/main/java/binnie/extratrees/kitchen/BottleRack.java +++ b/src/main/java/binnie/extratrees/kitchen/BottleRack.java @@ -1,6 +1,6 @@ package binnie.extratrees.kitchen; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentTankContainer; import binnie.extratrees.core.ExtraTreeTexture; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java index 3fc468d8..c9fc9da9 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.core.craftgui.Attribute; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.minecraft.MinecraftGUI; -import binnie.core.craftgui.window.Panel; +import binnie.core.gui.Attribute; +import binnie.core.gui.IWidget; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.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 77c0ec48..19ed66a2 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.core.craftgui.IWidget; -import binnie.core.craftgui.controls.button.ControlButton; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.button.ControlButton; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.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 fae0ea3c..d6aca191 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java @@ -13,14 +13,14 @@ import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.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 binnie.core.gui.Attribute; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.renderer.RenderUtil; public class ControlFluidDisplay extends Control implements ITooltip { @Nullable diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index c15dcc41..05c83af1 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -7,17 +7,17 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.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 binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.events.EventWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlSlotFluid extends Control implements ITooltip { ControlFluidDisplay itemDisplay; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java index e1ff7836..45bc16d1 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java @@ -2,9 +2,9 @@ package binnie.extratrees.kitchen.craftgui; import net.minecraft.item.ItemStack; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.minecraft.control.ControlSlotBase; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.minecraft.control.ControlSlotBase; import binnie.extratrees.alcohol.Glassware; public class ControlSlotGlassware extends ControlSlotBase implements IControlValue { diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java index 3bb68f66..ff8fd932 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java @@ -5,10 +5,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.IWidget; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.minecraft.Window; public class ControlTankSlot extends ControlSlotFluid { int tankID; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java b/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java index 1c7f8f3f..a2f6eb8f 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/WindowBottleRack.java @@ -8,8 +8,8 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import binnie.core.AbstractMod; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; diff --git a/src/main/java/binnie/extratrees/machines/Designer.java b/src/main/java/binnie/extratrees/machines/Designer.java index 184bac29..776e92fc 100644 --- a/src/main/java/binnie/extratrees/machines/Designer.java +++ b/src/main/java/binnie/extratrees/machines/Designer.java @@ -9,7 +9,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.component.ComponentRecipe; import binnie.core.machines.component.IComponentRecipe; diff --git a/src/main/java/binnie/extratrees/machines/Infuser.java b/src/main/java/binnie/extratrees/machines/Infuser.java index fe54e885..0f258c73 100644 --- a/src/main/java/binnie/extratrees/machines/Infuser.java +++ b/src/main/java/binnie/extratrees/machines/Infuser.java @@ -10,7 +10,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java index 90f31ccc..4a3e55da 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java @@ -2,7 +2,7 @@ package binnie.extratrees.machines.brewery; import net.minecraft.tileentity.TileEntity; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/package-info.java b/src/main/java/binnie/extratrees/machines/craftgui/package-info.java deleted file mode 100644 index 00b59a54..00000000 --- a/src/main/java/binnie/extratrees/machines/craftgui/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.extratrees.machines.craftgui; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java index db0eeddf..ea7df61a 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java @@ -2,7 +2,7 @@ package binnie.extratrees.machines.distillery; import net.minecraft.tileentity.TileEntity; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java index 1f9bd727..556064c4 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java @@ -2,7 +2,7 @@ package binnie.extratrees.machines.fruitpress; import net.minecraft.tileentity.TileEntity; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java index 886bc710..6738b1f3 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java @@ -2,7 +2,7 @@ package binnie.extratrees.machines.lumbermill; import net.minecraft.tileentity.TileEntity; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.liquid.ManagerLiquid; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; diff --git a/src/main/java/binnie/genetics/core/GeneticsGUI.java b/src/main/java/binnie/genetics/core/GeneticsGUI.java index 8ffdfa98..5a7eb8c3 100644 --- a/src/main/java/binnie/genetics/core/GeneticsGUI.java +++ b/src/main/java/binnie/genetics/core/GeneticsGUI.java @@ -10,8 +10,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; -import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; +import binnie.core.gui.minecraft.Window; import binnie.genetics.gui.WindowAnalyst; import binnie.genetics.gui.database.bee.WindowApiaristDatabase; import binnie.genetics.gui.punnett.WindowPunnettSquare; diff --git a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java index 2467f919..ba11910c 100644 --- a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java +++ b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java @@ -3,12 +3,12 @@ package binnie.genetics.gui; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -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.core.gui.controls.listbox.ControlList; +import binnie.core.gui.controls.listbox.ControlOption; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.renderer.RenderUtil; public class ControlGenesisOption extends ControlOption { public ControlGenesisOption(ControlList parent, Gene gene, int y) { diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index 5b9c0e68..f1c4f2d6 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -23,31 +23,31 @@ import forestry.api.lepidopterology.IButterfly; 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.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.Widget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.scroll.ControlScrollBar; +import binnie.core.gui.controls.scroll.ControlScrollableContent; +import binnie.core.gui.events.EventKey; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.minecraft.InventoryType; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.WindowInventory; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlide; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.window.Panel; import binnie.core.machines.inventory.SlotValidator; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java index 9b8b6970..f8771b71 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java @@ -15,12 +15,12 @@ import forestry.api.lepidopterology.IButterfly; import forestry.apiculture.PluginApiculture; 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.geometry.Area; -import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.TextJustification; import binnie.core.util.I18N; @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java index a1394aa0..6ded7059 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java @@ -16,11 +16,11 @@ import forestry.apiculture.PluginApiculture; import binnie.Binnie; import binnie.botany.api.IFlower; -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.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.control.ControlIconDisplay; import binnie.core.util.I18N; import binnie.genetics.item.ModuleItems; diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java index a450344e..2b63a600 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java @@ -13,23 +13,23 @@ import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; -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.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.controls.ControlTextEdit; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.listbox.ControlListBox; +import binnie.core.gui.controls.scroll.ControlScrollBar; +import binnie.core.gui.controls.scroll.ControlScrollableContent; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.window.Panel; import binnie.core.util.I18N; import binnie.genetics.gui.WindowAnalyst; diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java index b15fa805..9b0c7f11 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java @@ -10,13 +10,13 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; import binnie.core.util.I18N; @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java index 33d38069..a6494cc9 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java @@ -13,15 +13,15 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; 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.core.gui.CraftGUI; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; import binnie.core.util.I18N; @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java index b1001630..80ce6cc2 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java @@ -8,10 +8,10 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; 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.core.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; import binnie.core.util.I18N; public class AnalystPageKaryogram extends ControlAnalystPage { diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java index bbe7cac0..0a0b9b7b 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java @@ -18,19 +18,19 @@ import forestry.api.genetics.IMutation; 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.gui.Attribute; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.EnumColor; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlItemDisplay; +import binnie.core.gui.renderer.RenderUtil; import binnie.core.integration.extrabees.ExtraBeesIntegration; import binnie.core.resource.BinnieSprite; import binnie.core.util.I18N; diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java index 64fdaeab..9a637dc3 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java @@ -19,10 +19,10 @@ import forestry.api.recipes.ICentrifugeRecipe; import forestry.api.recipes.ISqueezerRecipe; import forestry.api.recipes.RecipeManagers; -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.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.UniqueFluidStackSet; import binnie.core.util.UniqueItemStackSet; import binnie.extratrees.machines.brewery.BreweryRecipes; diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java index 77aac9d4..6404221f 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java @@ -8,16 +8,16 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; 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.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.texture.BinnieCoreTexture; public class ControlAnalystChromosome extends Control implements ITooltip { diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java index 7e87945a..e2aaafb3 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java @@ -2,9 +2,9 @@ package binnie.genetics.gui.analyst; import java.text.DecimalFormat; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.geometry.Area; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Area; public abstract class ControlAnalystPage extends Control { public ControlAnalystPage(IWidget parent, Area area) { diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java b/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java index 19654734..4e35fdfb 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java @@ -10,12 +10,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.ForestryAPI; -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 binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.renderer.RenderUtil; public class ControlBiome extends Control implements ITooltip { private final Biome biome; diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java b/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java index 494a2444..834233fb 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java @@ -6,11 +6,11 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; 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.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.minecraft.control.ControlItemDisplay; public class ControlIndividualDisplay extends ControlItemDisplay implements ITooltip { public ControlIndividualDisplay(IWidget parent, int x, int y, IIndividual ind) { diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java b/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java index fd992165..c9a2ceeb 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java @@ -10,15 +10,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; -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.core.gui.Attribute; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Border; +import binnie.core.gui.renderer.RenderUtil; public abstract class ControlToleranceBar> extends Control implements ITooltip { EnumSet tolerated; diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java b/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java index dc99daab..90b52179 100644 --- a/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java +++ b/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java @@ -1,9 +1,9 @@ package binnie.genetics.gui.analyst; -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.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; public class ControlTooltip extends Control implements ITooltip { public ControlTooltip(IWidget parent, int x, int y, int w, int h) { diff --git a/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java index d36a435c..ff107461 100644 --- a/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java @@ -25,14 +25,14 @@ import forestry.apiculture.PluginApiculture; 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.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.CraftGUIUtil; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; import binnie.extratrees.kitchen.craftgui.ControlFluidDisplay; diff --git a/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java b/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java index ee8925a4..a68ea9a2 100644 --- a/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java +++ b/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java @@ -4,9 +4,9 @@ import net.minecraft.util.text.TextFormatting; import forestry.api.lepidopterology.IButterfly; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.core.craftgui.geometry.Area; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; import binnie.core.util.I18N; import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlAnalystPage; diff --git a/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java index 03735dde..20e134f7 100644 --- a/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java +++ b/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java @@ -11,14 +11,14 @@ import forestry.api.genetics.IAlleleSpecies; import binnie.botany.api.IFlower; import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerType; -import binnie.botany.craftgui.ControlColorDisplay; import binnie.botany.flower.FlowerSpriteManager; -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.botany.gui.database.ControlColorDisplay; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.gui.renderer.RenderUtil; import binnie.core.util.I18N; import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlAnalystPage; diff --git a/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java index e8877498..211de12c 100644 --- a/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java @@ -14,13 +14,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.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlAnalystPage; diff --git a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java index 83aa84b4..dcadc6e4 100644 --- a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java @@ -19,13 +19,13 @@ import forestry.api.lepidopterology.IButterfly; 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.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.TextJustification; import binnie.core.util.I18N; import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlAnalystPage; diff --git a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java index 80f74651..55092e08 100644 --- a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java @@ -20,11 +20,11 @@ import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.FruitProviderPod; 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.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; import binnie.genetics.gui.analyst.AnalystConstants; diff --git a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java index 93f1d252..c4196fc6 100644 --- a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java +++ b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java @@ -8,9 +8,9 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import binnie.Binnie; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.core.craftgui.geometry.Area; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; import binnie.core.util.I18N; import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlAnalystPage; diff --git a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java index b4b6449f..098ee697 100644 --- a/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java +++ b/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java @@ -14,12 +14,12 @@ import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IAlleleBoolean; -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.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; import binnie.genetics.gui.analyst.AnalystConstants; diff --git a/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java b/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java index ccce1ccf..f302650c 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java +++ b/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java @@ -13,14 +13,14 @@ import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; 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.Area; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlBiomes extends Control implements ITooltip { List tolerated; diff --git a/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java b/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java index 02163597..014ce1c4 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java +++ b/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java @@ -14,15 +14,15 @@ import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; 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.Area; -import binnie.core.craftgui.renderer.RenderUtil; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.renderer.RenderUtil; +import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlClimateBar extends Control implements ITooltip { private final int[] TEMP_COLORS = new int[]{ diff --git a/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java b/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java index 431f6901..882c8302 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java +++ b/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java @@ -12,8 +12,8 @@ import forestry.api.genetics.IAllele; import binnie.Binnie; import binnie.core.BinnieCore; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.listbox.ControlListBox; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.listbox.ControlListBox; public class ControlProductsBox extends ControlListBox { IAlleleBeeSpecies species; diff --git a/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java b/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java index 6c8db3d5..e08c027f 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java +++ b/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java @@ -2,13 +2,15 @@ package binnie.genetics.gui.database.bee; import java.text.DecimalFormat; -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 binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.controls.listbox.ControlList; +import binnie.core.gui.controls.listbox.ControlOption; +import binnie.core.gui.database.DatabaseConstants; +import binnie.core.gui.geometry.CraftGUIUtil; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.control.ControlItemDisplay; +import binnie.core.util.I18N; public class ControlProductsItem extends ControlOption { private ControlItemDisplay item; @@ -26,11 +28,11 @@ public class ControlProductsItem extends ControlOption 1) { - textWidget.setValue("Every " + df.format(hours) + " hours"); + textWidget.setValue(I18N.localise(DatabaseConstants.BEE_CONTROL_KEY + ".time.hours", df.format(hours))); } else if (minutes > 1) { - textWidget.setValue("Every " + df.format(minutes) + " min."); + textWidget.setValue(I18N.localise(DatabaseConstants.BEE_CONTROL_KEY + ".time.min", df.format(minutes))); } else { - textWidget.setValue("Every " + df.format(seconds) + " sec."); + textWidget.setValue(I18N.localise(DatabaseConstants.BEE_CONTROL_KEY + ".time.sec", df.format(seconds))); } } } diff --git a/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java index e6a0b94a..21f1f8ed 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java +++ b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java @@ -3,10 +3,10 @@ package binnie.genetics.gui.database.bee; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageSpecies; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageSpecies; public class PageSpeciesClimate extends PageSpecies { ControlClimateBar tempBar; diff --git a/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java index 1fdd8fbd..aa38d64e 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java +++ b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java @@ -10,18 +10,18 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.core.genetics.alleles.EnumAllele; import binnie.Binnie; -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.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.database.DatabaseConstants; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageSpecies; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.TextJustification; import binnie.core.util.I18N; import binnie.genetics.genetics.AlleleHelper; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageSpecies; public class PageSpeciesGenome extends PageSpecies { - static final String PRE_FIX = "genetics.gui.database.tab.species.genome.extrabees."; ControlText title; ControlText speedText; ControlText lifespanText; @@ -36,17 +36,17 @@ public class PageSpeciesGenome extends PageSpecies { public PageSpeciesGenome(IWidget parent, DatabaseTab tab) { super(parent, tab); - title = new ControlTextCentered(this, 8, I18N.localise(PRE_FIX + "title")); - new ControlText(this, new Area(0, 32, 68, 30), I18N.localise(PRE_FIX + "speed"), TextJustification.TOP_RIGHT); - new ControlText(this, new Area(0, 44, 68, 30), I18N.localise(PRE_FIX + "lifespan"), TextJustification.TOP_RIGHT); - new ControlText(this, new Area(0, 56, 68, 30), I18N.localise(PRE_FIX + "fertility"), TextJustification.TOP_RIGHT); - new ControlText(this, new Area(0, 68, 68, 30), I18N.localise(PRE_FIX + "flowering"), TextJustification.TOP_RIGHT); - new ControlText(this, new Area(0, 80, 68, 30), I18N.localise(PRE_FIX + "territory"), TextJustification.TOP_RIGHT); - new ControlText(this, new Area(0, 97, 68, 30), I18N.localise(PRE_FIX + "behavior"), TextJustification.TOP_RIGHT); - new ControlText(this, new Area(0, 109, 68, 30), I18N.localise(PRE_FIX + "sunlight"), TextJustification.TOP_RIGHT); - new ControlText(this, new Area(0, 121, 68, 30), I18N.localise(PRE_FIX + "rain"), TextJustification.TOP_RIGHT); - new ControlText(this, new Area(0, 138, 68, 30), I18N.localise(PRE_FIX + "flower"), TextJustification.TOP_RIGHT); - new ControlText(this, new Area(0, 155, 68, 30), I18N.localise(PRE_FIX + "effect"), TextJustification.TOP_RIGHT); + title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".title")); + new ControlText(this, new Area(0, 32, 68, 30), I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".speed"), TextJustification.TOP_RIGHT); + new ControlText(this, new Area(0, 44, 68, 30), I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".lifespan"), TextJustification.TOP_RIGHT); + new ControlText(this, new Area(0, 56, 68, 30), I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".fertility"), TextJustification.TOP_RIGHT); + new ControlText(this, new Area(0, 68, 68, 30), I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".flowering"), TextJustification.TOP_RIGHT); + new ControlText(this, new Area(0, 80, 68, 30), I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".territory"), TextJustification.TOP_RIGHT); + new ControlText(this, new Area(0, 97, 68, 30), I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".behavior"), TextJustification.TOP_RIGHT); + new ControlText(this, new Area(0, 109, 68, 30), I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".sunlight"), TextJustification.TOP_RIGHT); + new ControlText(this, new Area(0, 121, 68, 30), I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".rain"), TextJustification.TOP_RIGHT); + new ControlText(this, new Area(0, 138, 68, 30), I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".flower"), TextJustification.TOP_RIGHT); + new ControlText(this, new Area(0, 155, 68, 30), I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".effect"), TextJustification.TOP_RIGHT); int x = 72; speedText = new ControlText(this, new Area(x, 32, 72, 30), "", TextJustification.TOP_LEFT); lifespanText = new ControlText(this, new Area(x, 44, 72, 30), "", TextJustification.TOP_LEFT); @@ -137,7 +137,7 @@ public class PageSpeciesGenome extends PageSpecies { public static String tolerated(boolean t) { if (t) { - return I18N.localise(PRE_FIX + "tolerated"); + return I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".tolerated"); } return AlleleHelper.toDisplay(EnumTolerance.NONE); } @@ -153,23 +153,23 @@ public class PageSpeciesGenome extends PageSpecies { IBee bee = Binnie.GENETICS.getBeeRoot().getBee(genome); speedText.setValue(rateSpeed(genome.getSpeed())); lifespanText.setValue(rateLifespan(genome.getLifespan())); - fertilityText.setValue(I18N.localise(PRE_FIX + "children", genome.getFertility())); + fertilityText.setValue(I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".children", genome.getFertility())); floweringText.setValue(rateFlowering(genome.getFlowering())); Vec3i area = genome.getTerritory(); territoryText.setValue(area.getX() + "x" + area.getY() + "x" + area.getZ()); - String behavior = I18N.localise(PRE_FIX + "daytime"); + String behavior = I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".daytime"); if (genome.getPrimary().isNocturnal()) { - behavior = I18N.localise(PRE_FIX + "nighttime"); + behavior = I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".nighttime"); } if (genome.getNeverSleeps()) { - behavior = I18N.localise(PRE_FIX + "allDay"); + behavior = I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".allDay"); } nocturnalText.setValue(behavior); if (genome.getCaveDwelling()) { - caveDwellingText.setValue(I18N.localise(PRE_FIX + "notNeeded")); + caveDwellingText.setValue(I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".notNeeded")); } else { - caveDwellingText.setValue(I18N.localise(PRE_FIX + "required")); + caveDwellingText.setValue(I18N.localise(DatabaseConstants.BEE_GENOME_KEY + ".required")); } tolerantFlyerText.setValue(tolerated(genome.getToleratesRain())); diff --git a/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java index 1bf643b4..98cab9e0 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java +++ b/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java @@ -3,11 +3,13 @@ package binnie.genetics.gui.database.bee; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageSpecies; +import binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.database.DatabaseConstants; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageSpecies; +import binnie.core.util.I18N; public class PageSpeciesProducts extends PageSpecies { ControlText title; @@ -17,9 +19,9 @@ public class PageSpeciesProducts extends PageSpecies { public PageSpeciesProducts(IWidget parent, DatabaseTab tab) { super(parent, tab); - title = new ControlTextCentered(this, 8, "Products"); + title = new ControlTextCentered(this, 8, I18N.localise(DatabaseConstants.BEE_PRODUCTS_KEY + ".products")); productsBox = new ControlProductsBox(this, 4, 20, 136, 48, ControlProductsBox.Type.PRODUCTS); - title2 = new ControlTextCentered(this, 68, "Specialties"); + title2 = new ControlTextCentered(this, 68, I18N.localise(DatabaseConstants.BEE_PRODUCTS_KEY + ".specialties")); specialitiesBox = new ControlProductsBox(this, 4, 80, 136, 48, ControlProductsBox.Type.SPECIALTIES); } diff --git a/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java b/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java index 44a08563..0e42578d 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java +++ b/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java @@ -7,17 +7,17 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.Binnie; import binnie.core.AbstractMod; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.database.DatabaseTab; +import binnie.core.gui.database.PageBranchOverview; +import binnie.core.gui.database.PageBranchSpecies; +import binnie.core.gui.database.PageBreeder; +import binnie.core.gui.database.PageSpeciesClassification; +import binnie.core.gui.database.PageSpeciesMutations; +import binnie.core.gui.database.PageSpeciesOverview; +import binnie.core.gui.database.PageSpeciesResultant; +import binnie.core.gui.database.WindowAbstractDatabase; +import binnie.core.gui.minecraft.Window; import binnie.genetics.Genetics; -import binnie.genetics.gui.database.DatabaseTab; -import binnie.genetics.gui.database.PageBranchOverview; -import binnie.genetics.gui.database.PageBranchSpecies; -import binnie.genetics.gui.database.PageBreeder; -import binnie.genetics.gui.database.PageSpeciesClassification; -import binnie.genetics.gui.database.PageSpeciesMutations; -import binnie.genetics.gui.database.PageSpeciesOverview; -import binnie.genetics.gui.database.PageSpeciesResultant; -import binnie.genetics.gui.database.WindowAbstractDatabase; public class WindowApiaristDatabase extends WindowAbstractDatabase { public WindowApiaristDatabase(EntityPlayer player, Side side, boolean nei) { diff --git a/src/main/java/binnie/genetics/gui/database/package-info.java b/src/main/java/binnie/genetics/gui/database/package-info.java deleted file mode 100644 index 3fd8083b..00000000 --- a/src/main/java/binnie/genetics/gui/database/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.genetics.gui.database; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java b/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java index 909a517c..397bd70d 100644 --- a/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java @@ -5,14 +5,14 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IChromosomeType; -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 binnie.core.gui.Attribute; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.renderer.RenderUtil; public class ControlChromosome extends Control implements IControlValue, ITooltip { private IChromosomeType value; diff --git a/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java b/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java index 38682d52..9ad4946c 100644 --- a/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java +++ b/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java @@ -11,12 +11,12 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -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 binnie.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.renderer.RenderUtil; public class ControlPunnett extends Control { static int boxWidth = 80; diff --git a/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java b/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java index 8e0f69a7..fbf28e25 100644 --- a/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java +++ b/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java @@ -12,13 +12,13 @@ import forestry.api.genetics.ISpeciesRoot; import binnie.Binnie; import binnie.core.AbstractMod; -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.core.gui.CraftGUI; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.resource.StyleSheet; +import binnie.core.gui.resource.minecraft.CraftGUITexture; +import binnie.core.gui.resource.minecraft.PaddedTexture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java index 653fc726..e81a94bb 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/PackageAcclimatiser.java @@ -3,7 +3,7 @@ package binnie.genetics.machine.acclimatiser; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java index ba2efab6..73b1c27d 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java @@ -7,15 +7,15 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -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.ControlProgress; -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.core.gui.geometry.Position; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlProgress; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlSlotArray; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java index 72540238..8fdbf1b6 100644 --- a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java @@ -3,7 +3,7 @@ package binnie.genetics.machine.analyser; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; diff --git a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java index efbefdd9..ebefb5d7 100644 --- a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java @@ -7,20 +7,20 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -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.core.gui.geometry.Position; +import binnie.core.gui.minecraft.GUIIcon; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlProgress; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlSlotArray; +import binnie.core.gui.minecraft.control.ControlSlotCharge; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; +import binnie.core.gui.window.Panel; import binnie.core.util.I18N; 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 b56ddbaf..c74478d5 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -7,17 +7,17 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; 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.core.gui.Attribute; +import binnie.core.gui.ITooltip; +import binnie.core.gui.IWidget; +import binnie.core.gui.Tooltip; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.events.EventMouse; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.renderer.RenderUtil; 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 7f83a395..f4ae80b2 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java @@ -9,14 +9,14 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; 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.core.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.core.Control; +import binnie.core.gui.controls.core.IControlValue; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.Window; import binnie.genetics.genetics.GeneTracker; public class ControlGeneScroll extends Control implements IControlValue { diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java b/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java index 89745602..519c5ab4 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java @@ -3,11 +3,11 @@ package binnie.genetics.machine.craftgui; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -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 binnie.core.gui.IWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.minecraft.control.ControlMachineProgress; +import binnie.core.gui.renderer.RenderUtil; public class ControlProcessTemporary extends ControlMachineProgress { public ControlProcessTemporary(final IWidget parent, final int x, final int y, final int width, final int height) { diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java index eae0b0c6..7aef5c16 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java @@ -18,23 +18,23 @@ import forestry.api.genetics.IChromosomeType; 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.core.gui.Tooltip; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextEdit; +import binnie.core.gui.controls.scroll.ControlScrollableContent; +import binnie.core.gui.controls.tab.ControlTab; +import binnie.core.gui.controls.tab.ControlTabBar; +import binnie.core.gui.events.EventHandler; +import binnie.core.gui.events.EventTextEdit; +import binnie.core.gui.events.EventValueChanged; +import binnie.core.gui.geometry.Point; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlTabIcon; +import binnie.core.gui.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 414c4103..a6d86168 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java @@ -6,7 +6,7 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import binnie.core.AbstractMod; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.minecraft.Window; import binnie.genetics.Genetics; public class WindowGeneProject extends Window { diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java index 0ba02d50..20d767d5 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java @@ -6,7 +6,7 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import binnie.core.AbstractMod; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.minecraft.Window; import binnie.genetics.Genetics; public class WindowGenomeAssembler extends WindowMachine { diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java b/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java index ef18d514..92a5706b 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java @@ -8,7 +8,7 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.craftgui.minecraft.Window; +import binnie.core.gui.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) { diff --git a/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java b/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java index 51e5fe13..a2d34cc5 100644 --- a/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java @@ -7,7 +7,7 @@ import net.minecraftforge.fluids.FluidStack; import forestry.core.fluids.Fluids; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; diff --git a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java index ee645600..cec3d5b7 100644 --- a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java @@ -7,19 +7,19 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -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.core.gui.geometry.Position; +import binnie.core.gui.minecraft.GUIIcon; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.gui.minecraft.control.ControlLiquidTank; +import binnie.core.gui.minecraft.control.ControlMachineProgress; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlSlotArray; +import binnie.core.gui.minecraft.control.ControlSlotCharge; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java b/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java index 8af3ffc5..acb6d9ba 100644 --- a/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java @@ -2,7 +2,7 @@ package binnie.genetics.machine.incubator; import net.minecraft.tileentity.TileEntity; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; diff --git a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java b/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java index 58dc2cb5..19000b60 100644 --- a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java @@ -7,18 +7,18 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -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.core.gui.geometry.Position; +import binnie.core.gui.minecraft.GUIIcon; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.gui.minecraft.control.ControlLiquidTank; +import binnie.core.gui.minecraft.control.ControlMachineProgress; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlSlotArray; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java index 95c0e948..827c9c3e 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java @@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; diff --git a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java index bfb9a1d8..61a99f30 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java @@ -7,20 +7,20 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -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.core.gui.geometry.CraftGUIUtil; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.GUIIcon; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.gui.minecraft.control.ControlLiquidTank; +import binnie.core.gui.minecraft.control.ControlMachineProgress; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlSlotArray; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java index bcd3b73e..f0cbba90 100644 --- a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java @@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack; import forestry.core.fluids.Fluids; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; diff --git a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java index 7dc329e7..b6412d07 100644 --- a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java @@ -7,19 +7,19 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -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.core.gui.geometry.Position; +import binnie.core.gui.minecraft.GUIIcon; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.gui.minecraft.control.ControlLiquidTank; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlProgress; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlSlotArray; +import binnie.core.gui.minecraft.control.ControlSlotCharge; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java index 9583e12b..d225d452 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java @@ -6,7 +6,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java index 89dc3f49..7384f119 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java @@ -7,19 +7,19 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -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.core.gui.geometry.Position; +import binnie.core.gui.minecraft.GUIIcon; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.gui.minecraft.control.ControlLiquidTank; +import binnie.core.gui.minecraft.control.ControlMachineProgress; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlSlotArray; +import binnie.core.gui.minecraft.control.ControlSlotCharge; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java b/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java index a37a2647..c364a1f7 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java +++ b/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java @@ -5,14 +5,14 @@ import java.util.Random; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -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.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.MinecraftGUI; +import binnie.core.gui.minecraft.Window; +import binnie.core.gui.minecraft.control.ControlProgressBase; +import binnie.core.gui.window.Panel; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; diff --git a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java index b6223884..095f4cad 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java @@ -3,7 +3,7 @@ package binnie.genetics.machine.sequencer; import net.minecraft.tileentity.TileEntity; import binnie.Binnie; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentChargedSlots; diff --git a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java index 531fa03e..07eadb7e 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java @@ -9,21 +9,21 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -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.core.gui.controls.ControlText; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.CraftGUIUtil; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.GUIIcon; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlSlotArray; +import binnie.core.gui.minecraft.control.ControlSlotCharge; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java b/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java index 24fc4d13..d2ef5b7c 100644 --- a/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java +++ b/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java @@ -3,10 +3,10 @@ package binnie.genetics.machine.splicer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -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 binnie.core.gui.IWidget; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.minecraft.control.ControlProgressBase; +import binnie.core.gui.renderer.RenderUtil; public class ControlSplicerProgress extends ControlProgressBase { float strength; diff --git a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java index 22fd2287..c15fb049 100644 --- a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java @@ -3,7 +3,7 @@ package binnie.genetics.machine.splicer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.gui.minecraft.IMachineInformation; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; diff --git a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java index 75a3d94f..122fa63e 100644 --- a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java @@ -7,18 +7,18 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; -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.core.gui.geometry.CraftGUIUtil; +import binnie.core.gui.geometry.Position; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.GUIIcon; +import binnie.core.gui.minecraft.control.ControlEnergyBar; +import binnie.core.gui.minecraft.control.ControlErrorState; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.gui.minecraft.control.ControlPlayerInventory; +import binnie.core.gui.minecraft.control.ControlSlot; +import binnie.core.gui.minecraft.control.ControlSlotArray; +import binnie.core.gui.resource.Texture; +import binnie.core.gui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/resources/assets/binniecore/lang/en_US.lang b/src/main/resources/assets/binniecore/lang/en_US.lang index 6612dfb2..98d67c1e 100644 --- a/src/main/resources/assets/binniecore/lang/en_US.lang +++ b/src/main/resources/assets/binniecore/lang/en_US.lang @@ -239,7 +239,25 @@ binniecore.gui.database.breeder.stats=Stats binniecore.gui.database.mutations.further=Further Mutations binniecore.gui.database.mutations.resultant=Resultant Mutations binniecore.gui.database.branch.branch=Branch -binniecore.gui.database.branch.apidae=Apidae +binniecore.gui.database.branch.name=%s Branch +binniecore.gui.database.branch.apidae=Apidae %s +binniecore.gui.database.branch.discoveredBy=Discovered by %s +binniecore.gui.database.branch.noDesc=No Description Provided. +binniecore.gui.database.mode.breeder=Breeder +binniecore.gui.database.discovered.discovered=Discovered Species +binniecore.gui.database.discovered.undiscovered=Undiscovered Species +binniecore.gui.database.control.undiscovered=Undiscovered +binniecore.gui.database.control.chance=Current Chance - %s% + +binniecore.gui.database.time.minute=1 minute +binniecore.gui.database.time.minutes=%d minutes +binniecore.gui.database.time.second=1 second +binniecore.gui.database.time.seconds=%d seconds +binniecore.gui.database.time.progress=Progress +binniecore.gui.database.time.notInProgress=Not in Progress +binniecore.gui.database.time.inProgress=In Progress +binniecore.gui.database.time.left=Time Left: %s +binniecore.gui.database.time.total=Total Time: %s binniecore.gui.temperature.short=Temp. binniecore.gui.humidity.short=Humid. diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index 144c3ac6..ee7b3cb6 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -213,15 +213,16 @@ for.binnie.circuit.garden.damp.acid=Garden (Damp, Acidic) for.binnie.circuit.garden.damp.neutral=Garden (Damp, Neutral) for.binnie.circuit.garden.damp.alkaline=Garden (Damp, Alkaline) -botany.gui.controls.color_mix_symbol.chance=Current Chance - %f%% -botany.gui.controls.page.species_further.title=Resultant Mixes -botany.gui.controls.page.color_further.title=Further Mixes +botany.gui.database.control.color_mix_symbol.chance=Current Chance - %f%% + +botany.gui.database.pages.color_further.title=Further Mixes +botany.gui.database.pages.species_further.title=Resultant Mixes botany.gui.database.name=FlowerDatabase botany.gui.database.tab.color=Color botany.gui.database.tab.species.overview=Overview -botany.gui.database.tab.genome=Genome +botany.gui.database.tab.genome.title=Genome botany.gui.database.tab.genome.temp=Temp. : botany.gui.database.tab.genome.moist=Moist. : botany.gui.database.tab.genome.ph=pH. : diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index 653406ec..df1a0139 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -333,6 +333,12 @@ genetics.gui.database.tab.species.genome.extrabees.children=%d children genetics.gui.database.tab.species.genome.extrabees.notNeeded=Not Needed genetics.gui.database.tab.species.genome.extrabees.required=Required +genetics.gui.database.control.extrabees.time.hours=Every %s hours +genetics.gui.database.control.extrabees.time.min=Every %s min. +genetics.gui.database.control.extrabees.time.sec=Every %s sec. +genetics.gui.database.products.extrabees.products=Products +genetics.gui.database.products.extrabees.specialties=Specialties + genetics.gui.database.tab.species.overview=Overview genetics.gui.database.tab.species.classification=Classification genetics.gui.database.tab.species.genome=Genome